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

 Conflicts:

	core/src/mindustry/content/Blocks.java

	core/src/mindustry/net/CrashSender.java

	core/src/mindustry/ui/Links.java

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

	core/src/mindustry/world/blocks/power/LightBlock.java

	gradle.properties

2021-07-23 17:58:02 -04:00

..

legacy

Great cleanup

2020-11-07 11:37:46 +03:00

versions

Partial 7.0 merge - API preview

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

JsonIO.java

Use short filter names in JSON

2021-07-17 16:46:35 -04:00

MapIO.java

Partial 7.0 merge - API preview

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

SaveFileReader.java

Large constructor variant

2021-07-22 17:48:50 -04:00

SaveIO.java

Suppress invalid save meta errors

2021-07-18 14:40:59 -04:00

SaveMeta.java

Sector refactoring, invasions and cleanup

2020-10-16 11:02:24 -04:00

SavePreviewLoader.java

Partial 7.0 merge - API preview

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

SaveVersion.java

Partial 7.0 merge - API preview

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

TypeIO.java

(commented) support for Call server-to-client sounds

2021-07-16 15:39:03 -04:00