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

 Conflicts:

	gradle.properties

2021-06-18 18:40:02 -04:00

..

assets

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

2021-06-17 10:44:51 -04:00

assets-raw

stop

2021-06-12 10:55:18 -04:00

src/mindustry

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

2021-06-18 18:40:02 -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