summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-03-21 23:55:19 +0000
committerKHobbits <rob@khobbits.co.uk>2012-03-21 23:55:19 +0000
commitc3ad486f65046a37f2e512583f1db581cab0f062 (patch)
treea8db963da267347bd87fe66d3d1dabb92f94e3d8
parent7bcec32134b5bf62d60b235471f6350979b65e76 (diff)
parentb19b08dc6e351def40954a21d1b00f1613278783 (diff)
downloadEssentials-c3ad486f65046a37f2e512583f1db581cab0f062.tar
Essentials-c3ad486f65046a37f2e512583f1db581cab0f062.tar.gz
Essentials-c3ad486f65046a37f2e512583f1db581cab0f062.tar.lz
Essentials-c3ad486f65046a37f2e512583f1db581cab0f062.tar.xz
Essentials-c3ad486f65046a37f2e512583f1db581cab0f062.zip
Merge branch 'master' of github.com:essentials/Essentials
-rw-r--r--Essentials/src/config.yml12
1 files changed, 12 insertions, 0 deletions
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 7b72ee1c0..ef2485ae8 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -97,9 +97,14 @@ player-commands:
- back
- back.ondeath
- balance
+ - balance.others
+ - balancetop
+ - chat.shout
+ - chat.question
- clearinventory
- compass
- depth
+ - delhome
- getpos
- geoip.show
- help
@@ -108,20 +113,26 @@ player-commands:
- home.others
- ignore
- info
+ - itemdb
- kit
+ - kit.tools
- list
- mail
- mail.send
- me
- motd
- msg
+ - msg.color
- nick
+ - near
- pay
- ping
- powertool
+ - powertooltoggle
- protect
- r
- rules
+ - realname
- seen
- sell
- sethome
@@ -144,6 +155,7 @@ player-commands:
- signs.use.weather
- spawn
- suicide
+ - time
- tpa
- tpaccept
- tpahere