Merge remote-tracking branch 'upstream/master'

3d_armor/init.lua

@@ -296,16 +296,21 @@ player_api.register_model("3d_armor_character.b3d", {
 	},
 	animations = {
 		stand = {x=0, y=79},
-		lay = {x=162, y=166},
+		lay = {x=162, y=166, eye_height = 0.3, override_local = true,
+			collisionbox = {-0.6, 0.0, -0.6, 0.6, 0.3, 0.6}},
 		walk = {x=168, y=187},
 		mine = {x=189, y=198},
 		walk_mine = {x=200, y=219},
-		sit = {x=81, y=160},
+		sit = {x=81, y=160, eye_height = 0.8, override_local = true,
+			collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.0, 0.3}},
 		-- compatibility w/ the emote mod
 		wave = {x = 192, y = 196, override_local = true},
 		point = {x = 196, y = 196, override_local = true},
 		freeze = {x = 205, y = 205, override_local = true},
 	},
+	collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3},
+	-- stepheight: use default
+	eye_height = 1.47,
 })
 
 minetest.register_on_player_receive_fields(function(player, formname, fields)
@@ -444,7 +449,7 @@ minetest.register_globalstep(function(dtime)
 			local name = player:get_player_name()
 			if armor.def[name].feather > 0 then
 				local vel_y = player:get_velocity().y
-				if vel_y < 0 and vel_y < 3 then
+				if vel_y < -0.5 then
 					vel_y = -(vel_y * 0.05)
 					player:add_velocity({x = 0, y = vel_y, z = 0})
 				end

3d_armor/locale/3d_armor.pl.tr

@@ -0,0 +1,7 @@
+# textdomain: 3d_armor
+Radiation=Promieniowanie
+Level=Poziom
+Heal=Uzdrawianie
+Fire=Ogień
+Your @1 is almost broken!=Twój @1 jest prawie zepsuty!
+Your @1 got destroyed!=Twój @1 został zniszczony!

armor_nether/mod.conf

@@ -1,4 +1,4 @@
 name = armor_nether
 depends = 3d_armor
 optional_depends = nether
-description = Adds craftable wood armor.
+description = Adds craftable nether armor.