diff --git a/core/assets/maps/facility32m.msav b/core/assets/maps/facility32m.msav index a690d9022f..0cea5d1b0a 100644 Binary files a/core/assets/maps/facility32m.msav and b/core/assets/maps/facility32m.msav differ diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index b41c2b733b..cf1ab20889 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/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(); diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java index e6c368d97e..ec5523dd1c 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java +++ b/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; diff --git a/servers_v7.json b/servers_v7.json index 252a535ed6..e88be60de8 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -262,7 +262,7 @@ }, { "name": "Alex Multiverse", - "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869", "92.119.127.171:6888", "181.215.58.8:1025", "181.215.58.8:1027", "181.215.58.7:1820"] + "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869", "92.119.127.171:6888", "181.215.58.8:1025", "181.215.58.8:1027", "181.215.58.7:1820", "23.95.107.12"] }, { "name": "Open PVP",