diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-03-05 16:25:35 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-03-05 16:25:35 +0000 |
| commit | 1db5d619450af8db2522324cbd40d174e6297e0e (patch) | |
| tree | 0de098c99bc80b83ac609ea0b1f2bf3519a82a43 | |
| parent | 0b60d4efe2fed324131e083f6d4168256d943588 (diff) | |
| parent | 1e34a396cd1ab01c1b5cae038deac09bbf776615 (diff) | |
| download | Essentials-1db5d619450af8db2522324cbd40d174e6297e0e.tar Essentials-1db5d619450af8db2522324cbd40d174e6297e0e.tar.gz Essentials-1db5d619450af8db2522324cbd40d174e6297e0e.tar.lz Essentials-1db5d619450af8db2522324cbd40d174e6297e0e.tar.xz Essentials-1db5d619450af8db2522324cbd40d174e6297e0e.zip | |
Merge branch 'release'
Conflicts:
lib/bukkit.jar
lib/craftbukkit.jar
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 2 | ||||
| -rw-r--r-- | Essentials/src/config.yml | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index e8b67107f..ccc90cb01 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -133,7 +133,7 @@ public class Essentials extends JavaPlugin implements IEssentials if (versionMatch.matches()) { final int versionNumber = Integer.parseInt(versionMatch.group(1)); - if (versionNumber < BUKKIT_VERSION) + if (versionNumber < BUKKIT_VERSION && versionNumber > 100) { LOGGER.log(Level.SEVERE, _("notRecommendedBukkit")); LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION))); diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 11bc38329..4c9b31dc0 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -158,12 +158,19 @@ player-commands: # All kit names should be lower case, and will be treated as lower in permissions/costs. # Times are measured in seconds. kits: - tools: + dtools: delay: 10 items: - 277 1 - 278 1 - 279 1 + tools: + delay: 10 + items: + - 272 1 + - 273 1 + - 274 1 + - 275 1 # Essentials Sign Control # See http://ess.khhq.net/wiki/Sign_Tutorial for instructions on how to use these. |