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-09-04 12:26:07 -04:00

parent c6873a72f6 3f49807348

commit dddb282ce3

28 changed files with 80 additions and 22 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/rtg-generator.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/weapons/flakgun.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/weapons/missiles.png

Binary file not shown.

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