From b7b8c61d4772cc69e2010c625c4d49c6a8223de0 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 19 Jun 2026 01:21:56 +0000 Subject: [PATCH 1/2] Automatic class mapping update --- core/src/mindustry/mod/ClassMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index b6a9ca4e45..0fea69fed6 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -5,7 +5,7 @@ import arc.struct.*; @SuppressWarnings("deprecation") public class ClassMap{ public static final ObjectMap> classes = new ObjectMap<>(); - + static{ classes.put("AssemblerAI", mindustry.ai.types.AssemblerAI.class); classes.put("BoostAI", mindustry.ai.types.BoostAI.class); From 82d1df744529932b64dca122f278b4ac0563d1cf Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 20 Jun 2026 10:39:32 -0400 Subject: [PATCH 2/2] Fixed quitting editor not resetting data patches --- core/src/mindustry/editor/MapEditorDialog.java | 6 +++++- gradle.properties | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index 68f80900a7..cc31fef51b 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -788,7 +788,11 @@ public class MapEditorDialog extends Dialog implements Disposable{ } private void tryExit(){ - ui.showConfirm("@confirm", "@editor.unsaved", this::hide); + ui.showConfirm("@confirm", "@editor.unsaved", () -> { + //clears data patches + logic.reset(); + hide(); + }); } private void addBlockSelection(Table cont){ diff --git a/gradle.properties b/gradle.properties index 3cf7883b6c..dc266b929e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=abb6cc1a11 +archash=9a0fdcaadf