Merge branch 'refs/heads/master' into 3.0

Essentials/src/com/earth2me/essentials/Enchantments.java

@@ -59,6 +59,10 @@ public final class Enchantments
 		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
 		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
 		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
+		ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
+		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
+		ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
+		ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
 	}
 	
 	public static Enchantment getByName(final String name) {

Essentials/src/com/earth2me/essentials/Essentials.java

@@ -54,7 +54,7 @@ import org.yaml.snakeyaml.error.YAMLException;
 
 public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 1597;
+	public static final int BUKKIT_VERSION = 1713;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
 	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);

Essentials/src/items.csv

@@ -2429,6 +2429,30 @@ glisteringmelon,382,0
 shiningmelon,382,0
 gmelon,382,0
 smelon,382,0
+creeperegg,383,50
+skeletonegg,383,51
+spideregg,383,52
+giantegg,383,53
+zombieegg,383,54
+slimeegg,383,55
+ghastegg,383,56
+zombiepigmanegg,383,57
+pigmanegg,383,57
+endermanegg,383,58
+cavespideregg,383,59
+silverfishegg,383,60
+blazeegg,383,61
+lavaslimeegg,383,62
+magmacubeegg,383,63
+pigegg,383,90
+sheepegg,383,91
+cowegg,383,92
+chickenegg,383,93
+squidegg,383,94
+wolfegg,383,95
+mooshroomegg,383,96
+mushroomcowegg,383,96
+villageregg,383,120
 goldmusicrecord,2256,0
 goldmusicdisk,2256,0
 goldmusiccd,2256,0