Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	core/src/mindustry/core/Logic.java
#	gradle.properties
This commit is contained in:
Anuken
2020-03-03 12:12:25 -05:00
parent 3858cdd4c5 64c1800391
commit f1aadd97a8
17 changed files with 195 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ui/dialogs/ModsDialog.java
View File

@@ -40,7 +40,7 @@ public class ModsDialog extends FloatingDialog{
}else{
try{
Fi file = tmpDirectory.child(text.replace("/", "") + ".zip");
Streams.copyStream(result.getResultAsStream(), file.write(false));
Streams.copy(result.getResultAsStream(), file.write(false));
mods.importMod(file);
file.delete();
Core.app.post(() -> {