Anuken 3f293190cf Merge branch 'master' of https://github.com/Anuken/Mindustry into messages ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites2.png # core/assets/sprites/sprites5.png		2019-09-21 18:59:49 -04:00
..
bloomshaders
bundles	Merge branch 'master' of https://github.com/Anuken/Mindustry into messages	2019-09-21 18:59:49 -04:00
cursors
fonts
icons
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
shaders
sounds	Fixed moving unit target prediction	2019-08-17 11:23:49 -04:00
sprites	Unit enemy spawnpoint camping	2019-09-20 23:09:11 -04:00
contributors	Update the French translation (#631)	2019-09-15 20:39:59 -04:00