Patrick 'Quezler' Mounier e5e4884448 Merge branch 'master' into crater ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/world/modules/ItemModule.java		2020-03-05 10:00:02 +01:00
..
bloomshaders
bundles	Merge branch 'master' into crater	2020-03-05 10:00:02 +01:00
cursors
fonts	Fixed #1558 / Fixed #1556	2020-02-12 10:16:43 -05:00
icons	Register crater emoji via ui folder	2020-01-27 19:33:36 +01:00
maps
music
scripts	add floatf/p and func to global.js (#1633)	2020-02-24 15:06:33 -05:00
shaders
sounds
sprites	Merge branch 'master' into crater	2020-03-05 10:00:02 +01:00
contributors	:)	2020-02-12 19:28:54 +00:00