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

..

blocks

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

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

editor

Fallback atlas / Bugfixes / Cleanup

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

effects

beam drill visual improvements

2021-07-13 21:41:53 -04:00

items

Unspoiled

2021-06-02 11:15:30 -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

Partial 7.0 merge - API preview

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

ui

Better sliders

2021-07-12 12:36:45 -04:00

units

Partial 7.0 merge - API preview

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

pack.json

Sprite packing fix

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