Merge branch 'master' into crater

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/mindustry/world/modules/ItemModule.java

...

This commit is contained in:

Patrick 'Quezler' Mounier

2020-02-05 10:26:34 +01:00

parent 55932d03c9 67106abb9b

commit 05ccdfd51b

56 changed files with 1115 additions and 691 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/sprites.png

Binary file not shown.

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