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

Browse Source

 Conflicts:

	core/src/mindustry/content/Blocks.java

	core/src/mindustry/net/CrashSender.java

	core/src/mindustry/ui/Links.java

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

	core/src/mindustry/world/blocks/power/LightBlock.java

	gradle.properties

...

This commit is contained in:

Anuken

2021-07-23 17:58:02 -04:00

parent f98622fdc9 53214f0ddc

commit 385f493f36

90 changed files with 690 additions and 389 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/drills/blast-drill-rotator.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png

Binary file not shown.

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