Anuken e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # Conflicts: # core/src/mindustry/graphics/Bloom.java # gradle.properties		2020-01-10 15:19:07 -05:00
..
bloomshaders	Bloom fix	2019-06-28 23:31:34 -04:00
bundles	Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0	2020-01-10 15:19:07 -05:00
cursors	Cursor antialiasing	2019-08-04 09:41:25 -04:00
fonts	Changed Cyrillic font	2020-01-06 08:37:19 -05:00
icons	Updated Mac icon	2019-08-16 12:05:00 -04:00
maps	Travis testing	2019-09-12 17:19:01 -04:00
music	Fixed "disconnected" bug / Updated menu music	2019-09-01 10:19:13 -04:00
scripts	New, improved minimap / Bugfixes	2019-12-29 17:56:10 -05:00
shaders	Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0	2019-12-01 17:42:56 -05:00
sounds	Thruster fix / Removed info on Steam to prevent confusion	2019-09-28 15:40:31 -04:00
sprites	Merged in liquid void	2020-01-08 11:04:12 -05:00
contributors	Add - tutorial localized, description coverage++, fix broken translations (#1327)	2020-01-05 17:41:41 -05:00