Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger

2018-12-07 19:40:10 +01:00
parent 0a76647175 94665e8055
commit e6261a6bf8
14 changed files with 120 additions and 108 deletions
--- a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
@@ -48,10 +48,10 @@ public class LiquidBlocks extends BlockList implements ContentList{
        }};

        liquidRouter = new LiquidRouter("liquid-router"){{
-            liquidCapacity = 40f;
+            liquidCapacity = 20f;
        }};

-        liquidtank = new LiquidRouter("liquid-tank"){{
+        liquidtank = new LiquidTank("liquid-tank"){{
            size = 3;
            liquidCapacity = 1500f;
            health = 500;