Anuken 32d28a4070 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites2.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/io/anuke/mindustry/ctype/ContentType.java # core/src/io/anuke/mindustry/ctype/UnlockableContent.java # core/src/io/anuke/mindustry/io/LegacyMapIO.java # core/src/io/anuke/mindustry/type/WeatherEvent.java # gradle.properties		2019-12-24 12:40:23 -05:00
..
blocks	Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0	2019-12-24 12:40:23 -05:00
editor
effects	Lighting improvements	2019-11-10 16:18:47 -05:00
items
mechs
shapes
ui	Added Feathub to the "About" tab (#1234)	2019-12-19 19:33:24 -05:00
units	Display document import errors on iOS	2019-11-09 15:30:02 -05:00
weapons
zones
pack.json