From 2cc66b0d984981df20c17e043e09caa9c92555eb Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 29 Jan 2020 16:13:28 -0500
Subject: [PATCH] Minor upstream file changes

---
 CONTRIBUTING.md                                           | 4 ++--
 config/checkstyle/checkstyle.xml                          | 2 +-
 config/checkstyle/import-control.xml                      | 4 ++++
 gradle.properties                                         | 8 +++-----
 worldedit-bukkit/build.gradle.kts                         | 5 ++++-
 .../src/main/resources/defaults/config-legacy.yml         | 2 +-
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b48118009..1f1cd081c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ Ready to submit? Perform the checklist below:
    the team prior to starting work.
 6. Are my commit messages descriptive?
 
-You should be aware of `git rebase`.
+You should be aware of [`git rebase`](http://learn.github.com/p/rebasing.html).
 It allows you to modify existing commit messages, and combine, break apart, or
 adjust past changes.
 
@@ -66,4 +66,4 @@ This is **EXTREMELY BAD:**
     if(var.func( param1, param2 ))
     {
         // do things
-    }
\ No newline at end of file
+    }
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 7e9784556..e2b9d154b 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -18,7 +18,7 @@
     -->
 <!--
     <module name="ImportControl">
-      <property name="file" value="import-control.xml"/>
+      <property name="file" value="${config_loc}/import-control.xml"/>
     </module>
 -->
 
diff --git a/config/checkstyle/import-control.xml b/config/checkstyle/import-control.xml
index bc0081b37..7b72860a3 100644
--- a/config/checkstyle/import-control.xml
+++ b/config/checkstyle/import-control.xml
@@ -44,6 +44,10 @@
     <allow pkg="com.google.auto"/>
     <allow pkg="it.unimi.dsi.fastutil"/>
 
+    <subpackage name="util.io.file">
+      <allow pkg="net.java.truevfs"/>
+    </subpackage>
+
     <subpackage name="internal.expression">
       <allow pkg="org.antlr.v4"/>
     </subpackage>
diff --git a/gradle.properties b/gradle.properties
index 71ec96729..897ee31c9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,11 @@
 group=com.sk89q.worldedit
 #version=7.1.0-SNAPSHOT
 
-#org.gradle.jvmargs=-Xmx1G
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx1G
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.caching=true
 
-
-loom.version=0.2.5-20190906.190953-30
-mixin.version=0.7.11.38
\ No newline at end of file
+loom.version=0.2.6-20191213.183106-50
+mixin.version=0.8+build.17
diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts
index 35221faa4..3dbee6760 100644
--- a/worldedit-bukkit/build.gradle.kts
+++ b/worldedit-bukkit/build.gradle.kts
@@ -25,7 +25,6 @@ repositories {
 
 configurations.all {
     resolutionStrategy {
-        force()
         force("com.google.guava:guava:21.0")
     }
 }
@@ -69,6 +68,10 @@ tasks.named<Copy>("processResources") {
     filesMatching("plugin.yml") {
         expand("internalVersion" to project.ext["internalVersion"])
     }
+    from(zipTree("src/main/resources/worldedit-adapters.jar").matching {
+        exclude("META-INF/")
+    })
+    exclude("**/worldedit-adapters.jar")
 }
 
 tasks.named<Jar>("jar") {
diff --git a/worldedit-bukkit/src/main/resources/defaults/config-legacy.yml b/worldedit-bukkit/src/main/resources/defaults/config-legacy.yml
index 524a2a8e8..a2ea890be 100644
--- a/worldedit-bukkit/src/main/resources/defaults/config-legacy.yml
+++ b/worldedit-bukkit/src/main/resources/defaults/config-legacy.yml
@@ -3,7 +3,7 @@
 #
 # About editing this file:
 # - DO NOT USE TABS. You MUST use spaces or Bukkit will complain and post
-#   errors. If you use an editor, like Notepad++ (recommended for Windows
+#   errors. If you use an editor, like Notepad++ (recommended for Windows 
 #   users), you must configure it to "replace tabs with spaces."
 #   This can be changed in Settings > Preferences > Language Menu.
 # - Don't get rid of indentations. They are indented so some entries that are