summaryrefslogtreecommitdiffstats
path: root/MCServer
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-12-18 19:32:48 +0100
committerMasy98 <masy@antheruscraft.de>2014-12-18 19:32:48 +0100
commit706b9181e612410ea99c9d725d3cd448dafb152c (patch)
tree0d1281525b92566409a3c4a6d0bf8a0e9d5f7dc8 /MCServer
parentAdded Entity Guardian (diff)
parentMerge pull request #1679 from SphinxC0re/master (diff)
downloadcuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.gz
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.bz2
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.lz
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.xz
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.tar.zst
cuberite-706b9181e612410ea99c9d725d3cd448dafb152c.zip
Diffstat (limited to '')
m---------MCServer/Plugins/Core0
-rw-r--r--MCServer/crafting.txt6
-rw-r--r--MCServer/furnace.txt1
3 files changed, 4 insertions, 3 deletions
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject 39d980e3a3447ac23f61c7d65426b33ee6c0718
+Subproject 6e9d612b9eb548d888d2bf986488aad762a99be
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 4d28b1f52..a24fdee0c 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -277,12 +277,12 @@ ActivatorRail, 6 = IronIngot, 1:1, 1:2, 1:3, 3:1, 3:2, 3:3 | Stick, 2:1, 2:3 | R
#******************************************************#
# Mechanisms
#
-WoodenDoor, 3 = OakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
SpruceDoor, 3 = SprucePlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
BirchDoor, 3 = BirchPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
JungleDoor, 3 = JunglePlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
AcaciaDoor, 3 = AcaciaPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
DarkOakDoor, 3 = DarkOakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+WoodenDoor, 3 = OakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
IronDoor, 3 = 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
IronTrapDoor = IronIngot, 1:1, 1:2, 2:1, 2:2
@@ -358,21 +358,21 @@ IronBars, 16 = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
Paper, 3 = Sugarcane, 1:1, 2:1, 3:1
Book = Paper, *, *, * | leather, *
Bookandquill = Book, * | feather, * | inksac, *
-Fence, 3 = OakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
SpruceFence, 3 = SprucePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
BirchFence, 3 = BirchPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
JungleFence, 3 = JunglePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
DarkOakFence, 3 = DarkOakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
AcaciaFence, 3 = AcaciaPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+Fence, 3 = OakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
Cobblestonewall, 6 = cobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
mossycobblestonewall, 6 = mossycobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
NetherBrickFence, 6 = NetherBrick, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
-FenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | OakPlanks, 2:1, 2:2
SpruceFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | SprucePlanks, 2:1, 2:2
BirchFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | BirchPlanks, 2:1, 2:2
JungleFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | JunglePlanks, 2:1, 2:2
DarkOakFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | DarkOakPlanks, 2:1, 2:2
AcaciaFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | AcaciaPlanks, 2:1, 2:2
+FenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | OakPlanks, 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, *
diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt
index 7179b5299..fb8d63677 100644
--- a/MCServer/furnace.txt
+++ b/MCServer/furnace.txt
@@ -49,6 +49,7 @@ NetherQuartzOre = NetherQuartz
Sand = Glass
Pork = CookedPork
RawBeef = Steak
+Potato = BakedPotato
RawChicken = CookedChicken
Clay = Brick
ClayBlock = HardenedClay