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

Browse Source

 Conflicts:

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

...

This commit is contained in:

Anuken

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

parent f1c6b6f949 2dae8fdef4

commit b40957e28b

18 changed files with 487 additions and 429 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

core/assets-raw/sprites/blocks/power/impact-reactor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

core/assets-raw/sprites/blocks/power/solar-panel-large.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

core/assets-raw/sprites/shapes/ring-item.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 488 B