diff --git a/.gitignore b/.gitignore
index adc931227..6c25fbdd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,6 @@
 /EssentialsUpdate/dist/
 /EssentialsUpdate/build/
 /WebPush/apikey.php
-/WebPush/nbproject/private
\ No newline at end of file
+/WebPush/nbproject/private
+/.idea
+*.iml
\ No newline at end of file
diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties
index 59540b809..87e522254 100644
--- a/Essentials/nbproject/project.properties
+++ b/Essentials/nbproject/project.properties
@@ -66,7 +66,8 @@ endorsed.classpath=
 excludes=
 file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
 file.reference.bPermissions.jar=../lib/bPermissions.jar
-file.reference.craftbukkit-1.0.0-SNAPSHOT.jar=../lib/craftbukkit-1.0.0-SNAPSHOT.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
+file.reference.craftbukkit.jar=../lib/craftbukkit.jar
 file.reference.iCo4.jar=../lib/iCo4.jar
 file.reference.iCo5.jar=../lib/iCo5.jar
 file.reference.iCo6.jar=../lib/iCo6.jar
@@ -91,7 +92,8 @@ javac.classpath=\
     ${file.reference.PermissionsBukkit-1.2.jar}:\
     ${file.reference.lombok-0.10.1.jar}:\
     ${reference.EssentialsGroupManager.jar}:\
-    ${file.reference.craftbukkit-1.0.0-SNAPSHOT.jar}
+    ${file.reference.bukkit.jar}:\
+    ${file.reference.craftbukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties
index e59815e40..8cf7e9081 100644
--- a/EssentialsChat/nbproject/project.properties
+++ b/EssentialsChat/nbproject/project.properties
@@ -63,12 +63,12 @@ dist.jar=${dist.dir}/EssentialsChat.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
 includes=**
 jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
+    ${file.reference.bukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/EssentialsGeoIP/nbproject/project.properties b/EssentialsGeoIP/nbproject/project.properties
index d20b3418f..cec81b0c2 100644
--- a/EssentialsGeoIP/nbproject/project.properties
+++ b/EssentialsGeoIP/nbproject/project.properties
@@ -63,12 +63,12 @@ dist.jar=${dist.dir}/EssentialsGeoIP.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
 includes=**
 jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
+    ${file.reference.bukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/EssentialsGroupBridge/nbproject/project.properties b/EssentialsGroupBridge/nbproject/project.properties
index d23aed45b..b114e24e3 100644
--- a/EssentialsGroupBridge/nbproject/project.properties
+++ b/EssentialsGroupBridge/nbproject/project.properties
@@ -39,14 +39,14 @@ dist.jar=${dist.dir}/EssentialsGroupBridge.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.EssentialsGroupManager.jar}:\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
+    ${file.reference.bukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/EssentialsGroupManager/nbproject/project.properties b/EssentialsGroupManager/nbproject/project.properties
index 6fe938f17..eefc59f51 100644
--- a/EssentialsGroupManager/nbproject/project.properties
+++ b/EssentialsGroupManager/nbproject/project.properties
@@ -39,11 +39,11 @@ dist.jar=${dist.dir}/EssentialsGroupManager.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
 includes=**
 jar.compress=true
 javac.classpath=\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
+    ${file.reference.bukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/EssentialsProtect/nbproject/project.properties b/EssentialsProtect/nbproject/project.properties
index 5224b3af6..77c12c248 100644
--- a/EssentialsProtect/nbproject/project.properties
+++ b/EssentialsProtect/nbproject/project.properties
@@ -63,7 +63,7 @@ dist.jar=${dist.dir}/original-EssentialsProtect.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
 file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -72,7 +72,7 @@ jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.Essentials.jar}:\
     ${file.reference.c3p0-0.9.1.2.jar}:\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
+    ${file.reference.bukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/EssentialsSpawn/nbproject/project.properties b/EssentialsSpawn/nbproject/project.properties
index 96f4448ec..f78c2be3d 100644
--- a/EssentialsSpawn/nbproject/project.properties
+++ b/EssentialsSpawn/nbproject/project.properties
@@ -63,12 +63,12 @@ dist.jar=${dist.dir}/EssentialsSpawn.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
 includes=**
 jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
+    ${file.reference.bukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/EssentialsXMPP/nbproject/project.properties b/EssentialsXMPP/nbproject/project.properties
index 90aba36fa..66d780451 100644
--- a/EssentialsXMPP/nbproject/project.properties
+++ b/EssentialsXMPP/nbproject/project.properties
@@ -63,7 +63,7 @@ dist.jar=${dist.dir}/original-EssentialsXMPP.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
 file.reference.smack-3.2.1.jar=../lib/smack-3.2.1.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -71,8 +71,8 @@ jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}:\
-    ${file.reference.smack-3.2.1.jar}
+    ${file.reference.smack-3.2.1.jar}:\
+    ${file.reference.bukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked
 javac.deprecation=false
diff --git a/lib/bukkit-1.0.0-R1-SNAPSHOT.jar b/lib/bukkit.jar
similarity index 84%
rename from lib/bukkit-1.0.0-R1-SNAPSHOT.jar
rename to lib/bukkit.jar
index ddaaa3368..283d2224d 100644
Binary files a/lib/bukkit-1.0.0-R1-SNAPSHOT.jar and b/lib/bukkit.jar differ
diff --git a/lib/craftbukkit-1.0.0-SNAPSHOT.jar b/lib/craftbukkit.jar
similarity index 89%
rename from lib/craftbukkit-1.0.0-SNAPSHOT.jar
rename to lib/craftbukkit.jar
index ab3f075ac..28b3e3f7e 100644
Binary files a/lib/craftbukkit-1.0.0-SNAPSHOT.jar and b/lib/craftbukkit.jar differ