Merge remote-tracking branch 'upstream/master'

shields/init.lua

@@ -1,8 +1,7 @@
 -- support for i18n
-local S = armor_i18n.gettext
+local S = minetest.get_translator(minetest.get_current_modname())
 
 local disable_sounds = minetest.settings:get_bool("shields_disable_sounds")
-local use_moreores = minetest.get_modpath("moreores")
 local function play_sound_effect(player, name)
 	if not disable_sounds and player then
 		local pos = player:get_pos()
@@ -18,8 +17,6 @@ end
 
 if minetest.global_exists("armor") and armor.elements then
 	table.insert(armor.elements, "shield")
-	local mult = armor.config.level_multiplier or 1
-	armor.config.level_multiplier = mult * 0.9
 end
 
 -- Regisiter Shields
@@ -69,6 +66,11 @@ if armor.materials.wood then
 			{"default:steel_ingot"},
 		},
 	})
+	minetest.register_craft({
+		type = "fuel",
+		recipe = "shields:shield_wood",
+		burntime = 8,
+	})
 end
 
 if armor.materials.cactus then
@@ -108,6 +110,11 @@ if armor.materials.cactus then
 			{"default:steel_ingot"},
 		},
 	})
+	minetest.register_craft({
+		type = "fuel",
+		recipe = "shields:shield_cactus",
+		burntime = 16,
+	})
 end
 
 if armor.materials.steel then

shields/locale/shields.fr.tr

@@ -0,0 +1,16 @@
+# textdomain: shields
+
+
+### init.lua ###
+
+Admin Shield=Bouclier d'admin
+Bronze Shield=Bouclier en bronze
+Cactus Shield=Bouclier en cactus
+Crystal Shield=Bouclier en cristal
+Diamond Shield=Bouclier en diamant
+Enhanced Cactus Shield=Bouclier en cactus amélioré
+Enhanced Wood Shield=Bouclier en bois amélioré
+Gold Shield=Bouclier en or
+Mithril Shield=Bouclier en mithril
+Steel Shield=Bouclier en acier
+Wooden Shield=Bouclier en bois

shields/locale/template.txt

@@ -0,0 +1,16 @@
+# textdomain: shields
+
+
+### init.lua ###
+
+Admin Shield=
+Bronze Shield=
+Cactus Shield=
+Crystal Shield=
+Diamond Shield=
+Enhanced Cactus Shield=
+Enhanced Wood Shield=
+Gold Shield=
+Mithril Shield=
+Steel Shield=
+Wooden Shield=

shields/mod.conf

@@ -0,0 +1,3 @@
+name = shields
+depends = default, 3d_armor
+description = Adds visible shields to 3d armor.