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

 Conflicts:

	core/src/mindustry/ai/BlockIndexer.java

	gradle.properties

2021-12-07 14:09:03 -05:00

..

blocks

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

2021-12-07 14:09:03 -05:00

editor

Fallback atlas / Bugfixes / Cleanup

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

effects

gsd

2021-10-28 22:27:36 -04:00

items

arkycite recolor

2021-11-30 22:52:33 -05: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

Unit cargo transport system

2021-11-29 20:06:49 -05:00

pack.json

Sprite packing fix

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