From 5365014d4f72ea8bf55b18e20af47c33c5f8d6b3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 15 Mar 2024 14:14:53 -0400 Subject: [PATCH 1/5] Sector preset init fix --- core/src/mindustry/type/SectorPreset.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java index 3c6b885d8d..b23c909de2 100644 --- a/core/src/mindustry/type/SectorPreset.java +++ b/core/src/mindustry/type/SectorPreset.java @@ -39,8 +39,10 @@ public class SectorPreset extends UnlockableContent{ /** Internal use only! */ public SectorPreset(String name, LoadedMod mod){ super(name); - this.minfo.mod = mod; - this.generator = new FileMapGenerator(name, this); + if(mod != null){ + this.minfo.mod = mod; + } + this.generator = new FileMapGenerator(this.name, this); } /** Internal use only! */ From 9a43a708afb6d8147cdfe71f5f01909eaed72358 Mon Sep 17 00:00:00 2001 From: TheRadioactiveBanana <89061718+TheRadioactiveBanana@users.noreply.github.com> Date: Sat, 16 Mar 2024 09:47:17 +0530 Subject: [PATCH 2/5] Moving more ports from UK to EU (#9644) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index dd09fc929f..ad26421278 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -138,7 +138,7 @@ }, { "name": "Eradication Mindustry", - "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.100.100.249:7000", "77.100.100.249:7001", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004"] + "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004", "130.61.220.99:7005"] }, { "name": "Conservatory", From 6aa744bc575aa88293a8a539e45a53dd182e0913 Mon Sep 17 00:00:00 2001 From: 112Hack <144626073+112Hack@users.noreply.github.com> Date: Sat, 16 Mar 2024 07:17:41 +0300 Subject: [PATCH 3/5] Update servers_v7.json (#9639) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index ad26421278..247862f241 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -24,6 +24,10 @@ "name": "Crux's Revelations", "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"] }, + { + "name": "Chilldustry", + "address": ["trelesco.xyz"] + }, { "name": "CMS Empire", "address": ["94.250.250.252","95.84.198.97"] From a1e5566fe0395458d038e3a4a52c0f7c60ec80fc Mon Sep 17 00:00:00 2001 From: meiqiu <119494143+MEIQIUawa@users.noreply.github.com> Date: Sat, 16 Mar 2024 12:17:49 +0800 Subject: [PATCH 4/5] Update servers_v7.json (#9636) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 247862f241..da5b67a9bc 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -18,7 +18,7 @@ }, { "name": "meiqiuMDT", - "address": ["cn1.meiqiumdy.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013"] + "address": ["cn1.meiqiumdt.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013","cn1.meiqiumdt.top:9000"] }, { "name": "Crux's Revelations", From 789264f3b663453b6a58062ddeabb8bb5bb7735b Mon Sep 17 00:00:00 2001 From: 00Bread00 <144006814+00Bread00@users.noreply.github.com> Date: Sun, 17 Mar 2024 01:49:13 +1100 Subject: [PATCH 5/5] Update servers_v7.json (#9646) add toast servers --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index da5b67a9bc..5d551d6b87 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,4 +1,8 @@ [ + { + "name": "Toast Mindustry", + "address": ["192.3.139.5:6567", "192.3.139.5:6568", "192.3.139.5:6569", "104.168.64.154:6567", "104.168.64.154:6568", "104.168.64.154:6569"] + }, { "name": "gods field", "address": ["n2.akiracloud.net:10225"]