From d6625f693ce6cd342710286296d06d833d0192da Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Thu, 1 Mar 2012 10:48:44 +0000
Subject: Updated Bukkit API for 1.2

---
 pom.xml                                   | 2 +-
 src/main/java/org/bukkit/Material.java    | 6 +++++-
 src/main/java/org/bukkit/block/Biome.java | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f261d9e..615a33a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bukkit</groupId>
     <artifactId>bukkit</artifactId>
-    <version>1.1-R6</version>
+    <version>1.2.2-R0-SNAPSHOT</version>
     <name>Bukkit</name>
     <url>http://www.bukkit.org</url>
 
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 942957c7..b184079e 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -141,6 +141,8 @@ public enum Material {
     ENDER_PORTAL_FRAME(120),
     ENDER_STONE(121),
     DRAGON_EGG(122),
+    REDSTONE_LAMP_OFF(123),
+    REDSTONE_LAMP_ON(124),
     // ----- Item Separator -----
     IRON_SPADE(256, 1, 250),
     IRON_PICKAXE(257, 1, 250),
@@ -275,7 +277,9 @@ public enum Material {
     CAULDRON_ITEM(380),
     EYE_OF_ENDER(381),
     SPECKLED_MELON(382),
-    MONSTER_EGG(383, 1, SpawnEgg.class),
+    MONSTER_EGG(383, 64, SpawnEgg.class),
+    EXP_BOTTLE(384, 64),
+    FIREBALL(385, 64),
     GOLD_RECORD(2256, 1),
     GREEN_RECORD(2257, 1),
     RECORD_3(2258, 1),
diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
index 93cdbe0b..3c95e469 100644
--- a/src/main/java/org/bukkit/block/Biome.java
+++ b/src/main/java/org/bukkit/block/Biome.java
@@ -30,5 +30,7 @@ public enum Biome {
     DESERT_HILLS,
     FOREST_HILLS,
     TAIGA_HILLS,
-    SMALL_MOUNTAINS
+    SMALL_MOUNTAINS,
+    JUNGLE,
+    JUNGLE_HILLS
 }
-- 
cgit v1.2.3