Merge remote-tracking branch 'upstream/master' into breaking

2019-04-03 16:53:34 +11:00
parent 3419bb6f30 961da1b93f
commit f361619037
281 changed files with 5963 additions and 5444 deletions
--- a/worldedit-sponge/build.gradle
+++ b/worldedit-sponge/build.gradle
@@ -63,6 +63,7 @@ task copyFiles {
 shadowJar {
    dependencies {
        include(dependency(':worldedit-core'))
+        include(dependency('org.bstats:bstats-sponge:1.4'))
    }
    archiveName = "${parent.name}-${project.name.replaceAll("worldedit-", "")}-${parent.version}.jar"
    destinationDir = file '../target'