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

core/assets/contributors

@@ -126,3 +126,4 @@ Skat
 WilloIzCitron
 SAMBUYYA
 genNAowl
+TranquillyUnpleasant

core/convert_sounds.sh

@@ -1,12 +0,0 @@
-#convert from stereo to mono
-cd assets/sounds/
-for i in *.ogg; do
-  echo $i
-  ffmpeg -i "$i" -ac 1 "OUT_$i"
-done
-
-find . -type f ! -name "OUT_*" -delete
-
-for file in OUT_*; do mv "$file" "${file#OUT_}"; done;
-
-cd ../../