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/world/meta/BlockFlag.java

@@ -18,13 +18,8 @@ public enum BlockFlag{
     rally,
     /** Block that stored power for resupply. */
     battery,
-    /** Block used for resupply. */
-    resupply,
     /** Any reactor block. */
     reactor,
-    /** This flag is unused, and will be removed. */
-    @Deprecated
-    unitModifier,
     /** Blocks that extinguishes fires. */
     extinguisher,
     /** Just a launch pad. */
@@ -33,5 +28,5 @@ public enum BlockFlag{
     public final static BlockFlag[] all = values();
 
     /** Values for logic only. Filters out some internal flags. */
-    public final static BlockFlag[] allLogic = {core, storage, generator, turret, factory, repair, rally, battery, resupply, reactor};
+    public final static BlockFlag[] allLogic = {core, storage, generator, turret, factory, repair, rally, battery, reactor};
 }