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

Browse Source

 Conflicts:

	core/src/mindustry/content/Blocks.java

...

This commit is contained in:

Anuken

2021-06-05 11:57:14 -04:00

parent 7dd2a3ba70 b4dad32b2b

commit 974ebe6937

94 changed files with 1030 additions and 714 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/defense/shock-mine-team-top.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/dark-metal-large.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 521 B After Width:  |  Height:  |  Size: 467 B

BIN

core/assets-raw/sprites/blocks/environment/dark-metal2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 267 B After Width:  |  Height:  |  Size: 280 B

BIN

core/assets-raw/sprites/blocks/environment/dark-panel-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 218 B After Width:  |  Height:  |  Size: 228 B

BIN

core/assets-raw/sprites/blocks/environment/dark-panel-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 200 B After Width:  |  Height:  |  Size: 227 B

BIN

core/assets-raw/sprites/blocks/environment/dark-panel-4.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 201 B After Width:  |  Height:  |  Size: 219 B

BIN

core/assets-raw/sprites/blocks/environment/dark-panel-5.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 250 B After Width:  |  Height:  |  Size: 214 B

BIN

core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 231 B

BIN

core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 221 B After Width:  |  Height:  |  Size: 228 B

BIN

core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 217 B After Width:  |  Height:  |  Size: 227 B