Merge branch 'master' into multiplayer

2017-12-30 19:44:31 -05:00
parent 4a2b2dee72 6db329900e
commit 85ade1b346
10 changed files with 526 additions and 6 deletions
--- a/core/src/io/anuke/mindustry/net/Packets.java
+++ b/core/src/io/anuke/mindustry/net/Packets.java
@@ -13,4 +13,7 @@ public class Packets {
        public String addressTCP;
    }

+    public static class WorldData {
+
+    }
 }