Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2020-11-12 09:41:54 -05:00
commit d163cacb6a

View file

@ -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);