Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/blocks/distribution/Conveyor.java

@@ -30,6 +30,7 @@ public class Conveyor extends Block implements Autotiler{
 
     public float speed = 0f;
     public float displayedSpeed = 0f;
+    public boolean pushUnits = true;
 
     public @Nullable Block junctionReplacement, bridgeReplacement;
 
@@ -223,7 +224,7 @@ public class Conveyor extends Block implements Autotiler{
         @Override
         public void unitOn(Unit unit){
 
-            if(clogHeat > 0.5f || !enabled) return;
+            if(!pushUnits || clogHeat > 0.5f || !enabled) return;
 
             noSleep();
 

core/src/mindustry/world/blocks/payloads/PayloadConveyor.java

@@ -21,6 +21,7 @@ public class PayloadConveyor extends Block{
     public @Load("@-edge") TextureRegion edgeRegion;
     public Interp interp = Interp.pow5;
     public float payloadLimit = 3f;
+    public boolean pushUnits = true;
 
     public PayloadConveyor(String name){
         super(name);
@@ -257,7 +258,7 @@ public class PayloadConveyor extends Block{
 
         @Override
         public void unitOn(Unit unit){
-            if(!enabled) return;
+            if(!pushUnits || !enabled) return;
 
             //calculate derivative of units moved last frame
             float delta = (curInterp - lastInterp) * size * tilesize;