From 8e4d00d594ce509029f606b7550e76bc56f1269b Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Thu, 1 Oct 2020 11:03:59 +0200 Subject: [PATCH 1/2] Move cryofluid mixer emoji back to the old number --- core/assets/icons/icons.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index d541868250..b07514ea1b 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -62,7 +62,7 @@ 63674=plastanium-compressor|block-plastanium-compressor-medium 63673=phase-weaver|block-phase-weaver-medium 63672=alloy-smelter|block-alloy-smelter-medium -63671=cryofluidmixer|block-cryofluidmixer-medium +63671=cryofluid-mixer|block-cryofluid-mixer-medium 63670=blast-mixer|block-blast-mixer-medium 63669=pyratite-mixer|block-pyratite-mixer-medium 63668=melter|block-melter-medium @@ -313,4 +313,3 @@ 63423=memory-bank|block-memory-bank-medium 63422=foreshadow|block-foreshadow-medium 63421=tsunami|block-tsunami-medium -63420=cryofluid-mixer|block-cryofluid-mixer-medium From ce463d225fe88808e7f2f828c649ffe5c8cdc196 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Thu, 1 Oct 2020 11:54:58 +0200 Subject: [PATCH 2/2] Clarify stack conveyor recharge property (also, should be minimum & multiple of 1) --- core/src/mindustry/world/blocks/distribution/StackConveyor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index d70c518bc0..009cc8fbfe 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -27,6 +27,7 @@ public class StackConveyor extends Block implements Autotiler{ public float speed = 0f; public boolean splitOut = true; + /** (minimum) amount of loading docks needed to fill a line */ public float recharge = 2f; public Effect loadEffect = Fx.plasticburn; public Effect unloadEffect = Fx.plasticburn;