From bf9d61ce3a754697269e39a65d0de18dbacdc65a Mon Sep 17 00:00:00 2001 From: Epowerj Date: Fri, 11 Nov 2022 10:26:49 -0500 Subject: [PATCH 1/8] Updated onset description --- core/assets/bundles/bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 7dd9c7980d..e5309261cf 100644 --- a/core/assets/bundles/bundle.properties +++ b/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. From 30eda697fa293f631271f6f5ee40cfdd846b0a8f Mon Sep 17 00:00:00 2001 From: Phinner <62483793+Phinner@users.noreply.github.com> Date: Fri, 11 Nov 2022 16:27:13 +0000 Subject: [PATCH 2/8] Update servers_v7.json (#7873) * Update servers_v7.json I come back from the deads, with an extra server. * The forbidden comma --- servers_v7.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 6b83f81f9e..bfb40f07c4 100644 --- a/servers_v7.json +++ b/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"] @@ -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"] - }, + } ] From c3732e51f796f64edf094d736f92ab8b0d930721 Mon Sep 17 00:00:00 2001 From: Volas171 Date: Fri, 11 Nov 2022 13:29:43 -0500 Subject: [PATCH 3/8] Update servers_v6.json (#7878) --- servers_v6.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 2a759dc455..51485db66a 100644 --- a/servers_v6.json +++ b/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"] From 899e32eeed2414df0679339ff115d6c5850f40db Mon Sep 17 00:00:00 2001 From: Bill Arndt Date: Fri, 11 Nov 2022 10:29:49 -0800 Subject: [PATCH 4/8] Update servers_v6.json (#7877) now that v7 is released, v6 Eviction server will be permanently retired. --- servers_v6.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 51485db66a..401d08e263 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -119,10 +119,6 @@ "name": "MindustryBR", "address": ["mindustryptbr.ddns.net:25579"] }, - { - "name": "Conservatory", - "address": ["143.198.71.232"] - }, { "name": "Shard", "address": ["59.12.120.171"] From ae0e78e012db560a440b52c2edad0df455e4d967 Mon Sep 17 00:00:00 2001 From: Drylian <109999325+drylian@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:30:06 -0300 Subject: [PATCH 5/8] Update servers_v6.json (#7875) remove alternight v6 --- servers_v6.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 401d08e263..187fb906c8 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -126,9 +126,5 @@ { "name": "New Campaign Like", "address": ["n5.yeet.ml:6568"] - }, - { - "name": "AlternightBR", - "address": ["mindustrypt.ga:8300"] } ] From a79557b917a5e66ecf8a13c61852989931436647 Mon Sep 17 00:00:00 2001 From: Drylian <109999325+drylian@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:30:22 -0300 Subject: [PATCH 6/8] Update servers_v7.json (#7876) Add alternight server --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index bfb40f07c4..f4269a5246 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -98,5 +98,9 @@ { "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"] + }, + { + "name": "Alternight Vanilla", + "address": ["mindustrypt.ga:6567"] } ] From 557647e0bda175a46a8c21abf23a40751c85b2c7 Mon Sep 17 00:00:00 2001 From: Volas171 Date: Fri, 11 Nov 2022 13:35:52 -0500 Subject: [PATCH 7/8] Update servers_v7.json (#7879) --- servers_v7.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index f4269a5246..dc43b15501 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -29,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"] }, { "name": "KMWStudios", @@ -98,9 +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"] - }, - { - "name": "Alternight Vanilla", - "address": ["mindustrypt.ga:6567"] } ] From 4a78478ab2fad5d3c6dec6ab05530f234270fc4c Mon Sep 17 00:00:00 2001 From: Volas171 Date: Fri, 11 Nov 2022 14:14:17 -0500 Subject: [PATCH 8/8] Update servers_v7.json (#7880) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index dc43b15501..82a9583bca 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -29,7 +29,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"] + "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",