Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -788,7 +788,7 @@ sector.crossroads.name = Crossroads
 sector.karst.name = Karst
 sector.origin.name = Origin
 
-sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
+sector.onset.description = Gather resources, research tech to automate production.\nBegin your attack.
 sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
 sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
 sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.

servers_v6.json

@@ -11,10 +11,6 @@
     "name": "{AA}",
     "address": ["recessive.net"]
   },
-  {
-    "name": "Omega Hub",
-    "address": ["n7.mindustry.me:6567","n1.mindustry.me:6568","n7.mindustry.me:6570","n1.mindustry.me:6570","n1.mindustry.me:6609", "n1.mindustry.me:6577"]
-  },
   {
     "name": "EasyPlay",
     "address": ["easyplay.su"]
@@ -123,10 +119,6 @@
     "name": "MindustryBR",
     "address": ["mindustryptbr.ddns.net:25579"]
   },
-  {
-    "name": "Conservatory",
-    "address": ["143.198.71.232"]
-  },
   {
     "name": "Shard",
     "address": ["59.12.120.171"]
@@ -134,9 +126,5 @@
   {
     "name": "New Campaign Like",
     "address": ["n5.yeet.ml:6568"]
-  },
-  {
-    "name": "AlternightBR",
-    "address": ["mindustrypt.ga:8300"]
   }
 ]

servers_v7.json

@@ -1,4 +1,8 @@
 [
+  {
+    "name": "Mindustry Español",
+    "address": ["mes.xpdustry.fr"]
+  },
   {
     "name": "mindustry.pl",
     "address": ["0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000", "1.baseduser.eu.org:6966", "1.baseduser.eu.org:6666", "1.baseduser.eu.org:6000"]
@@ -25,7 +29,7 @@
   },
   {
     "name": "Omega Hub",
-    "address": ["n1.mindustry.me:6572","n1.mindustry.me:6573","n1.mindustry.me:6574","n1.mindustry.me:6604","n1.mindustry.me:6569","n1.mindustry.me:6611","n1.mindustry.me:6610","n1.mindustry.me:6599","n1.mindustry.me","n1.mindustry.me:6608"]
+    "address": ["n7.mindustry.me", "n7.mindustry.me:6570", "n1.mindustry.me:6568", "n1.mindustry.me:6570", "n1.mindustry.me:6571", "n1.mindustry.me:6573", "n1.mindustry.me", "n1.mindustry.me:6599", "n1.mindustry.me:6774", "n1.mindustry.me:6608", "n1.mindustry.me:6572"]
   },
   {
     "name": "KMWStudios",
@@ -51,6 +55,10 @@
     "name": "Phoenix Network",
     "address": ["phoenix-network.dev", "phoenix-network.dev:6464"]
   },
+  {
+    "name": "Xpdustry",
+    "address": ["play.xpdustry.fr", "event.xpdustry.fr"]
+  },
   {
     "name": "Pandorum",
     "address": ["pandorum.su:5018", "pandorum.su:5019", "pandorum.su:5020"]
@@ -90,5 +98,5 @@
   {
     "name": "Sakura", 
     "address": ["160.16.207.141:22527", "160.16.207.141:23527", "160.16.207.141:24527", "160.16.207.141:25527", "160.16.207.141:26527"]
-  },
+  }
 ]