Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry

# Conflicts: # core/src/io/anuke/mindustry/content/Blocks.java # gradle.properties
2019-12-08 00:15:42 -05:00
parent ccca26d98f 477ebc91bf
commit 268f3cc3c2
98 changed files with 910 additions and 337 deletions
@@ -33,7 +33,9 @@ public class MindustryServer implements ApplicationListener{

        Vars.loadSettings();
        Vars.init();
-        content.createContent();
+        content.createBaseContent();
+        mods.loadScripts();
+        content.createModContent();
        content.init();

        Core.app.addListener(logic = new Logic());