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

Browse Source

 Conflicts:

	core/assets/icons/icons.properties

	core/assets/logicids.dat

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

	core/src/mindustry/world/blocks/distribution/ItemBridge.java

	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java

	core/src/mindustry/world/blocks/storage/StorageBlock.java

	gradle.properties

...

This commit is contained in:

Anuken

2021-08-10 15:15:07 -04:00

parent 385f493f36 e7e64379dd

commit e6bd259c0e

196 changed files with 2485 additions and 1664 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

core/assets-raw/sprites/blocks/environment/craters1.png → core/assets-raw/sprites/blocks/environment/crater-stone1.png

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

core/assets-raw/sprites/blocks/environment/craters2.png → core/assets-raw/sprites/blocks/environment/crater-stone2.png

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

core/assets-raw/sprites/blocks/environment/craters3.png → core/assets-raw/sprites/blocks/environment/crater-stone3.png

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

core/assets-raw/sprites/blocks/environment/craters4.png → core/assets-raw/sprites/blocks/environment/crater-stone4.png

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

core/assets-raw/sprites/blocks/environment/craters5.png → core/assets-raw/sprites/blocks/environment/crater-stone5.png

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

core/assets-raw/sprites/blocks/environment/craters6.png → core/assets-raw/sprites/blocks/environment/crater-stone6.png

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

core/assets-raw/sprites/blocks/environment/deepwater.png → core/assets-raw/sprites/blocks/environment/deep-water.png

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

core/assets-raw/sprites/blocks/environment/slag.png → core/assets-raw/sprites/blocks/environment/molten-slag.png

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

core/assets-raw/sprites/blocks/environment/water.png → core/assets-raw/sprites/blocks/environment/shallow-water.png

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

core/assets-raw/sprites/blocks/production/disassembler.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/storage/core-foundation-thruster1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/storage/core-foundation-thruster2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/storage/core-nucleus-thruster1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

core/assets-raw/sprites/blocks/storage/core-nucleus-thruster2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

core/assets-raw/sprites/blocks/storage/core-shard-thruster1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/storage/core-shard-thruster2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/units/additive-reconstructor.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/effects/clear-effect.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/teams/team-crux.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/teams/team-derelict.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/teams/team-sharded.png

BIN

Binary file not shown.

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