Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse Source

# Conflicts:
#	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/io/anuke/mindustry/graphics/Shaders.java
#	gradle.properties

...

This commit is contained in:

Anuken

2019-12-01 17:42:56 -05:00

parent 0c0573a7b1 5a9957c578

commit 78f146fbcf

178 changed files with 4412 additions and 1699 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/liquid/liquid-overflow-gate-top.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/power/illuminator-top.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/power/illuminator.png Normal file

Binary file not shown.

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