Merge branch 'master' of github.com:CitizensDev/Citizens2

.gitignore

@@ -9,8 +9,5 @@
 target/
 bin/
 dependency-reduced-pom.xml
-*.jar
 *.jardesc
 *.lnk
-
-

main/pom.xml

@@ -14,9 +14,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.13.2-R0.1-SNAPSHOT</craftbukkit.version>
 		<citizensapi.version>${project.version}</citizensapi.version>
-		<vault.version>1.5.4</vault.version>
 		<powermock.version>1.4.12</powermock.version>
-		<bstats.version>1.2</bstats.version>
+		<bstats.version>1.4</bstats.version>
 	</properties>
 
 	<repositories>
@@ -28,14 +27,10 @@
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
 		</repository>
-		<repository>
-			<id>vault-repo</id>
-			<url>http://nexus.hc.to/content/repositories/pub_releases</url>
-		</repository>
 		<repository>
 			<!-- for bstats -->
-			<id>jitpack-repo</id>
+			<id>CodeMC</id>
-			<url>https://jitpack.io/</url>
+			<url>https://repo.codemc.org/repository/maven-public</url>
 		</repository>
 	</repositories>
 
@@ -63,12 +58,13 @@
 		<dependency>
 			<groupId>net.milkbowl.vault</groupId>
 			<artifactId>Vault</artifactId>
-			<version>${vault.version}</version>
+			<version>1.5.6</version>
 			<type>jar</type>
-			<scope>provided</scope>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/lib/Vault.jar</systemPath>
 		</dependency>
 		<dependency>
-			<groupId>org.bstats.bStats-Metrics</groupId>
+			<groupId>org.bstats</groupId>
 			<artifactId>bstats-bukkit</artifactId>
 			<version>${bstats.version}</version>
 			<scope>compile</scope>
@@ -133,7 +129,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.1</version>
+				<version>3.2.0</version>
 				<executions>
 					<execution>
 						<phase>package</phase>

main/src/main/resources/plugin.yml

@@ -9,24 +9,31 @@ commands:
   traitc:
     aliases: [trc]
     description: Configures traits
+    permission: citizens.trait.help
   trait:
     aliases: [tr]
     description: Trait commands
+    permission: citizens.trait.help
   script:
     aliases: [sc]
     description: Scripting commands
+    permission: citizens.script.help
   citizens:
     aliases: [citizens2]
     description: Administration commands
+    permission: citizens.citizens.help
   npc:
     aliases: [npc2]
     description: Basic commands for all NPC-related things
+    permission: citizens.npc.help
   template:
     aliases: [tpl]
     description: Template commands
+    permission: citizens.templates.help
   waypoint:
     aliases: [waypoints, wp]
     description: Waypoint commands
+    permission: citizens.waypoints.help
 permissions:
 # -------------------------------------------- #
 # THE REAL NODES