From 20c8e7474bf09a15f35a8267f16c9311e624fac7 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Mon, 9 Jan 2017 12:13:45 +0100 Subject: Added 1.11 smelting recipes and fuels (#3526) --- Server/Plugins/Core | 2 +- Server/furnace.txt | 87 +++++++++++++++++++++++++++++------------------------ Server/items.ini | 4 +++ 3 files changed, 53 insertions(+), 40 deletions(-) diff --git a/Server/Plugins/Core b/Server/Plugins/Core index be81e9a37..d4f39a515 160000 --- a/Server/Plugins/Core +++ b/Server/Plugins/Core @@ -1 +1 @@ -Subproject commit be81e9a37bac4d871e7182edb2e4dda434a37c2b +Subproject commit d4f39a515c1afb47953f4608a4eb6b2b70f908ba diff --git a/Server/furnace.txt b/Server/furnace.txt index 2f6449d1b..a98b6b681 100644 --- a/Server/furnace.txt +++ b/Server/furnace.txt @@ -42,20 +42,22 @@ #-------------------------- # Smelting recipes -Cactus = GreenDye +Beef = Steak +Cactus = CactusGreen ChainmailBoots = IronNugget ChainmailChestplate = IronNugget ChainmailHelmet = IronNugget ChainmailLeggings = IronNugget +Chicken = CookedChicken ChorusFruit = PoppedChorusFruit Clay = Brick ClayBlock = HardenedClay CoalOre = Coal -Cobble = Stone +Cobblestone = Stone CrackedStonebrick = Stonebrick -DarkOakLog = CharCoal DiamondOre = Diamond EmeraldOre = Emerald +Fish = CookedFish GoldOre = GoldIngot GoldAxe = GoldNugget GoldBoots = GoldNugget @@ -80,18 +82,17 @@ IronShovel = IronNugget IronSword = IronNugget LapisOre = LapisLazuli Log = CharCoal +Log2 = CharCoal +Mutton = CookedMutton NetherQuartzOre = NetherQuartz Netherrack = NetherBrick -Pork = CookedPork +Porkchop = CookedPorkchop Potato = BakedPotato -RawBeef = Steak -RawChicken = CookedChicken -RawFish = CookedFish -RawMutton = CookedMutton -RawRabbit = CookedRabbit -RawSalmon = CookedSalmon +Rabbit = CookedRabbit RedstoneOre = Redstone +Salmon = CookedSalmon Sand = Glass +StoneBrick = CrackedStoneBricks WetSponge = Sponge @@ -101,61 +102,69 @@ WetSponge = Sponge #-------------------------- # Fuels +! AcaciaBoat = 400 # -> 20 sec +! AcaciaDoor = 200 # -> 10 sec ! AcaciaFence = 300 # -> 15 sec +! AcaciaFenceGate = 300 # -> 15 sec +! AcaciaStairs = 300 # -> 15 sec ! Banner = 300 # -> 15 sec +! BirchBoat = 400 # -> 20 sec +! BirchDoor = 200 # -> 10 sec ! BirchFence = 300 # -> 15 sec ! BirchFenceGate = 300 # -> 15 sec -! BlackBanner = 300 # -> 15 sec +! BirchStairs = 300 # -> 15 sec ! BlazeRod = 2400 # -> 120 sec -! BlueBanner = 300 # -> 15 sec +! Boat = 400 # -> 20 sec ! Bookshelf = 300 # -> 15 sec -! BrownBanner = 300 # -> 15 sec +! Bow = 300 # -> 15 sec +! Bowl = 100 # -> 5 sec +! BrownMushroomBlock = 300 # -> 15 sec +! Carpet = 67 # -> 3.35 sec ! CharCoal = 1600 # -> 80 sec ! Chest = 300 # -> 15 sec ! Coal = 1600 # -> 80 sec ! CoalBlock = 16000 # -> 800 sec -! CyanBanner = 300 # -> 15 sec +! CraftingTable = 300 # -> 15 sec +! DarkOakBoat = 400 # -> 20 sec +! DarkOakDoor = 200 # -> 10 sec ! DarkOakFence = 300 # -> 15 sec ! DarkOakFenceGate = 300 # -> 15 sec -! DarkOakLog = 300 # -> 15 sec +! DarkOakStairs = 300 # -> 15 sec ! DaylightSensor = 300 # -> 15 sec ! Fence = 300 # -> 15 sec ! FenceGate = 300 # -> 15 sec -! GrayBanner = 300 # -> 15 sec -! GreenBanner = 300 # -> 15 sec -! HugeBrownMushroom = 300 # -> 15 sec -! HugeRedMushroom = 300 # -> 15 sec +! FishingRod = 300 # -> 15 sec ! Jukebox = 300 # -> 15 sec +! JungleBoat = 400 # -> 20 sec +! JungleDoor = 200 # -> 10 sec ! JungleFence = 300 # -> 15 sec ! JungleFenceGate = 300 # -> 15 sec +! JungleStairs = 300 # -> 15 sec +! Ladder = 300 # -> 15 sec ! Lavabucket = 20000 # -> 1000 sec -! LightBlueBanner = 300 # -> 15 sec -! LimeBanner = 300 # -> 15 sec ! Log = 300 # -> 15 sec -! MagentaBanner = 300 # -> 15 sec +! Log2 = 300 # -> 15 sec ! NoteBlock = 300 # -> 15 sec -! OrangeBanner = 300 # -> 15 sec -! PinkBanner = 300 # -> 15 sec +! OakStairs = 300 # -> 15 sec ! Planks = 300 # -> 15 sec -! PurpleBanner = 300 # -> 15 sec -! RedBanner = 300 # -> 15 sec +! RedMushroomBlock = 300 # -> 15 sec ! Sapling = 100 # -> 5 sec -! SilverBanner = 300 # -> 15 sec +! Sign = 200 # -> 10 sec +! SpruceBoat = 400 # -> 20 sec +! SpruceDoor = 200 # -> 10 sec ! SpruceFence = 300 # -> 15 sec ! SpruceFenceGate = 300 # -> 15 sec +! SpruceStairs = 300 # -> 15 sec ! Stick = 100 # -> 5 sec ! Trapdoor = 300 # -> 15 sec ! TrappedChest = 300 # -> 15 sec -! WhiteBanner = 300 # -> 15 sec -! WoodAxe = 200 # -> 10 sec +! WoodenAxe = 200 # -> 10 sec +! WoodenButton = 100 # -> 5 sec +! WoodenDoor = 200 # -> 10 sec +! WoodenHoe = 200 # -> 10 sec +! WoodenPressurePlate = 300 # -> 15 sec +! WoodenPickaxe = 200 # -> 10 sec ! WoodenSlab = 150 # -> 7.5 sec -! WoodHoe = 200 # -> 10 sec -! WoodPickaxe = 200 # -> 10 sec -! WoodPlate = 300 # -> 15 sec -! WoodShovel = 200 # -> 10 sec -! WoodStairs = 300 # -> 15 sec -! WoodSword = 200 # -> 10 sec -! Workbench = 300 # -> 15 sec -! YellowBanner = 300 # -> 15 sec - - +! WoodenShovel = 200 # -> 10 sec +! WoodenSword = 200 # -> 10 sec +! Wool = 100 # -> 5 sec diff --git a/Server/items.ini b/Server/items.ini index a871c71e0..64d703d9f 100644 --- a/Server/items.ini +++ b/Server/items.ini @@ -365,8 +365,11 @@ silverfishblock=97 stonebrick=98 stonebricks=98 mossystonebrick=98:1 +mossystonebricks=98:1 crackedstonebrick=98:2 +crackedstonebricks=98:2 chiseledstonebrick=98:3 +chiseledstonebricks=98:3 brown_mushroom_block=99 brownmushroomblock=99 hugebrownmushroom=99 @@ -1049,6 +1052,7 @@ lightdust=348 glowdust=348 fish=349 rawfish=349 +salmon=349:1 rawsalmon=349:1 clownfish=349:2 pufferfish=349:3 -- cgit v1.2.3