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

 Conflicts:

	core/src/mindustry/content/Planets.java

	tools/src/mindustry/tools/Generators.java

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

@@ -6,7 +6,8 @@ import mindustry.graphics.*;
 public enum BlockStatus{
     active(Color.valueOf("5ce677")),
     noOutput(Color.orange),
-    noInput(Pal.remove);
+    noInput(Pal.remove),
+    logicDisable(Color.valueOf("8a73c6"));
 
     public final Color color;