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/assets/bundles/bundle.properties

@@ -215,6 +215,7 @@ hosts.none = [lightgray]No local games found!
 host.invalid = [scarlet]Can't connect to host.
 
 servers.local = Local Servers
+servers.local.steam = Open Games & Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
 
@@ -316,7 +317,7 @@ data.invalid = This isn't valid game data.
 data.import.confirm = Importing external data will overwrite[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
 quit.confirm = Are you sure you want to quit?
 loading = [accent]Loading...
-reloading = [accent]Reloading Mods...
+downloading = [accent]Downloading...
 saving = [accent]Saving...
 respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] to clear plan
@@ -538,6 +539,7 @@ configure = Configure Loadout
 loadout = Loadout
 resources = Resources
 bannedblocks = Banned Blocks
+bannedunits = Banned Units
 addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.destination = Destination: {0}
@@ -834,13 +836,13 @@ category.items = Items
 category.crafting = Input/Output
 category.function = Function
 category.optional = Optional Enhancements
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 setting.landscape.name = Lock Landscape
 setting.shadows.name = Shadows
 setting.blockreplace.name = Automatic Block Suggestions
 setting.linear.name = Linear Filtering
 setting.hints.name = Hints
 setting.logichints.name = Logic Hints
-setting.flow.name = Display Resource Flow Rate
 setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
 setting.doubletapmine.name = Double-Tap to Mine
@@ -875,6 +877,7 @@ setting.seconds = {0} seconds
 setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Borderless Window
+setting.borderlesswindow.name.windows = Borderless Fullscreen
 setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = Show FPS & Ping
 setting.smoothcamera.name = Smooth Camera
@@ -1104,13 +1107,12 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
 
-block.resupply-point.name = Resupply Point
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
 block.basalt-boulder.name = Basalt Boulder
 block.grass.name = Grass
-block.slag.name = Slag
+block.molten-slag.name = Slag
 block.space.name = Space
 block.salt.name = Salt
 block.salt-wall.name = Salt Wall
@@ -1141,8 +1143,8 @@ block.spawn.name = Enemy Spawn
 block.core-shard.name = Core: Shard
 block.core-foundation.name = Core: Foundation
 block.core-nucleus.name = Core: Nucleus
-block.deepwater.name = Deep Water
-block.water.name = Water
+block.deep-water.name = Deep Water
+block.shallow-water.name = Water
 block.tainted-water.name = Tainted Water
 block.darksand-tainted-water.name = Dark Sand Tainted Water
 block.tar.name = Tar
@@ -1151,7 +1153,7 @@ block.sand.name = Sand
 block.darksand.name = Dark Sand
 block.ice.name = Ice
 block.snow.name = Snow
-block.craters.name = Craters
+block.crater-stone.name = Craters
 block.sand-water.name = Sand Water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
@@ -1355,6 +1357,7 @@ hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemi
 hint.breaking = [accent]Right-click[] and drag to break blocks.
 hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
 hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
 hint.research = Use the \ue875 [accent]Research[] button to research new technology.
 hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
 hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
@@ -1406,7 +1409,7 @@ liquid.slag.description = Refined in separators into constituent metals, or spra
 liquid.oil.description = Used in advanced material production and as incendiary ammunition.
 liquid.cryofluid.description = Used as coolant in reactors, turrets and factories.
 
-block.resupply-point.description = Resupplies nearby units with copper ammunition. Not compatible with units that require battery power.
+block.derelict =  [lightgray]Derelict
 block.armored-conveyor.description = Moves items forward. Does not accept inputs from the sides.
 block.illuminator.description = Emits light.
 block.message.description = Stores a message for communication between allies.