Minor upstream file changes

Dieser Commit ist enthalten in:
MattBDev 2020-01-29 16:13:28 -05:00
Ursprung bef69b5be3
Commit 2cc66b0d98
6 geänderte Dateien mit 15 neuen und 10 gelöschten Zeilen

Datei anzeigen

@ -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
}
}

Datei anzeigen

@ -18,7 +18,7 @@
-->
<!--
<module name="ImportControl">
<property name="file" value="import-control.xml"/>
<property name="file" value="${config_loc}/import-control.xml"/>
</module>
-->

Datei anzeigen

@ -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>

Datei anzeigen

@ -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
loom.version=0.2.6-20191213.183106-50
mixin.version=0.8+build.17

Datei anzeigen

@ -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") {

Datei anzeigen

@ -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