Patrick 'Quezler' Mounier 5c28985ee6 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/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/content/Blocks.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/BlockStorage.java		2020-04-16 12:39:52 +02:00
..
bloomshaders	Fixed compilation	2020-03-10 19:51:31 -04:00
bundles	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
cubemaps/stars	Added cubemap stars	2020-03-29 19:39:29 -04:00
cursors	Cursor antialiasing	2019-08-04 09:41:25 -04:00
fonts	Fixed #1558 / Fixed #1556	2020-02-12 10:16:43 -05:00
icons	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
maps	Travis testing	2019-09-12 17:19:01 -04:00
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	Thruster fix / Removed info on Steam to prevent confusion	2019-09-28 15:40:31 -04:00
sprites	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
contributors	Update contributors (#1780)	2020-03-28 22:14:05 -04:00