Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5

Bukkit/build.gradle

@@ -16,9 +16,9 @@ repositories {
 
 
 dependencies {
-    implementation(project(":Core"))
+    implementation(project(":PlotSquared"))
     compile("org.bstats:bstats-bukkit:1.7")
-    compile(project(":Core"))
+    compile(project(":PlotSquared"))
     compile("com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT")
     //implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
     implementation("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
@@ -81,7 +81,7 @@ task copyFiles {
 
 shadowJar {
     dependencies {
-        include(dependency(":Core"))
+        include(dependency(":PlotSquared"))
         include(dependency("io.papermc:paperlib:1.0.2"))
         include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
         include(dependency("org.bstats:bstats-bukkit:1.7"))
@@ -89,7 +89,7 @@ shadowJar {
     relocate('net.kyori.text', 'com.plotsquared.formatting.text')
     relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
     relocate("org.bstats", "com.plotsquared.metrics")
-    archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar"
+    archiveFileName = "${project.name}-${parent.version}.jar"
     destinationDirectory = file "../target"
 }
 

Bukkit/pom.xml

@@ -20,8 +20,8 @@
     </dependency>
     <dependency>
       <groupId>com.plotsquared</groupId>
-      <artifactId>Core</artifactId>
-      <version>unspecified</version>
+      <artifactId>PlotSquared</artifactId>
+      <version>5.11.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

build.gradle

@@ -126,9 +126,11 @@ subprojects {
             exclude "org/json/simple/**"
         }
         // relocate('org.mcstats', 'com.plotsquared.stats')
-        archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar"
+        archiveFileName = "${project.name}-${parent.version}.jar"
         destinationDirectory = file "../target"
     }
+
+    version = rootProject.version
 }
 
 task aggregatedJavadocs(type: Javadoc, description: "Generate javadocs from all child projects as if it was a single project", group: "Documentation") {

settings.gradle

@@ -1,3 +1,6 @@
 rootProject.name = 'PlotSquared'
 
 include 'Core', 'Bukkit' // , 'Nukkit', 'Sponge'
+
+project(':Core').name = 'PlotSquared'
+project(':Bukkit').name = 'PlotSquared-Bukkit'