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

...

This commit is contained in:

Patrick 'Quezler' Mounier

2020-01-10 12:02:07 +01:00

parent 5f047603bf 5675565c96

commit ed765ad10a

73 changed files with 6154 additions and 4205 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/sprites/sprites.atlas

+2747 -2691

File diff suppressed because it is too large Load Diff