summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornielsbreu@gmail.com <nielsbreu@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-04-01 12:39:40 +0200
committernielsbreu@gmail.com <nielsbreu@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-04-01 12:39:40 +0200
commitbbb8fdf21ae938aada387892f8446da05dfa9adf (patch)
tree8d2224a97bdfa4ef46a24e74165f911a8739d043
parentMineShafts: Added tracks to corridors (diff)
downloadcuberite-bbb8fdf21ae938aada387892f8446da05dfa9adf.tar
cuberite-bbb8fdf21ae938aada387892f8446da05dfa9adf.tar.gz
cuberite-bbb8fdf21ae938aada387892f8446da05dfa9adf.tar.bz2
cuberite-bbb8fdf21ae938aada387892f8446da05dfa9adf.tar.lz
cuberite-bbb8fdf21ae938aada387892f8446da05dfa9adf.tar.xz
cuberite-bbb8fdf21ae938aada387892f8446da05dfa9adf.tar.zst
cuberite-bbb8fdf21ae938aada387892f8446da05dfa9adf.zip
-rw-r--r--MCServer/crafting.txt5
-rw-r--r--MCServer/items.ini5
2 files changed, 9 insertions, 1 deletions
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 12a019171..30f13f087 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -70,6 +70,8 @@ NetherBrick = netherbrickitem, 1:1, 1:2, 2:1, 2:2
Glowstone = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
Wool = String, 1:1, 1:2, 2:1, 2:2
TNT = Gunpowder, 1:1, 3:1, 2:2, 1:3, 3:3 | Sand, 2:1, 1:2, 3:2, 2:3
+PillarQuartzBlock = QuartzSlab, 1:1, 1:2
+ChiseledQuartzBlock, 2 = QuartzBlock, 1:1, 1:2
# Slabs:
StoneSlab, 6 = Stone, 1:1, 2:1, 3:1
@@ -79,6 +81,7 @@ CobblestoneSlab, 6 = Cobblestone, 1:1, 2:1, 3:1
BrickSlab, 6 = BrickBlock, 1:1, 2:1, 3:1
StonebrickSlab, 6 = StoneBrick, 1:1, 2:1, 3:1
NetherbrickSlab, 6 = NetherBrick, 1:1, 2:1, 3:1
+Quartzslab, 6 = QuartzBlock, 1:1, 2:1, 3:1
snow, 6 = SnowBlock, 1:1, 2:1, 3:1
# Stairs:
@@ -91,7 +94,7 @@ BrickStairs, 4 = BrickBlock, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
SandstoneStairs, 4 = Sandstone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
SandstoneStairs, 4 = Sandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
NetherBrickStairs, 4 = NetherBrick, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-quartzstairs, 4 = Quartzblock, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+quartzstairs, 4 = QuartzBlock, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
SnowBlock = SnowBall, 1:1, 1:2, 2:1, 2:2
ClayBlock = Clay, 1:1, 1:2, 2:1, 2:2
BrickBlock = Brick, 1:1, 1:2, 2:1, 2:2
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 6919aca99..ec518cb0a 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -132,6 +132,8 @@ wooddoubleslab=43:2
cobblestonedoubleslab=43:3
brickdoubleslab=43:4
stonebrickdoubleslab=43:5
+netherbrickdoubleslab=43:6
+quartzdoubleslab=43:7
slab=44
step=44
stoneslab=44:0
@@ -141,6 +143,7 @@ cobblestoneslab=44:3
brickslab=44:4
stonebrickslab=44:5
netherbrickslab=44:6
+quartzslab=44:7
brickblock=45
brickwall=45
tnt=46
@@ -273,6 +276,8 @@ redstoneblock=152
netherquartzore=153
hopper=154
quartzblock=155
+chiseledquartzblock=155:1
+pillarquartzblock=155:2
quartzstairs=156
activatorrail=157
dropper=158