mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-02-12 12:23:59 +00:00
Merge branch 'release'
Conflicts: lib/bukkit.jar lib/craftbukkit.jar
This commit is contained in:
commit
1db5d61945
2 changed files with 9 additions and 2 deletions
|
@ -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)));
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue