merge upstream

mods/fire/init.lua

@@ -92,7 +92,7 @@ minetest.register_tool("fire:flint_and_steel", {
 	on_use = function(itemstack, user, pointed_thing)
 		local sound_pos = pointed_thing.above or user:get_pos()
 		minetest.sound_play("fire_flint_and_steel",
-			{pos = sound_pos, gain = 0.5, max_hear_distance = 8}, true)
+			{pos = sound_pos, gain = 0.2, max_hear_distance = 8}, true)
 		local player_name = user:get_player_name()
 		if pointed_thing.type == "node" then
 			local node_under = minetest.get_node(pointed_thing.under).name
@@ -111,11 +111,10 @@ minetest.register_tool("fire:flint_and_steel", {
 				minetest.set_node(pointed_thing.above, {name = "fire:basic_flame"})
 			end
 		end
-		if not (creative and creative.is_enabled_for
-				and creative.is_enabled_for(player_name)) then
+		if not minetest.is_creative_enabled(player_name) then
 			-- Wear tool
 			local wdef = itemstack:get_definition()
-			itemstack:add_wear(1000)
+			itemstack:add_wear_by_uses(66)
 
 			-- Tool break sound
 			if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then

mods/fire/locale/fire.eo.tr

@@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=Fajro
+Permanent Fire=Ĉiama Fajro
+Flint and Steel=Siliko kaj Ŝtalo

mods/fire/locale/fire.es.tr

@@ -1,3 +1,4 @@
 # textdomain: fire
-Permanent Flame=Llama permanente
+Fire=Fuego
+Permanent Fire=Fuego permanente
 Flint and Steel=Yesca y pedernal

mods/fire/locale/fire.fr.tr

@@ -1,3 +1,10 @@
+# textdomain: fire
+Fire=Feu
+Permanent Fire=Feu qui brûle en permanence
+Flint and Steel=Briquet à silex en acier
+
+
+##### not used anymore #####
+
 # textdomain: fire
 Permanent Flame=Flamme permanente
-Flint and Steel=Briquet à silex en acier

mods/fire/locale/fire.id.tr

@@ -1,4 +1,4 @@
 # textdomain: fire
 Fire=Api
 Permanent Fire=Api Abadi
-Flint and Steel=Pemantik
+Flint and Steel=Pemantik Api

mods/fire/locale/fire.it.tr

@@ -1,3 +1,10 @@
-# textdomain: fire
-Permanent Flame=Fiamma permanente
-Flint and Steel=Acciarino
+# textdomain: fire
+Fire=
+Permanent Fire=
+Flint and Steel=Acciarino
+
+
+##### not used anymore #####
+
+# textdomain: fire
+Permanent Flame=Fiamma permanente

mods/fire/locale/fire.ja.tr

@@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=炎
+Permanent Fire=燃え続ける炎
+Flint and Steel=火打ち石と打ち金

mods/fire/locale/fire.jbo.tr

@@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=lo fagri
+Permanent Fire=lo vitno fagri
+Flint and Steel=lo fakro'i jo'u gasta

mods/fire/locale/fire.ms.tr

@@ -1,3 +1,10 @@
+# textdomain: fire
+Fire=
+Permanent Fire=
+Flint and Steel=Pemetik Api
+
+
+##### not used anymore #####
+
 # textdomain: fire
 Permanent Flame=Api Abadi
-Flint and Steel=Pemetik Api

mods/fire/locale/fire.pl.tr

@@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=Ogień
+Permanent Fire=Stały ogień
+Flint and Steel=Zapalniczka

mods/fire/locale/fire.pt_BR.tr

@@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=Fogo
+Permanent Fire=Fogo Permanente
+Flint and Steel=Sílex e Fogo

mods/fire/locale/fire.ru.tr

@@ -1,3 +1,10 @@
+# textdomain: fire
+Fire=Огонь
+Permanent Fire=Вечный Огонь
+Flint and Steel=Огниво
+
+
+##### not used anymore #####
+
 # textdomain: fire
 Permanent Flame=Вечный Огонь
-Flint and Steel=Огниво и Сталь

mods/fire/locale/fire.se.tr

@@ -1,3 +0,0 @@
-# textdomain: fire
-Permanent Flame=Permanent Eld
-Flint and Steel=Flinta och Stål

mods/fire/locale/fire.sk.tr

@@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=Oheň
+Permanent Fire=Stály oheň
+Flint and Steel=Pazúrik a ocieľka

mods/fire/locale/fire.sv.tr

@@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=Eld
+Permanent Fire=Permanent eld
+Flint and Steel=Flinta och stål

mods/fire/locale/fire.uk.tr

@@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=Вогонь
+Permanent Fire=Вічний Вогонь
+Flint and Steel=Кремінь і Сталь

mods/fire/locale/fire.zh_CN.tr

@@ -1,4 +1,4 @@
 # textdomain: fire
-Permanent Fire=永久火焰
-Flint and Steel=火石和钢
 Fire=火焰
+Permanent Fire=永久火焰
+Flint and Steel=火石和划片

mods/fire/locale/fire.zh_TW.tr

@@ -1,4 +1,4 @@
 # textdomain: fire
+Fire=火焰
 Permanent Fire=永久火焰
 Flint and Steel=火石和鋼
-Fire=火焰