From 93260d4662144bb76d74a0ebdae164f9b86f5eab Mon Sep 17 00:00:00 2001
From: Abdullah <abdullah.ajeebi19@gmail.com>
Date: Tue, 7 Jul 2026 22:06:28 +0300
Subject: [PATCH 01/13] Improve sound selector UI

---
 core/src/mindustry/logic/LStatements.java | 147 +++++++++++++++++++---
 1 file changed, 132 insertions(+), 15 deletions(-)

diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index ff887d3920..3f7a68b16f 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -2,6 +2,7 @@ package mindustry.logic;
 
 import arc.*;
 import arc.audio.*;
+import arc.files.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.scene.style.*;
@@ -2367,6 +2368,20 @@ public class LStatements{
 
     @RegisterStatement("playsound")
     public static class PlaySoundStatement extends LStatement{
+        private static @Nullable Sound lastPreview;
+
+        private static class SoundChoice{
+            final String category;
+            final String name;
+            final Sound sound;
+
+            SoundChoice(String category, String name, Sound sound){
+                this.category = category;
+                this.name = name;
+                this.sound = sound;
+            }
+        }
+
         public boolean positional;
         public String id = "@sfx-shoot", volume = "1", pitch = "1", pan = "0", x = "@thisx", y = "@thisy", limit = "true";
 
@@ -2385,21 +2400,7 @@ public class LStatements{
 
             table.button(b -> {
                 b.image(Icon.pencilSmall);
-
-                Seq<String> soundNames = new Seq<>();
-
-                for(var entry : Core.assets.getAllEntries(Sound.class, new Seq<>())){
-                    if(entry.value != Sounds.none && entry.value.file != null){
-                        soundNames.add(Strings.getFileNameWithoutExtension(entry.key));
-                    }
-                }
-                soundNames.sort();
-
-                String soundName = id.startsWith("@sfx-") ? id.substring(5) : id;
-                b.clicked(() -> showSelect(b, soundNames.toArray(String.class), soundName, t -> {
-                    id = "@sfx-" + t;
-                    build(table);
-                }, 3, cell -> cell.size(170, 50)));
+                b.clicked(() -> showSoundSelect(b, table));
             }, Styles.logict, () -> {}).size(40).color(table.color).left().padLeft(-1);
 
             row(table);
@@ -2436,6 +2437,122 @@ public class LStatements{
         public LCategory category(){
             return LCategory.world;
         }
+
+        private void showSoundSelect(Button button, Table table){
+            Seq<SoundChoice> choices = new Seq<>();
+            ObjectMap<String, Seq<SoundChoice>> categories = new ObjectMap<>();
+
+            for(var entry : Core.assets.getAllEntries(Sound.class, new Seq<>())){
+                Sound sound = entry.value;
+                if(sound == Sounds.none || sound.file == null) continue;
+
+                String name = sound.file.nameWithoutExtension();
+                Fi parent = sound.file.parent();
+                String category = parent == null ? "other" : parent.name();
+
+                SoundChoice choice = new SoundChoice(category, name, sound);
+                choices.add(choice);
+                categories.get(category, Seq::new).add(choice);
+            }
+
+            if(choices.isEmpty()) return;
+
+            choices.sort((a, b) -> {
+                int cmp = a.category.compareTo(b.category);
+                return cmp == 0 ? a.name.compareTo(b.name) : cmp;
+            });
+
+            Seq<String> categoryNames = categories.keys().toSeq().sort();
+            categoryNames.insert(0, "all");
+
+            for(var seq : categories.values()){
+                seq.sort((a, b) -> a.name.compareTo(b.name));
+            }
+
+            String current = id.startsWith("@sfx-") ? id.substring(5) : id;
+            String currentCategory = "all";
+            for(var choice : choices){
+                if(choice.name.equals(current)){
+                    currentCategory = choice.category;
+                    break;
+                }
+            }
+
+            final String selectedCurrentCategory = currentCategory;
+
+            showSelectTable(button, (root, hide) -> {
+                root.left().top();
+
+                String[] selectedCategory = {categories.containsKey(selectedCurrentCategory) ? selectedCurrentCategory : "all"};
+                Table soundList = new Table();
+                ButtonGroup<Button> tabGroup = new ButtonGroup<>();
+
+                Runnable rebuild = () -> {
+                    soundList.clearChildren();
+                    soundList.defaults().left().pad(2f);
+                    soundList.top();
+
+                    Seq<SoundChoice> visible = new Seq<>();
+                    if("all".equals(selectedCategory[0])){
+                        visible.addAll(choices);
+                    }else{
+                        visible.addAll(categories.get(selectedCategory[0], Seq::new));
+                    }
+
+                    if(visible.isEmpty()){
+                        soundList.add("[lightgray]No sounds in this category.").pad(8f);
+                        return;
+                    }
+
+                    for(var choice : visible){
+                        soundList.table(row -> {
+                            row.left().top();
+                            row.defaults().left();
+
+                            row.button(Icon.play, Styles.cleari, 28f, () -> previewSound(choice.sound)).size(40f).padRight(6f);
+
+                            String label = "all".equals(selectedCategory[0]) ? choice.category + "/" + choice.name : choice.name;
+                            row.button(label, Styles.logicTogglet, () -> {
+                                id = "@sfx-" + choice.name;
+                                build(table);
+                                hide.run();
+                            }).growX().left().checked(choice.name.equals(current)).padRight(4f).minWidth(540f);
+                        }).growX().padBottom(3f).minWidth(620f).row();
+                    }
+                };
+
+                root.table(tabs -> {
+                    tabs.left().top();
+                    tabs.defaults().size(140f, 34f).left();
+
+                    for(String category : categoryNames){
+                        String label = "all".equals(category) ? "all" : Strings.capitalize(category);
+                        tabs.button(label, Styles.logicTogglet, () -> {
+                            selectedCategory[0] = category;
+                            rebuild.run();
+                        }).checked(selectedCategory[0].equals(category)).group(tabGroup).growX().row();
+                    }
+                }).top().left().width(160f).padRight(10f);
+
+                root.add(soundList).top().width(720f);
+                rebuild.run();
+            });
+        }
+
+        private static void previewSound(Sound sound){
+            if(sound == null || sound == Sounds.none) return;
+
+            if(lastPreview != null && lastPreview.countPlaying() > 0){
+                lastPreview.stop();
+            }
+
+            lastPreview = sound;
+
+            var bus = sound.bus;
+            sound.bus = control.sound.uiBus;
+            sound.play();
+            sound.bus = bus;
+        }
     }
 
     @RegisterStatement("playmusic")

From ad4cd7c54a65bac592c223d6002ce805d6798e71 Mon Sep 17 00:00:00 2001
From: Abdullah <abdullah.ajeebi19@gmail.com>
Date: Tue, 7 Jul 2026 22:19:45 +0300
Subject: [PATCH 02/13] Use asset names in sound selector

---
 core/src/mindustry/logic/LStatements.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 3f7a68b16f..12cfcf0bf2 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -2,7 +2,6 @@ package mindustry.logic;
 
 import arc.*;
 import arc.audio.*;
-import arc.files.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.scene.style.*;
@@ -2446,9 +2445,8 @@ public class LStatements{
                 Sound sound = entry.value;
                 if(sound == Sounds.none || sound.file == null) continue;
 
-                String name = sound.file.nameWithoutExtension();
-                Fi parent = sound.file.parent();
-                String category = parent == null ? "other" : parent.name();
+                String name = Strings.getFileNameWithoutExtension(entry.key);
+                String category = soundCategory(entry.key);
 
                 SoundChoice choice = new SoundChoice(category, name, sound);
                 choices.add(choice);
@@ -2516,8 +2514,8 @@ public class LStatements{
                                 id = "@sfx-" + choice.name;
                                 build(table);
                                 hide.run();
-                            }).growX().left().checked(choice.name.equals(current)).padRight(4f).minWidth(540f);
-                        }).growX().padBottom(3f).minWidth(620f).row();
+                            }).growX().height(40f).left().checked(choice.name.equals(current)).padRight(4f).minWidth(540f);
+                        }).growX().height(40f).padBottom(3f).minWidth(620f).row();
                     }
                 };
 
