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

Browse Source

 Conflicts:

	core/assets/icons/icons.properties

	core/src/mindustry/content/Blocks.java

	core/src/mindustry/world/meta/StatValues.java

...

This commit is contained in:

Anuken

2021-09-04 23:12:28 -04:00

parent ed1d4414a0 f20b9c828c

commit 393d3a19a3

12 changed files with 70 additions and 75 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/environment/deep-tainted-water.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/tainted-water.png

Binary file not shown.

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