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

..

assets

Merge branch 'master' into crater

2020-02-05 10:26:34 +01:00

assets-raw

Merge branch 'master' into crater

2020-02-05 10:26:34 +01:00

src/mindustry

Merge branch 'master' into crater

2020-02-05 10:26:34 +01:00

build.gradle

Better annotation processing

2020-01-24 18:31:54 -05:00

convert_sounds.sh

Fixed truncated sounds

2019-08-15 14:16:41 -04:00