From 18b73e471fdf2ffab1198a46986f6c118af65a32 Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Sat, 17 Nov 2012 09:27:27 +0000
Subject: Updated crafting and items to 1.4.4 (initial patch by STR_Warrior)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1051 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 MCServer/crafting.txt |  8 +++++++-
 MCServer/items.ini    | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 55bd19156..559b6aced 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -210,6 +210,7 @@ DiamondBoots     = Diamond,   1:1, 3:1, 1:2, 3:2
 #******************************************************#
 # Transportation
 #
+CarrotOnAStick   = FishingRod, 1:2 | Carrot, 2:3
 Minecart         = IronIngot, 1:1, 3:1, 1:2, 2:2, 3:2
 PoweredMinecart  = Minecart, * | Furnace, *
 StorageMinecart  = Minecart, * | Chest, *
@@ -230,7 +231,8 @@ IronDoor         = IronIngot, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
 TrapDoor, 2      = Planks,    1:1, 2:1, 3:1, 1:2, 2:2, 3:2
 WoodPlate        = Planks,  1:1, 2:1
 StonePlate       = Stone,   1:1, 2:1
-Button           = Stone,   1:1, 1:2
+StoneButton      = Stone,   1:1
+WoodenButton     = Planks,  1:1
 RedstoneTorchOn  = Stick, 1:2        | RedstoneDust, 1:1
 Lever            = Cobblestone, 1:2  | Stick, 1:1
 NoteBlock        = Planks,      1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | RedstoneDust, 2:2
@@ -260,6 +262,7 @@ EnchantedGoldenApple = RedApple, 2:2 | GoldBlock, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1,
 Melon                = MelonSlice, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 MelonSeeds           = MelonSlice, *
 PumpkinSeeds, 4      = Pumpkin, *
+PumpkinPie           = Pumpkin, * | Suger, * | egg, *
 
 
 
@@ -289,6 +292,9 @@ FenceGate           = Stick,       1:1, 1:2, 3:1, 3:2  | Planks, 2:1, 2:2
 Bed                 = Planks,            1:2, 2:2, 3:2 | Wool,   1:1, 2:1, 3:1
 GoldIngot           = GoldNugget, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 EyeOfEnder          = EnderPearl, *                 | BlazePowder, *
+BeaconBlock         = Glass, 1:1, 1:2, 2:1, 3:1, 3:2 | Obsidian, 1:3, 2:3, 3:3 | NetherStar, 2:2
+Anvil               = IronBlock, 1:1, 2:1, 3:1 | IronIngot, 2:2, 1:3, 2:3, 3:3
+FlowerPot           = Brick, 1:2, 2:3, 3:2
 
 
 
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 3d51ae602..5ad5ab3a6 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -183,7 +183,7 @@ redstoneore=73
 redstoneorealt=74
 redstonetorchoff=75
 redstonetorchon=76
-button=77
+stonebutton=77
 snow=78
 ice=79
 snowblock=80
@@ -247,6 +247,21 @@ enderchest=130
 tripwirehook=131
 tripwire=132
 emeraldblock=133
+commandblock=137
+beacon=138
+cobblestonewall=139
+mossycobblestonewall=139:1
+flowerpotblock=140
+carrotcrop=141
+potatocrop=142
+woodenbutton=143
+skeletonhead=144
+witherhead=144:1
+zombiehead=144:2
+humanhead=144:3
+stevehead=144:3
+creeperhead=144:4
+anvil=145
 ironshovel=256
 ironspade=256
 ironpickaxe=257
@@ -469,6 +484,24 @@ firecharge=385
 bookandquill=386
 writtenbook=387
 emerald=388
+
+itemframe=389
+flowerpot=390
+carrot=391
+potato=392
+bakedpotato=393
+poisonouspotato=394
+emptymap=395
+goldencarrot=396
+skeletonhead=397
+witherhead=397:1
+zombiehead=397:2
+stevehead=397:3
+creeperhead=397:4
+carrotonastick=398
+netherstar=399
+pumpkinpie=400
+
 goldrecord=2256
 greenrecord=2257
 blocksrecord=2258
-- 
cgit v1.2.3