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
..
2020-04-16 22:38:51 +02:00
2019-08-27 22:53:24 -04:00
2019-07-02 10:01:34 -04:00
2020-04-09 20:55:59 -04:00
2019-10-18 19:31:01 -04:00
2020-04-16 16:31:43 -04:00
2020-04-16 17:13:18 +02:00
2020-04-16 16:31:43 -04:00
2020-04-16 22:38:51 +02:00
2020-04-16 16:31:43 -04:00
2020-04-16 16:31:43 -04:00
2020-04-16 16:31:43 -04:00
