Anuken 9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/version.properties		2018-03-09 20:58:21 -05:00
..
res	Add drop shadow to icon	2017-12-20 00:46:01 -05:00
src/io/anuke/mindustry	Changed android UUID flow, again	2018-03-08 22:36:22 -05:00
AndroidManifest.xml	Fixed some admin bugs	2018-02-26 22:05:07 -05:00
build.gradle	Completely borked liquid/power/inventory system	2018-03-07 22:54:12 -05:00
ic_launcher-web.png	Add drop shadow to icon	2017-12-20 00:46:01 -05:00
proguard-project.txt
project.properties