Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0

# Conflicts:
#	core/src/mindustry/core/Logic.java
#	gradle.properties

core/src/mindustry/game/GlobalData.java

@@ -56,7 +56,7 @@ public class GlobalData{
             for(Fi add : files){
                 if(add.isDirectory()) continue;
                 zos.putNextEntry(new ZipEntry(add.path().substring(base.length())));
-                Streams.copyStream(add.read(), zos);
+                Streams.copy(add.read(), zos);
                 zos.closeEntry();
             }