Merged current master and fixed conflicts

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

@@ -83,7 +83,7 @@ public class Items implements ContentList{
         }};
 
         biomatter = new Item("biomatter", Color.valueOf("648b55")){{
-            flammability = 0.4f;
+            flammability = 0.55f;
             fluxiness = 0.3f;
         }};
 

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

@@ -26,7 +26,7 @@ public class Liquids implements ContentList{
 
         lava = new Liquid("lava", Color.valueOf("e37341")){
             {
-                temperature = 0.8f;
+                temperature = 1f;
                 viscosity = 0.8f;
                 tier = 2;
                 effect = StatusEffects.melting;

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

@@ -123,6 +123,7 @@ public class Mechs implements ContentList{
                 speed = 0.44f;
                 drag = 0.35f;
                 boostSpeed = 0.8f;
+                canHeal = true;
                 weapon = Weapons.healBlaster;
                 armor = 15f;
                 trailColorTo = Palette.heal;
@@ -287,8 +288,8 @@ public class Mechs implements ContentList{
         trident = new Mech("trident-ship", true){
             {
                 drillPower = 2;
-                speed = 0.12f;
-                drag = 0.035f;
+                speed = 0.14f;
+                drag = 0.034f;
                 mass = 2.5f;
                 turnCursor = false;
                 armor = 20f;

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

@@ -152,7 +152,7 @@ public class Weapons implements ContentList{
         bomberTrident = new Weapon("bomber"){{
             length = 0f;
             width = 2f;
-            reload = 9f;
+            reload = 8f;
             shots = 2;
             roundrobin = true;
             ejectEffect = Fx.none;

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

@@ -192,9 +192,9 @@ public class CraftingBlocks extends BlockList implements ContentList{
         biomatterCompressor = new Compressor("biomattercompressor"){{
             liquidCapacity = 60f;
             itemCapacity = 50;
-            craftTime = 25f;
+            craftTime = 20f;
             outputLiquid = Liquids.oil;
-            outputLiquidAmount = 1.5f;
+            outputLiquidAmount = 2.5f;
             size = 2;
             health = 320;
             hasLiquids = true;

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

@@ -99,13 +99,13 @@ public class ProductionBlocks extends BlockList implements ContentList{
 
         cultivator = new Cultivator("cultivator"){{
             result = Items.biomatter;
-            drillTime = 260;
+            drillTime = 200;
             size = 2;
             hasLiquids = true;
             hasPower = true;
 
             consumes.powerDirect(0.08f);
-            consumes.liquid(Liquids.water, 0.2f);
+            consumes.liquid(Liquids.water, 0.15f);
         }};
 
     }

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

@@ -27,7 +27,7 @@ public class StorageBlocks extends BlockList implements ContentList{
         }};
 
         unloader = new SortedUnloader("unloader"){{
-            speed = 12f;
+            speed = 7f;
         }};
     }
 }

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

@@ -69,7 +69,7 @@ public class TurretBlocks extends BlockList implements ContentList{
             inaccuracy = 5f;
             shootCone = 50f;
             shootEffect = ShootFx.shootLiquid;
-            range = 70f;
+            range = 90f;
             health = 360;
 
             drawer = (tile, entity) -> {

core/src/io/anuke/mindustry/content/bullets/TurretBullets.java

@@ -334,7 +334,7 @@ public class TurretBullets extends BulletList implements ContentList{
                 lifetime = 200f;
                 despawneffect = BlockFx.smeltsmoke;
                 hiteffect = BulletFx.hitBulletBig;
-                drag = 0.01f;
+                drag = 0.005f;
             }
 
             @Override