Merge

2019-08-30 16:39:40 -04:00
parent bbadf6795e 6d9a59c60b
commit 7aafa8b150
172 changed files with 6795 additions and 5599 deletions
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
@@ -23,7 +23,7 @@ public class DesktopLauncher{
                Net.setServerProvider(new ArcNetServer());
            }

-            new SdlApplication(new Mindustry(), new SdlConfig(){{
+            new SdlApplication(new ClientLauncher(), new SdlConfig(){{
                title = "Mindustry";
                maximized = true;
                depth = 0;