Patrick 'Quezler' Mounier 5c28985ee6 Merge branch '6.0' into crater ... # Conflicts: # core/assets/icons/icons.properties # 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/content/Blocks.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/BlockStorage.java		2020-04-16 12:39:52 +02:00
..
block_colors.png	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
error.png
logo.png
noise.png
schematic-background.png
sprites2.png	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
sprites3.png	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
sprites4.png	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
sprites5.png	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
sprites6.png	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
sprites.atlas	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
sprites.png	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00