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

 Conflicts:

	core/assets/icons/icons.properties

	core/assets/logicids.dat

	core/src/mindustry/ui/dialogs/PlanetDialog.java

	core/src/mindustry/world/blocks/distribution/ItemBridge.java

	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java

	core/src/mindustry/world/blocks/storage/StorageBlock.java

	gradle.properties

core/src/mindustry/io/JsonIO.java

@@ -214,7 +214,8 @@ public class JsonIO{
                 String str = jsonData.asString();
                 Item item = Vars.content.getByName(ContentType.item, str);
                 Liquid liquid = Vars.content.getByName(ContentType.liquid, str);
-                return item != null ? item : liquid;
+                Block block = Vars.content.getByName(ContentType.block, str);
+                return item != null ? item : liquid == null ? block : liquid;
             }
         });
 

core/src/mindustry/io/SaveFileReader.java

@@ -50,7 +50,11 @@ public abstract class SaveFileReader{
     "holostone-wall", "dacite-wall",
     "rock", "boulder",
     "snowrock", "snow-boulder",
-    "cliffs", "stone-wall", 
+    "cliffs", "stone-wall",
+    "craters", "crater-stone",
+    "deepwater", "deep-water",
+    "water", "shallow-water",
+    "slag", "molten-slag",
 
     "cryofluidmixer", "cryofluid-mixer",
     "block-forge", "constructor"

core/src/mindustry/io/SaveVersion.java

@@ -363,7 +363,7 @@ public abstract class SaveVersion extends SaveFileReader{
         int amount = stream.readInt();
         for(int j = 0; j < amount; j++){
             readChunk(stream, true, in -> {
-                byte typeid = in.readByte();
+                int typeid = in.readUnsignedByte();
                 if(mapping[typeid] == null){
                     in.skipBytes(lastRegionLength - 1);
                     return;
@@ -408,7 +408,8 @@ public abstract class SaveVersion extends SaveFileReader{
 
             for(int j = 0; j < total; j++){
                 String name = stream.readUTF();
-                map[type.ordinal()][j] = content.getByName(type, fallback.get(name, name));
+                //fallback only for blocks
+                map[type.ordinal()][j] = content.getByName(type, type == ContentType.block ? fallback.get(name, name) : name);
             }
         }