flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1622 from M10360/master

Browse Source 
Missing Fuels, Incorrect Smelting Recipe, Duplicate Code, Listing Myself
This commit is contained in:
Mattes D 2014-11-29 22:00:06 +01:00
commit c8384fee39
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -10,6 +10,7 @@ Howaner
keyboard keyboard
Lapayo Lapayo
Luksor Luksor
M10360
marmot21 marmot21
Masy98 Masy98
mborland mborland

1
MCServer/crafting.txt
View File

@ -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 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 PillarQuartzBlock = QuartzSlab, 1:1, 1:2
ChiseledQuartzBlock, 2 = QuartzBlock, 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 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 SnowBlock = SnowBall, 1:1, 1:2, 2:1, 2:2
ClayBlock = Clay, 1:1, 1:2, 2:1, 2:2 ClayBlock = Clay, 1:1, 1:2, 2:1, 2:2

21
MCServer/furnace.txt
View File

@ -52,7 +52,7 @@ RawBeef = Steak
RawChicken = CookedChicken RawChicken = CookedChicken
Clay = Brick Clay = Brick
ClayBlock = HardenedClay ClayBlock = HardenedClay
TallGrass = NetherBrickItem Netherrack = NetherBrickItem
RawFish = CookedFish RawFish = CookedFish
Log = CharCoal Log = CharCoal
Cactus = GreenDye Cactus = GreenDye
@ -90,6 +90,25 @@ RawMutton = CookedMutton
! CoalBlock = 16000 # -> 800 sec ! CoalBlock = 16000 # -> 800 sec
! BlazeRod = 2400 # -> 120 sec ! BlazeRod = 2400 # -> 120 sec
! NoteBlock = 300 # -> 15 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 ! DaylightSensor = 300 # -> 15 sec
! FenceGate = 300 # -> 15 sec ! FenceGate = 300 # -> 15 sec
! SpruceFenceGate = 300 # -> 15 sec ! SpruceFenceGate = 300 # -> 15 sec