Merge branches 'kill-packages' and 'master' of https://github.com/Anuken/Mindustry

Browse Source

...

This commit is contained in:

Anuken

2019-12-25 12:55:38 -05:00

parent c7ea4e85c9 f89af1b26a

commit ee429ef4f2

8 changed files with 2030 additions and 2030 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: 745 B After Width:  |  Height:  |  Size: 747 B

4060

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: 741 KiB After Width:  |  Height:  |  Size: 957 KiB

BIN

core/assets/sprites/sprites2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 278 KiB After Width:  |  Height:  |  Size: 304 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: 1.1 MiB

BIN

core/assets/sprites/sprites4.png

Binary file not shown.

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

BIN

core/assets/sprites/sprites5.png

Binary file not shown.

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