From a92e1c05a377acc82d021d46b920bc5227daabbc Mon Sep 17 00:00:00 2001 From: NO11 Date: Tue, 15 Jun 2021 16:26:32 +0000 Subject: [PATCH 1/8] Add debarking by right clicking wood using an axe --- mods/ITEMS/mcl_tools/init.lua | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index 4dc9af01..99fcb213 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -351,6 +351,34 @@ minetest.register_tool("mcl_tools:shovel_diamond", { }) -- Axes +local function make_stripped_trunk(itemstack, placer, pointed_thing) + if pointed_thing.type ~= "node" then return end + + local node = minetest.get_node(pointed_thing.under) + local nodedef = minetest.registered_nodes[minetest.get_node(pointed_thing.under).name] + + if not placer:get_player_control().sneak and nodedef.on_rightclick then + return minetest.item_place(itemstack, placer, pointed_thing) + end + if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then + minetest.record_protection_violation(pointed_thing.under, placer:get_player_name()) + return itemstack + end + + if nodedef._mcl_stripped_variant == nil then + return itemstack + else + minetest.swap_node(pointed_thing.under, {name=nodedef._mcl_stripped_variant, param2=node.param2}) + if not minetest.is_creative_enabled(placer:get_player_name()) then + -- Add wear (as if digging a axey node) + local toolname = itemstack:get_name() + local wear = mcl_autogroup.get_wear(toolname, "axey") + itemstack:add_wear(wear) + end + end + return itemstack +end + minetest.register_tool("mcl_tools:axe_wood", { description = S("Wooden Axe"), _doc_items_longdesc = axe_longdesc, @@ -364,6 +392,7 @@ minetest.register_tool("mcl_tools:axe_wood", { damage_groups = {fleshy=7}, punch_attack_uses = 30, }, + on_place = make_stripped_trunk, sound = { breaks = "default_tool_breaks" }, _repair_material = "group:wood", _mcl_toollike_wield = true, @@ -383,6 +412,7 @@ minetest.register_tool("mcl_tools:axe_stone", { damage_groups = {fleshy=9}, punch_attack_uses = 66, }, + on_place = make_stripped_trunk, sound = { breaks = "default_tool_breaks" }, _repair_material = "mcl_core:cobble", _mcl_toollike_wield = true, @@ -403,6 +433,7 @@ minetest.register_tool("mcl_tools:axe_iron", { damage_groups = {fleshy=9}, punch_attack_uses = 126, }, + on_place = make_stripped_trunk, sound = { breaks = "default_tool_breaks" }, _repair_material = "mcl_core:iron_ingot", _mcl_toollike_wield = true, @@ -422,6 +453,7 @@ minetest.register_tool("mcl_tools:axe_gold", { damage_groups = {fleshy=7}, punch_attack_uses = 17, }, + on_place = make_stripped_trunk, sound = { breaks = "default_tool_breaks" }, _repair_material = "mcl_core:gold_ingot", _mcl_toollike_wield = true, @@ -441,6 +473,7 @@ minetest.register_tool("mcl_tools:axe_diamond", { damage_groups = {fleshy=9}, punch_attack_uses = 781, }, + on_place = make_stripped_trunk, sound = { breaks = "default_tool_breaks" }, _repair_material = "mcl_core:diamond", _mcl_toollike_wield = true, From 616b009452dcec4817abdb98242e46096234d02b Mon Sep 17 00:00:00 2001 From: NO11 Date: Tue, 15 Jun 2021 16:35:04 +0000 Subject: [PATCH 2/8] Add stripped trunk and stripped wood nodes --- mods/ITEMS/mcl_core/nodes_trees.lua | 70 ++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/mods/ITEMS/mcl_core/nodes_trees.lua b/mods/ITEMS/mcl_core/nodes_trees.lua index 3a8aef8d..e5757b92 100644 --- a/mods/ITEMS/mcl_core/nodes_trees.lua +++ b/mods/ITEMS/mcl_core/nodes_trees.lua @@ -8,7 +8,7 @@ if mod_screwdriver then end -- Register tree trunk (wood) and bark -local register_tree_trunk = function(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark) +local function register_tree_trunk(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark, stripped_variant) minetest.register_node("mcl_core:"..subname, { description = description_trunk, _doc_items_longdesc = longdesc, @@ -22,6 +22,7 @@ local register_tree_trunk = function(subname, description_trunk, description_bar on_rotate = on_rotate, _mcl_blast_resistance = 2, _mcl_hardness = 2, + _mcl_stripped_variant = stripped_variant, }) minetest.register_node("mcl_core:"..subname.."_bark", { @@ -37,6 +38,48 @@ local register_tree_trunk = function(subname, description_trunk, description_bar on_rotate = on_rotate, _mcl_blast_resistance = 2, _mcl_hardness = 2, + _mcl_stripped_variant = stripped_variant.."_bark", + }) + + minetest.register_craft({ + output = "mcl_core:"..subname.."_bark 3", + recipe = { + { "mcl_core:"..subname, "mcl_core:"..subname }, + { "mcl_core:"..subname, "mcl_core:"..subname }, + } + }) +end + +-- Register stripped trunk and stripped wood +local function register_stripped_trunk(subname, description_stripped_trunk, description_stripped_bark, longdesc, tile_stripped_inner, tile_stripped_bark) + minetest.register_node("mcl_core:"..subname, { + description = description_stripped_trunk, + _doc_items_longdesc = longdesc, + _doc_items_hidden = false, + tiles = {tile_stripped_inner, tile_stripped_inner, tile_stripped_bark}, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + stack_max = 64, + groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + sounds = mcl_sounds.node_sound_wood_defaults(), + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + }) + + minetest.register_node("mcl_core:"..subname.."_bark", { + description = description_stripped_bark, + _doc_items_longdesc = S("This is a decorative block."), + tiles = {tile_stripped_bark}, + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + stack_max = 64, + groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + sounds = mcl_sounds.node_sound_wood_defaults(), + is_ground_content = false, + on_rotate = on_rotate, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, }) minetest.register_craft({ @@ -48,7 +91,7 @@ local register_tree_trunk = function(subname, description_trunk, description_bar }) end -local register_wooden_planks = function(subname, description, tiles) +local function register_wooden_planks(subname, description, tiles) minetest.register_node("mcl_core:"..subname, { description = description, _doc_items_longdesc = doc.sub.items.temp.build, @@ -70,7 +113,7 @@ local register_leaves = function(subname, description, longdesc, tiles, sapling, end local apple_chances = {200, 180, 160, 120, 40} local stick_chances = {50, 45, 30, 35, 10} - + local function get_drops(fortune_level) local drop = { max_items = 1, @@ -119,7 +162,7 @@ local register_leaves = function(subname, description, longdesc, tiles, sapling, }) end -local register_sapling = function(subname, description, longdesc, tt_help, texture, selbox) +local function register_sapling(subname, description, longdesc, tt_help, texture, selbox) minetest.register_node("mcl_core:"..subname, { description = description, _tt_help = tt_help, @@ -161,12 +204,19 @@ end --------------------- -register_tree_trunk("tree", S("Oak Wood"), S("Oak Bark"), S("The trunk of an oak tree."), "default_tree_top.png", "default_tree.png") -register_tree_trunk("darktree", S("Dark Oak Wood"), S("Dark Oak Bark"), S("The trunk of a dark oak tree."), "mcl_core_log_big_oak_top.png", "mcl_core_log_big_oak.png") -register_tree_trunk("acaciatree", S("Acacia Wood"), S("Acacia Bark"), S("The trunk of an acacia."), "default_acacia_tree_top.png", "default_acacia_tree.png") -register_tree_trunk("sprucetree", S("Spruce Wood"), S("Spruce Bark"), S("The trunk of a spruce tree."), "mcl_core_log_spruce_top.png", "mcl_core_log_spruce.png") -register_tree_trunk("birchtree", S("Birch Wood"), S("Birch Bark"), S("The trunk of a birch tree."), "mcl_core_log_birch_top.png", "mcl_core_log_birch.png") -register_tree_trunk("jungletree", S("Jungle Wood"), S("Jungle Bark"), S("The trunk of a jungle tree."), "default_jungletree_top.png", "default_jungletree.png") +register_tree_trunk("tree", S("Oak Wood"), S("Oak Bark"), S("The trunk of an oak tree."), "default_tree_top.png", "default_tree.png", "mcl_core:stripped_oak") +register_tree_trunk("darktree", S("Dark Oak Wood"), S("Dark Oak Bark"), S("The trunk of a dark oak tree."), "mcl_core_log_big_oak_top.png", "mcl_core_log_big_oak.png", "mcl_core:stripped_dark_oak") +register_tree_trunk("acaciatree", S("Acacia Wood"), S("Acacia Bark"), S("The trunk of an acacia."), "default_acacia_tree_top.png", "default_acacia_tree.png", "mcl_core:stripped_acacia") +register_tree_trunk("sprucetree", S("Spruce Wood"), S("Spruce Bark"), S("The trunk of a spruce tree."), "mcl_core_log_spruce_top.png", "mcl_core_log_spruce.png", "mcl_core:stripped_spruce") +register_tree_trunk("birchtree", S("Birch Wood"), S("Birch Bark"), S("The trunk of a birch tree."), "mcl_core_log_birch_top.png", "mcl_core_log_birch.png", "mcl_core:stripped_birch") +register_tree_trunk("jungletree", S("Jungle Wood"), S("Jungle Bark"), S("The trunk of a jungle tree."), "default_jungletree_top.png", "default_jungletree.png", "mcl_core:stripped_jungle") + +register_stripped_trunk("stripped_oak", S("Stripped Oak Log"), S("Stripped Oak Wood"), S("The stripped trunk of an oak tree."), "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png") +register_stripped_trunk("stripped_acacia", S("Stripped Acacia Log"), S("Stripped Acacia Wood"), S("The stripped trunk of an acacia tree."), "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png") +register_stripped_trunk("stripped_dark_oak", S("Stripped Dark Oak Log"), S("Stripped Dark Oak Wood"), S("The stripped trunk of an dark oak tree."), "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png") +register_stripped_trunk("stripped_birch", S("Stripped Birch Log"), S("Stripped Birch Wood"), S("The stripped trunk of an birch tree."), "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png") +register_stripped_trunk("stripped_spruce", S("Stripped Spruce Log"), S("Stripped Spruce Wood"), S("The stripped trunk of an spruce tree."), "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png") +register_stripped_trunk("stripped_jungle", S("Stripped Jungle Log"), S("Stripped Jungle Wood"), S("The stripped trunk of an jungle tree."),"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png") register_wooden_planks("wood", S("Oak Wood Planks"), {"default_wood.png"}) register_wooden_planks("darkwood", S("Dark Oak Wood Planks"), {"mcl_core_planks_big_oak.png"}) From eadb96dd402e44fc56e9e0071574c7c1c21f6147 Mon Sep 17 00:00:00 2001 From: NO11 Date: Tue, 15 Jun 2021 16:39:54 +0000 Subject: [PATCH 3/8] Refactor wooden plank crafting This patch makes it possible to craft planks out of stripped wood. --- mods/ITEMS/mcl_core/crafting.lua | 61 ++++++++++++-------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/mods/ITEMS/mcl_core/crafting.lua b/mods/ITEMS/mcl_core/crafting.lua index a0ad38a7..cec26e74 100644 --- a/mods/ITEMS/mcl_core/crafting.lua +++ b/mods/ITEMS/mcl_core/crafting.lua @@ -4,47 +4,30 @@ -- Crafting definition -- -minetest.register_craft({ - output = 'mcl_core:wood 4', - recipe = { - {'mcl_core:tree'}, - } -}) +local function craft_planks(output, input) + minetest.register_craft({ + output = "mcl_core:"..output.."wood 4", + recipe = { + {"mcl_core:"..input}, + } + }) +end -minetest.register_craft({ - output = 'mcl_core:darkwood 4', - recipe = { - {'mcl_core:darktree'}, - } -}) +local planks = { + {"", "oak"}, + {"dark", "dark_oak"}, + {"jungle", "jungle"}, + {"acacia", "acacia"}, + {"spruce", "spruce"}, + {"birch", "birch"} +} -minetest.register_craft({ - output = 'mcl_core:junglewood 4', - recipe = { - {'mcl_core:jungletree'}, - } -}) - -minetest.register_craft({ - output = 'mcl_core:acaciawood 4', - recipe = { - {'mcl_core:acaciatree'}, - } -}) - -minetest.register_craft({ - output = 'mcl_core:sprucewood 4', - recipe = { - {'mcl_core:sprucetree'}, - } -}) - -minetest.register_craft({ - output = 'mcl_core:birchwood 4', - recipe = { - {'mcl_core:birchtree'}, - } -}) +for _, p in pairs(planks) do + craft_planks(p[1], p[1].."tree") + craft_planks(p[1], p[1].."tree_bark") + craft_planks(p[1], "stripped_"..p[2]) + craft_planks(p[1], "stripped_"..p[2].."_bark") +end minetest.register_craft({ type = 'shapeless', From d3348ef8b7d6becbab07a811281e7db4c82cb555 Mon Sep 17 00:00:00 2001 From: NO11 Date: Tue, 15 Jun 2021 16:41:17 +0000 Subject: [PATCH 4/8] Add stripped trunk / wood textures Stripped trunk / wood nodes exist for acacia, birch, dark oak, jungle tree, oak, and spruce. This patch adds the textures for all of these. --- .../textures/mcl_core_stripped_acacia_side.png | Bin 0 -> 2171 bytes .../textures/mcl_core_stripped_acacia_top.png | Bin 0 -> 2025 bytes .../textures/mcl_core_stripped_birch_side.png | Bin 0 -> 611 bytes .../textures/mcl_core_stripped_birch_top.png | Bin 0 -> 681 bytes .../textures/mcl_core_stripped_dark_oak_side.png | Bin 0 -> 2007 bytes .../textures/mcl_core_stripped_dark_oak_top.png | Bin 0 -> 695 bytes .../textures/mcl_core_stripped_jungle_side.png | Bin 0 -> 650 bytes .../textures/mcl_core_stripped_jungle_top.png | Bin 0 -> 637 bytes .../textures/mcl_core_stripped_oak_side.png | Bin 0 -> 2130 bytes .../textures/mcl_core_stripped_oak_top.png | Bin 0 -> 729 bytes .../textures/mcl_core_stripped_spruce_side.png | Bin 0 -> 2054 bytes .../textures/mcl_core_stripped_spruce_top.png | Bin 0 -> 733 bytes 12 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_side.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_top.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_side.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_top.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_side.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_top.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_side.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_top.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_side.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_top.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_side.png create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_top.png diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_side.png new file mode 100644 index 0000000000000000000000000000000000000000..2b57a0863e404e0ee1177fd4562bffecc5a3e527 GIT binary patch literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b@vLh!9{Ld+J1SAk2$6=VEYHzT|PXiKu&wkme zq~a-iFatvBZb`O#e*YToFT9wjxG1@#nv%yW)>ye=Q2c)FJNdXi^^3Q`w|RFSFs1_T zVSi1Ju5Xx^*M=N*{`x-ea#uS=4Vh&%80N{0fvziRDDa*q{qCynYw=4s`W~IvW4ZRD z_wO+Sj9XwYu;V9C@c1nAlrY~E8t$?_3l>qxXGTK$89R4|Z{VHL8+N|weE1H9^GO$^ zH;i*J1)v$!Sm)${JxI;EZ8yOSm%Lf^l9~ z#Z?eu2V*zbyl{0#l^AFbigZ(>LC?B(>Togg!x?wx4i4sA37ISRFe!-hqQN=TaJx{z zQwM7S(|mlPb#7hfbt*XdCagp=%uZ&cn(-6K03csgYvBg01?g>I70yp_(VY{ zkej8o1FQ|ND5)FMl#8{X)*=|<3lWi4tFo+{>Yn?_^){5e`3x} z>i!Sr+@wyK`{eBh*6y}CN>~KVES#A7Fi_YYgweQQTO4Q$&-&scP>VtWeES;3;!9i4 zlK46&1fAlRy(&6aaiMwP~1 zXB$u+ySj$d-DgH-S?ep>eXDWG3;QQ*Bvd!uw6pWR=@prdsd}6aAyP` z(_SPEI=s{&N^0QRz9t}a?*mJ}M4e!9NxevVWMbASSj!gY9zfSw{V>ofI9sPfkioBw zg%0k7p~7uMdD(7E*OY-ei`;rREx3(YFv2P;`(#)Ljl)0tJc!4jj5}K9*lzdcGnt85 zkj+Hb0p)#6^(TDu%DWUE4c0LC8op@~bdV1EQJ50!y9wA;r3IBEtC&EIj(jpxUey<+ zsvwdy9km(0+dL{XaO)t!7T9>h2CMb#Sk+ZT=pF^0hi1*JA$yp76w4_yTM8SE-PD~X z6!56L)S*%&-2V1)YbNu!r(y6XgQhF#2|YVDCe(z65>23 z*!?l*Hxx5YC9Mmd&SQ;#X-tZ zS2qe?1z|hqmUjk;RX*ZV$1E)0u20|ME{aTON2hX}RJ*GBM(Hu&RA~4udmnT49Lige zQ1uTeWi3+HFuXp(uJTw3RN10yH@CqDms=`$>J5))6Fr-bVxOd(8m=WcY1wfr<+QH4Jcwi<+=$I3O{&q;rE8{mDNp{hdyeL`eO7BqCqI?q)BTe-4Vqri=M@wmi~IPoVD;M? zIJAB#O5VER{ErFG+}~s^+mqQMMvVXf00v@9M??Vs0RI60puMM)00009a7bBm001r{ z001r{0eGc9b^rhX2XskIMF-^t2o?o6%GVSZ00064Nkl}nj9g=3cn*^{2`i2M`P?ZV&_wPS-jDcD4{x*nfLc#HIaDJYsH8P6ht#OQw zHRtQkH?QxLKhGPxqqwdc1Bzn&e2|q`bF3MeMIVk35y?C!0L`7sq5;fInj7miaW_oj z`n>4lKr4uAk#00O>k3M6u3+?r%@w>oI+6gmzF+w0^!EdqkZI3=WK<*tcyr8!_2x7; zkdXEwBB(5oFksyaC=iT~0YGJ8ZdeIcB-$sC32(;zI+^Fq^}IkutVKL0eRLuc6I3J? zD-b(=KN?kHU4hJqnV30w2b4H|4qm@s^v8jjVR9^@$SMF<1XYC}h64JdW6iMUATh56 z68F7my#ZiFa?h1CzLU;-(oE#$U~~y{qcVwW0cC&CCbTM`k}B|{^XATaEo!HwjgCyj zxsVxSILbymFU-KQl4CT?M9dAbYQMC(vDU7X6z=<_?{i{;xdMw!KA&@ITR|15i`VaO z71(?KmKRCY@6$u6riAsFEZjR=(U+)j@Yw|rC xKaTBPF52VZIw$LSaXbc6Q4~THfp;TU@;}m>L&kpLdwu`_002ovPDHLkV1jdt1=|1s literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_top.png new file mode 100644 index 0000000000000000000000000000000000000000..bd10499c811843193bf35170c6ebb4bd8cd290dd GIT binary patch literal 2025 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b<(&Q!#{m&_K1SAm4aaioC+#tu#0|eclyJxB< zm3Fm_Wzh1TkZg1P^Y?B3!jH+a@e)(WAz1u;_L&O?$*$kJlJ)bfH+Bzx$jy1c5IJ1k zx(%1kFObV?LG&uGKjkJi)ss}w)~pKMu*?|fyrha8FFEPG$-1uiw{Y}-H=d8Bu1C*% z9|1-e=yPoNa^x(|X;^XNPp;r9^PDh=TwG(Ez4PC(GiUe!?~ESU*`jjy6AEL4P6!W- zR8I08yNS?)wQc#w1G;Ur@4t8K?w;=ZTG16BfK)IV)DC5iFcENiHw+|I2X{-Sd9Gl9M7Wc=!HshPK|%;Ij2cyPOLyxAXo_o3ILMmPUk}F*C zN>{$hja<9k?Qglm9q)AKyByY()t{`^ExLO z8LerEpmr(rj;c!dv4+6OPk~*6=21rGYSi5U3`Xf?dh6Skz|$Bw%BnE=W6JEw(q~Ml z#%+y;TG_H?4XQM7t5>H{6m${A0=YX?`b6rQXZx{iO~!v~&a89Ip2WAPxAX`ogc%3I zdO@}4hN#c1QQvHktZ`6TP~a8EFE6oWu5GU_9TXn=%})b5Ew#3NZ)NGv<@iHu&_-ii znL)XmIh3Q!w(8bX>-@qBj;RbqIQ6w)Y}vRRr<_`0GpvE}x}U$8eUZJFWOTY`&N;ix z85n!9e3-YfZwF;N7}P;jliC%iLr65T5OW+BoXAyG+ji2hTN2peWyt44wk~tVInta$ zEBT#ky)6+^rzvw*;!?w{8rm>sg#@8q8>Sbs_&B3`KZLAc^C-Nl44{(h(hy!4yzOLC z4^JwD)<-?UOQO#~6B(~Sst+~0^quDKZXe<}ZGRRZL~k``p1NDh;4ex~FDy zQUSZQ?%kT-IDCur;C~|CJFH>S*?xZ^?+g(kFK7#&IaXXt$=G)WHt$A=e zIr-5m4B|f1ibjdIMO77a4`4y<>f*COQdsnt@j0MAYfHh4hpNJ7ftFt+|1L0zWWkP? z`4g=<0p$(F?o}19smHOp9ZQ!|_h@>ijIU7bZ1v$h`Jk&v+X-{uY@F`!1tY(0XeLO~ zuFbpcVf4%hzvwkcYApt@PD1XZwbx&_f6eS~`;ir+)6RpMO8U}6NjsXQzB8Nl+fP6Hd}wxjn45nA_2JIY2>7#~00006VoOIv0RI600RN!9r;`8x z010qNS#tmYE+YT{E+YYWr9XB6000McNliru~QHb3pV>&RM=_Bwayccg-28IqbO^HK%m&FgqsuMW>R?=S1IV<_{`I8p} zEkYC-z%xNa0Eo0=7zX_LDl!IurgIph4L7O1Na)(0XkqZ)BO=(;a>xs!#hB>Nm721` z;0FNKH|x;(kQa1qkBM}6oMuV512B;WKxw7uJ2wWam}tEUkEe5OW3-Ja4`rAFz~fQE z8?+K$zU3@8mfgc$ptb+{j1nRFuw#3lUC=eth}y<}ORR}D&u`ls{u;eD`HL`buQG)u5|w`}h-Y-$k^y!V$BfS|Zq#bF;N8?_Sl z-}5k~h@g}jM|Wk7J#XZ%$Da&U9r(Jk#+5b4r+wH;05^EdHPxg;`PT1tIZ0TIW;vko%2Ce?>%kP(f2(~-Li}qW5K~w zoEuz!C26>~03h7@@0bT^8P ztis*sD#C+okPl~!z}=yX%wlB{9+(-mCS$wt>*r5Af~q1SFd8tlMPLRr%$1zy3Bbw) zz+5LEj}NvH&>%AawtXYQ&vKyV}!X>JT#^~;+!$xJ&U01AYVkRPjs!MT%qgBmZi|R&Z zR2gP4k3SfYRTzeKBZ;bfrf}g!7j8llS#AICMi7)yDC7&=}`Rwr!BrR5x+8 x?PVP7+Xi|O0VclO--xkM>qHXP&6?M)`~`88C+khq9Z3KH002ovPDHLkV1j_E3-bT~ literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_top.png new file mode 100644 index 0000000000000000000000000000000000000000..69d2e0bfdffc760bed2d9936723cbe5d8803207b GIT binary patch literal 681 zcmV;a0#^NrP) zKI-R>@1nIrDTSvr+S3?M^S@Wu4FH$AK@i$jFrKFg{2Tm%=?kY5+sB*CUFBPsb7vDa znWNZO7_C$qRCo3db-A0Z>|@)vI_oj@Ul0xHQt`{teTK z#nT?=^BJ31c4f)XAF^7eOeYqF!WiQ*omke(l>5g|9LpWm>BQl1KzkmSy2iihJc`1u zvxu*;h5`JiTJU9~kEAEpZexpFOc!%m7#~Q*2@p z0bMs8U88{p5nl3wBb$!)Tb#p1P`6 zVH8G;!swl6Ev9W+M1;Dj5fSntzk=rt=kC-Yt3}F(`;W}h8BNoo1vnfl1_PfYPS8p- z3_^xM$Y|Vk(@HT4BUX!)IEtwbCDVyT0MoWD`{RkGZ7KH$?k1M%P?8rpNt}@71-CZg zSng;v#fBw>h%bQ~N{7pilO@jS}ob3b~%-ykBma@{lX#==W+K-!i+SU4n=LjB=M P00000NkvXXu0mjfM+!1R literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_side.png new file mode 100644 index 0000000000000000000000000000000000000000..32a8bfebd2cd0b3954d8c6a0c35e28a25673e9bd GIT binary patch literal 2007 zcmV;|2PpW7P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bxvg{@d{AU$e0uqSFaxgYk*+G_{220G?_vBV3 zm2sUhBZFSuG(PV7>(Al-z=wTGE=n$`rsVO7HCApI6n}s2JNdZ2^@q2?!|wJ2hAH44 z?w{$>`3-jYEXYyq$J6d|S3gA^nP+tvW@N@d=M{An__mY&c2(E4_*IVnjn3<_9QUL5 z@0ihyQ{XSK<10|`_%1U_n12)+?y|lsCQ(Qj$58Rjq5j-Ew}-Fh?a`}uzNtMtTj6}t z3F*}%wUhkZyVao=Y8LtNVDug0*WQh@jB(x7wV2SUhF-uN4=aOq~C6rjCq>@W1wY17LK*FS^nq4im z*47ZT!F9vxh8e9Le1sz&a-<_4<)}yNpihrodg{5CUVA(F3@5h#na=Faa@Mn5bb(4& zyyQw(zRFdvHo&zJMjSHI$fJxp+D1)LeWFG$#YB1+)E@;Y$Ow527 zM*`w`A^<}3#LO3pktcE!GhZ2-LKvu#OmI$`hylTP5zC;B-3Phf;^rj&E8O^>kaH8d z{{uNUp;P33#q9^w&bCgJumGC7aQ4)P0b#p5;&W*|o~5QWgp9R$pNGZ~g`xziVcrQn z3A`pjjn8Gl-WGCe2#npAA&>Y?b8SI6bJU&GDXs7z)}N8t*x|i7w5TKDWu`LB^;x(Fw9yN=i5V}aIb?& z%TwRQk9P;8xx3y<8mwd;^s2QnAGfJ{t5(xSj)%o+PV)xU@6@QKUHSQ}7u~VkvejmT z;`C99;px$vAGr3K(z}!FKiN734DGU6a#;t4dMcu`lT~ui6S(<)WIajmE*Yt)+?)iD zPa~(b)OW+ybwz;8R-g|`0ZnPXO=6;ObtjKI>*Jf>#7rEHr-j7&WQ;VZ$ zQ8wJl?w;7H)h!q;$6)xy&2G2T)+CXU?g?83Y=UjCoxi#ElJ1lobkkDtnq@yW1I9DT z&dsNgo+&x-?y$i0+8m}KAb=rAe&=+lOIdr$t!;T2<+ns+BdQb=reO(Z6DG-@&37}~ zd)u+m$auc`2ws+QwRM{Y47k4F+5vQ$vm+$e9S^`LwKoSVtVP4pQ7y)@Mt2yFVRM8tRqql zl3+-FqG@R#5ekOQrgeP6w*HsV!9J=;9f1=56%FUHbwmzLpc{a`T*hld$%#2g&E#9b ziTri`-Mtkf;MU&51jeM+H+cyzma``9y_aI~cNd7riptl4fV8Jjqd=T6(&noM@U?|qiy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jv9` z6)_!v1L~Uq00G-cL_t(I%T1HXb=@!wMK3^*`mzhkHU*^rN)lTlF=RpIpX`A*0`lwU zkLrE!`EjD6^wEh3A`>%1fXqZhm}~KQo?Q3M?>}E$_ZOB~wAMfbZH@2iLRHB~tQp_; z%`ihvsVpK3K^S8o0@|%1A^>78(7ORbJyina(*gpcA81if1r(zhBCwW&2=2l0)V194<){jgK^3?!G!sgMtj#J2 z=j%l`BQk-VfvN&KJb*1!P#y(qO(GKyXU-caj?r1}d|%faWVvsf1-XM2+cp29bd_;V;khDq^!P4y^zH002ovPDHLkV1ff@Cm~v{cabNrkHfe z>G2t}`Mf5$f-xCIRpPoXp0!HgJGib#J01|Vnz)XOs%4XBoF1P6aM*vq;jqVH@moT#kmQDxMbt;Oq(q zjTWvO;CUf8w>Na+h>P=cs;XjX5=4aQ!(yvwf@)cZ3Xquk#m^rW>B1u?f8JD9Wd7kZi#l#I2!c#%kvzk z$7kIAy#-*sDe*kFwqVlLeqF7tXh#udmEnj`Rux522P-0+ot$qU`t$Ues>)*06?vZF zI1aylU(=3T9QJwyzDKrR6GttUi9uD#)+vq%2zaXCID!Z~7Q3}m5|fgcbT5B0oncj} dc{N!r{09N8D$|RsG+h7y002ovPDHLkV1nVIG|vD4 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_side.png new file mode 100644 index 0000000000000000000000000000000000000000..c656696558567389d95946817c7f4eeaa03f6d21 GIT binary patch literal 650 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 IM6N<$f@A3O?EnA( literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_top.png new file mode 100644 index 0000000000000000000000000000000000000000..e060862e7a66b485affc10e0f6d74f20bdc2b298 GIT binary patch literal 729 zcmV;~0w(>5P) zK~y-)Rg+&+(@+q_e|wXr3GGnpGy>BRWspJCXL)k;gZNGSdc64OQ9ux>B9%V@N=log zZF1L#v{m+H@9fN;yL--A`SAX&A^_kxE&_;@1qICX4WO!6Ys;*Ps>Kx%0?)xQf~r#W zeLSy9HqJpOtUYS*^C}^zdW^>zX_BF;jPim>A-G}$#|VDlv)OI}5H@N=@sQ)o1kZIa z6uf@cB8rD}qLe%@u>F|a7PyXa0PZ#K?44q95X~_r0N|oGV5wOL;K#)f#~6$#2EY$| z_Pc!mcJ@wr+^VzHUPMIrb)6w197hRJJOp5Usm5ZX0V0?gVO#A*c2BOE^zDxjE3j>TX zCBQ7aio^PHo#lshF5{HjyNs{DZ)w*3Qf6bwi-Jy+a?tGo;LgxauVRkQZt<%DR+WAn zQ&_kgBz*pHg@~|wa)mJlwK?%%^bg?Uw=))em-XcbIF6xN_xXI3Q?)s@1)ry3ox^UA zm#Zy0Q976O)4_SU!uInOUaqz{?@t&_a+1-6cdyz2JZaVDT+GIf;vxIpKB`k0J5h=; z!uCeUpWcY$%Y?I=J1P~gWPIw6*}7q)hVNBSz*SYo;|vJ6=nZ)DVuiw5j0lI*9}l`c zI#GIWihg{HT3Z5SX~x%+9$W3k+$;b=u)vqY3tn$7&ujmKSZhlX^TJYODM#m}CuXr0 z21GY8ohY4~3Lr}}a;qqcYprFhf-y3cW;6$gZsL0xps*IE=M2JMna@6R%Q>@N00000 LNkvXXu0mjf^cP7D literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_side.png new file mode 100644 index 0000000000000000000000000000000000000000..55cb4cec3fdd8d2c466b30ddbf75a2aa6748b050 GIT binary patch literal 2054 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 literal 0 HcmV?d00001 From 68646b62b318e79e1efae8d89a683b57de196328 Mon Sep 17 00:00:00 2001 From: NO11 Date: Tue, 15 Jun 2021 17:24:53 +0000 Subject: [PATCH 5/8] Add some spaces --- mods/ITEMS/mcl_core/nodes_trees.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mods/ITEMS/mcl_core/nodes_trees.lua b/mods/ITEMS/mcl_core/nodes_trees.lua index e5757b92..3a1e2da0 100644 --- a/mods/ITEMS/mcl_core/nodes_trees.lua +++ b/mods/ITEMS/mcl_core/nodes_trees.lua @@ -17,7 +17,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, sounds = mcl_sounds.node_sound_wood_defaults(), on_rotate = on_rotate, _mcl_blast_resistance = 2, @@ -32,7 +32,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1,axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, sounds = mcl_sounds.node_sound_wood_defaults(), is_ground_content = false, on_rotate = on_rotate, @@ -99,7 +99,7 @@ local function register_wooden_planks(subname, description, tiles) tiles = tiles, stack_max = 64, is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=20}, + groups = {handy=1, axey=1, flammable=3,wood=1,building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=20}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 3, _mcl_hardness = 2, @@ -151,7 +151,7 @@ local register_leaves = function(subname, description, longdesc, tiles, sapling, tiles = tiles, paramtype = "light", stack_max = 64, - groups = {handy=1,shearsy=1,swordy=1, leafdecay=leafdecay_distance, flammable=2, leaves=1, deco_block=1, dig_by_piston=1, fire_encouragement=30, fire_flammability=60}, + groups = {handy=1, shearsy=1, swordy=1, leafdecay=leafdecay_distance, flammable=2, leaves=1, deco_block=1, dig_by_piston=1, fire_encouragement=30, fire_flammability=60}, drop = get_drops(0), _mcl_shears_drop = true, sounds = mcl_sounds.node_sound_leaves_defaults(), @@ -182,7 +182,7 @@ local function register_sapling(subname, description, longdesc, tt_help, texture fixed = selbox }, stack_max = 64, - groups = {dig_immediate=3, plant=1,sapling=1,non_mycelium_plant=1,attached_node=1,dig_by_water=1,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1}, + groups = {dig_immediate=3, plant=1, sapling=1, non_mycelium_plant=1, attached_node=1, dig_by_water=1, dig_by_piston=1, destroy_by_lava_flow=1, deco_block=1}, sounds = mcl_sounds.node_sound_leaves_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) From 508b08dfd3527ea3067eb2ac86c160e5ab4c1aa7 Mon Sep 17 00:00:00 2001 From: NO11 Date: Fri, 18 Jun 2021 19:01:50 +0000 Subject: [PATCH 6/8] Add specific help text for stripped wood --- mods/ITEMS/mcl_core/nodes_trees.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mods/ITEMS/mcl_core/nodes_trees.lua b/mods/ITEMS/mcl_core/nodes_trees.lua index 3a1e2da0..a6dbc389 100644 --- a/mods/ITEMS/mcl_core/nodes_trees.lua +++ b/mods/ITEMS/mcl_core/nodes_trees.lua @@ -51,7 +51,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark, end -- Register stripped trunk and stripped wood -local function register_stripped_trunk(subname, description_stripped_trunk, description_stripped_bark, longdesc, tile_stripped_inner, tile_stripped_bark) +local function register_stripped_trunk(subname, description_stripped_trunk, description_stripped_bark, longdesc, longdesc_wood, tile_stripped_inner, tile_stripped_bark) minetest.register_node("mcl_core:"..subname, { description = description_stripped_trunk, _doc_items_longdesc = longdesc, @@ -69,7 +69,7 @@ local function register_stripped_trunk(subname, description_stripped_trunk, desc minetest.register_node("mcl_core:"..subname.."_bark", { description = description_stripped_bark, - _doc_items_longdesc = S("This is a decorative block."), + _doc_items_longdesc = longdesc_wood, tiles = {tile_stripped_bark}, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, @@ -211,12 +211,12 @@ register_tree_trunk("sprucetree", S("Spruce Wood"), S("Spruce Bark"), S("The tru register_tree_trunk("birchtree", S("Birch Wood"), S("Birch Bark"), S("The trunk of a birch tree."), "mcl_core_log_birch_top.png", "mcl_core_log_birch.png", "mcl_core:stripped_birch") register_tree_trunk("jungletree", S("Jungle Wood"), S("Jungle Bark"), S("The trunk of a jungle tree."), "default_jungletree_top.png", "default_jungletree.png", "mcl_core:stripped_jungle") -register_stripped_trunk("stripped_oak", S("Stripped Oak Log"), S("Stripped Oak Wood"), S("The stripped trunk of an oak tree."), "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png") -register_stripped_trunk("stripped_acacia", S("Stripped Acacia Log"), S("Stripped Acacia Wood"), S("The stripped trunk of an acacia tree."), "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png") -register_stripped_trunk("stripped_dark_oak", S("Stripped Dark Oak Log"), S("Stripped Dark Oak Wood"), S("The stripped trunk of an dark oak tree."), "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png") -register_stripped_trunk("stripped_birch", S("Stripped Birch Log"), S("Stripped Birch Wood"), S("The stripped trunk of an birch tree."), "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png") -register_stripped_trunk("stripped_spruce", S("Stripped Spruce Log"), S("Stripped Spruce Wood"), S("The stripped trunk of an spruce tree."), "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png") -register_stripped_trunk("stripped_jungle", S("Stripped Jungle Log"), S("Stripped Jungle Wood"), S("The stripped trunk of an jungle tree."),"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png") +register_stripped_trunk("stripped_oak", S("Stripped Oak Log"), S("Stripped Oak Wood"), S("The stripped trunk of an oak tree."), S("The stripped wood of an oak tree."), "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png") +register_stripped_trunk("stripped_acacia", S("Stripped Acacia Log"), S("Stripped Acacia Wood"), S("The stripped trunk of an acacia tree."), S("The stripped wood of an acacia tree."), "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png") +register_stripped_trunk("stripped_dark_oak", S("Stripped Dark Oak Log"), S("Stripped Dark Oak Wood"), S("The stripped trunk of a dark oak tree."), S("The stripped wood of a dark oak tree."), "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png") +register_stripped_trunk("stripped_birch", S("Stripped Birch Log"), S("Stripped Birch Wood"), S("The stripped trunk of a birch tree."), S("The stripped wood of a birch tree."), "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png") +register_stripped_trunk("stripped_spruce", S("Stripped Spruce Log"), S("Stripped Spruce Wood"), S("The stripped trunk of a spruce tree."), S("The stripped wood of a spruce tree."), "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png") +register_stripped_trunk("stripped_jungle", S("Stripped Jungle Log"), S("Stripped Jungle Wood"), S("The stripped trunk of a jungle tree."), S("The stripped wood of a jungle tree."),"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png") register_wooden_planks("wood", S("Oak Wood Planks"), {"default_wood.png"}) register_wooden_planks("darkwood", S("Dark Oak Wood Planks"), {"mcl_core_planks_big_oak.png"}) From 50e913b3708f60aa90eef2797c91a45710f12488 Mon Sep 17 00:00:00 2001 From: NO11 Date: Fri, 18 Jun 2021 19:18:28 +0000 Subject: [PATCH 7/8] Add template for stripped wood translation --- mods/ITEMS/mcl_core/locale/template.txt | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/mods/ITEMS/mcl_core/locale/template.txt b/mods/ITEMS/mcl_core/locale/template.txt index f988435a..5e3223df 100644 --- a/mods/ITEMS/mcl_core/locale/template.txt +++ b/mods/ITEMS/mcl_core/locale/template.txt @@ -202,18 +202,42 @@ Stained glass is a decorative and mostly transparent block which comes in variou Stick= Sticks are a very versatile crafting material; used in countless crafting recipes.= Stone= +Stripped Acacia Log= +Stripped Acacia Wood= +Stripped Birch Log= +Stripped Birch Wood= +Stripped Dark Oak Log= +Stripped Dark Oak Wood= +Stripped Jungle Log= +Stripped Jungle Wood= +Stripped Oak Log= +Stripped Oak Wood= +Stripped Spruce Log= +Stripped Spruce Wood= Stone Bricks= Sugar= Sugar Canes= Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.= Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.= Sugar comes from sugar canes and is used to make sweet foods.= +The stripped trunk of an acacia tree.= +The stripped trunk of a birch tree.= +The stripped trunk of a dark oak tree.= +The stripped trunk of a jungle tree.= +The stripped trunk of an oak tree.= +The stripped trunk of a spruce tree.= The trunk of a birch tree.= The trunk of a dark oak tree.= The trunk of a jungle tree.= The trunk of a spruce tree.= The trunk of an acacia.= The trunk of an oak tree.= +The stripped wood of an acacia tree.= +The stripped wood of a birch tree.= +The stripped wood of a dark oak tree.= +The stripped wood of a jungle tree.= +The stripped wood of an oak tree.= +The stripped wood of a spruce tree.= This block consists of a couple of loose stones and can't support itself.= This is a decorative block surrounded by the bark of a tree trunk.= This is a full block of snow. Snow of this thickness is usually found in areas of extreme cold.= From 3759d503440e4558566076a41b68b1f60ddce8e8 Mon Sep 17 00:00:00 2001 From: NO11 Date: Fri, 18 Jun 2021 19:25:18 +0000 Subject: [PATCH 8/8] Add german translation for stripped wood --- mods/ITEMS/mcl_core/locale/mcl_core.de.tr | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr index 57ef530a..37d9db63 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr @@ -202,18 +202,42 @@ Stained glass is a decorative and mostly transparent block which comes in variou Stick=Stock Sticks are a very versatile crafting material; used in countless crafting recipes.=Stöcke sind ein vielseitiges Material, sie werden in zahllosen Fertigungsrezepten gebraucht. Stone=Stein +Stripped Acacia Log=Entrindeter Akazienstamm +Stripped Acacia Wood=Entrindetes Akazienholz +Stripped Birch Log=Entrindeter Birkenstamm +Stripped Birch Wood=Entrindetes Birkenholz +Stripped Dark Oak Log=Entrindeter Schwarzeichenstamm +Stripped Dark Oak Wood=Entrindetes Schwarzeichenholz +Stripped Jungle Log=Entrindeter Dschungelbaumstamm +Stripped Jungle Wood=Entrindetes Dschungelholz +Stripped Oak Log=Entrindeter Eichenstamm +Stripped Oak Wood=Entrindetes Eichenholz +Stripped Spruce Log=Entrindeter Fichtenstamm +Stripped Spruce Wood=Entrindetes Fichtenholz Stone Bricks=Steinziegel Sugar=Zucker Sugar Canes=Zuckerrohr Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.=Zuckerrohr ist eine Pflanze, die in der Herstellung gebraucht wird. Zuckerrohr wird in der Nähe von Wasser bis zu 3 zusätzliche Blöcke wachsen lassen, wenn sie sich neben Wasser befinden und auf einem Grasblock, auf Erde, Sand, roten Sand, Podsol oder grobe Erde platziert wurden. Wird ein Zuckerrohr abgebrochen, werden alle verbundenen Zuckerrohrblöcke ebenfalls abbrechen. Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=Zuckerrohr kann nur auf Zuckerrohr platziert werden und auf Blöcken, auf denen Zuckerrohr wachsen würde. Sugar comes from sugar canes and is used to make sweet foods.=Zucker kommt von Zuckerrohr und wird benutzt, um süße Lebensmittel zu machen. +The stripped trunk of an acacia tree.=Der entrindete Stamm einer Akazie. +The stripped trunk of a birch tree.=Der entrindete Stamm einer Birke. +The stripped trunk of a dark oak tree.=Der entrindete Stamm einer Schwarzeiche. +The stripped trunk of a jungle tree.=Der entrindete Stamm eines Dschungelbaums. +The stripped trunk of an oak tree.=Der entrindete Stamm einer Eiche. +The stripped trunk of a spruce tree.=Der entrindete Stamm einer Fichte. The trunk of a birch tree.=Der Baumstamm einer Birke. The trunk of a dark oak tree.=Der Baumstamm einer Schwarzeiche. The trunk of a jungle tree.=Der Baumstamm eines Dschungelbaums. The trunk of a spruce tree.=Der Baumstamm einer Fichte. The trunk of an acacia.=Der Baumstamm einer Akazie. The trunk of an oak tree.=Der Baumstamm einer Eiche. +The stripped wood of an acacia tree.=Das entrindete Holz einer Akazie. +The stripped wood of a birch tree.=Das entrindete Holz einer Birke. +The stripped wood of a dark oak tree.=Das entrindete Holz einer Schwarzeiche. +The stripped wood of a jungle tree.=Das entrindete Holz eines Dschungelbaums. +The stripped wood of an oak tree.=Das entrindete Holz einer Eiche. +The stripped wood of a spruce tree.=Das entrindete Holz einer Fichte. This block consists of a couple of loose stones and can't support itself.=Diser Block besteht aus ein paar losen Steinchen und kann sich nicht selbst tragen. This is a decorative block surrounded by the bark of a tree trunk.=Dies ist ein dekorativer Block, der von der Rinde eines Baumstamms umgeben ist. This is a full block of snow. Snow of this thickness is usually found in areas of extreme cold.=Ein ganzer Block aus Schnee. Schnee von dieser Dicke wird üblicherweise in Gebieten extremer Kälte gefunden.