Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor upstream file changes

Browse Source
This commit is contained in:
MattBDev 2020-01-29 16:13:28 -05:00
parent bef69b5be3
commit 2cc66b0d98
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -48,7 +48,7 @@ Ready to submit? Perform the checklist below:
the team prior to starting work. the team prior to starting work.
6. Are my commit messages descriptive? 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 It allows you to modify existing commit messages, and combine, break apart, or
adjust past changes. adjust past changes.
@ -66,4 +66,4 @@ This is **EXTREMELY BAD:**
if(var.func( param1, param2 )) if(var.func( param1, param2 ))
{ {
// do things // do things
} }

2
config/checkstyle/checkstyle.xml
View File

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

4
config/checkstyle/import-control.xml
View File

@ -44,6 +44,10 @@
<allow pkg="com.google.auto"/> <allow pkg="com.google.auto"/>
<allow pkg="it.unimi.dsi.fastutil"/> <allow pkg="it.unimi.dsi.fastutil"/>
<subpackage name="util.io.file">
<allow pkg="net.java.truevfs"/>
</subpackage>
<subpackage name="internal.expression"> <subpackage name="internal.expression">
<allow pkg="org.antlr.v4"/> <allow pkg="org.antlr.v4"/>
</subpackage> </subpackage>

8
gradle.properties
View File

@ -1,13 +1,11 @@
group=com.sk89q.worldedit group=com.sk89q.worldedit
#version=7.1.0-SNAPSHOT #version=7.1.0-SNAPSHOT
#org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.configureondemand=true org.gradle.configureondemand=true
org.gradle.parallel=true org.gradle.parallel=true
org.gradle.caching=true org.gradle.caching=true
loom.version=0.2.6-20191213.183106-50
loom.version=0.2.5-20190906.190953-30 mixin.version=0.8+build.17
mixin.version=0.7.11.38

5
worldedit-bukkit/build.gradle.kts
View File

@ -25,7 +25,6 @@ repositories {
configurations.all { configurations.all {
resolutionStrategy { resolutionStrategy {
force()
force("com.google.guava:guava:21.0") force("com.google.guava:guava:21.0")
} }
} }
@ -69,6 +68,10 @@ tasks.named<Copy>("processResources") {
filesMatching("plugin.yml") { filesMatching("plugin.yml") {
expand("internalVersion" to project.ext["internalVersion"]) 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") { tasks.named<Jar>("jar") {

2
worldedit-bukkit/src/main/resources/defaults/config-legacy.yml
View File

@ -3,7 +3,7 @@
# #
# About editing this file: # About editing this file:
# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain and post # - 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." # users), you must configure it to "replace tabs with spaces."
# This can be changed in Settings > Preferences > Language Menu. # This can be changed in Settings > Preferences > Language Menu.
# - Don't get rid of indentations. They are indented so some entries that are # - Don't get rid of indentations. They are indented so some entries that are