@@ -2539,6 +2537,15 @@ public class LStatements{
             });
         }
 
+        private static String soundCategory(String entryName){
+            String normalized = entryName.replace('\\', '/');
+            int end = normalized.lastIndexOf('/');
+            if(end < 0) return "other";
+
+            int start = normalized.lastIndexOf('/', end - 1);
+            return normalized.substring(start + 1, end);
+        }
+
         private static void previewSound(Sound sound){
             if(sound == null || sound == Sounds.none) return;
 

From 8713c41741661c460d034fc5f408280d655259d7 Mon Sep 17 00:00:00 2001
From: Abdullah <abdullah.ajeebi19@gmail.com>
Date: Sat, 18 Jul 2026 05:42:06 +0300
Subject: [PATCH 03/13] Make sounds actually play first try, stop sounds on
 dialog close, and add playback indicator.

Use temporary UI bus for preview playback, retry start on next frame and after short delay, stop preview when dialog closes, update UI icon to indicate playback.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 core/src/mindustry/logic/LStatements.java | 49 +++++++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 12cfcf0bf2..a5def5cf1f 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -5,6 +5,7 @@ import arc.audio.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.scene.style.*;
+import arc.scene.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
@@ -2507,7 +2508,7 @@ public class LStatements{
                             row.left().top();
                             row.defaults().left();
 
-                            row.button(Icon.play, Styles.cleari, 28f, () -> previewSound(choice.sound)).size(40f).padRight(6f);
+                            row.button(Icon.play, Styles.cleari, 28f, () -> previewSound(choice.sound)).update(b -> b.getStyle().imageUp = choice.sound != null && choice.sound.countPlaying() > 0 ? Icon.pause : Icon.play).size(40f).padRight(6f);
 
                             String label = "all".equals(selectedCategory[0]) ? choice.category + "/" + choice.name : choice.name;
                             row.button(label, Styles.logicTogglet, () -> {
@@ -2533,6 +2534,25 @@ public class LStatements{
                 }).top().left().width(160f).padRight(10f);
 
                 root.add(soundList).top().width(720f);
+
+                // stop preview when dialog is closed and keep silent while playing
+                root.add(new arc.scene.Element(){
+                    @Override
+                    public boolean remove(){
+                        if(lastPreview != null){
+                            lastPreview.stop();
+                        }
+                        return super.remove();
+                    }
+
+                    @Override
+                    public void act(float delta){
+                        if(lastPreview != null && lastPreview.countPlaying() > 0){
+                            control.sound.keepSilent();
+                        }
+                    }
+                });
+
                 rebuild.run();
             });
         }
