summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-09-27 02:01:18 +0100
committerKHobbits <rob@khobbits.co.uk>2011-09-27 02:01:18 +0100
commitee00fb77d0569aba9b3e666df3f178f2ddd8e196 (patch)
tree97f74041f3cbc6942df9fce01dc4347a26c179e7
parent8e0560ae1a4d4de4c407d42856510cec720f7374 (diff)
parentd89041894479c339bb865d72f677b69d3c6f2c30 (diff)
downloadEssentials-ee00fb77d0569aba9b3e666df3f178f2ddd8e196.tar
Essentials-ee00fb77d0569aba9b3e666df3f178f2ddd8e196.tar.gz
Essentials-ee00fb77d0569aba9b3e666df3f178f2ddd8e196.tar.lz
Essentials-ee00fb77d0569aba9b3e666df3f178f2ddd8e196.tar.xz
Essentials-ee00fb77d0569aba9b3e666df3f178f2ddd8e196.zip
Merge remote branch 'remotes/ess/groupmanager' into essmaster
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/plugin.yml2
2 files changed, 3 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index ee7c77a23..47c0457a7 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -21,4 +21,5 @@ v 1.1:
- Removed superperms update on plugins unloading. Unneeded and created undesired lag on shutdown.
- Added a BukkitPermsUpdateTask to only update superperms once on a load/reload.
- Fix for GM not checking inheritance for known superperms nodes.
- - Optimized getAllPlayersPermissions and fixed pushing unknown perms to superperms. \ No newline at end of file
+ - Optimized getAllPlayersPermissions and fixed pushing unknown perms to superperms.
+v 1.2: \ No newline at end of file
diff --git a/EssentialsGroupManager/src/plugin.yml b/EssentialsGroupManager/src/plugin.yml
index 91f8df05c..b0d2bc4d1 100644
--- a/EssentialsGroupManager/src/plugin.yml
+++ b/EssentialsGroupManager/src/plugin.yml
@@ -1,5 +1,5 @@
name: GroupManager
-version: "1.1 (Phoenix)"
+version: "1.2 (Phoenix)"
main: org.anjocaido.groupmanager.GroupManager
website: http://www.anjocaido.info/
description: Provides on-the-fly system for permissions system created by Nijikokun. But all in memory, and with flat-file saving schedule.