From 7cce9fad553d637067d4497aae866c761dcbeb1f Mon Sep 17 00:00:00 2001 From: "Mr.S" <75036456+MrS-1302@users.noreply.github.com> Date: Sun, 8 Jan 2023 03:44:56 +0100 Subject: [PATCH 01/10] Update servers_v7.json (#8128) Server upgrade to V7 --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 564b292ef5..2a89abcb2f 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -118,5 +118,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"] } ] From 23d3c2dfe782a97302bd8149d4fe668bacb04d50 Mon Sep 17 00:00:00 2001 From: xem8k5 <69492624+xem8k5@users.noreply.github.com> Date: Sun, 8 Jan 2023 11:58:42 +0800 Subject: [PATCH 02/10] Update servers_v7.json (#8129) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 2a89abcb2f..67433e08ff 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -85,7 +85,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", From 33f6004c816e4f0d8f88b2bb40e0111354fabca1 Mon Sep 17 00:00:00 2001 From: adamlolgaming <94706391+adamlolgaming@users.noreply.github.com> Date: Sun, 8 Jan 2023 05:34:18 +0100 Subject: [PATCH 03/10] Update bundle_pl.properties (#8057) --- core/assets/bundles/bundle_pl.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 97e5eb1384..ce1f8c7bee 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/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 From 021173252029abbc2d18a8a31a6d447969685f2e Mon Sep 17 00:00:00 2001 From: Miniontoby <47940064+Miniontoby@users.noreply.github.com> Date: Sun, 8 Jan 2023 05:38:12 +0100 Subject: [PATCH 04/10] Fixed sand-floor translation in Dutch (#8058) Changed from 'Donker Zand' which means 'dark sand' to 'Zand' which is just 'sand' --- core/assets/bundles/bundle_nl.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index f1367ae3eb..cf4c3c07dd 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/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 From 50cc281e24dc39de1c72114efcb7415d2ff3fc76 Mon Sep 17 00:00:00 2001 From: MWestfall Date: Sat, 7 Jan 2023 23:38:26 -0500 Subject: [PATCH 05/10] Update servers_v6.json (#7990) Remove ECAN from v6 --- servers_v6.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 5c724f7007..4a81579e64 100644 --- a/servers_v6.json +++ b/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"] From b9c85fcaf27f866a35a42db94c76543afa84244a Mon Sep 17 00:00:00 2001 From: MWestfall Date: Sat, 7 Jan 2023 23:40:42 -0500 Subject: [PATCH 06/10] Update servers_v7.json (#7989) Add ECAN to v7 --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 67433e08ff..f61b3c7cb9 100644 --- a/servers_v7.json +++ b/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"] From 13bca1b7bd6997c6b9c0de175398a1659d583fd6 Mon Sep 17 00:00:00 2001 From: Volas171 Date: Sat, 7 Jan 2023 23:41:28 -0500 Subject: [PATCH 07/10] Update servers_v7.json (#8074) * Update servers_v7.json * little space --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index f61b3c7cb9..3e0f9e4a40 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -41,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", From 36513c709df8216000e99305380ab1b9996315fb Mon Sep 17 00:00:00 2001 From: Somka000 <51973243+Somka000@users.noreply.github.com> Date: Sun, 8 Jan 2023 05:42:16 +0100 Subject: [PATCH 08/10] Add server to list (#8009) Co-authored-by: Anuken --- servers_v7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 3e0f9e4a40..496859f344 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -16,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", From 5b3531955927d826dba67d69e772b86e6313234f Mon Sep 17 00:00:00 2001 From: Somka000 <51973243+Somka000@users.noreply.github.com> Date: Sun, 8 Jan 2023 05:42:28 +0100 Subject: [PATCH 09/10] Add server to list (#8009) Co-authored-by: Anuken From e6bfc1cee82e5a36f1bf341521860bf1d35cfc29 Mon Sep 17 00:00:00 2001 From: Khanx Date: Sun, 8 Jan 2023 06:15:55 +0100 Subject: [PATCH 10/10] Updated spanish translation (#7928) --- core/assets/bundles/bundle_es.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 4a2a5afb2b..1bc2e825e1 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -154,7 +154,7 @@ mod.outdatedv7.details = Este mod no es compatible con la última versión del j mod.blacklisted.details = Este mod ha sido bloqueado manualmente por causar cierres inesperados, errores u otros problemas en esta versión del juego. Será mejor no usarlo. mod.missingdependencies.details = A este mod le faltan dependencias: {0} mod.erroredcontent.details = La partida causó errores al cargar. Puedes pedir al autor del mod que los arregle. -mod.requiresversion = Requires game version: [red]{0} +mod.requiresversion = Requiere la versión del juego: [red]{0} mod.errors = Ha ocurrido un fallo al cargar el contenido. mod.noerrorplay = [scarlet]Se están ejecutando algunos mods con fallos.[]Debes deshabilitarlos o arreglar los errores antes de jugar. mod.nowdisabled = [scarlet]El mod '{0}' necesita ejecutarse junto a otros mods de los que depende:[accent] {1}\n[lightgray]Es necesario descargar primero estos mods.\nEste mod se desactivará automaticamente. @@ -243,7 +243,7 @@ servers.disclaimer = Los servidores de la comunidad [accent]no[] son propiedad d servers.showhidden = Mostrar servidores ocultos server.shown = Visibles server.hidden = Ocultos -viewplayer = Viewing Player: [accent]{0} +viewplayer = Viendo Jugador: [accent]{0} trace = Rastrear Jugador trace.playername = Nombre del jugador: [accent]{0} @@ -326,11 +326,11 @@ open = Abrir customize = Personalizar reglas cancel = Cancelar command = Comando -command.mine = Mine -command.repair = Repair -command.rebuild = Rebuild -command.assist = Assist Player -command.move = Move +command.mine = Minar +command.repair = Reparar +command.rebuild = Reconstruir +command.assist = Asistir Jugador +command.move = Mover openlink = Abrir enlace copylink = Copiar enlace back = Atrás