Merge remote-tracking branch 'origin/master'

2020-11-12 09:41:54 -05:00
parent e847a74a25 c2aa655d87
commit d163cacb6a
1 changed files with 1 additions and 1 deletions
--- a/core/src/mindustry/world/blocks/production/Pump.java
+++ b/core/src/mindustry/world/blocks/production/Pump.java
@@ -15,7 +15,7 @@ import static mindustry.Vars.*;

 public class Pump extends LiquidBlock{
    /** Pump amount per tile. */
-    protected float pumpAmount = 0.2f;
+    public float pumpAmount = 0.2f;

    public Pump(String name){
        super(name);