Patrick 'Quezler' Mounier 05ccdfd51b 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-02-05 10:26:34 +01:00
..
fontgen	Added default ore flags for modded ores	2020-01-23 20:20:04 -05:00
fonts	Added new Cyrillic font	2019-12-15 21:31:55 -05:00
sprites	Merge branch 'master' into crater	2020-02-05 10:26:34 +01:00