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

 Conflicts:

	core/src/mindustry/editor/MapInfoDialog.java

	core/src/mindustry/maps/filters/ClearFilter.java

	core/src/mindustry/mod/ClassMap.java

	gradle.properties

core/assets/bundles/bundle.properties

@@ -492,6 +492,7 @@ filter.option.block = Block
 filter.option.floor = Floor
 filter.option.flooronto = Target Floor
 filter.option.target = Target
+filter.option.replacement = Replacement
 filter.option.wall = Wall
 filter.option.ore = Ore
 filter.option.floor2 = Secondary Floor
@@ -994,6 +995,7 @@ rules.waves = Waves
 rules.attack = Attack Mode
 rules.buildai = AI Building
 rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier