merge upstream

This commit is contained in:
Milan 2022-08-25 17:51:59 +02:00
commit f3be63d874
697 changed files with 8307 additions and 2471 deletions

View file

@ -4,9 +4,8 @@
local S = default.get_translator
-- The hand
minetest.register_item(":", {
type = "none",
wield_image = "wieldhand.png",
-- Override the hand item registered in the engine in builtin/game/register.lua
minetest.override_item("", {
wield_scale = {x=1,y=1,z=2.5},
tool_capabilities = {
full_punch_interval = 0.9,
@ -453,46 +452,6 @@ for name, mat in pairs(craft_ingreds) do
})
end
minetest.register_tool("default:key", {
description = S("Key"),
inventory_image = "default_key.png",
groups = {key = 1, not_in_creative_inventory = 1},
stack_max = 1,
on_place = function(itemstack, placer, pointed_thing)
local under = pointed_thing.under
local node = minetest.get_node(under)
local def = minetest.registered_nodes[node.name]
if def and def.on_rightclick and
not (placer and placer:is_player() and
placer:get_player_control().sneak) then
return def.on_rightclick(under, node, placer, itemstack,
pointed_thing) or itemstack
end
if pointed_thing.type ~= "node" then
return itemstack
end
local pos = pointed_thing.under
node = minetest.get_node(pos)
if not node or node.name == "ignore" then
return itemstack
end
local ndef = minetest.registered_nodes[node.name]
if not ndef then
return itemstack
end
local on_key_use = ndef.on_key_use
if on_key_use then
on_key_use(pos, placer)
end
return nil
end
})
minetest.register_craft({
type = "fuel",
recipe = "default:pick_wood",