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

..

EventType.java

Fixed minimap not updating when build team changes

2021-08-05 14:20:23 -04:00

Gamemode.java

Fixed #5797

2021-08-18 11:41:38 -04:00

GameStats.java

Campaign tweaks

2020-10-31 14:52:03 -04:00

Objectives.java

Allow research even if sector was attacked after capture

2020-11-26 21:48:45 -05:00

Rules.java

Support for team-specific multipliers (no UI)

2021-08-11 21:18:48 -04:00

Saves.java

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

Schematic.java

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

Schematics.java

Sector wave spawning fixes

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

SectorInfo.java

Fixed #5722

2021-08-08 20:42:48 -04:00

SpawnGroup.java

Partial impl of #2923

2021-07-20 13:17:18 -04:00

Team.java

Auto-generate block paletted team regions for mods

2021-07-31 21:31:36 -04:00

Teams.java

Lambda memory allocation optimizations

2021-08-17 11:38:57 -04:00

Universe.java

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

2021-08-10 15:15:07 -04:00

Waves.java

Sector wave spawning fixes

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