Merge remote-tracking branch 'origin/master'

2020-10-01 13:33:55 -04:00
parent 199be4d13d 2604a2d649
commit 1170880127
2 changed files with 2 additions and 2 deletions
--- 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;