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

 Conflicts:

	core/src/mindustry/type/UnitType.java

	gradle.properties

2021-11-04 19:39:16 -04:00

..

EventType.java

Add event PlayerConnectionConfirmed (#6274)

2021-10-31 09:31:53 -04:00

Gamemode.java

Fixed #5797

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

GameStats.java

Game stats cleanup

2021-08-18 16:39:20 -04:00

Objectives.java

Allow research even if sector was attacked after capture

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

Rules.java

asd

2021-10-23 19:59:11 -04:00

Saves.java

Update/draw payload buildings (broken)

2021-10-18 11:37:26 -04:00

Schematic.java

Partial 7.0 merge - API preview

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

Schematics.java

I guess people need to be yelled at for bad schematics

2021-11-02 10:39:22 -04:00

SectorInfo.java

Fixed #5907

2021-09-04 09:55:23 -04:00

SpawnGroup.java

Experimental positional spawn support / WIP map

2021-09-10 13:56:12 -04:00

Team.java

Auto-generate block paletted team regions for mods

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

Teams.java

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

2021-11-04 19:39:16 -04:00

Universe.java

Default loadout for erekir

2021-10-30 14:39:07 -04:00

Waves.java

Fixed incorrect waves on serpulo sectors

2021-10-19 18:18:58 -04:00