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

 Conflicts:

	gradle.properties

core/src/mindustry/mod/ModClassLoader.java

@@ -11,6 +11,10 @@ public class ModClassLoader extends ClassLoader{
         }
     };
 
+    public ModClassLoader(ClassLoader parent){
+        super(parent);
+    }
+
     public void addChild(ClassLoader child){
         children.add(child);
     }

core/src/mindustry/mod/Mods.java

@@ -39,7 +39,7 @@ public class Mods implements Loadable{
 
     private int totalSprites;
     private MultiPacker packer;
-    private ModClassLoader mainLoader = new ModClassLoader();
+    private ModClassLoader mainLoader = new ModClassLoader(getClass().getClassLoader());
 
     Seq<LoadedMod> mods = new Seq<>();
     private ObjectMap<Class<?>, ModMeta> metas = new ObjectMap<>();