Merge branch 'master' of https://github.com/Anuken/Mindustry into messages

Browse Source

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites5.png

...

This commit is contained in:

Anuken

2019-09-21 18:59:49 -04:00

parent 209f0902c9 7f299869c5

commit 3f293190cf

267 changed files with 11249 additions and 6885 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/units/rally-point.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/icons/icon-admin-small.png → core/assets-raw/sprites/ui/icons/icon-admin-badge.png

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

core/assets-raw/sprites/ui/icons/icon-command-idle.png → core/assets-raw/sprites/ui/icons/icon-command-rally.png

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

core/assets-raw/sprites/ui/icons/icon-fdroid.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/icons/icon-workshop.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/window-empty.9.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 2.3 KiB