Merge

2020-01-18 11:16:03 -05:00
parent b20e0967fd 95352e1729
commit f044f30829
236 changed files with 6310 additions and 6330 deletions
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -19,6 +19,7 @@ import arc.util.serialization.*;
 import mindustry.*;
 import mindustry.game.Saves.*;
 import mindustry.io.*;
+import mindustry.net.*;
 import mindustry.ui.dialogs.*;

 import java.io.*;
@@ -144,6 +145,7 @@ public class AndroidLauncher extends AndroidApplication{
        }, new AndroidApplicationConfiguration(){{
            useImmersiveMode = true;
            hideStatusBar = true;
+            errorHandler = CrashSender::log;
        }});
        checkFiles(getIntent());