summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@Palmergames.com>2014-07-19 00:08:00 +0100
committerElgarL <ElgarL@Palmergames.com>2014-07-19 00:08:00 +0100
commitd3be04c81aa68f1d46b43b164223d28cf71838ae (patch)
treead45976157449fd6994244cc1ea6f84a69181ed9
parente6049b081825233ce7a2d3ff56be9031c71f6fa1 (diff)
parent2e04dbf7becc2a8c4b345d6603084a4ff64f4af6 (diff)
downloadEssentials-d3be04c81aa68f1d46b43b164223d28cf71838ae.tar
Essentials-d3be04c81aa68f1d46b43b164223d28cf71838ae.tar.gz
Essentials-d3be04c81aa68f1d46b43b164223d28cf71838ae.tar.lz
Essentials-d3be04c81aa68f1d46b43b164223d28cf71838ae.tar.xz
Essentials-d3be04c81aa68f1d46b43b164223d28cf71838ae.zip
Merge branch 'groupmanager' of https://github.com/essentials/Essentials into groupmanager
-rw-r--r--EssentialsGroupManager/src/globalgroups.yml3
-rw-r--r--EssentialsGroupManager/src/groups.yml3
2 files changed, 3 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/globalgroups.yml b/EssentialsGroupManager/src/globalgroups.yml
index cec4d889d..fd0af641e 100644
--- a/EssentialsGroupManager/src/globalgroups.yml
+++ b/EssentialsGroupManager/src/globalgroups.yml
@@ -313,7 +313,6 @@ groups:
g:vanish_moderator:
permissions:
- - -vanish.*
- vanish.vanish
- vanish.smokin
- vanish.nofollow
@@ -326,4 +325,4 @@ groups:
permissions:
- vanish.silentjoin
- vanish.silentquit
- - vanish.silentchests \ No newline at end of file
+ - vanish.silentchests
diff --git a/EssentialsGroupManager/src/groups.yml b/EssentialsGroupManager/src/groups.yml
index 9c63ffd94..3e54ea672 100644
--- a/EssentialsGroupManager/src/groups.yml
+++ b/EssentialsGroupManager/src/groups.yml
@@ -65,7 +65,8 @@ groups:
default: false
permissions:
- '*'
- - -vanish.*
+ - -vanish.effects.*
+ - +vanish.effects.toggle.all
inheritance:
- admin
info: