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 @@ + + + + + + + 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){ diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java index ea5725bc68..c021cc6972 100644 --- a/core/src/mindustry/world/blocks/units/UnitAssembler.java +++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java @@ -706,6 +706,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; 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); }); }