Anuken 436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # Conflicts: # core/src/mindustry/world/blocks/BuildBlock.java		2020-03-17 20:03:12 -04:00
..
bloomshaders	Fixed compilation	2020-03-10 19:51:31 -04:00
bundles	Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0	2020-03-17 20:03:12 -04:00
cursors
fonts	Fixed #1558 / Fixed #1556	2020-02-12 10:16:43 -05:00
icons	Added cliffs as separate block	2020-02-21 23:45:25 -05:00
maps
music
planets	Added sector deployment UI	2020-03-16 23:09:07 -04:00
scripts	add mod name to js print() (#1677)	2020-03-05 15:58:10 -05:00
shaders	Cleaned up weather class	2020-03-11 10:08:27 -04:00
sounds
sprites	Bugfixes / Fixed #1680	2020-03-06 17:06:21 -05:00
contributors	:)	2020-02-12 19:28:54 +00:00