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
..
power	Fixed tests	2019-12-12 16:33:24 -05:00
ApplicationTests.java	Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0	2019-12-24 12:40:23 -05:00
IOTests.java	Fixed #971	2019-11-01 12:48:42 -04:00
ZoneTests.java	Refactoring of functional package	2019-10-29 15:57:25 -04:00