summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
m---------MCServer/Plugins/Core0
-rw-r--r--MCServer/crafting.txt1
-rw-r--r--MCServer/furnace.txt21
4 files changed, 21 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8620a1475..fffc55b2a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -10,6 +10,7 @@ Howaner
keyboard
Lapayo
Luksor
+M10360
marmot21
Masy98
mborland
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject 4702471943511f641458c7e8e89b430a723f43e
+Subproject 5b7a6d464ed3e0e5d2a438ebf119430cacab26a
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 8e68d5cb5..4d28b1f52 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -75,7 +75,6 @@ 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
-CoalBlock = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
HayBale = Wheat, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
SnowBlock = SnowBall, 1:1, 1:2, 2:1, 2:2
ClayBlock = Clay, 1:1, 1:2, 2:1, 2:2
diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt
index 0c12a798d..7179b5299 100644
--- a/MCServer/furnace.txt
+++ b/MCServer/furnace.txt
@@ -52,7 +52,7 @@ RawBeef = Steak
RawChicken = CookedChicken
Clay = Brick
ClayBlock = HardenedClay
-TallGrass = NetherBrickItem
+Netherrack = NetherBrickItem
RawFish = CookedFish
Log = CharCoal
Cactus = GreenDye
@@ -90,6 +90,25 @@ RawMutton = CookedMutton
! CoalBlock = 16000 # -> 800 sec
! BlazeRod = 2400 # -> 120 sec
! NoteBlock = 300 # -> 15 sec
+! HugeRedMushroom = 300 # -> 15 sec
+! HugeBrownMushroom = 300 # -> 15 sec
+! Banner = 300 # -> 15 sec
+! BlackBanner = 300 # -> 15 sec
+! RedBanner = 300 # -> 15 sec
+! GreenBanner = 300 # -> 15 sec
+! BrownBanner = 300 # -> 15 sec
+! BlueBanner = 300 # -> 15 sec
+! PurpleBanner = 300 # -> 15 sec
+! CyanBanner = 300 # -> 15 sec
+! SilverBanner = 300 # -> 15 sec
+! GrayBanner = 300 # -> 15 sec
+! PinkBanner = 300 # -> 15 sec
+! LimeBanner = 300 # -> 15 sec
+! YellowBanner = 300 # -> 15 sec
+! LightBlueBanner = 300 # -> 15 sec
+! MagentaBanner = 300 # -> 15 sec
+! OrangeBanner = 300 # -> 15 sec
+! WhiteBanner = 300 # -> 15 sec
! DaylightSensor = 300 # -> 15 sec
! FenceGate = 300 # -> 15 sec
! SpruceFenceGate = 300 # -> 15 sec