develop #32

Merged
milan merged 7 commits from develop into master 2021-02-28 22:06:32 +01:00
2 changed files with 4 additions and 3 deletions
Showing only changes of commit 033ffd868f - Show all commits

View file

@ -89,8 +89,9 @@ circular_saw.names = {
} }
function circular_saw:get_cost(inv, stackname) function circular_saw:get_cost(inv, stackname)
local name = minetest.registered_aliases[stackname] or stackname
for i, item in pairs(inv:get_list("output")) do for i, item in pairs(inv:get_list("output")) do
if item:get_name() == stackname then if item:get_name() == name then
return circular_saw.cost_in_microblocks[i] return circular_saw.cost_in_microblocks[i]
end end
end end

View file

@ -1,13 +1,13 @@
local S = protector.intllib local S = protector.intllib
local radius = (tonumber(minetest.setting_get("protector_radius")) or 5) local radius = (tonumber(minetest.settings:get("protector_radius")) or 5)
-- radius limiter (minetest cannot handle node volume of more than 4096000) -- radius limiter (minetest cannot handle node volume of more than 4096000)
if radius > 22 then radius = 22 end if radius > 22 then radius = 22 end
local hud = {} local hud = {}
local hud_timer = 0 local hud_timer = 0
local hud_interval = (tonumber(minetest.setting_get("protector_hud_interval")) or 5) local hud_interval = (tonumber(minetest.settings:get("protector_hud_interval")) or 5)
if hud_interval > 0 then if hud_interval > 0 then
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)