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/maps/Maps.java

@@ -420,6 +420,8 @@ public class Maps{
                     writeCache(map);
                 }catch(Exception e){
                     e.printStackTrace();
+                }finally{
+                    pix.dispose();
                 }
             });
         }catch(Exception e){

core/src/mindustry/maps/SectorDamage.java

@@ -496,7 +496,7 @@ public class SectorDamage{
                                 other.build.addPlan(false);
                                 other.remove();
                             }else{
-                                indexer.notifyTileDamaged(other.build);
+                                indexer.notifyBuildDamaged(other.build);
                             }
 
                         }else if(other.solid() && !other.synthetic()){ //skip damage propagation through solid blocks