Renamed 2.1 -> trunk

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1017 e251c2fe-e539-e718-e476-b85c1f46cddb

3 files changed, 232 insertions, 159 deletions

diff --git a/EssentialsGroupManager/nbproject/private/private.properties b/EssentialsGroupManager/nbproject/private/private.properties
new file mode 100644
index 000000000..94183418a
--- /dev/null
+++ b/EssentialsGroupManager/nbproject/private/private.properties
@@ -0,0 +1 @@
+user.properties.file=C:\\Users\\Paul\\.netbeans\\7.0beta2\\build.properties

diff --git a/EssentialsGroupManager/src/groups.yml b/EssentialsGroupManager/src/groups.yml
index e5650b54d..73c55b880 100644
--- a/EssentialsGroupManager/src/groups.yml
+++ b/EssentialsGroupManager/src/groups.yml
@@ -1,144 +1,172 @@
-# "For a more advanced configuration example utilizing the advanced features of GroupManager, se http://pastebin.com/MeCpqVZv"
-groups:
-  Default:
-    default: true
-    permissions:
-    - essentials.help
-    - essentials.helpop
-    - essentials.list
-    - essentials.motd
-    - essentials.rules
-    - essentials.spawn
-    inheritance: []
-    info:
-      prefix: '&e'
-      build: false
-      suffix: ''
-  SemiAdmin:
-    default: false
-    permissions:
-    - essentials.clearinventory
-    - essentials.cooldown.bypass
-    - essentials.deljail
-    - essentials.give
-    - essentials.god
-    - essentials.heal
-    - essentials.heal.others
-    - essentials.invsee
-    - essentials.item
-    - essentials.jails
-    - essentials.kit.*
-    - essentials.mute
-    - essentials.reloadall
-    - essentials.setjail
-    - essentials.signs.disposal.create
-    - essentials.spawmob
-    - essentials.togglejail
-    - groupmanager.*
-    inheritance:
-    - moderator
-    info:
-      prefix: '&1'
-      build: true
-      suffix: ''
-  Builder:
-    default: false
-    permissions:
-    - essentials.afk
-    - essentials.back.death
-    - essentials.balance
-    - essentials.chat.shout
-    - essentials.home
-    - essentials.kit
-    - essentials.kit.tools
-    - essentials.mail
-    - essentials.mail.send
-    - essentials.me
-    - essentials.msg
-    - essentials.nick
-    - essentials.pay
-    - essentials.portal
-    - essentials.protect
-    - essentials.sell
-    - essentials.sethome
-    - essentials.signs.buy.use
-    - essentials.signs.disposal.use
-    - essentials.signs.free.use
-    - essentials.signs.heal.use
-    - essentials.signs.mail.create
-    - essentials.signs.mail.use
-    - essentials.signs.protection.create
-    - essentials.signs.protection.use
-    - essentials.signs.sell.use
-    - essentials.signs.trade.create
-    - essentials.signs.trade.use
-    - essentials.tpa
-    - essentials.tpaccept
-    - essentials.tpahere
-    - essentials.tpdeny
-    - essentials.warp
-    - essentials.warp.list
-    - essentials.worth
-    inheritance:
-    - default
-    info:
-      prefix: '&5'
-      build: true
-      suffix: ''
-  Moderator:
-    default: false
-    permissions:
-    - essentials.back
-    - essentials.ban
-    - essentials.banip
-    - essentials.broadcast
-    - essentials.compass
-    - essentials.delwarp
-    - essentials.depth
-    - essentials.eco
-    - essentials.getpos
-    - essentials.jump
-    - essentials.kick
-    - essentials.kill
-    - essentials.setwarp
-    - essentials.time
-    - essentials.togglejail
-    - essentials.top
-    - essentials.tp
-    - essentials.tpa
-    - essentials.tpaaccept
-    - essentials.tpahere
-    - essentials.tpdeny
-    - essentials.tphere
-    - essentials.tpo
-    - essentials.tpohere
-    - essentials.tppos
-    - essentials.tptoggle
-    - essentials.unban
-    - essentials.unbanip
-    - essentials.whois
-    - essentials.world
-    - groupmanager.listgroups
-    - groupmanager.mandemote
-    - groupmanager.manload
-    - groupmanager.manpromote
-    - groupmanager.mansave
-    - groupmanager.manselect
-    - groupmanager.manuadd
-    - groupmanager.manudel
-    inheritance:
-    - builder
-    info:
-      prefix: '&9'
-      build: true
-      suffix: ''
-  Admin:
-    default: false
-    permissions:
-    - '*'
-    inheritance:
-    - semiadmin
-    info:
-      prefix: '&4'
-      build: true
-      suffix: ''
+groups:

+  Default:

+    default: true

+    permissions:

+    - essentials.help

+    - essentials.home

+    - essentials.motd

+    - essentials.sethome

+    - essentials.spawn

+    inheritance: []

+    info:

+      prefix: ''

+      build: false

+      suffix: ''

+  SemiAdmin:

+    default: false

+    permissions:

+    - +groupmanager.mandemote

+    - +groupmanager.manpromote

+    - -groupmanager.*

