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

Bukkit/build.gradle

@@ -7,16 +7,6 @@ dependencies {
     compile 'net.milkbowl.vault:VaultAPI:1.5'
 }
 
-processResources {
-    from('src/main/resources') {
-        include 'plugin.yml'
-        expand(
-                name: project.parent.name,
-                version: project.parent.version
-        )
-    }
-}
-
 shadowJar {
     dependencies {
         include(dependency(':Core'))

Bukkit/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
-name: $name
+name: PlotSquared
 main: com.plotsquared.bukkit.BukkitMain
-version: $version
+version: 3.3.0
 load: STARTUP
 description: >
              Easy, yet powerful Plot World generation and management.