Patrick 'Quezler' Mounier 32e32ecae2 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/sprites2.png # core/assets/sprites/sprites4.png # core/assets/sprites/sprites6.png		2020-04-16 22:38:51 +02:00
..
assets	Merge branch '6.0' into crater	2020-04-16 22:38:51 +02:00
assets-raw	Grow the circle slightly inward	2020-04-16 22:05:55 +02:00
src/mindustry	Merge branch '6.0' into crater	2020-04-16 22:38:51 +02:00
build.gradle	[formatting] add newline to file(s) (#1508)	2020-02-05 18:36:56 -05:00
convert_sounds.sh	Fixed truncated sounds	2019-08-15 14:16:41 -04:00