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

 Conflicts:

	core/src/mindustry/ui/dialogs/PlanetDialog.java

2021-08-18 15:04:30 -04:00

..

AsteroidGenerator.java

Asteroid variants

2021-06-23 16:21:12 -04:00

ErekirPlanetGenerator.java

Name cleanup

2021-06-22 16:52:48 -04:00

SerpuloPlanetGenerator.java

Sector wave spawning fixes

2021-08-16 13:15:14 -04:00

TantrosPlanetGenerator.java

Cleanup

2021-06-20 09:50:25 -04:00