From 679085b520f32e898a88823b1c2d23a12a1764f1 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 18 Aug 2013 00:33:14 +0100
Subject: Bugfix Update [SEE DESC}

Added stained clay, coal block, and hardened clay Block IDs
Added stained clay and carpet block Metas
Fixed bug with sticky retract bailing out but not unsetting arm
Fixed autocomplete not working when not at the first character, fixes
#64
Added furnace recipes for hardened clay and coal and coal blocks
---
 source/BlockID.h | 44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

(limited to 'source/BlockID.h')

diff --git a/source/BlockID.h b/source/BlockID.h
index b1c952857..8a60c16ce 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -169,8 +169,11 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_ACTIVATOR_RAIL = 157,
 	
 	E_BLOCK_DROPPER = 158,
-	
-	E_BLOCK_CARPET = 171,
+	E_BLOCK_STAINED_CLAY = 159,
+	E_BLOCK_HAY_BALE = 170
+	E_BLOCK_CARPET = 171,	
+	E_BLOCK_HARDENED_CLAY = 172,
+	E_BLOCK_BLOCK_OF_COAL = 173,
 	
 	// Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++
 	// IsValidBlock() depends on this
@@ -507,7 +510,42 @@ enum
 	E_META_WOOL_RED        = 14,
 	E_META_WOOL_BLACK      = 15,
 	
-
+	// E_BLOCK_CARPET metas:
+	E_META_CARPET_WHITE      = 0,
+	E_META_CARPET_ORANGE     = 1,
+	E_META_CARPET_MAGENTA    = 2,
+	E_META_CARPET_LIGHTBLUE  = 3,
+	E_META_CARPET_YELLOW     = 4,
+	E_META_CARPET_LIGHTGREEN = 5,
+	E_META_CARPET_PINK       = 6,
+	E_META_CARPET_GRAY       = 7,
+	E_META_CARPET_LIGHTGRAY  = 8,
+	E_META_CARPET_CYAN       = 9,
+	E_META_CARPET_PURPLE     = 10,
+	E_META_CARPET_BLUE       = 11,
+	E_META_CARPET_BROWN      = 12,
+	E_META_CARPET_GREEN      = 13,
+	E_META_CARPET_RED        = 14,
+	E_META_CARPET_BLACK      = 15,
+	
+	// E_BLOCK_STAINED_CLAY metas
+	E_META_STAINED_CLAY_WHITE      = 0,
+	E_META_STAINED_CLAY_ORANGE     = 1,
+	E_META_STAINED_CLAY_MAGENTA    = 2,
+	E_META_STAINED_CLAY_LIGHTBLUE  = 3,
+	E_META_STAINED_CLAY_YELLOW     = 4,
+	E_META_STAINED_CLAY_LIGHTGREEN = 5,
+	E_META_STAINED_CLAY_PINK       = 6,
+	E_META_STAINED_CLAY_GRAY       = 7,
+	E_META_STAINED_CLAY_LIGHTGRAY  = 8,
+	E_META_STAINED_CLAY_CYAN       = 9,
+	E_META_STAINED_CLAY_PURPLE     = 10,
+	E_META_STAINED_CLAY_BLUE       = 11,
+	E_META_STAINED_CLAY_BROWN      = 12,
+	E_META_STAINED_CLAY_GREEN      = 13,
+	E_META_STAINED_CLAY_RED        = 14,
+	E_META_STAINED_CLAY_BLACK      = 15,
+	
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Item metas:
 	
-- 
cgit v1.2.3