Merge branch '6.0' into crater

Browse Source

# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png

...

This commit is contained in:

Patrick 'Quezler' Mounier

2020-04-16 22:38:51 +02:00

parent 1acc6461e6 280f3dd428

commit 32e32ecae2

19 changed files with 373 additions and 10 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/sprites5.png

Binary file not shown.

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