Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	core/assets/bundles/bundle_ko.properties

servers_v6.json

@@ -9,7 +9,7 @@
   },
   {
     "name": "Yeet Hosting",
-    "address": ["omegam.mindustry.me:5004", "omegav.mindustry.me:25575", "omegav.mindustry.me:25588"]
+    "address": ["node2.crewcraft.cc:25568", "node2.crewcraft.cc:25570"]
   },
   {
     "name": "RCM",
@@ -25,7 +25,7 @@
   },
   {
     "name": "C.A.M.S.",
-    "address": ["baseduser.eu.org:6568", "nikochio.ddns.net", "play.thedimas.pp.ua"]
+    "address": ["0.baseduser.eu.org:42000", "nikochio.ddns.net", "play.thedimas.pp.ua"]
   },
   {
     "name": "ECAN",
@@ -61,7 +61,7 @@
   },
   {
     "name": "Korea",
-    "address": ["mindustry.initd.kr"]
+    "address": ["mindustry.initd.kr","mindustry.kr:7100"]
   },
   {
     "name": "Omega",

servers_v7.json

@@ -1,11 +1,11 @@
 [
   {
     "name": "mindustry.pl",
-    "address": ["0.baseduser.eu.org:6000", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6966"]
+    "address": ["130.61.226.9", "0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000"]
   },
   {
     "name": "C.A.M.S.",
-    "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua", "yeeth.mindustry.me:7000", "yeeth.mindustry.me:4000", "yeeth.mindustry.me:2000", "yeeth.mindustry.me:3000"]
+    "address": ["0.baseduser.eu.org:42001", "0.baseduser.eu.org:42002", "v7.thedimas.pp.ua", "yeeth.mindustry.me:7000", "yeeth.mindustry.me:4000", "yeeth.mindustry.me:2000", "yeeth.mindustry.me:3000"]
   },
   {
     "name": "SMokeOfAnarchy",
@@ -17,7 +17,7 @@
   },
   {
     "name": "Omega",
-    "address": ["omegam.mindustry.me:25577", "omegam.mindustry.me", "omegam.mindustry.me:25586", "omegam.mindustry.me:25565"]
+    "address": ["node2.crewcraft.cc:25569", "node2.crewcraft.cc:25571", "node2.crewcraft.cc:25572"]
   },
   {
     "name": "MeowLand",