diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-12-12 23:15:48 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-12-12 23:15:48 +0000 |
| commit | 40a9c28699d2bedd450160102042249385850021 (patch) | |
| tree | a81eca2dadf153a93c3e88c739ce8c5092383a97 | |
| parent | 081491d0a14afc3c9ac7dc9b8acd01ac11fa46e1 (diff) | |
| parent | e37ab86c9bf80fcd5fb755e14963cf79638297b4 (diff) | |
| download | Essentials-40a9c28699d2bedd450160102042249385850021.tar Essentials-40a9c28699d2bedd450160102042249385850021.tar.gz Essentials-40a9c28699d2bedd450160102042249385850021.tar.lz Essentials-40a9c28699d2bedd450160102042249385850021.tar.xz Essentials-40a9c28699d2bedd450160102042249385850021.zip | |
Merge branch 'master' into release
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 2 | ||||
| -rw-r--r-- | EssentialsGroupManager/nbproject/project.properties | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 10e6f9a4c..5c0b1cdf8 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -61,7 +61,7 @@ import org.yaml.snakeyaml.error.YAMLException; public class Essentials extends JavaPlugin implements IEssentials { - public static final int BUKKIT_VERSION = 1566; + public static final int BUKKIT_VERSION = 1597; private static final Logger LOGGER = Logger.getLogger("Minecraft"); private transient ISettings settings; private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this); diff --git a/EssentialsGroupManager/nbproject/project.properties b/EssentialsGroupManager/nbproject/project.properties index 7a333a590..5b58a2c8c 100644 --- a/EssentialsGroupManager/nbproject/project.properties +++ b/EssentialsGroupManager/nbproject/project.properties @@ -39,7 +39,7 @@ dist.jar=${dist.dir}/EssentialsGroupManager.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.bukkit.jar=../lib/craftbukkit.jar +file.reference.craftbukkit.jar=../lib/craftbukkit.jar includes=** jar.compress=true javac.classpath=\ |