@@ -2555,10 +2575,31 @@ public class LStatements{
 
             lastPreview = sound;
 
-            var bus = sound.bus;
-            sound.bus = control.sound.uiBus;
+            // set the sound's bus to the UI bus while starting playback, then restore after a short delay
+            var oldBus = sound.bus;
+            try{
+                sound.setBus(control.sound.uiBus);
+            }catch(Throwable ignored){}
+
             sound.play();
-            sound.bus = bus;
+
+            // if it didn't start, retry next frame
+            Core.app.post(() -> {
+                if(lastPreview == sound && sound.countPlaying() == 0){
+                    sound.play();
+                }
+            });
+
+            // restore original bus shortly after to avoid side-effects
+            Time.run(0.08f, () -> {
+                if(lastPreview != sound){
+                    // if another sound started, restore immediately
+                    try{ sound.setBus(oldBus); }catch(Throwable ignored){}
+                    return;
+                }
+
+                try{ sound.setBus(oldBus); }catch(Throwable ignored){};
+            });
         }
     }
 

From d23f0729220ee96fb72156b6fadaeb47b8f8e70d Mon Sep 17 00:00:00 2001
From: BalaM314 <71201189+BalaM314@users.noreply.github.com>
Date: Tue, 21 Jul 2026 00:59:49 +0530
Subject: [PATCH 04/13] Unbork bug report template description (#12393)

the text has been totally wrong for years and i never noticed
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 53c3710077..5e5f902a98 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,5 @@
 name: Bug report
-description: The type of device you were playing on
+description: An issue with the game.
 labels: ["bug"]
 
 body:

From 7e416f4251e7cb997482e580851d260ecb220d1f Mon Sep 17 00:00:00 2001
From: Cardillan <122014763+cardillan@users.noreply.github.com>
Date: Mon, 20 Jul 2026 21:30:13 +0200
Subject: [PATCH 05/13] Set result to null when sensor fails (#12391)

---
 core/src/mindustry/logic/LExecutor.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 4941d9825f..fa608d3afe 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -691,6 +691,7 @@ public class LExecutor{
             if(target instanceof Senseable se){
                 if(sense instanceof Content co){
                     to.setnum(se.sense(co));
+                    return;
                 }else if(sense instanceof LAccess la){
                     Object objOut = se.senseObject(la);
 
@@ -701,6 +702,7 @@ public class LExecutor{
                         //object output
                         to.setobj(objOut);
                     }
+                    return;
                 }
             }else{
                 if(sense == LAccess.size || sense == LAccess.bufferSize){
@@ -712,9 +714,10 @@ public class LExecutor{
                         return;
                     }
                 }
-
-                to.setobj(null);
             }
+
+            //unrecognized or unhandled property
+            to.setobj(null);
         }
     }
 

From feab7aa908fa6135e32d8d31f0a74d42041f55e3 Mon Sep 17 00:00:00 2001
From: WMF <87574232+WMF-Industries@users.noreply.github.com>
Date: Mon, 20 Jul 2026 21:30:48 +0200
Subject: [PATCH 06/13] datapatch planet requirement fix (#12389)

---
 core/src/mindustry/mod/DataPatcher.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/mod/DataPatcher.java b/core/src/mindustry/mod/DataPatcher.java
index f4959335f0..85e039bdf5 100644
--- a/core/src/mindustry/mod/DataPatcher.java
+++ b/core/src/mindustry/mod/DataPatcher.java
@@ -218,7 +218,10 @@ public class DataPatcher{
             if(reloadContentWorld) fixContentArrays();
         }
 
-        for(var set : patches){
+        var patchIt = patches.iterator();
+        while(patchIt.hasNext()){
+            PatchAsset set = patchIt.next();
+
             set.warnings.clear();
             set.error = false;
 
@@ -234,6 +237,7 @@ public class DataPatcher{
                     if(Vars.headless){
                         String[] planets = req.isArray() ? req.asStringArray() : new String[]{req.asString()};
                         if(!Structs.contains(planets, Vars.state.rules.planet.name)){
+                            patchIt.remove();
                             continue;
                         }
                     }

From 21290057f054ff67415aa7b05f22e1d730ee4a50 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 20 Jul 2026 15:40:43 -0400
Subject: [PATCH 07/13] Fixed #12392

---
 core/src/mindustry/world/blocks/units/UnitAssembler.java    | 2 +-
 core/src/mindustry/world/consumers/ConsumeItemFilter.java   | 6 +++++-
 core/src/mindustry/world/consumers/ConsumeItems.java        | 2 +-
 core/src/mindustry/world/consumers/ConsumeLiquid.java       | 2 +-
 core/src/mindustry/world/consumers/ConsumeLiquidFilter.java | 4 +++-
 core/src/mindustry/world/consumers/ConsumeLiquids.java      | 2 +-
 gradle.properties                                           | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java
index c021cc6972..2f883db497 100644
--- a/core/src/mindustry/world/blocks/units/UnitAssembler.java
+++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java
@@ -186,7 +186,7 @@ public class UnitAssembler extends PayloadBlock{
 
             if(plan.liquidReq != null){
                 for(LiquidStack stack : plan.liquidReq){
-                    liquidFilter[stack.liquid.id] = true;
+                    if(stack.liquid.id < liquidFilter.length) liquidFilter[stack.liquid.id] = true;
                 }
             }
         }
diff --git a/core/src/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/mindustry/world/consumers/ConsumeItemFilter.java
index 3bd20f19b0..fe766267ef 100644
--- a/core/src/mindustry/world/consumers/ConsumeItemFilter.java
+++ b/core/src/mindustry/world/consumers/ConsumeItemFilter.java
@@ -25,7 +25,11 @@ public class ConsumeItemFilter extends Consume{
     public void apply(Block block){
         block.hasItems = true;
         block.acceptsItems = true;
-        content.items().each(filter, item -> block.itemFilter[item.id] = true);
+        content.items().each(filter, item -> {
+            if(item.id < block.itemFilter.length){
+                block.itemFilter[item.id] = true;
+            }
+        });
     }
 
     @Override
diff --git a/core/src/mindustry/world/consumers/ConsumeItems.java b/core/src/mindustry/world/consumers/ConsumeItems.java
index c43fa42a32..a733cb4674 100644
--- a/core/src/mindustry/world/consumers/ConsumeItems.java
+++ b/core/src/mindustry/world/consumers/ConsumeItems.java
@@ -24,7 +24,7 @@ public class ConsumeItems extends Consume{
         block.hasItems = true;
         block.acceptsItems = true;
         for(var stack : items){
-            block.itemFilter[stack.item.id] = true;
+            if(stack.item.id < block.itemFilter.length) block.itemFilter[stack.item.id] = true;
         }
     }
 
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquid.java b/core/src/mindustry/world/consumers/ConsumeLiquid.java
index a4a3ebc460..ea864d8ef7 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquid.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquid.java
@@ -25,7 +25,7 @@ public class ConsumeLiquid extends ConsumeLiquidBase{
     @Override
     public void apply(Block block){
         super.apply(block);
-        block.liquidFilter[liquid.id] = true;
+        if(liquid.id < block.liquidFilter.length) block.liquidFilter[liquid.id] = true;
     }
 
     @Override
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
index ceacb52554..bca037f02b 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
@@ -26,7 +26,9 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
     @Override
     public void apply(Block block){
         block.hasLiquids = true;
-        content.liquids().each(filter, item -> block.liquidFilter[item.id] = true);
+        content.liquids().each(filter, item -> {
+            if(item.id < block.liquidFilter.length) block.liquidFilter[item.id] = true;
+        });
     }
 
     @Override
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquids.java b/core/src/mindustry/world/consumers/ConsumeLiquids.java
index 2b53287374..49c247356c 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquids.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquids.java
@@ -24,7 +24,7 @@ public class ConsumeLiquids extends Consume{
     public void apply(Block block){
         block.hasLiquids = true;
         for(var stack : liquids){
-            block.liquidFilter[stack.liquid.id] = true;
+            if(stack.liquid.id < block.liquidFilter.length) block.liquidFilter[stack.liquid.id] = true;
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 76302350a4..ed78c070f2 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=208a754044
+archash=18fd1e15f0

From 6425f37e6823d7d35342da692db410b6ce83404c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 20 Jul 2026 15:41:26 -0400
Subject: [PATCH 08/13] arc


From 62dbbe39d1c1659ec55250cdba0686012b2d1775 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 20 Jul 2026 17:42:38 -0400
Subject: [PATCH 09/13] Patches below stack trace

---
 core/src/mindustry/net/CrashHandler.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/net/CrashHandler.java b/core/src/mindustry/net/CrashHandler.java
index 8a0f36be08..23dbeabe91 100644
--- a/core/src/mindustry/net/CrashHandler.java
+++ b/core/src/mindustry/net/CrashHandler.java
@@ -41,8 +41,8 @@ public class CrashHandler{
         + "Cores: " + OS.cores + "\n"
         + (cause == null ? "" : "Likely Cause: " + cause.meta.displayName + " (" + cause.name + " v" + cause.meta.version + ")\n")
         + (enabledMods == null ? "<no mod init>" : "Mods: " + (enabledMods.isEmpty() ? "none (vanilla)" : enabledMods.toString(", ", mod -> mod.name + ":" + mod.meta.version))) + "\n"
-        + (state != null && state.data != null && state.data.getPatches().size > 0 ? "Patches: \n" + state.data.getPatches().toString("\n---\n", p -> p.patch) + "\n" : "")
-        + "\n\n" + error;
+        + "\n\n" + error
+        + (state != null && state.data != null && state.data.getPatches().size > 0 ? "\n\nPatches: \n" + state.data.getPatches().toString("\n---\n", p -> p.patch) + "\n" : "");
     }
 
     public static void log(Throwable exception){

From 2fd3ab74a0782b69fbe1331f4397597dd0c8a0d2 Mon Sep 17 00:00:00 2001
From: Abdullah <abdullah.ajeebi19@gmail.com>
Date: Tue, 21 Jul 2026 10:52:53 +0300
Subject: [PATCH 10/13] Actually use play(..., AudioBus) because IDEA is trying
 to be funny and whatnot (it somehow never updated Arc)

---
 core/src/mindustry/logic/LStatements.java | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index a5def5cf1f..4cf9563af1 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -2575,31 +2575,16 @@ public class LStatements{
 
             lastPreview = sound;
 
-            // set the sound's bus to the UI bus while starting playback, then restore after a short delay
-            var oldBus = sound.bus;
-            try{
-                sound.setBus(control.sound.uiBus);
-            }catch(Throwable ignored){}
-
-            sound.play();
+            // play sound on the UI bus to avoid conflicts with other audio output
+            sound.play(1, 1, 0, false, true, control.sound.uiBus);
 
             // if it didn't start, retry next frame
             Core.app.post(() -> {
                 if(lastPreview == sound && sound.countPlaying() == 0){
-                    sound.play();
+                    sound.bus = control.sound.uiBus;
+                    sound.play(1, 1, 0, false, true, control.sound.uiBus);
                 }
             });
-
-            // restore original bus shortly after to avoid side-effects
-            Time.run(0.08f, () -> {
-                if(lastPreview != sound){
-                    // if another sound started, restore immediately
-                    try{ sound.setBus(oldBus); }catch(Throwable ignored){}
-                    return;
-                }
-
-                try{ sound.setBus(oldBus); }catch(Throwable ignored){};
-            });
         }
     }
 

From ae274d35c75b89bf991497c0e97901aff64b62af Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 21 Jul 2026 18:31:17 -0400
Subject: [PATCH 11/13] Fixed #12397

---
 core/src/mindustry/type/UnitType.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 83512435d9..2018d9328c 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -1470,16 +1470,16 @@ public class UnitType extends UnlockableContent implements Senseable{
         float scl = xscl;
         if(unit.inFogTo(Vars.player.team())) return;
 
-        if(buildSpeed > 0f){
+        boolean isPayload = !unit.isAdded();
+
+        if(buildSpeed > 0f && !isPayload){
             unit.drawBuilding();
         }
 
-        if(unit.mining()){
+        if(unit.mining() && !isPayload){
             drawMining(unit);
         }
 
-        boolean isPayload = !unit.isAdded();
-
         Mechc mech = unit instanceof Mechc m ? m : null;
         Segmentc seg = unit instanceof Segmentc c ? c : null;
         float z =

From 8b672526e5a4bc590251c06a82607ce479dc39f3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 21 Jul 2026 19:09:25 -0400
Subject: [PATCH 12/13] Fixed tab selection

---
 core/src/mindustry/logic/LStatement.java  |  6 ++
 core/src/mindustry/logic/LStatements.java | 97 ++++++++++-------------
 2 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java
index 0557d087b6..b92e00fcf3 100644
--- a/core/src/mindustry/logic/LStatement.java
+++ b/core/src/mindustry/logic/LStatement.java
@@ -224,6 +224,10 @@ public abstract class LStatement{
     }
 
     protected static void showSelectTable(Button b, Cons2<Table, Runnable> hideCons){
+        showSelectTable(b, hideCons, () -> {});
+    }
+
+    protected static void showSelectTable(Button b, Cons2<Table, Runnable> hideCons, Runnable hideCallback){
         Table t = new Table(Tex.paneSolid){
             @Override
             public float getPrefHeight(){
@@ -243,6 +247,7 @@ public abstract class LStatement{
         Runnable hide = () -> {
             Core.app.post(hitter::remove);
             t.actions(Actions.fadeOut(0.3f, Interp.fade), Actions.remove());
+            hideCallback.run();
         };
 
         hitter.fillParent = true;
@@ -256,6 +261,7 @@ public abstract class LStatement{
                 Core.app.post(() -> {
                     hitter.remove();
                     t.remove();
+                    hideCallback.run();
                 });
                 return;
             }
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index c17f02ae60..cd107e4b03 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -5,7 +5,6 @@ import arc.audio.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.scene.style.*;
-import arc.scene.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
@@ -2373,20 +2372,6 @@ public class LStatements{
 
     @RegisterStatement("playsound")
     public static class PlaySoundStatement extends LStatement{
-        private static @Nullable Sound lastPreview;
-
-        private static class SoundChoice{
-            final String category;
-            final String name;
-            final Sound sound;
-
-            SoundChoice(String category, String name, Sound sound){
-                this.category = category;
-                this.name = name;
-                this.sound = sound;
-            }
-        }
-
         public boolean positional;
         public String id = "@sfx-shoot", volume = "1", pitch = "1", pan = "0", x = "@thisx", y = "@thisy", limit = "true";
 
@@ -2443,13 +2428,27 @@ public class LStatements{
             return LCategory.world;
         }
 
-        private void showSoundSelect(Button button, Table table){
+        private static @Nullable Sound lastPreview;
+
+        private static class SoundChoice{
+            final String category;
+            final String name;
+            final Sound sound;
+
+            SoundChoice(String category, String name, Sound sound){
+                this.category = category;
+                this.name = name;
+                this.sound = sound;
+            }
+        }
+
+        protected void showSoundSelect(Button button, Table table){
             Seq<SoundChoice> choices = new Seq<>();
             ObjectMap<String, Seq<SoundChoice>> categories = new ObjectMap<>();
 
             for(var entry : Core.assets.getAllEntries(Sound.class, new Seq<>())){
                 Sound sound = entry.value;
-                if(sound == Sounds.none || sound.file == null) continue;
+                if(sound == Sounds.none || sound == null || sound.file == null) continue;
 
                 String name = Strings.getFileNameWithoutExtension(entry.key);
                 String category = soundCategory(entry.key);
@@ -2470,7 +2469,7 @@ public class LStatements{
             categoryNames.insert(0, "all");
 
             for(var seq : categories.values()){
-                seq.sort((a, b) -> a.name.compareTo(b.name));
+                seq.sortComparing(a -> a.name);
             }
 
             String current = id.startsWith("@sfx-") ? id.substring(5) : id;
@@ -2504,7 +2503,7 @@ public class LStatements{
                     }
 
                     if(visible.isEmpty()){
-                        soundList.add("[lightgray]No sounds in this category.").pad(8f);
+                        soundList.add("@none.found").pad(8f);
                         return;
                     }
 
@@ -2513,15 +2512,19 @@ public class LStatements{
                             row.left().top();
                             row.defaults().left();
 
-                            row.button(Icon.play, Styles.cleari, 28f, () -> previewSound(choice.sound)).update(b -> b.getStyle().imageUp = choice.sound != null && choice.sound.countPlaying() > 0 ? Icon.pause : Icon.play).size(40f).padRight(6f);
+                            row.button(Icon.play, Styles.cleari, 28f, () -> previewSound(choice.sound))
+                            .update(b -> b.getStyle().imageUp = choice.sound != null && choice.sound == lastPreview && choice.sound.countPlaying() > 0 ? Icon.pause : Icon.play)
+                            .size(40f).padRight(6f);
 
                             String label = "all".equals(selectedCategory[0]) ? choice.category + "/" + choice.name : choice.name;
                             row.button(label, Styles.logicTogglet, () -> {
                                 id = "@sfx-" + choice.name;
                                 build(table);
                                 hide.run();
-                            }).growX().height(40f).left().checked(choice.name.equals(current)).padRight(4f).minWidth(540f);
-                        }).growX().height(40f).padBottom(3f).minWidth(620f).row();
+                            }).growX().height(40f).left().checked(choice.name.equals(current)).with(t -> {
+                                t.getLabelCell().growX().left().labelAlign(Align.left).padLeft(10f);
+                            }).padRight(4f);
+                        }).growX().height(40f).padBottom(3f).row();
                     }
                 };
 
@@ -2530,42 +2533,31 @@ public class LStatements{
                     tabs.defaults().size(140f, 34f).left();
 
                     for(String category : categoryNames){
-                        String label = "all".equals(category) ? "all" : Strings.capitalize(category);
-                        tabs.button(label, Styles.logicTogglet, () -> {
+                        tabs.button(Strings.capitalize(category), Styles.logicTogglet, () -> {
                             selectedCategory[0] = category;
                             rebuild.run();
+                            //fixes flickering
+                            var parent = (Table)root.parent.parent;
+                            parent.pack();
+                            parent.act(0f);
                         }).checked(selectedCategory[0].equals(category)).group(tabGroup).growX().row();
                     }
-                }).top().left().width(160f).padRight(10f);
+                }).top().left().width(160f);
 
-                root.add(soundList).top().width(720f);
-
-                // stop preview when dialog is closed and keep silent while playing
-                root.add(new arc.scene.Element(){
-                    @Override
-                    public boolean remove(){
-                        if(lastPreview != null){
-                            lastPreview.stop();
-                        }
-                        return super.remove();
-                    }
-
-                    @Override
-                    public void act(float delta){
-                        if(lastPreview != null && lastPreview.countPlaying() > 0){
-                            control.sound.keepSilent();
-                        }
-                    }
-                });
+                root.add(soundList).top().width(Math.min(Core.graphics.getWidth() / Scl.scl(1f) * 0.9f, 450f));
 
                 rebuild.run();
+            }, () -> {
+                if(lastPreview != null){
+                    lastPreview.stop();
+                }
             });
         }
 
         private static String soundCategory(String entryName){
             String normalized = entryName.replace('\\', '/');
             int end = normalized.lastIndexOf('/');
-            if(end < 0) return "other";
+            if(end < 0) return "Data Patch";
 
             int start = normalized.lastIndexOf('/', end - 1);
             return normalized.substring(start + 1, end);
@@ -2574,22 +2566,17 @@ public class LStatements{
         private static void previewSound(Sound sound){
             if(sound == null || sound == Sounds.none) return;
 
-            if(lastPreview != null && lastPreview.countPlaying() > 0){
+            if(lastPreview != null && lastPreview.countPlaying() > 0 && lastPreview != Sounds.uiButton){
                 lastPreview.stop();
+                if(lastPreview == sound) return; //double tap = stop
             }
 
             lastPreview = sound;
+            //don't play the button sound every time
+            if(sound != Sounds.uiButton) Sounds.uiButton.stop();
 
-            // play sound on the UI bus to avoid conflicts with other audio output
+            //play sound on the UI bus as the main one is paused
             sound.play(1, 1, 0, false, true, control.sound.uiBus);
-
-            // if it didn't start, retry next frame
-            Core.app.post(() -> {
-                if(lastPreview == sound && sound.countPlaying() == 0){
-                    sound.bus = control.sound.uiBus;
-                    sound.play(1, 1, 0, false, true, control.sound.uiBus);
-                }
-            });
         }
     }
 

From 8a183e72d4cc5cba06c04fc2eb1a4cbfe981f5ac Mon Sep 17 00:00:00 2001
From: "Sunky.MP3G" <125795960+SunkyMP3G@users.noreply.github.com>
Date: Wed, 22 Jul 2026 02:10:52 +0300
Subject: [PATCH 13/13] Ru translations (#12400)

* Music logic, block limit

* Better "workshop" translation and some untranslated lines

* Why did I only do this now
---
 core/assets/bundles/bundle_ru.properties | 20 ++++++++++----------
 core/assets/contributors                 |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index d96d99270c..c3439ec58c 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -62,7 +62,7 @@ export.file = Экспортировать файл
 import.file = Импортировать файл
 copy.clipboard = Скопировать в буфер обмена
 load.clipboard = Вставить из буфера обмена
-workshop.browse = Мастерская
+workshop.browse = Искать в Мастерской
 workshop.share = Поделиться в Мастерской
 
 schematic = Схема
@@ -74,7 +74,7 @@ schematic.exists = Схема с таким названием уже сущес
 schematic.import = Импортировать схему...
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Отразить схему
 schematic.saved = Схема сохранена.
-schematic.delete.confirm = Эта схема будет поджарена Испепелителем.
+schematic.delete.confirm = Эта схема будет разнесена в металлолом.
 schematic.edit = Редактировать схему
 schematic.info = {0}x{1}, {2} блоков
 schematic.disabled = [scarlet]Схемы отключены[]\nНа этой [accent]карте[] или [accent]сервере[] запрещено использование схем.
@@ -183,7 +183,7 @@ mod.incompletedependencies.details = Этот мод не может быть з
 mod.requiresversion = Требуется версия игры: [red]{0}
 
 mod.errors = Ошибки были вызваны загружаемым содержимым.
-mod.errors.map = [scarlet]Errors have occurred loading map content. All custom content has been disabled.[]\nThis map will likely not function correctly.
+mod.errors.map = [scarlet]При загрузке ресурсов карты произошли ошибки. Весь пользовательский контент был отключен.[]\nЭта карта, вероятно, не будет работать правильно.
 mod.noerrorplay = [scarlet]У Вас есть модификации с ошибками.[] Выключите проблемные модификации или исправьте ошибки перед игрой.
 mod.enable = Вкл.
 mod.requiresrestart = Теперь игра закроется, чтобы применить изменения в модификациях.
@@ -281,7 +281,7 @@ servers.remote = Удалённые серверы
 servers.global = Серверы сообщества
 
 servers.disclaimer = Серверы сообщества [accent]не[] принадлежат разработчику и [accent]не[] контролируются им.\n\nСерверы могут содержать пользовательский контент, который не подходит для всех возрастов.
-servers.connect.confirm = Join the following server?\n\n[accent]{0}[]\n\nOnly connect to servers you trust!
+servers.connect.confirm = Присоединиться к этому серверу?\n\n[accent]{0}[]\n\nНе подключайтесь к серверам, которым не доверяете!
 servers.showhidden = Отображать скрытые серверы
 server.shown = Отображается
 server.hidden = Скрыт
@@ -333,7 +333,7 @@ disconnect.timeout = Время ожидания истекло.
 disconnect.data = Ошибка при загрузке данных мира!
 disconnect.snapshottimeout = Превышено время ожидания при получении UDP-снапшотов.\nЭто может быть вызвано нестабильной сетью или соединением.
 cantconnect = Не удаётся присоединиться к игре ([accent]{0}[]).
-disconnect.reason = Disconnected: {0}
+disconnect.reason = Отключение: {0}
 connecting = [accent]Подключение...
 reconnecting = [accent]Переподключение...
 
@@ -443,7 +443,7 @@ commandmode.nounits = [нет единиц]
 wave = [accent]Волна {0}
 wave.cap = [accent]Волна {0}/{1}
 wave.waiting = [lightgray]Волна через {0}
-wave.waveInProgress = [lightgray]Волна продолжается
+wave.waveInProgress = [lightgray]Волна в процессе
 waiting = [lightgray]Ожидание...
 waiting.players = Ожидание игроков...
 wave.enemies = [lightgray]Враги: {0}
@@ -1117,7 +1117,7 @@ settings.clearplanetcampaignsaves.confirm = Вы уверены, что хоти
 paused = [accent]< Пауза >
 clear = Очистить
 banned = [scarlet]Запрещено
-block.limit = [scarlet]Limit: {0} Buildings
+block.limit = [scarlet]Лимит: {0} блоков
 unsupported.environment = [scarlet]Неподдерживаемые условия
 yes = Да
 no = Нет
@@ -2836,8 +2836,8 @@ lglobal.@clientUnit = Боевая единица клиента, выполня
 lglobal.@clientName = Имя игрока клиента, выполняющего код
 lglobal.@clientTeam = ID команды клиента, выполняющего код.
 lglobal.@clientMobile = True, если код работает на мобильном клиенте, иначе False
-lglobal.@clientMusicPlaying = True if any music is currently playing
-lglobal.@clientCurrentMusic = Name of the current track being played, or null
+lglobal.@clientMusicPlaying = True, если в данный момент играет любая музыка
+lglobal.@clientCurrentMusic = Название текущей проигрываемой музыки, или null
 
 lenum.type = Тип постройки/единицы. \nНапример, для маршрутизатора это будет [accent]@router[].\nНе строка.
 lenum.shoot = Стрельба в определённую позицию.
@@ -3035,4 +3035,4 @@ lenum.solarmultiplier = Устанавливает множитель получ
 lenum.dragmultiplier = Устанавливает множитель скорости торможения боевых единиц.
 lenum.ban = Устанавливает запрещённые блоки и боевые единицы.
 lenum.unban = Снимает запрет на ранее запрещённые блоки и боевые единицы.
-lenum.musicvolume = Global music volume multiplier.\nClamped to [0, 1].
+lenum.musicvolume = Глобальный множитель громкости музыки.\nСокращается до диапазона [0, 1].
diff --git a/core/assets/contributors b/core/assets/contributors
index a11328d412..f9047985f1 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -195,4 +195,5 @@ Jovinull
 Alon
 硫缺铅/PyratiteNoLead
 Space
-NeilGreenFly
\ No newline at end of file
+NeilGreenFly
+Sunky.MP3G