Merge fixes

2020-08-11 00:09:08 +02:00
parent 89058448cf d591a1492c
commit ff0d38d56a
121 changed files with 1684 additions and 1995 deletions
@@ -60,7 +60,8 @@ public class FluidP2PTunnelPart extends P2PTunnelPart<FluidP2PTunnelPart> {
        return MODELS.getModels();
    }

-    public float getPowerDrainPerTick() {
+    @Override
+    protected float getPowerDrainPerTick() {
        return 2.0f;
    }