Anuken b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # Conflicts: # core/assets/bundles/bundle_uk_UA.properties # core/src/mindustry/core/NetClient.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/blocks/power/ImpactReactor.java # gradle.properties		2020-04-11 10:37:52 -04:00
..
bloomshaders
bundles	Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0	2020-04-11 10:37:52 -04:00
cubemaps/stars	Added cubemap stars	2020-03-29 19:39:29 -04:00
cursors
fonts
icons	Added sorter cross (#1566)	2020-03-26 17:39:23 -04:00
maps
music	Added landing sound	2020-04-08 22:06:43 -04:00
planets
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	Cleanup	2020-04-10 13:49:36 -04:00
contributors	Update contributors (#1780)	2020-03-28 22:14:05 -04:00