Merge remote-tracking branch 'origin/master'

README.md

@@ -17,7 +17,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases). Old builds might still be on [jenkins](https://jenkins.hellomouse.net/job/mindustry/).
 
 If you'd rather compile on your own, follow these instructions.
-First, make sure you have [Java 8](https://www.java.com/en/download/) and [JDK 8](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands:
+First, make sure you have [JDK 8](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands:
 
 #### Windows
 

core/src/mindustry/mod/Scripts.java

@@ -21,7 +21,8 @@ public class Scripts implements Disposable{
         context.setClassShutter(type -> (ClassAccess.allowedClassNames.contains(type) || type.startsWith("$Proxy") ||
             type.startsWith("adapter") || type.contains("PrintStream") ||
             type.startsWith("mindustry")) && !type.equals("mindustry.mod.ClassAccess"));
-
+        context.getWrapFactory().setJavaPrimitiveWrap(false);
+        
         scope = new ImporterTopLevel(context);
         wrapper = Core.files.internal("scripts/wrapper.js").readString();