Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework

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/world/blocks/defense/MendProjector.java
#	gradle.properties

...

This commit is contained in:

Anuken

2019-12-02 22:45:05 -05:00

parent e6647484bd 5c30f4bc9c

commit 9e3870acbe

217 changed files with 7797 additions and 4613 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/sprites/block_colors.png

Binary file not shown.

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

5007

core/assets/sprites/sprites.atlas

File diff suppressed because it is too large Load Diff

BIN

core/assets/sprites/sprites.png

Binary file not shown.

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

BIN

core/assets/sprites/sprites3.png

Binary file not shown.

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

BIN

core/assets/sprites/sprites5.png

Binary file not shown.

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