Merge remote-tracking branch 'upstream/master'

3d_armor_stand/LICENSE.txt

@@ -1,43 +0,0 @@
-[mod] 3d Armor Stand [3d_armor_stand]
-=====================================
-
-License Source Code
--------------------
-
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Lecense Models
---------------
-
-Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0
-
-UV model mapping by tobyplowy(aka toby109tt)
-
-License Textures
-----------------
-
-3d_armor_stand.png
-3d_armor_stand_locked.png
-
-Copyright (C) 2017-2019 tobyplowy - CC BY-SA 3.0
-
-3d_armor_stand_feet.png
-3d_armor_stand_head.png
-3d_armor_stand_legs.png
-3d_armor_stand_torso.png
-
-Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0

3d_armor_stand/init.lua

@@ -300,26 +300,27 @@ minetest.register_node("3d_armor_stand:locked_armor_stand", {
 })
 
 minetest.register_entity("3d_armor_stand:armor_entity", {
-	physical = true,
-	visual = "mesh",
-	mesh = "3d_armor_entity.obj",
-	visual_size = {x=1, y=1},
-	collisionbox = {0,0,0,0,0,0},
-	textures = {"3d_armor_trans.png"},
-	pos = nil,
-	timer = 0,
+	initial_properties = {
+		physical = true,
+		visual = "mesh",
+		mesh = "3d_armor_entity.obj",
+		visual_size = {x=1, y=1},
+		collisionbox = {0,0,0,0,0,0},
+		textures = {"3d_armor_trans.png"},
+	},
+	_pos = nil,
 	on_activate = function(self)
 		local pos = self.object:get_pos()
 		if pos then
-			self.pos = vector.round(pos)
+			self._pos = vector.round(pos)
 			update_entity(pos)
 		end
 	end,
 	on_blast = function(self, damage)
 		local drops = {}
-		local node = minetest.get_node(self.pos)
+		local node = minetest.get_node(self._pos)
 		if node.name == "3d_armor_stand:armor_stand" then
-			drop_armor(self.pos)
+			drop_armor(self._pos)
 			self.object:remove()
 		end
 		return false, false, drops

3d_armor_stand/locale/3d_armor_stand.de.tr

@@ -0,0 +1,5 @@
+# textdomain: 3d_armor_stand
+Armor Stand Top=Rüstungsständeroberseite
+Armor Stand=Rüstungsständer
+Locked Armor Stand=Abgeschlossener Rüstungsständer
+Armor Stand (owned by @1)=Rüstungsständer (Eigentum von @1)