From 0cc22149517db5a51cc602c7f00fa509d8c2457f Mon Sep 17 00:00:00 2001 From: Volas171 Date: Fri, 25 Jun 2021 13:41:24 -0500 Subject: [PATCH 1/4] Add Mindustry Reborn to V7 Alpha list (#5470) * v7 * be removal * formatting Co-authored-by: Anuken --- servers_be.json | 3 --- servers_v7.json | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/servers_be.json b/servers_be.json index 2c9abaa644..fb1e551f24 100644 --- a/servers_be.json +++ b/servers_be.json @@ -7,8 +7,5 @@ }, { "address": "v7.mindurka.tk:9999" - }, - { - "address": "mindustry.me:7000" } ] diff --git a/servers_v7.json b/servers_v7.json index 283c38b759..bc3cac26be 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -2,6 +2,10 @@ { "address": "mindustry.us.to" }, + { + "name": "[accent]Mindustry [red]Reborn", + "address": "mindustry.me:7000" + }, { "name": "Omega", "address": "157.90.180.53:25777" From 7e2c830f9cb341ae9b420c8ec49c1e11b104a21c Mon Sep 17 00:00:00 2001 From: Ilya246 <57039557+Ilya246@users.noreply.github.com> Date: Sat, 26 Jun 2021 00:01:38 +0400 Subject: [PATCH 2/4] Add .pl to 7.0 serverlist (#5466) * Add .pl to 7.0 serverlist .pl will move to 7.0 once b127 is out Somka currently can't make a PR by himself so i asked him whether i should and, after a positive answer, did it for him * Update servers_v7.json --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index bc3cac26be..0269115244 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -2,6 +2,10 @@ { "address": "mindustry.us.to" }, + { + "name": "mindustry.pl", + "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl:6966"] + }, { "name": "[accent]Mindustry [red]Reborn", "address": "mindustry.me:7000" From ff1ab9dd425f582211ddde94a193948522efcf74 Mon Sep 17 00:00:00 2001 From: L0615T1C5-216AC-9437 <60281819+L0615T1C5-216AC-9437@users.noreply.github.com> Date: Fri, 25 Jun 2021 16:22:11 -0400 Subject: [PATCH 3/4] Add Chaotic Neutral Survival to BE Server List (#5435) Co-authored-by: Anuken --- servers_be.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers_be.json b/servers_be.json index fb1e551f24..eff76d37c5 100644 --- a/servers_be.json +++ b/servers_be.json @@ -7,5 +7,8 @@ }, { "address": "v7.mindurka.tk:9999" + }, + { + "address": "c-n.ddns.net:6567" } ] From ebd444cc5ff75ba2b3e1c6c8a17c31397f440816 Mon Sep 17 00:00:00 2001 From: Catchears <57631841+Catchears@users.noreply.github.com> Date: Fri, 25 Jun 2021 22:57:20 +0200 Subject: [PATCH 4/4] final v7 german translation (#5473) --- core/assets/bundles/bundle_de.properties | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index dc70c9f685..4e08fe56a9 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -460,6 +460,7 @@ toolmode.drawteams = Teams zeichnen toolmode.drawteams.description = Zeichnet Teams statt Blöcke. filters.empty = [lightgray]Keine Filter! Füge einen mit dem unteren Knopf hinzu. + filter.distort = Verzerren filter.noise = Rauschen filter.enemyspawn = Gegnerischer Spawn Auswahl @@ -476,6 +477,7 @@ filter.clear = Löschen filter.option.ignore = Ignorieren filter.scatter = Streuen filter.terrain = Landschaft + filter.option.scale = Skalierung filter.option.chance = Wahrscheinlichkeit filter.option.mag = Größe @@ -490,6 +492,7 @@ filter.option.block = Block filter.option.floor = Boden filter.option.flooronto = Zielboden filter.option.target = Ziel +filter.option.replacement = Ersatz filter.option.wall = Wand filter.option.ore = Erz filter.option.floor2 = Sekundärer Boden @@ -675,6 +678,7 @@ unit.nobuild = [scarlet]Einheit kann nicht bauen! lastaccessed = [lightgray]Zuletzt konfiguriert: {0} block.unknown = [lightgray]??? +stat.showinmap = <öffne Spiel um zu zeigen> stat.description = Beschreibung stat.input = Eingang stat.output = Ausgang @@ -991,6 +995,7 @@ rules.waves = Wellen rules.attack = Angriff-Modus rules.buildai = KI kann bauen rules.corecapture = Kern nach Zerstörung einnehmen +rules.polygoncoreprotection = Polygonaler Kernschutz rules.enemyCheat = Unbegrenzte Ressourcen für die KI (Rotes Team) rules.blockhealthmultiplier = Block-Lebenspunkte-Multiplikator rules.blockdamagemultiplier = Block-Schaden-Multiplikator @@ -1161,6 +1166,7 @@ block.spore-cluster.name = Sporen-Cluster block.metal-floor.name = Metallboden 1 block.metal-floor-2.name = Metallboden 2 block.metal-floor-3.name = Metallboden 3 +block.metal-floor-4.name = Metallboden 4 block.metal-floor-5.name = Metallboden 5 block.metal-floor-damaged.name = beschädigter Metallboden block.dark-panel-1.name = Dunkles Panel 1 @@ -1585,6 +1591,8 @@ lst.sensor = Gibt Daten über einen Block oder eine Einheit wieder. lst.set = Setzt eine Variable fest. lst.operation = Verändert eine Variable. lst.end = Springt wieder nach oben. +lst.wait = Wartet eine bestimmte Zeit. +lst.lookup = Sucht ein Item, eine Flüssigkeit, eine Einheit oder einen Block.\nGesamtmengen von jeder Sache können mit \n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nabgerufen werden. lst.jump = Falls die Bedingung erfüllt ist, wird woanders weitergemacht. lst.unitbind = Speichert eine Einheit einer Sorte als [accent]@unit[]. lst.unitcontrol = Steuert [accent]@unit[].