Merge remote-tracking branch 'origin/master' into feature/sponge-new

2016-05-18 19:49:16 -04:00
parent 991aaa0541 03d7cd394a
commit 7dc9a9aece
35 changed files with 11685 additions and 3515 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -58,11 +58,11 @@ subprojects {
    apply plugin: 'com.jfrog.artifactory-upload'

    group = 'com.sk89q.worldedit'
-    version = '6.1.1-SNAPSHOT'
+    version = '6.1.3-SNAPSHOT'
    ext.internalVersion = version + ";" + gitCommitHash

-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7

    checkstyle.configFile = new File(rootProject.projectDir, "config/checkstyle/checkstyle.xml")