Merge branch '6.0' into crater

Browse Source

# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java

...

This commit is contained in:

Patrick 'Quezler' Mounier

2020-04-16 12:39:52 +02:00

parent 424e58ff7d 8a01b87c99

commit 5c28985ee6

610 changed files with 27167 additions and 25697 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/distribution/cross.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/mass-conveyor.png

BIN

Binary file not shown.

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