Anuken 92e970456e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ...

 Conflicts:

	gradle.properties

2021-06-02 12:41:46 -04:00

..

assets

Unspoiled

2021-06-02 11:15:30 -04:00

assets-raw

Moved bushes into correct directory

2021-06-02 11:24:15 -04:00

src/mindustry

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2021-06-02 12:41:46 -04:00

build.gradle

Use core/src for kotlin source

2021-04-03 11:31:41 -04:00

convert_sounds.sh

Fixed truncated sounds

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