summaryrefslogtreecommitdiffstats
path: root/MCServer
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-09-02 21:09:32 +0200
committerMasy98 <masy@antheruscraft.de>2014-09-02 21:09:32 +0200
commit96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3 (patch)
treee817690c77429000211c1a1736d427f2ef902cb8 /MCServer
parentSeperated "custom" names list from the normal list in items.ini! (diff)
downloadcuberite-96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3.tar
cuberite-96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3.tar.gz
cuberite-96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3.tar.bz2
cuberite-96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3.tar.lz
cuberite-96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3.tar.xz
cuberite-96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3.tar.zst
cuberite-96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3.zip
Diffstat (limited to 'MCServer')
-rw-r--r--MCServer/crafting.txt23
1 files changed, 19 insertions, 4 deletions
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 6c0c79e0a..b7218927e 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -67,6 +67,7 @@ DiamondBlock = Diamond, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3
LapisBlock = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
EmeraldBlock = Emerald, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
RedstoneBlock = RedstoneDust, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+CoalBlock = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
QuartzBlock = NetherQuartz, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
NetherBrick = netherbrickitem, 1:1, 1:2, 2:1, 2:2
Glowstone = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
@@ -147,9 +148,6 @@ StoneBrickStairs, 4 = StoneBrick, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
RedSandstoneStairs, 4 = RedSandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
RedSandstoneStairs, 4 = RedSandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-# Other
-Carpet = Wool, 1:3, 2:3
-
#******************************************************#
@@ -451,13 +449,30 @@ PinkWool = Wool, * | PinkDye, *
GrayWool = Wool, * | GrayDye, *
LightGrayWool = Wool, * | LightGrayDye, *
CyanWool = Wool, * | CyanDye, *
-VioletWool = Wool, * | VioletDye, *
+PurpleWool = Wool, * | PurpleDye, *
BlueWool = Wool, * | BlueDye, *
BrownWool = Wool, * | BrownDye, *
GreenWool = Wool, * | GreenDye, *
RedWool = Wool, * | RedDye, *
BlackWool = Wool, * | BlackDye, *
+WhiteCrapet, 3 = WhiteWool, 1:1, 2:1
+OrangeCarpet, 3 = OrangeWool, 1:1, 2:1
+MagentaCarpet, 3 = MagentaWool, 1:1, 2:1
+LightBlueCarpet, 3 = LightBlueWool, 1:1, 2:1
+YellowCarpet, 3 = YellowWool, 1:1, 2:1
+LimeCarpet, 3 = LimeWool, 1:1, 2:1
+PinkCarpet, 3 = PinkWool, 1:1, 2:1
+GrayCarpet, 3 = GrayWool, 1:1, 2:1
+LightGrayCarpet, 3 = LightGrayWool, 1:1, 2:1
+CyanCarpet, 3 = CyanWool, 1:1, 2:1
+PurpleCarpet, 3 = PurpleWool, 1:1, 2:1
+BlueCarpet, 3 = BlueWool, 1:1, 2:1
+BrownCarpet, 3 = BrownWool, 1:1, 2:1
+GreenCarpet, 3 = GreenWool, 1:1, 2:1
+RedCarpet, 3 = RedWool, 1:1, 2:2
+BlackCarpet, 3 = BlackWool, 1:1, 2:1
+
#******************************************************#
# Stained Glass:
#