Merge remote-tracking branch 'upstream/master'

fix deployer issue nalc/nalc-server-mods#104
fix deprecated function
fix bad/Nonexistent collision detection on mobs/players, use collision box for very good detection
add translation client side

functions.lua

@@ -51,6 +51,7 @@ function spears_set_entity(spear_type, base_damage, toughness)
 			visual_size = {x = 0.3, y = 0.3, z = 0.3},
 			wield_item = "spears:spear_" .. spear_type,
 			collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
+			lastpos={},
 		},
 
 		on_activate = function (self, staticdata, dtime_s)

init.lua

@@ -11,4 +11,4 @@ dofile(minetest.get_modpath("spears").."/functions.lua")
 
 dofile(minetest.get_modpath("spears").."/tools.lua")
 
-minetest.log("action", "[MOD] Spears loaded with throwing speed " .. (minetest.settings:get("spears_throw_speed") or 13) .. " and drag coeff. " .. (minetest.settings:get("spears_drag_coeff") or 0.1))
+minetest.log("action", "[MOD] Spears loaded with throwing speed " .. minetest.settings:get("spears_throw_speed") .. " and drag coeff. " .. minetest.settings:get("spears_drag_coeff"))

locale/spears.eo.tr

@@ -1,9 +1,9 @@
 # textdomain: spears
-Stone Spear=Ŝtona ponardego
-Iron Spear=Fera ponardego
-Steel Spear=Ŝtala ponardego
-Copper Spear=Kupra ponardego
-Bronze Spear=Bronza ponardego
-Obsidian Spear=Obsidiana ponardego
-Diamond Spear=Diamanta ponardego
-Golden Spear=Ora ponardego
+Stone Spear=Ŝtona Ponardego
+Iron Spear=Fera Ponardego
+Steel Spear=Ŝtala Ponardego
+Copper Spear=Kupra Ponardego
+Bronze Spear=Bronza Ponardego
+Obsidian Spear=Obsidiana Ponardego
+Diamond Spear=Diamanta Ponardego
+Golden Spear=Ora Ponardego

locale/spears.fr.tr

@@ -0,0 +1,9 @@
+# textdomain: spears
+
+Stone spear=Lance en pierre
+Steel spear=Lance en acier
+Copper spear=Lance en cuivre
+Bronze spear=Lance en bronze
+Obsidian spear=Lance en obsidienne
+Diamond spear=Lance en diamant
+Golden spear=Lance en or

mod.conf

@@ -5,4 +5,3 @@ description = Add spears to Minetest, versatile weapons that can be thrown
 author = Echoes91
 title = Spears
 min_minetest_version = 5.4
-

tools.lua

@@ -15,6 +15,13 @@ function spears_register_spear(spear_type, desc, base_damage, toughness, materia
 			return itemstack
 		end,
 		on_place = function(itemstack, user, pointed_thing)
+			if pointed_thing.type == "node" then
+				local node = minetest.get_node(pointed_thing.under)
+				if minetest.registered_nodes[node.name] and (node.name == "itemframes:pedestal" or node.name == "itemframes:frame") then
+				    minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack)
+				    return itemstack
+				end
+			end
 			spears_throw(itemstack, user, pointed_thing)
 			if not minetest.settings:get_bool("creative_mode") then
 				itemstack:take_item()