Merged with master

2020-02-09 12:27:44 -05:00
parent d2ab316072 baab36bfc5
commit a2706a80b1
84 changed files with 488 additions and 413 deletions
--- a/server/src/mindustry/server/ServerLauncher.java
+++ b/server/src/mindustry/server/ServerLauncher.java
@@ -82,4 +82,4 @@ public class ServerLauncher implements ApplicationListener{

        Events.fire(new ServerLoadEvent());
    }
-}
+}