Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

Browse Source 
# 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
This commit is contained in:
Anuken
2018-05-23 10:36:59 -04:00
parent 3f1389818c b4088dcfbc
commit fd77dfd66d
74 changed files with 533 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/io/anuke/mindustry/AndroidLauncher.java
View File

@@ -20,7 +20,7 @@ import io.anuke.kryonet.DefaultThreadImpl;
import io.anuke.kryonet.KryoClient;
import io.anuke.kryonet.KryoServer;
import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
import io.anuke.mindustry.io.Platform;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.scene.ui.TextField;