Patrick 'Quezler' Mounier 32e32ecae2 Merge branch '6.0' into crater ...

# 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

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

..

icon_64.png

New icon

2019-08-12 13:29:02 -04:00

icon.icns

Updated Mac icon

2019-08-16 12:05:00 -04:00

icon.ico

New icon

2019-08-12 13:29:02 -04:00

icons.properties

Merge branch '6.0' into crater

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