Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-10-01 13:33:55 -04:00
parent 199be4d13d 2604a2d649
commit 1170880127
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/icons/icons.properties
+1 -2
View File
@@ -62,7 +62,7 @@
63674=plastanium-compressor|block-plastanium-compressor-medium 63674=plastanium-compressor|block-plastanium-compressor-medium
63673=phase-weaver|block-phase-weaver-medium 63673=phase-weaver|block-phase-weaver-medium
63672=alloy-smelter|block-alloy-smelter-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 63670=blast-mixer|block-blast-mixer-medium
63669=pyratite-mixer|block-pyratite-mixer-medium 63669=pyratite-mixer|block-pyratite-mixer-medium
63668=melter|block-melter-medium 63668=melter|block-melter-medium
@@ -313,4 +313,3 @@
63423=memory-bank|block-memory-bank-medium 63423=memory-bank|block-memory-bank-medium
63422=foreshadow|block-foreshadow-medium 63422=foreshadow|block-foreshadow-medium
63421=tsunami|block-tsunami-medium 63421=tsunami|block-tsunami-medium
63420=cryofluid-mixer|block-cryofluid-mixer-medium
core/src/mindustry/world/blocks/distribution/StackConveyor.java
+1
View File
@@ -27,6 +27,7 @@ public class StackConveyor extends Block implements Autotiler{
public float speed = 0f; public float speed = 0f;
public boolean splitOut = true; public boolean splitOut = true;
/** (minimum) amount of loading docks needed to fill a line */
public float recharge = 2f; public float recharge = 2f;
public Effect loadEffect = Fx.plasticburn; public Effect loadEffect = Fx.plasticburn;
public Effect unloadEffect = Fx.plasticburn; public Effect unloadEffect = Fx.plasticburn;