From ed130b1bac224f567dd386cd67c1e74538d0cd38 Mon Sep 17 00:00:00 2001 From: NeilGreenFly <1471761931@qq.com> Date: Sun, 21 Jun 2026 08:04:05 +0800 Subject: [PATCH 1/4] Let the logic display enable allowRectanglePlacement. (#12247) --- core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java b/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java index b18717365d..cc12e22c8c 100644 --- a/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java +++ b/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java @@ -33,6 +33,7 @@ public class TileableLogicDisplay extends LogicDisplay{ super(name); displaySize = 32; + allowRectanglePlacement = true; } public static void linkDisplays(TileableLogicDisplayBuild start){ From 3e4de7df525b8977ca8abd730bc84c3d6d865ca9 Mon Sep 17 00:00:00 2001 From: Adham Hakki Date: Sun, 21 Jun 2026 03:04:52 +0300 Subject: [PATCH 2/4] Add mindustry:// URL scheme intent filter for Android (#12238) --- android/AndroidManifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 868acaa1aa..c6e1629da8 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -31,6 +31,13 @@ + + + + + + + From 0e4d0f62163942c40be148982500849386fc8451 Mon Sep 17 00:00:00 2001 From: StesNiash <111519914+StesNiash@users.noreply.github.com> Date: Sun, 21 Jun 2026 03:08:50 +0300 Subject: [PATCH 3/4] Update UnitAssembler.java (#12227) Now units can payenter in assemblers. --- core/src/mindustry/world/blocks/units/UnitAssembler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java index 62d39ee38e..d5cb6ba9eb 100644 --- a/core/src/mindustry/world/blocks/units/UnitAssembler.java +++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java @@ -705,6 +705,13 @@ public class UnitAssembler extends PayloadBlock{ return super.sense(sensor); } + @Override + public boolean acceptUnitPayload(Unit unit){ + var plan = plan(); + return plan.requirements.contains(b -> b.item == unit.type() && + blocks.get(unit.type()) < Mathf.round(b.amount * state.rules.unitCost(team))); + } + @Override public PayloadSeq getPayloads(){ return blocks; From 24adf22c53826cf40b7f121e483d36d344c05c0e Mon Sep 17 00:00:00 2001 From: BalaM314 <71201189+BalaM314@users.noreply.github.com> Date: Sun, 21 Jun 2026 05:39:58 +0530 Subject: [PATCH 4/4] Fix wiki builds failing (#12205) --- core/src/mindustry/world/meta/StatValues.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index 5ef77b6beb..2c6598cf48 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -656,7 +656,7 @@ public class StatValues{ if(blockName != null && t instanceof UnlockableContent){ UnlockableContent content = (UnlockableContent) t; String key = "block." + blockName + "." + content.name + ".info"; - if(Core.bundle.has(key)){ + if(Core.bundle.has(key) && !Vars.headless){ bt.table(desc -> { desc.image(Icon.info.getRegion()).size(20).color(Color.lightGray).scaling(Scaling.fit).padRight(8).padLeft(12); desc.add("[lightgray]" + Core.bundle.get(key)); @@ -872,7 +872,7 @@ public class StatValues{ private static Cell note(Table table, String text){ table.row(); return table.table(t -> { - t.image(Icon.arrowNoteSmall.getRegion()).size(15).color(Pal.stat).scaling(Scaling.fit).padRight(6).padLeft(12); + if(!Vars.headless) t.image(Icon.arrowNoteSmall.getRegion()).size(15).color(Pal.stat).scaling(Scaling.fit).padRight(6).padLeft(12); t.add(text); }); }