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
..
bloomshaders	Fixed compilation	2020-03-10 19:51:31 -04:00
bundles	Merge branch '6.0' into crater	2020-04-16 22:38:51 +02:00
cubemaps/stars	Added cubemap stars	2020-03-29 19:39:29 -04:00
cursors
fonts
icons	Merge branch '6.0' into crater	2020-04-16 22:38:51 +02:00
maps
music	Added landing sound	2020-04-08 22:06:43 -04:00
planets	Added distributed ore gen	2020-03-23 14:08:37 -04:00
scripts	Fixed issue in #1804	2020-04-01 14:44:17 -04:00
shaders	Simpler sun shader	2020-04-09 21:15:42 -04:00
sounds
sprites	Merge branch '6.0' into crater	2020-04-16 22:38:51 +02:00
contributors	Update contributors (#1780)	2020-03-28 22:14:05 -04:00