From 70e6e52eba4ac61adc5d2ad48e08c8890d5a3965 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 2 Jan 2020 14:04:12 -0500 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0dbca644f0..2f0cab8ff3 100644 --- a/README.md +++ b/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 From d161ba442f5fb3262acca1431e3d12bed76cde01 Mon Sep 17 00:00:00 2001 From: KSean222 <44050761+KSean222@users.noreply.github.com> Date: Fri, 3 Jan 2020 05:07:38 +1000 Subject: [PATCH 2/2] Set primitive wrapping to false for scripts (#1302) * Set primitive wrapping to false for scripts * Added one newline cause why not --- core/src/mindustry/mod/Scripts.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 7a39b774a7..5ac96fbb0a 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/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();