From b9bf4ee79405363cfee650b154889ace5bee0b5a Mon Sep 17 00:00:00 2001 From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com> Date: Wed, 24 Jan 2024 04:05:14 +0100 Subject: [PATCH 1/8] Allow markers to be deleted (#9485) --- core/src/mindustry/logic/LExecutor.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index 44e03ef12c..3b67f5a958 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -2049,6 +2049,11 @@ public class LExecutor{ state.markers.add(id, marker); } + @Remote(called = Loc.server, variants = Variant.both, unreliable = true) + public static void removeMarker(int id){ + state.markers.remove(id); + } + @Remote(called = Loc.server, variants = Variant.both, unreliable = true) public static void updateMarker(int id, LMarkerControl control, double p1, double p2, double p3){ var marker = state.markers.get(id); From 35a833eb67c4cce3051d5f36aab26f19d2eed5f5 Mon Sep 17 00:00:00 2001 From: HubsvVN <157294903+HubsvVN@users.noreply.github.com> Date: Thu, 25 Jan 2024 10:43:40 +0700 Subject: [PATCH 2/8] Update servers_v7.json (#9484) * Update servers_v7.json * Update servers_v7.json --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 54ce1c7466..75b0446fdf 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -279,5 +279,9 @@ { "name": "MineCore", "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] + }, + { + "name": "hubVn" + "address": ["de-free-01.hosts.optikservers.com:32362"] } ] From 083168f7e03d6422f8efc0014c0ed84f171b31e2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 26 Jan 2024 19:04:43 -0500 Subject: [PATCH 3/8] 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 75b0446fdf..fd09b2b6db 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -281,7 +281,7 @@ "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] }, { - "name": "hubVn" + "name": "hubVn", "address": ["de-free-01.hosts.optikservers.com:32362"] } ] From 1c40e3bbf2be042102a6d962a491aa5610132512 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 26 Jan 2024 19:07:32 -0500 Subject: [PATCH 4/8] Update pr.yml --- .github/workflows/pr.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4cc2f6d88f..5bb8637f56 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -17,8 +17,10 @@ jobs: java-version: 17 - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Run unit tests + run: ./gradlew clean cleanTest test --stacktrace - name: Run unit tests and build JAR - run: ./gradlew test desktop:dist + run: ./gradlew desktop:dist - name: Upload desktop JAR for testing uses: actions/upload-artifact@v2 with: From 440643129149392a589c09fd0e70a9f1e6a17955 Mon Sep 17 00:00:00 2001 From: Elixias <61173114+LixieWulf@users.noreply.github.com> Date: Fri, 26 Jan 2024 17:08:15 -0700 Subject: [PATCH 5/8] Better Malis palette (#9491) --- core/src/mindustry/game/Team.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index afd32eb95e..affcbe525c 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -31,7 +31,7 @@ public class Team implements Comparable{ derelict = new Team(0, "derelict", Color.valueOf("4d4e58")), sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")), crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")), - malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c195fb"), Color.valueOf("665c9f"), Color.valueOf("484988")), + malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c7a4f5"), Color.valueOf("896fd6"), Color.valueOf("504cba")), //TODO temporarily no palettes for these teams. green = new Team(4, "green", Color.valueOf("54d67d")),//Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")), From d4d85ec8731a75022b4e2e097e86064f6ad49b7f Mon Sep 17 00:00:00 2001 From: StalkerBaran <120944331+StalkerBaran@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:22:12 +0700 Subject: [PATCH 6/8] Update servers_v7.json (#9494) New server (MeowIsland) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index fd09b2b6db..509fee6b66 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -222,7 +222,7 @@ }, { "name": "MeowIsland", - "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651"] + "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651", "orion.minecraft.rent:25573"] }, { "name": "3MIDustry", From 342ec4adcebedc1e43ce6aa2d51a1f66e2f6a653 Mon Sep 17 00:00:00 2001 From: Elixias <61173114+LixieWulf@users.noreply.github.com> Date: Sat, 27 Jan 2024 07:22:28 -0700 Subject: [PATCH 7/8] Unprotect dumpTime (#9493) --- core/src/mindustry/world/Block.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 31d98e1efc..05f064cbaf 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -382,7 +382,7 @@ public class Block extends UnlockableContent implements Senseable{ /** Dump timer ID.*/ protected final int timerDump = timers++; /** How often to try dumping items in ticks, e.g. 5 = 12 times/sec*/ - protected final int dumpTime = 5; + public int dumpTime = 5; public Block(String name){ super(name); From 8d89fac0af651b8a0ffa5e4eed2ca97200dbb7c5 Mon Sep 17 00:00:00 2001 From: ulwepo <85295540+ulwepo@users.noreply.github.com> Date: Sun, 28 Jan 2024 00:05:03 +0900 Subject: [PATCH 8/8] Update servers_v7.json (#9496) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 509fee6b66..4e5c27d47b 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -157,7 +157,7 @@ }, { "name": "Sakura", - "address": ["160.16.207.141:20527", "160.16.207.141:21527", "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", "160.16.207.141:27527", "160.16.207.141:28527", "160.16.207.141:29527"] + "address": ["160.16.207.141:20527", "160.16.207.141:21527", "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", "160.16.207.141:27527", "160.16.207.141:28527", "160.16.207.141:29527", "162.43.36.78:20527", "162.43.36.78:21527", "162.43.36.78:22527", "162.43.36.78:23527", "162.43.36.78:24527", "162.43.36.78:25527", "162.43.36.78:26527", "162.43.36.78:27527", "162.43.36.78:28527", "162.43.36.78:29527", "sakura-mindustry.jp:20527"] }, { "name": "|RussianServers|[]",