Anuken be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl ... # 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/mindustry/Vars.java # core/src/mindustry/entities/traits/SaveTrait.java # core/src/mindustry/maps/generators/MapGenerator.java # core/src/mindustry/ui/dialogs/DeployDialog.java # core/src/mindustry/world/blocks/Floor.java # desktop/src/mindustry/desktop/DesktopLauncher.java # gradle.properties		2020-02-04 12:25:18 -05:00
..
res	New icon	2019-08-12 13:29:02 -04:00
src/mindustry/android	Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl	2020-02-04 12:25:18 -05:00
AndroidManifest.xml	Android fixes	2019-12-25 12:06:19 -05:00
build.gradle	Android fixes	2019-12-25 12:06:19 -05:00
ic_launcher-web.png	New icon	2019-08-12 13:29:02 -04:00
proguard-project.txt	it is done	2019-12-25 01:39:38 -05:00
project.properties	Source reformat	2019-04-08 09:03:18 -04:00