Merge remote-tracking branch 'origin/dev' into dev

2013-11-17 02:51:14 -07:00 · 2013-11-17 02:51:14 -07:00 · 47452ecd9b
commit 47452ecd9b
parent beabe96e39 b235d7a94a
35 changed files with 0 additions and 9 deletions
--- a/BankEconomyMod/.classpath
+++ b/BankEconomyMod/.classpath
@ -1,9 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="C:/Users/Alex/Dropbox/Projects/External Plugins/bukkit-1.6.4-R1.0.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Alex/Dropbox/Projects/External Plugins/Vault.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Alex/Dropbox/Projects/External Plugins/WorldEdit.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/BankEconomyMod/bin/me/kaZep/Base/BrewingStandData.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/BrewingStandData.class
--- a/BankEconomyMod/bin/me/kaZep/Base/EntityHitData.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/EntityHitData.class
--- a/BankEconomyMod/bin/me/kaZep/Base/EntityInteractData.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/EntityInteractData.class
--- a/BankEconomyMod/bin/me/kaZep/Base/FurnaceData.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/FurnaceData.class
--- a/BankEconomyMod/bin/me/kaZep/Base/JukeboxData.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/JukeboxData.class
--- a/BankEconomyMod/bin/me/kaZep/Base/Main$1.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/Main$1.class
--- a/BankEconomyMod/bin/me/kaZep/Base/Main$2.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/Main$2.class
--- a/BankEconomyMod/bin/me/kaZep/Base/Main$3.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/Main$3.class
--- a/BankEconomyMod/bin/me/kaZep/Base/Main$4.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/Main$4.class
--- a/BankEconomyMod/bin/me/kaZep/Base/Main.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/Main.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PersistentExplorerList.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PersistentExplorerList.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerBuffData.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerBuffData.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerData.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerData.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$10.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$10.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$11.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$11.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$12.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$12.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$13.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$13.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$14.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$14.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$15.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$15.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$16.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$16.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$17.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$17.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$7.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$7.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$8.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$8.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$9.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$9.class
--- a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class
--- a/BankEconomyMod/bin/me/kaZep/Base/ReviveInventory.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/ReviveInventory.class
--- a/BankEconomyMod/bin/me/kaZep/Base/SupportEntity.class
+++ b/BankEconomyMod/bin/me/kaZep/Base/SupportEntity.class
--- a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy.class
+++ b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy.class