Anuken e11a8565d0 Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/src/mindustry/ui/dialogs/PausedDialog.java		2020-10-11 10:51:46 -04:00
..
baseparts
bloomshaders
bundles	Merge remote-tracking branch 'origin/master'	2020-10-11 10:51:46 -04:00
cubemaps/stars
cursors
fonts
icons	space	2020-10-08 14:06:07 -04:00
maps	Sector simplification	2020-10-11 10:51:33 -04:00
music	Fixed #2799 / Fixed #2797	2020-10-02 09:54:08 -04:00
scripts	Re-added tap event for servers	2020-09-30 15:01:46 -04:00
shaders	Bugfixes	2020-10-09 10:02:08 -04:00
sounds
sprites	Map center button	2020-10-10 12:05:11 -04:00
contributors	Update contributors	2020-09-30 09:30:12 -04:00