resolve conflicts

build.gradle

@@ -38,26 +38,23 @@ println """
 *******************************************
 """
 
-allprojects {
-    group = 'com.boydti.fawe'
+group = 'com.boydti.fawe'
 
-    def rootVersion = "1.13"
-    def revision = ""
-    def buildNumber = ""
-    def date = ""
-    ext {
-        git = Grgit.open(dir: '.git')
-        date = git.head().getDate().format("yy.MM.dd")
-        revision = "-${git.head().abbreviatedId}"
-        parents = git.head().parentIds;
-        if (project.hasProperty('buildnumber')) {
-            buildNumber = "$buildnumber"
-        } else {
-            index = -2109;  // Offset to match CI
-            for (; parents != null && !parents.isEmpty(); index++) {
-                parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
-            }
-            buildNumber = "${index}"
+def rootVersion = "1.14"
+def revision = ""
+def buildNumber = ""
+def date = ""
+ext {
+    git = Grgit.open(dir: '.git')
+    date = git.head().getDate().format("yy.MM.dd")
+    revision = "-${git.head().abbreviatedId}"
+    parents = git.head().parentIds;
+    if (project.hasProperty('buildnumber')) {
+        buildNumber = "$buildnumber"
+    } else {
+        index = -2109;  // Offset to match CI
+        for (; parents != null && !parents.isEmpty(); index++) {
+            parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
         }
     }
 
@@ -85,6 +82,12 @@ subprojects {
         maven { url "http://repo.spongepowered.org/maven" }
         maven { url "http://dl.bintray.com/tastybento/maven-repo" }
         maven { url "http://ci.emc.gs/nexus/content/groups/aikar/" }
+        ivy {
+            url 'https://ci.athion.net/job'
+            layout 'pattern', {
+                artifact '/[organisation]/[module]/artifact/[revision].[ext]'
+            }
+        }
     }
     configurations.all {
         resolutionStrategy {
@@ -165,6 +168,9 @@ configure(['bukkit'].collect { project(":worldedit-$it") }) {
     //    include '**/*.java'
     //}
 }
+
+
+
 task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all child projects as if it was a single project', group: 'Documentation') {
     destinationDir = file("./docs/javadoc")
     title = "$project.name $version API"