Merge remote-tracking branch 'upstream/1.6.x' into 1.6.x

Merge commit writed after the fork
2018-11-21 02:28:38 +01:00
parent 5f8ea0bd19 139a28de8a
commit a59e3d9a82
348 changed files with 3101 additions and 2202 deletions
--- a/src/main/java/com/massivecraft/factions/cmd/CmdChest.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdChest.java
@@ -11,6 +11,7 @@ public class CmdChest extends FCommand {

    public CmdChest() {
        this.aliases.add("chest");
+        this.aliases.add("pv");

        //this.requiredArgs.add("");