Anuken fd77dfd66d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # build.gradle # core/src/io/anuke/mindustry/Vars.java # core/src/io/anuke/mindustry/core/Control.java # core/src/io/anuke/mindustry/core/Logic.java # core/src/io/anuke/mindustry/core/NetClient.java # core/src/io/anuke/mindustry/core/NetServer.java # core/src/io/anuke/mindustry/core/UI.java # core/src/io/anuke/mindustry/editor/MapSaveDialog.java # core/src/io/anuke/mindustry/input/GestureHandler.java # core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java # core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java # core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java # gradle/wrapper/gradle-wrapper.properties # server/src/io/anuke/mindustry/server/ServerControl.java		2018-05-23 10:36:59 -04:00
..
res
src/io/anuke/mindustry	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-05-23 10:36:59 -04:00
AndroidManifest.xml	Improved rubble and VTOL accuracy	2018-05-01 19:07:13 -04:00
build.gradle	Optimized floor rendering	2018-05-02 11:38:44 -04:00
ic_launcher-web.png
proguard-project.txt
project.properties