Fixed stone formers

core/assets/version.properties

@@ -1,5 +1,5 @@
 #Autogenerated file. Do not modify.
-#Tue Apr 10 21:29:35 EDT 2018
+#Tue Apr 10 22:25:05 EDT 2018
 version=release
 androidBuildCode=897
 name=Mindustry

core/src/io/anuke/mindustry/content/Recipes.java

@@ -32,7 +32,6 @@ public class Recipes {
 		new Recipe(distribution, DistributionBlocks.router, stack(Items.iron, 2)),
 		new Recipe(distribution, DistributionBlocks.multiplexer, stack(Items.iron, 8)),
 		new Recipe(distribution, DistributionBlocks.junction, stack(Items.iron, 2)),
-		new Recipe(distribution, DistributionBlocks.tunnel, stack(Items.iron, 2)),
 		new Recipe(distribution, DistributionBlocks.sorter, stack(Items.steel, 2)),
 		new Recipe(distribution, DistributionBlocks.splitter, stack(Items.steel, 1)),
 		new Recipe(distribution, DistributionBlocks.overflowgate, stack(Items.steel, 1)),
@@ -40,7 +39,7 @@ public class Recipes {
 		new Recipe(distribution, StorageBlocks.core, stack(Items.steel, 50)),
 		new Recipe(distribution, StorageBlocks.unloader, stack(Items.steel, 5)),
 		new Recipe(distribution, StorageBlocks.sortedunloader, stack(Items.steel, 5)),
-		new Recipe(distribution, DistributionBlocks.itembridge, stack(Items.steel, 5)),
+		new Recipe(distribution, DistributionBlocks.bridgeconveyor, stack(Items.steel, 5)),
 
 		new Recipe(weapon, WeaponBlocks.doubleturret, stack(Items.iron, 7)),
 		new Recipe(weapon, WeaponBlocks.gatlingturret, stack(Items.iron, 8)),
@@ -114,8 +113,7 @@ public class Recipes {
 		new Recipe(liquid, LiquidBlocks.liquidrouter, stack(Items.steel, 2)),
 		new Recipe(liquid, LiquidBlocks.liquidtank, stack(Items.steel, 2)),
 		new Recipe(liquid, LiquidBlocks.liquidjunction, stack(Items.steel, 2)),
-		new Recipe(liquid, LiquidBlocks.conduittunnel, stack(Items.titanium, 2), stack(Items.steel, 2)),
+		new Recipe(liquid, LiquidBlocks.bridgeconduit, stack(Items.titanium, 2), stack(Items.steel, 2)),
-		new Recipe(liquid, LiquidBlocks.liquidbridge, stack(Items.titanium, 2), stack(Items.steel, 2)),
 
 		new Recipe(liquid, LiquidBlocks.pump, stack(Items.steel, 10)),
 		new Recipe(liquid, LiquidBlocks.fluxpump, stack(Items.steel, 10), stack(Items.densealloy, 5)),

core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java

@@ -182,12 +182,13 @@ public class CraftingBlocks {
 
     stoneFormer = new GenericCrafter("stoneformer") {{
         inputLiquid = Liquids.lava;
-        liquidUse = 0.1f;
+        liquidUse = 1f;
         liquidCapacity = 21f;
-        craftTime = 12;
+        craftTime = 14;
         output = Items.stone;
         health = 80;
         craftEffect = BlockFx.purifystone;
+        hasLiquids = hasInventory = true;
     }},
 
     weaponFactory = new WeaponFactory("weaponfactory") {{

core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java

@@ -34,11 +34,11 @@ public class DistributionBlocks{
 		capacity = 32;
 	}},
 
-	tunnel = new TunnelConveyor("conveyortunnel"){{
+	bridgeconveyor = new ItemBridge("bridgeconveyor"){{
-		speed = 53;
+		range = 2;
 	}},
 
-	itembridge = new ItemBridge("itembridge"){{
+	laserconveyor = new ItemBridge("laserconveyor"){{
 		range = 7;
 	}},
 

core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java

@@ -36,11 +36,11 @@ public class LiquidBlocks {
 
     liquidjunction = new LiquidJunction("liquidjunction"),
 
-    conduittunnel = new TunnelConduit("conduittunnel") {{
+    bridgeconduit = new LiquidBridge("bridgeconduit"){{
-        speed = 53;
+        range = 7;
     }},
 
-    liquidbridge = new LiquidBridge("liquidbridge"){{
+    laserconduit = new LiquidBridge("laserconduit"){{
         range = 7;
     }};
 }