Merge branch '1.6.x' of https://github.com/vemacs/Factions into vemacs

2015-03-06 16:32:20 -07:00
parent 3933e135c1 1ea6dbe12d
commit 6d6b63ba19
9 changed files with 73 additions and 4 deletions
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -93,6 +93,7 @@ permissions:
      factions.seechunk: true
      factions.monitorlogins: true
      factions.top: true
+      factions.togglealliancechat
  factions.admin:
    description: hand over your admin rights
  factions.admin.any:
@@ -249,4 +250,6 @@ permissions:
  factions.claim.line:
    description: claim in a line
  factions.top:
-    description: sort factions
+    description: sort factions
+  factions.togglealliancechat:
+    description: toggle alliance chat on and off