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

 Conflicts:

	core/assets/logicids.dat

	core/src/mindustry/content/Blocks.java

	gradle.properties

2021-09-28 18:45:09 -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

Planet background system

2021-09-17 11:23:32 -04:00

MapIO.java

Partial 7.0 merge - API preview

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

SaveFileReader.java

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

2021-09-13 20:52:41 -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

Sync/save @tick/@time; make @time be based off of @tick

2021-09-22 19:35:15 -04:00

TypeIO.java

Add boolean[] to TypeIO (#6026)

2021-09-20 00:10:43 -04:00