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

Browse Source

 Conflicts:

	core/src/mindustry/world/blocks/environment/Floor.java

	core/src/mindustry/world/blocks/payloads/Payload.java

	gradle.properties

...

This commit is contained in:

Anuken

2021-07-15 09:13:35 -04:00

parent 8644844b7d 61d81046ae

commit 103f24d41d

61 changed files with 571 additions and 262 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/ui/slider-back.9.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/slider-knob-down.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 118 B After Width:  |  Height:  |  Size: 117 B

BIN

core/assets-raw/sprites/ui/slider-knob-over.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 123 B After Width:  |  Height:  |  Size: 120 B

BIN

core/assets-raw/sprites/ui/slider-knob.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 122 B After Width:  |  Height:  |  Size: 120 B

BIN

core/assets-raw/sprites/ui/slider-vertical.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 72 B