Patrick 'Quezler' Mounier a1d4804fae Merge branch '6.0' into crater ... # 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/sprites4.png # core/assets/sprites/sprites6.png # core/src/mindustry/ui/fragments/PlayerListFragment.java		2020-04-16 17:13:18 +02:00
..
block_colors.png	Merge branch '6.0' into crater	2020-04-16 17:13:18 +02:00
error.png
logo.png
noise.png	Better detail	2020-04-09 20:55:59 -04:00
schematic-background.png
sprites2.png	Payload fixes	2020-04-16 09:55:57 -04:00
sprites3.png	Merge branch '6.0' into crater	2020-04-16 17:13:18 +02:00
sprites4.png	Payload fixes	2020-04-16 09:55:57 -04:00
sprites5.png	Merge branch '6.0' into crater	2020-04-16 17:13:18 +02:00
sprites6.png	Merge branch '6.0' into crater	2020-04-16 17:13:18 +02:00
sprites.atlas	Merge branch '6.0' into crater	2020-04-16 17:13:18 +02:00
sprites.png	Merge branch '6.0' into crater	2020-04-16 17:13:18 +02:00