Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Conflicts: core/assets/bundles/bundle_ko.properties core/src/mindustry/type/UnitType.java
2021-11-22 10:12:48 -05:00
parent 6edf0a27a4 25f98fdeb0
commit 65f36faf71
42 changed files with 8369 additions and 1504 deletions
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -474,6 +474,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
        return block.unloadable;
    }

+    public boolean canResupply(){
+        return block.allowResupply;
+    }
+
    public boolean payloadCheck(int conveyorRotation){
        return block.rotate && (rotation + 2) % 4 == conveyorRotation;
    }