Resolve conflicts

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png

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

@@ -63,7 +63,7 @@ public class Blocks implements ContentList{
 
     //power
     combustionGenerator, thermalGenerator, turbineGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
-    impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower,
+    impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower, diode,
 
     //production
     mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, waterExtractor, oilExtractor, cultivator,
@@ -1071,6 +1071,10 @@ public class Blocks implements ContentList{
             laserRange = 30f;
         }};
 
+        diode = new PowerDiode("diode"){{
+            requirements(Category.power, ItemStack.with(Items.silicon, 10, Items.plastanium, 5, Items.metaglass, 10));
+        }};
+
         battery = new Battery("battery"){{
             requirements(Category.power, ItemStack.with(Items.copper, 4, Items.lead, 20));
             consumes.powerBuffered(4000f);

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

@@ -26,6 +26,7 @@ public class Liquids implements ContentList{
             flammability = 1.2f;
             explosiveness = 1.2f;
             heatCapacity = 0.7f;
+            barColor = Color.valueOf("6b675f");
             effect = StatusEffects.tarred;
         }};
 

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

@@ -194,7 +194,7 @@ public class Mechs implements ContentList{
 
             @Override
             public void updateAlt(Player player){
-                float scl = 1f - player.shootHeat / 2f;
+                float scl = 1f - player.shootHeat / 2f*Time.delta();
                 player.velocity().scl(scl);
             }
 

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

@@ -215,8 +215,10 @@ public class TechTree implements ContentList{
                 node(combustionGenerator, () -> {
                     node(powerNode, () -> {
                         node(powerNodeLarge, () -> {
-                            node(surgeTower, () -> {
+                            node(diode, () -> {
+                                node(surgeTower, () -> {
 
+                                });
                             });
                         });