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

 Conflicts:

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

2022-04-20 14:16:20 -04:00

..

blank.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

circle-small.png

Various fixes

2020-11-02 16:46:11 -05:00

circle.png

Improved battery brightness display / Palette tweak / Diffgen buff

2020-02-11 17:27:33 -05:00

hcircle.png

Partial 7.0 merge - API preview

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

ring-item.png

Use sprites instead of polygons (#6725)

2022-04-20 14:15:35 -04:00