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
..
icon_64.png
icon.icns
icon.ico
icons.properties	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00