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

..

blocks

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

2021-09-28 18:45:09 -04:00

editor

Fallback atlas / Bugfixes / Cleanup

2020-06-11 15:25:46 -04:00

effects

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

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

items

sprite tweaks

2021-08-18 20:09:59 -04:00

rubble

Fallback atlas / Bugfixes / Cleanup

2020-06-11 15:25:46 -04:00

shapes

Partial 7.0 merge - API preview

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

statuses

Implemented #5853

2021-08-25 10:09:00 -04:00

teams

Things

2021-08-11 09:54:30 -04:00

ui

Sector info list / Minor hint fixes

2021-08-12 22:16:13 -04:00

units

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

2021-09-28 18:45:09 -04:00

pack.json

Sprite packing fix

2021-06-03 11:37:33 -04:00