Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config

# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java

core/src/mindustry/entities/def/TileComp.java

@@ -232,10 +232,14 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
         return proximity;
     }
 
-    /** Tile configuration. Defaults to 0. Used for block rebuilding. */
-    @Override
-    public int config(){
-        return 0;
+    /** Tile configuration. Defaults to null. Used for block rebuilding. */
+    public Object config(){
+        return null;
+    }
+
+    /** Sets the config object and casts it. Does nothing by default. */
+    public void setConfig(Object config){
+
     }
 
     @Override