Anuken d3ec50825e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/version.properties # core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java		2018-02-27 19:58:34 -05:00
..
assets	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-02-27 19:58:34 -05:00
assets-raw/sprites	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-02-27 19:58:34 -05:00
src	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-02-27 19:58:34 -05:00
build.gradle	Removed direct usage of texture packer, buildscript cleanup	2018-01-26 15:09:13 -05:00