Partial 7.0 merge - API preview

core/src/mindustry/game/Gamemode.java

@@ -2,6 +2,7 @@ package mindustry.game;
 
 import arc.*;
 import arc.func.*;
+import arc.util.*;
 import mindustry.maps.*;
 
 import static mindustry.Vars.*;
@@ -22,7 +23,7 @@ public enum Gamemode{
         rules.waves = true;
         rules.waveTimer = true;
 
-        rules.waveSpacing /= 2f;
+        rules.waveSpacing = 60f * Time.toMinutes;
         rules.teams.get(rules.waveTeam).infiniteResources = true;
     }, map -> map.teams.contains(state.rules.waveTeam.id)),
     pvp(rules -> {