Patrick 'Quezler' Mounier ed765ad10a Merge branch 'master' into crater ... # 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		2020-01-10 12:02:07 +01:00
..
bloomshaders
bundles	Merge branch 'master' into crater	2020-01-10 12:02:07 +01:00
cursors
fonts	Changed Cyrillic font	2020-01-06 08:37:19 -05:00
icons
maps
music
scripts
shaders
sounds
sprites	Merge branch 'master' into crater	2020-01-10 12:02:07 +01:00
contributors	Add - tutorial localized, description coverage++, fix broken translations (#1327)	2020-01-05 17:41:41 -05:00