Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_es.properties

@@ -79,7 +79,7 @@ schematic.addtag = Añadir etiqueta
 schematic.texttag = Texto de etiqueta
 schematic.icontag = Icono de etiqueta
 schematic.renametag = Renombrar etiqueta
-schematic.tagged = {0} tagged
+schematic.tagged = {0} etiquetado
 schematic.tagdelconfirm = ¿Eliminar completamente esta etiqueta?
 schematic.tagexists = Esa etiqueta ya existe.
 
@@ -264,10 +264,10 @@ trace.ips = IPs:
 trace.names = Names:
 invalidid = ¡ID de cliente no válida! Puedes enviar un informe reportando el error.
 player.ban = Ban
-player.kick = Kick
+player.kick = Expulsar
 player.trace = Trace
 player.admin = Toggle Admin
-player.team = Change Team
+player.team = Cambiar equipo
 server.bans = Vetos
 server.bans.none = ¡No se ha vetado a ningún usuario!
 server.admins = Administradores
@@ -284,7 +284,7 @@ confirmkick = ¿Quieres expulsar a "{0}[white]"?
 confirmunban = ¿Quieres quitar el veto a este jugador?
 confirmadmin = ¿Quieres hacer administrador a "{0}[white]"?
 confirmunadmin = ¿Quieres quitarle los permisos de administrador a "{0}[white]"?
-votekick.reason = Vote-Kick Reason
+votekick.reason = Razón del Voto de Expulsión
 votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Unirse a una Partida
 joingame.ip = Dirección IP:
@@ -303,7 +303,7 @@ server.invalidport = ¡El número de puerto no es valido!
 server.error = [scarlet]Error alojando el servidor.
 save.new = Nuevo archivo de guardado
 save.overwrite = ¿Quieres sobrescribir\neste guardado?
-save.nocampaign = Individual save files from the campaign cannot be imported.
+save.nocampaign = Los archivos individuales guardados de la campaña no se pueden importar.
 overwrite = Sobrescribir
 save.none = ¡No se ha encontrado ningún archivo de guardado!
 savefail = ¡No se ha podido guardar la partida!

servers_v7.json

@@ -1,8 +1,4 @@
 [
-  {
-    "name": "OmniCorp Classic",
-    "address": ["omnidustry.ddns.net:6567","omnidustry.ddns.net:6568","omnidustry.ddns.net:6569","omnidustry.ddns.net:6570","omnidustry.ddns.net:6571","omnidustry.ddns.net:6572","omnidustry.ddns.net:6573","omnidustry.ddns.net:6574"]
-  },
   {
     "name": "meiqiuMDT",
     "address": ["43.248.103.156:14740","211.101.236.94:10000","bj-1.lcf.icu:10240"]
@@ -123,6 +119,10 @@
     "name": "Fish",
     "address": ["162.248.101.95", "162.248.100.98", "162.248.100.133", "162.248.102.204", "c-n.ddns.net:7003"]
   },
+  {
+    "name": "OmniCorp Classic",
+    "address": ["omnidustry.ru:6567", "omnidustry.ru:6568", "omnidustry.ru:6569", "omnidustry.ru:6570", "omnidustry.ru:6571", "omnidustry.ru:6572", "omnidustry.ru:6573", "omnidustry.ru:6574"]
+  },
   {
     "name": "The Devil",
     "address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936", "n2.akiracloud.net:10404", "new.xem8k5.top"]
@@ -157,7 +157,7 @@
   },
   {
     "name": "|RussianServers|[]",
-    "address": ["tyancraft.ru:6567", "tyancraft.ru:6568", "tyancraft.ru:6569", "tyancraft.ru:6570", "tyancraft.ru:6571", "tyancraft.ru:6572", "tyancraft.ru:6573"]
+    "address": ["02calm.ru:6567", "02calm.ru:6568", "02calm.ru:6569", "02calm.ru:6570", "02calm.ru:6571", "02calm.ru:6572", "02calm.ru:6573"]
   },
   {
     "name": "Hungarian",
@@ -169,7 +169,7 @@
   },
   {
     "name": "Router Pi",
-    "address": ["a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com"]
+    "address": ["a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6568", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6569", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6570", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6571", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6572", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6573", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6574"]
   },
   {
     "name": "Vndustry",