Anuken 9e3870acbe Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework ...

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
#	gradle.properties

2019-12-02 22:45:05 -05:00

..

blocks

Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework

2019-12-02 22:45:05 -05:00

editor

Cleanup

2019-06-04 23:30:07 -04:00

effects

Lighting improvements

2019-11-10 16:18:47 -05:00

items

Cleanup, main menu progress

2019-07-03 23:36:51 -04:00

mechs

Alpha stuff

2019-10-16 18:57:19 -04:00

shapes

Fixed performance regression / Removed useless fallback sprites

2019-07-03 17:07:22 -04:00

ui

Texture overrides / Potential mod texture binding optimizations

2019-11-25 20:50:32 -05:00

units

Display document import errors on iOS

2019-11-09 15:30:02 -05:00

weapons

Alpha sprite

2019-10-16 18:36:02 -04:00

zones

Fixed map loading bugs

2019-09-01 10:46:44 -04:00

pack.json

Cleanup

2019-06-04 23:30:07 -04:00