+    - '*'

+    inheritance:

+    - moderator

+    info:

+      prefix: '&c'

+      build: true

+      suffix: SemiAdmin

+  RedFaction:

+    default: false

+    permissions: []

+    inheritance:

+    - peasant

+    info:

+      prefix: '&c'

+      roles-category: faction

+      build: true

+      suffix: Red

+  Farmer:

+    default: false

+    permissions:

+    - essentials.kit

+    - essentials.kit.farmer

+    - essentials.spawnmob

+    inheritance: []

+    info:

+      roles-requirement:

+      - BlueFaction

+      - RedFaction

+      prefix: ''

+      roles-category: job

+      build: false

+      suffix: ''

+  Healer:

+    default: false

+    permissions:

+    - essentials.kit

+    - essentials.kit.healer

+    - essentials.heal

+    inheritance: []

+    info:

+      roles-requirement:

+      - BlueFaction

+      - RedFaction

+      prefix: ''

+      roles-category: job

+      build: false

+      suffix: ''

+  Fighter:

+    default: false

+    permissions:

+    - essentials.kit

+    - essentials.kit.fighter

+    inheritance: []

+    info:

+      prefix: ''

+      roles-category: skill

+      build: false

+      suffix: ''

+  Admin:

+    default: false

+    permissions:

+    - '*'

+    inheritance:

+    - semiadmin

+    info:

+      prefix: ''

+      build: true

+      suffix: ''

+  Miner:

+    default: false

+    permissions:

+    - essentials.kit

+    - essentials.kit.miner

+    - flashlight.regular

+    inheritance: []

+    info:

+      roles-requirement:

+      - BlueFaction

+      - RedFaction

+      prefix: ''

+      roles-category: job

+      build: false

+      suffix: ''

+  FlyingMan:

+    default: false

+    permissions:

+    - nocheat.moving

+    inheritance: []

+    info:

+      roles-requirement: Fighter&SuperCart

+      prefix: ''

+      roles-category: skill

+      build: false

+      suffix: ''

+  Peasant:

+    default: false

+    permissions:

+    - roles.joinrole

+    - roles.leaverole

+    - roles.myroles

+    inheritance:

+    - default

+    info:

+      prefix: '&e'

+      build: true

+      suffix: Peasant

+  BlueFaction:

+    default: false

+    permissions: []

+    inheritance:

+    - peasant

+    info:

+      prefix: '&d'

+      roles-category: faction

+      build: true

+      suffix: Blue

+  Railer:

+    default: false

+    permissions:

+    - essentials.kit

+    - essentials.kit.railer

+    inheritance: []

+    info:

+      roles-requirement: Miner

+      prefix: ''

+      roles-category: subjob

+      build: false

+      suffix: ''

+  SuperCart:

+    default: false

+    permissions:

+    - minecartmania.*

+    inheritance: []

+    info:

+      roles-requirement: Railer

+      prefix: ''

+      roles-category: skill

+      build: false

+      suffix: ''

+  Moderator:

+    default: false

+    permissions:

+    - essentials.tp

+    - essentials.tphere

+    - essentials.item

+    - essentials.give

+    inheritance:

+    - default

+    info:

+      prefix: '&c'

+      build: true

+      suffix: Mod
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/users.yml b/EssentialsGroupManager/src/users.yml
index c3324f0c0..5645c5d23 100644
--- a/EssentialsGroupManager/src/users.yml
+++ b/EssentialsGroupManager/src/users.yml
@@ -1,15 +1,59 @@
-# "For a more advanced configuration example utilizing the advanced features of GroupManager, see http://pastebin.com/a8ZA0j5G"
-users:
-  kimkandor:
-    subgroups: []
-    permissions: []
-    group: Admin
-  mudzereli:
-    subgroups: []
-    permissions: []
-    group: Builder
-  zenexer:
-    subgroups: []
-    permissions: []
-    group: Admin
-
+users:

+  aMiner:

+    subgroups:

+    - Miner

+    permissions: []

+    group: BlueFaction

+    info:

+      prefix: '&d'

+      suffix: Miner

+  gmcouto:

+    subgroups: []

+    permissions: []

+    group: SemiAdmin

+  tempRailer:

+    subgroups:

+    - Miner

+    - Railer

+    permissions: []

+    group: BlueFaction

+    info:

+      prefix: '&d'

+      suffix: Miner

+  anjocaido:

+    subgroups: []

+    permissions: []

+    group: Admin

+    info:

+      prefix: '&c'

+      suffix: King

+  aFarmer:

+    subgroups:

+    - Farmer

+    permissions: []

+    group: RedFaction

+    info:

+      prefix: '&d'

+      suffix: Farmer

+  zenexer:

+    subgroups: []

+    permissions:

+    - essentials.god

+    group: Moderator

+  Teste:

+    subgroups:

+    - Miner

+    - Railer

+    - SuperCart

+    - Fighter

+    - FlyingMan

+    permissions: []

+    group: BlueFaction

+  aHealer:

+    subgroups:

+    - Healer

+    permissions: []

+    group: RedFaction

+    info:

+      prefix: '&d'

+      suffix: Healer