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

# Conflicts:
#	core/src/mindustry/core/Logic.java
#	gradle.properties
This commit is contained in:
Anuken
2020-03-03 12:12:25 -05:00
17 changed files with 195 additions and 160 deletions

View File

@@ -31,7 +31,7 @@ public class FontGenerator{
String session = folder.child("session").readString();
net.httpGet("http://fontello.com/" + session + "/get", result -> {
try{
Streams.copyStream(result.getResultAsStream(), folder.child("font.zip").write());
Streams.copy(result.getResultAsStream(), folder.child("font.zip").write());
}catch(IOException e){
throw new RuntimeException(e);
}