Merge branch 'master' into end_portal_frame

This commit is contained in:
NO11 2021-06-16 21:01:19 +00:00
commit 2361c1c797
2 changed files with 5 additions and 5 deletions

View File

@ -9,7 +9,7 @@ if mod_screwdriver then
end
-- Register tree trunk (wood) and bark
local function register_tree_trunk(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark, stripped_varient)
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,
@ -23,7 +23,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark,
on_rotate = on_rotate,
_mcl_blast_resistance = 2,
_mcl_hardness = 2,
_mcl_stripped_varient = stripped_varient,
_mcl_stripped_variant = stripped_variant,
})
minetest.register_node("mcl_core:"..subname.."_bark", {
@ -39,7 +39,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark,
on_rotate = on_rotate,
_mcl_blast_resistance = 2,
_mcl_hardness = 2,
_mcl_stripped_varient = stripped_varient.."_bark",
_mcl_stripped_variant = stripped_variant.."_bark",
})
minetest.register_craft({

View File

@ -368,10 +368,10 @@ local function make_stripped_trunk(itemstack, placer, pointed_thing)
return itemstack
end
if noddef._mcl_stripped_varient == nil then
if noddef._mcl_stripped_variant == nil then
return itemstack
else
minetest.swap_node(pointed_thing.under, {name=noddef._mcl_stripped_varient, param2=node.param2})
minetest.swap_node(pointed_thing.under, {name=noddef._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()