Anuken 91c3cb93f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # build.gradle # core/assets/bundles/bundle_es_LA.properties # core/assets/version.properties		2018-04-25 20:45:39 -04:00
..
assets	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-04-25 20:45:39 -04:00
assets-raw/sprites	Implemented ammo ressuplying	2018-04-24 21:38:57 -04:00
src	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-04-25 20:45:39 -04:00
build.gradle	Removed direct usage of texture packer, buildscript cleanup	2018-01-26 15:09:13 -05:00