Merge pull request #18 from minetest-mods/master

[pull] pandorabox from minetest-mods:master
mt-mods · Jan 6, 2020 · b5921b8 · b5921b8
2 parents 0544543 + e90b288
commit b5921b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/extranodes/init.lua b/extranodes/init.lua
@@ -142,7 +142,7 @@ local iclipfence_def = {
 
 local sclip_tex = {
 	"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" }
 }
 

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