From e4eadbbb7f35db3093a0a3d13272bdfbedfaead3 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 6 Nov 2023 20:54:58 -0500 Subject: [PATCH 1/7] jlfhuyksft (#9251) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c91419525c..4ad56f59ff 100644 --- a/build.gradle +++ b/build.gradle @@ -413,7 +413,7 @@ project(":annotations"){ dependencies{ implementation 'com.squareup:javapoet:1.12.1' - implementation "com.github.Anuken.Arc:arc-core:$arcHash" + implementation arcModule("arc-core") } } From d53ac76461028eed7602b6929f6a17e5880e6b18 Mon Sep 17 00:00:00 2001 From: KotMilkMeoWtwo <88706776+KotMilkMeoWtwo@users.noreply.github.com> Date: Wed, 8 Nov 2023 00:13:50 +0300 Subject: [PATCH 2/7] Update servers_v7.json (#9243) I changed the host ip. --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index c482219b76..6f2b273219 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -69,7 +69,7 @@ }, { "name": "KMWStudios", - "address": ["46.151.26.232:1024", "46.151.26.232:2000", "46.151.26.232:3000", "46.151.26.232:4000", "46.151.26.232:6000", "46.151.26.232:7000", "46.151.26.232:8000"] + "address": ["x.kmwstuios.xyz:9000", "x.kmwstuios.xyz:9002", "x.kmwstuios.xyz:9003", "x.kmwstuios.xyz:9004", "x.kmwstuios.xyz:9005", "x.kmwstuios.xyz:9006", "x.kmwstuios.xyz:9007"] }, { "name": "XCore", From 8f97625fa1544c38c500e82e5f26af4e9ac78d0f Mon Sep 17 00:00:00 2001 From: TheRadioactiveBanana <89061718+TheRadioactiveBanana@users.noreply.github.com> Date: Wed, 8 Nov 2023 08:11:13 +0530 Subject: [PATCH 3/7] Eradication Mindustry IP change (#9241) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 6f2b273219..61112f314c 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -125,7 +125,7 @@ }, { "name": "Eradication Mindustry", - "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.mindustry.me:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678", "eradicationmindustry.mindustry.me:6675"] + "address": ["140.238.246.78:6569", "140.238.246.78:9547", "140.238.246.78:6572", "140.238.246.78:6570", "140.238.246.78:6571", "140.238.246.78:6574", "140.238.246.78:6573", "140.238.246.78:6568", "140.238.246.78:6677", "140.238.246.78:6678", "140.238.246.78:6675", "130.61.22.183:6573", "130.61.22.183:6599", "130.61.22.183:6774"] }, { "name": "Conservatory", From 5c50356fb226767a9b55db5402930c6dc109c348 Mon Sep 17 00:00:00 2001 From: The1Crux <134880334+The1Crux@users.noreply.github.com> Date: Tue, 7 Nov 2023 23:38:53 -0400 Subject: [PATCH 4/7] Update servers_v7.json (#9255) Crux's Revelations servers addition --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 61112f314c..b2575ac75a 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,6 +3,10 @@ "name": "meiqiuMDT", "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240","play.simpfun.cn:14523"] }, + { + "name": "Crux's Revelations" + "Address": ["fsn1.bbn.one:52397","fsn1.bbn.one:58375","de-free-01.hosts.optikservers.com:32212","fsn1.bbn.one:49840","de-free-01.hosts.optikservers.com:30449"] + } { "name": "CMS", "address": ["195.2.84.144"] From 498bf079ec152dae273cd1cff3acfa4a160d064b Mon Sep 17 00:00:00 2001 From: Gerald Elder-Vass <47088217+GeraldEV@users.noreply.github.com> Date: Wed, 8 Nov 2023 03:44:22 +0000 Subject: [PATCH 5/7] Move Surge Alloy in ErekirTechTree to the correct position (#9253) Surge Alloy can be first obtained on the "Ravine" map. Thorium can be first obtained on the "Caldera" map. The "Ravine" map must be unlocked and completed before the "Caldera" map can be accessed. Since Surge Alloy isn't required to produce Thorium (and vice versa), they should appear at the same level of the tech tree, under Tungsten. Signed-off-by: Gerald Elder-Vass --- core/src/mindustry/content/ErekirTechTree.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 89f128ae72..6c4571a43a 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -447,11 +447,11 @@ public class ErekirTechTree{ //nodeProduce(Liquids.gallium, () -> {}); }); + }); - nodeProduce(Items.surgeAlloy, () -> { - nodeProduce(Items.phaseFabric, () -> { + nodeProduce(Items.surgeAlloy, () -> { + nodeProduce(Items.phaseFabric, () -> { - }); }); }); }); From e7a0d0589538b25a1fc2244837b4605565e00341 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 8 Nov 2023 08:47:40 -0500 Subject: [PATCH 6/7] Update servers_v7.json --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index b2575ac75a..48c80a69e2 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -129,7 +129,7 @@ }, { "name": "Eradication Mindustry", - "address": ["140.238.246.78:6569", "140.238.246.78:9547", "140.238.246.78:6572", "140.238.246.78:6570", "140.238.246.78:6571", "140.238.246.78:6574", "140.238.246.78:6573", "140.238.246.78:6568", "140.238.246.78:6677", "140.238.246.78:6678", "140.238.246.78:6675", "130.61.22.183:6573", "130.61.22.183:6599", "130.61.22.183:6774"] + "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.mindustry.me:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678", "eradicationmindustry.mindustry.me:6675"] }, { "name": "Conservatory", From afc97ebeda954edc8371185eb93f7f71238cdd03 Mon Sep 17 00:00:00 2001 From: StalkerBaran <120944331+StalkerBaran@users.noreply.github.com> Date: Wed, 8 Nov 2023 20:56:12 +0700 Subject: [PATCH 7/7] Update servers_v7.json (#9256) Update "MeowIsland" IP servers (Dont ask about "minecraft" in IP names, I using host for minecraft and its working on mindustry(no jokes plz, I know... its stupid... but its working)) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 48c80a69e2..530f8b9510 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -222,7 +222,7 @@ }, { "name": "MeowIsland", - "address": ["n1.mindustry.me:6590", "n1.mindustry.me:6592", "n1.mindustry.me:6595"] + "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651"] }, { "name": "3MIDustry",