summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKingCol13 <48412633+KingCol13@users.noreply.github.com>2020-09-17 23:47:38 +0200
committerGitHub <noreply@github.com>2020-09-17 23:47:38 +0200
commita72769b30e32108f0a127f6a3fb83d63edf0e3a0 (patch)
treebbb7fa0289a5d2ffab58f97dc47ddefa7f1d0c54
parentFixed leaves and wheat not breakable with piston (#4882) (diff)
downloadcuberite-a72769b30e32108f0a127f6a3fb83d63edf0e3a0.tar
cuberite-a72769b30e32108f0a127f6a3fb83d63edf0e3a0.tar.gz
cuberite-a72769b30e32108f0a127f6a3fb83d63edf0e3a0.tar.bz2
cuberite-a72769b30e32108f0a127f6a3fb83d63edf0e3a0.tar.lz
cuberite-a72769b30e32108f0a127f6a3fb83d63edf0e3a0.tar.xz
cuberite-a72769b30e32108f0a127f6a3fb83d63edf0e3a0.tar.zst
cuberite-a72769b30e32108f0a127f6a3fb83d63edf0e3a0.zip
Diffstat (limited to '')
-rw-r--r--CONTRIBUTORS1
-rw-r--r--Server/crafting.txt2
2 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3a798fde9..aec0bffe5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -29,6 +29,7 @@ jan64
jasperarmstrong
kevinr (Kevin Riggle)
keyboard
+KingCol13
Lapayo
linnemannr (Reid Linnemann)
lkolbly
diff --git a/Server/crafting.txt b/Server/crafting.txt
index e1a07d96b..82de1ec6b 100644
--- a/Server/crafting.txt
+++ b/Server/crafting.txt
@@ -319,6 +319,8 @@ jungle_door: JungleDoor, 3 = JunglePlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
lever: Lever = Cobblestone, 1:2 | Stick, 1:1
light_weighted_pressure_plate: lightweightedpressureplate = GoldIngot, 1:1, 2:1
note_block: NoteBlock = Planks^-1, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | RedstoneDust, 2:2
+observer: Observer = Cobblestone, 1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | RedstoneDust, 1:2, 2:2 | NetherQuartz, 3:2
+Observer = Cobblestone, 1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | RedstoneDust, 3:2, 2:2 | NetherQuartz, 1:2
piston: Piston = Planks^-1, 1:1, 2:1, 3:1 | RedstoneDust, 2:3 | Cobblestone, 1:2, 3:2, 1:3, 3:3 | IronIngot, 2:2
redstone_lamp: RedstoneLamp = RedstoneDust, 2:1, 1:2, 3:2, 2:3 | Glowstone, 2:2
redstone_torch: RedstoneTorchOn = Stick, 1:2 | RedstoneDust, 1:1