Merge branch 'master' into armored-conduit

2019-11-14 21:32:15 +01:00
parent 8a089ba3c9 836e72119c
commit 3ec7e40213
46 changed files with 462 additions and 446 deletions
@@ -1010,6 +1010,7 @@ public class Blocks implements ContentList{
        pulseConduit = new Conduit("pulse-conduit"){{
            requirements(Category.liquid, ItemStack.with(Items.titanium, 2, Items.metaglass, 1));
            liquidCapacity = 16f;
+            liquidPressure = 1.025f;
            health = 90;
        }};