Merge remote-tracking branch 'origin/v6' into v6

core/src/mindustry/mod/Scripts.java

@@ -25,7 +25,7 @@ public class Scripts implements Disposable{
     private static final Seq<String> blacklist = Seq.with(".net.", "java.net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk",
         "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system",
         ".awt", "socket", "classloader", "oracle", "invoke", "java.util.function", "java.util.stream", "org.", "mod.classmap");
-    private static final Seq<String> whitelist = Seq.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy", "jdk.proxy1", "mindustry.gen.",
+    private static final Seq<String> whitelist = Seq.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy", "jdk.proxy1", "jdk.proxy2", "mindustry.gen.",
         "mindustry.logic.", "mindustry.async.", "saveio", "systemcursor", "filetreeinitevent", "com.github.blahblahbloopster.");
 
     private final Context context;

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -21,7 +21,7 @@ if (new File(settingsDir, 'local.properties').exists()) {
 
 if (System.getenv("JITPACK") == "true") hasSdk = false
 
-if (hasSdk && false) {
+if (hasSdk) {
     include 'android'
 } else {
     println("No Android SDK found. Skipping Android module.")