Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/assets/bundles/bundle_es.properties

core/assets/bundles/bundle_nl.properties

@@ -1374,7 +1374,7 @@ block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Donker Zand Vervuild Water
 block.tar.name = Olie
 block.stone.name = Steen
-block.sand-floor.name = Donker Zand
+block.sand-floor.name = Zand
 block.darksand.name = Donker Zand
 block.ice.name = Ijs
 block.snow.name = Sneeuw

core/assets/bundles/bundle_pl.properties

@@ -1527,7 +1527,7 @@ block.rotary-pump.name = Wirowa Pompa
 block.thorium-reactor.name = Reaktor Torowy
 block.mass-driver.name = Katapulta Masy
 block.blast-drill.name = Wybuchowe Wiertło
-block.impulse-pump.name = Impulsywna Pompa
+block.impulse-pump.name = Impulsowa Pompa
 block.thermal-generator.name = Generator Termalny
 block.surge-smelter.name = Piec Mieszający
 block.mender.name = Naprawiacz

servers_v6.json

@@ -23,10 +23,6 @@
     "name": "C.A.M.S.",
     "address": ["0.baseduser.eu.org:42000", "nikochio.ddns.net"]
   },
-  {
-    "name": "ECAN",
-    "address": ["mindustry.ecansol.com:6597", "mindustry.ecansol.com:6499", "mindustry.ecansol.com:6599"]
-  },
   {
     "name": "Chaotic Neutral",
     "address": ["c-n.ddns.net:1111", "c-n.ddns.net:2222", "c-n.ddns.net:3333"]

servers_v7.json

@@ -3,6 +3,10 @@
     "name": "generic mindustry",
     "address": ["212.192.29.92:25554", "212.192.29.24:25298"]
   },
+  {
+    "name": "ECAN",
+    "address": ["mindustry.ecansol.com:6597", "mindustry.ecansol.com:6499", "mindustry.ecansol.com:6599"]
+  },
   {
     "name": "Mindustry Español",
     "address": ["mes.xpdustry.fr"]
@@ -12,8 +16,8 @@
     "address": ["smokeofanarchy.ru, backup.smokeofanarchy.ru"]
   },
   {
-    "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"]
+    "name": "Mindustry.pl",
+    "address": ["78.46.100.178", "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"]
   },
   {
     "name": "SynapseOS",
@@ -37,7 +41,7 @@
   },
   {
     "name": "Omega Hub",
-    "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"]
+    "address": ["omegahub.xyz", "rush.omegahub.xyz", "annexation.omegahub.xyz", "2r2t.omegahub.xyz", "3r3t.omegahub.xyz", "campaign.omegahub.xyz", "rapid.omegahub.xyz", "survivalattack.omegahub.xyz", "castlewars.omegahub.xyz", "skyblock.omegahub.xyz", "skywarsranked.omegahub.xyz", "colonization.omegahub.xyz"]
   },
   {
     "name": "KMWStudios",
@@ -85,7 +89,7 @@
   },
   {
     "name": "The Devil",
-    "address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936"]
+    "address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936", "n2.akiracloud.net:10404"]
   },
   {
     "name": "Eradicationdustry",
@@ -118,5 +122,9 @@
   {
     "name": "|RussianServers|[]",
     "address": ["2p2g.ml:6568","2p2g.ml:6569","2p2g.ml:6570","2p2g.ml:6571","2p2g.ml:6572","2p2g.ml:6573"]
+  },
+  {
+    "name": "Hungarian",
+    "address": ["play.hudustry.tk"]
   }
 ]