Patrick 'Quezler' Mounier cf186e0219 Merge branch 'master' into crater ...

# Conflicts:
#	core/assets/sprites/sprites2.png

2020-04-23 21:15:11 +02:00

..

assets

Merge branch 'master' into crater

2020-04-23 21:15:11 +02:00

assets-raw

Merge branch 'master' into crater

2020-04-23 21:10:48 +02:00

src/mindustry

Merge branch 'master' into crater

2020-04-23 21:15:11 +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