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

 Conflicts:

	gradle.properties

core/src/mindustry/game/Gamemode.java

@@ -38,7 +38,6 @@ public enum Gamemode{
         rules.infiniteResources = true;
         rules.editor = true;
         rules.waves = false;
-        rules.enemyCoreBuildRadius = 0f;
         rules.waveTimer = false;
     });