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
..
src/io/anuke/mindustry/desktop	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-05-23 10:36:59 -04:00
build.gradle	Updated build.gradle to fix invalid JVM args for windows	2018-05-05 15:47:18 -04:00