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-core/build.gradle
+++ b/worldedit-core/build.gradle
@@ -13,6 +13,8 @@ dependencies {
    compile 'com.google.code.gson:gson:2.8.0'
    compile 'com.sk89q.lib:jlibnoise:1.0.0'
    compile 'com.googlecode.json-simple:json-simple:1.1.1'
+    compile 'org.slf4j:slf4j-api:1.7.26'
+    //compile 'net.sf.trove4j:trove4j:3.0.3'
    testCompile 'org.mockito:mockito-core:1.9.0-rc1'

    // Fawe depends