Anuken 78f146fbcf 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/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/graphics/Shaders.java
#	gradle.properties

2019-12-01 17:42:56 -05:00

..

src/test

Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

2019-12-01 17:42:56 -05:00

build.gradle

Save loading regression tests

2019-06-12 15:52:47 -04:00