Merge branch 'master' into patch-3

2020-07-22 21:40:05 -04:00
parent b291c09b73 1b17944901
commit b9ff9b7ee4
173 changed files with 4506 additions and 2406 deletions
@@ -50,6 +50,9 @@
  {
    "address": "mindustry.atannergaming.com:8000"
  },
+  {
+    "address": "mindustry.atannergaming.com:6800"
+  },
  {
    "address": "mindustry.kbni.net.au:6567"
  },
@@ -62,6 +65,9 @@
  {
    "address": "Chaotic-Neutral.ddns.net:1111"
  },
+  {
+    "address": "Chaotic-Neutral.ddns.net:4444"
+  },
  {
    "address": "Chaotic-Neutral.ddns.net:3333"
  }