Merge pull request #18 from minetest-mods/master

[pull] pandorabox from minetest-mods:master
This commit is contained in:
pull[bot] 2020-01-06 20:54:26 +00:00 committed by GitHub
commit b5921b8e90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -142,7 +142,7 @@ local iclipfence_def = {
local sclip_tex = { local sclip_tex = {
"technic_insulator_clip.png", "technic_insulator_clip.png",
{ name = "strut.png^steel_strut_overlay.png", color = "white" }, { name = "strut.png^technic_steel_strut_overlay.png", color = "white" },
{ name = "strut.png", color = "white" } { name = "strut.png", color = "white" }
} }

View File

@ -452,7 +452,7 @@ function technic.discharge_tools(meta, batt_charge, charge_step, max_charge)
if inv:is_empty("dst") then if inv:is_empty("dst") then
return batt_charge, false return batt_charge, false
end end
srcstack = inv:get_stack("dst", 1) local srcstack = inv:get_stack("dst", 1)
local toolname = srcstack:get_name() local toolname = srcstack:get_name()
if technic.power_tools[toolname] == nil then if technic.power_tools[toolname] == nil then
return batt_charge, false return batt_charge, false