Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	gradle.properties

core/src/mindustry/world/blocks/production/AttributeCrafter.java

@@ -45,7 +45,7 @@ public class AttributeCrafter extends GenericCrafter{
 
         @Override
         public float efficiency(){
-            return (baseEfficiency + Math.min(maxBoost, boostScale * attrsum)) * super.efficiency();
+            return (baseEfficiency + Math.min(maxBoost, boostScale * attrsum) + attribute.env()) * super.efficiency();
         }
 
         @Override

core/src/mindustry/world/blocks/production/Incinerator.java

@@ -9,6 +9,7 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 public class Incinerator extends Block{
     public Effect effect = Fx.fuelburn;
@@ -30,6 +31,11 @@ public class Incinerator extends Block{
             heat = Mathf.approachDelta(heat, consValid() && efficiency() > 0.9f ? 1f : 0f, 0.04f);
         }
 
+        @Override
+        public BlockStatus status(){
+            return heat > 0.5f ? BlockStatus.active : BlockStatus.noInput;
+        }
+
         @Override
         public void draw(){
             super.draw();

core/src/mindustry/world/meta/Attribute.java

@@ -14,7 +14,7 @@ public class Attribute{
     spores = add("spores"),
     /** Water content. Used for water extractor yield. */
     water = add("water"),
-    /** Oil content. Used for  oil extractor yield. */
+    /** Oil content. Used for oil extractor yield. */
     oil = add("oil"),
     /** Light coverage. Negative values decrease solar panel efficiency. */
     light = add("light"),