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

 Conflicts:

	core/src/mindustry/content/Blocks.java

core/assets/bundles/bundle.properties

@@ -460,6 +460,7 @@ toolmode.drawteams = Draw Teams
 toolmode.drawteams.description = Draw teams instead of blocks.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
+
 filter.distort = Distort
 filter.noise = Noise
 filter.enemyspawn = Enemy Spawn Select
@@ -476,6 +477,7 @@ filter.clear = Clear
 filter.option.ignore = Ignore
 filter.scatter = Scatter
 filter.terrain = Terrain
+
 filter.option.scale = Scale
 filter.option.chance = Chance
 filter.option.mag = Magnitude
@@ -675,6 +677,7 @@ unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <load map to show>
 stat.description = Purpose
 stat.input = Input
 stat.output = Output
@@ -1164,8 +1167,9 @@ block.spore-cluster.name = Spore Cluster
 block.metal-floor.name = Metal Floor 1
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
-block.metal-floor-5.name = Metal Floor 4
-block.metal-floor-damaged.name = Metal Floor Damaged
+block.metal-floor-4.name = Metal Floor 4
+block.metal-floor-5.name = Metal Floor 5
+block.metal-floor-damaged.name = Damaged Metal Floor
 block.dark-panel-1.name = Dark Panel 1
 block.dark-panel-2.name = Dark Panel 2
 block.dark-panel-3.name = Dark Panel 3