Merge remote-tracking branch 'upstream/master'

- [3d_armor_ui] et [shields] sont concernés

.gitignore

@@ -4,7 +4,6 @@
 *bak*
 tags
 *.vim
-armor.conf
 
 ## Eclipse project files & directories
 .project

3d_armor/api.lua

@@ -352,7 +352,7 @@ armor.update_player_visuals = function(self, player)
 	end
 	local name = player:get_player_name()
 	if self.textures[name] then
-		player_api.set_textures(player, {
+		default.player_set_textures(player, {
 			self.textures[name].skin,
 			self.textures[name].armor,
 			self.textures[name].wielditem,
@@ -373,7 +373,7 @@ armor.set_player_armor = function(self, player)
 	local state = 0
 	local count = 0
 	local preview = armor:get_preview(name)
-	local texture = "blank.png"
+	local texture = "3d_armor_trans.png"
 	local physics = {}
 	local attributes = {}
 	local levels = {}
@@ -415,7 +415,7 @@ armor.set_player_armor = function(self, player)
 				end
 				-- DEPRECATED, use armor_groups instead
 				if def.groups["armor_radiation"] and levels["radiation"] then
-					levels["radiation"] = levels["radiation"] + def.groups["armor_radiation"]
+					levels["radiation"] = def.groups["armor_radiation"]
 				end
 			end
 			local item = stack:get_name()
@@ -694,9 +694,6 @@ armor.equip = function(self, player, itemstack)
 				index = i
 			end
 		end
-		if not index then -- armor inventory is full with other armor elements
-			return itemstack
-		end
 		local stack = itemstack:take_item()
 		armor_inv:set_stack("armor", index, stack)
 		self:run_callbacks("on_equip", player, index, stack)
@@ -722,14 +719,11 @@ armor.unequip = function(self, player, armor_element)
 		if self:get_element(stack:get_name()) == armor_element then
 			armor_inv:set_stack("armor", i, "")
 			minetest.after(0, function()
-				local pplayer = minetest.get_player_by_name(name)
-				if pplayer then -- player is still online
-					local inv = pplayer:get_inventory()
-					if inv:room_for_item("main", stack) then
-						inv:add_item("main", stack)
-					else
-						minetest.add_item(pplayer:get_pos(), stack)
-					end
+				local inv = player:get_inventory()
+				if inv:room_for_item("main", stack) then
+					inv:add_item("main", stack)
+				else
+					minetest.add_item(player:get_pos(), stack)
 				end
 			end)
 			self:run_callbacks("on_unequip", player, i, stack)

3d_armor/armor.conf

@@ -0,0 +1,37 @@
+-- Armor Configuration (defaults)
+
+-- Increase this if you get initialization glitches when a player first joins.
+ARMOR_INIT_DELAY = 3
+
+-- Number of initialization attempts.
+-- Use in conjunction with ARMOR_INIT_DELAY if initialization problems persist.
+ARMOR_INIT_TIMES = 3
+
+-- Increase this if armor is not getting into bones due to server lag.
+ARMOR_BONES_DELAY = 3
+
+-- How often player armor/wield items are updated.
+ARMOR_UPDATE_TIME = 1
+
+-- Drop armor when a player dies.
+-- Uses bones mod if present, otherwise items are dropped around the player.
+ARMOR_DROP = true
+
+-- Pulverise armor when a player dies, overrides ARMOR_DROP.
+ARMOR_DESTROY = false
+
+-- You can use this to increase or decrease overall armor effectiveness,
+-- eg: ARMOR_LEVEL_MULTIPLIER = 0.5 will reduce armor level by half.
+ARMOR_LEVEL_MULTIPLIER = 1
+
+-- You can use this to increase or decrease overall armor healing,
+-- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether.
+ARMOR_HEAL_MULTIPLIER = 1
+
+-- You can also use this file to execute arbitary lua code
+-- eg: Dumb the armor down if using Simple Mobs
+--if minetest.get_modpath("mobs") then
+--	ARMOR_LEVEL_MULTIPLIER = 1
+--	ARMOR_HEAL_MULTIPLIER = 0
+--end
+

3d_armor/init.lua

@@ -268,8 +268,8 @@ local function init_player_armor(initplayer)
 	local skin = armor:get_player_skin(name)
 	armor.textures[name] = {
 		skin = skin,
-		armor = "blank.png",
-		wielditem = "blank.png",
+		armor = "3d_armor_trans.png",
+		wielditem = "3d_armor_trans.png",
 		preview = armor.default_skin.."_preview.png",
 	}
 	local texture_path = minetest.get_modpath("player_textures")
@@ -291,26 +291,21 @@ player_api.register_model("3d_armor_character.b3d", {
 	animation_speed = 30,
 	textures = {
 		armor.default_skin..".png",
-		"blank.png",
-		"blank.png",
+		"3d_armor_trans.png",
+		"3d_armor_trans.png",
 	},
 	animations = {
 		stand = {x=0, y=79},
-		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}},
+		lay = {x=162, y=166},
 		walk = {x=168, y=187},
 		mine = {x=189, y=198},
 		walk_mine = {x=200, y=219},
-		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}},
+		sit = {x=81, y=160},
 		-- 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)
@@ -327,7 +322,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 end)
 
 minetest.register_on_joinplayer(function(player)
-	player_api.set_model(player, "3d_armor_character.b3d")
+	default.player_set_model(player, "3d_armor_character.b3d")
 	init_player_armor(player)
 end)
 
@@ -400,14 +395,10 @@ if armor.config.punch_damage == true then
 	minetest.register_on_punchplayer(function(player, hitter,
 			time_from_last_punch, tool_capabilities)
 		local name = player:get_player_name()
-		if hitter then
-			local hit_ip = hitter:is_player()
-			if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
-				return
-			end
-		end
-
-		if name then
+		local hit_ip = hitter:is_player()
+		if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
+			return
+		elseif name then
 			armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
 			last_punch_time[name] = minetest.get_gametime()
 		end
@@ -449,7 +440,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.5 then
+				if vel_y < 0 and vel_y < 3 then
 					vel_y = -(vel_y * 0.05)
 					player:add_velocity({x = 0, y = vel_y, z = 0})
 				end
@@ -500,3 +491,5 @@ if armor.config.fire_protect == true then
 		return hp_change
 	end, true)
 end
+
+minetest.log("action", "[3d_armor] loaded.")

3d_armor/locale/3d_armor.eo.tr

@@ -1,7 +1,7 @@
 # textdomain: 3d_armor
 Radiation=Radiado
 Level=Nivelo
-Heal=Blokŝanco
+Heal=Sanigi
 Fire=Fajro
 Your @1 is almost broken!=Via @1 estas preskaŭ rompita!
 Your @1 got destroyed!=Via @1 detruiĝis!

3d_armor/locale/3d_armor.pl.tr

@@ -1,7 +0,0 @@
-# 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!

3d_armor/locale/3d_armor.ru.tr

@@ -1,7 +1,7 @@
 # textdomain: 3d_armor
-Radiation=Излучение
-Level=Уровень
-Heal=Исцеление
-Fire=Пламя
-Your @1 is almost broken!=Ваш предмет «@1» почти сломан!
-Your @1 got destroyed!=Ваш предмет «@1» был уничтожен!
+Radiation=излучение
+Level=уровень
+Heal=исцеление
+Fire=огонь
+Your @1 is almost broken!=
+Your @1 got destroyed!=твой(и) @1 был(и) разрушен(ы)!

3d_armor/locale/3d_armor.uk.tr

@@ -1,7 +0,0 @@
-# textdomain: 3d_armor
-Radiation=Радіація
-Level=Рівень
-Heal=Зцілення
-Fire=Вогонь
-Your @1 is almost broken!=Ваш @1 майже зламаний!
-Your @1 got destroyed!=Ваш(і) @1 був(ли) зламаний(і)!

3d_armor_ip/locale/3d_armor_ip.eo.tr

@@ -1,3 +1,3 @@
 # textdomain: 3d_armor_ip
 Back=Dorso
-Armor=Armaĵo
+Armor=Kiraso

3d_armor_ip/locale/3d_armor_ip.ru.tr

@@ -1,3 +0,0 @@
-# textdomain: 3d_armor_ip
-Back=Назад
-Armor=Броня

3d_armor_ip/locale/3d_armor_ip.uk.tr

@@ -1,3 +0,0 @@
-# textdomain: 3d_armor_ip
-Back=Назад
-Armor=Броня

3d_armor_sfinv/init.lua

@@ -15,7 +15,7 @@ sfinv.register_page("3d_armor:armor", {
 	end
 })
 armor:register_on_update(function(player)
-	if sfinv.enabled and sfinv.get_page(player) == "3d_armor:armor" then
+	if sfinv.enabled then
 		sfinv.set_player_inventory_formspec(player)
 	end
 end)

3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr

@@ -1,2 +1,2 @@
 # textdomain: 3d_armor_sfinv
-Armor=Armaĵoj
+Armor=Kiraso

3d_armor_sfinv/locale/3d_armor_sfinv.ru.tr

@@ -1,2 +0,0 @@
-# textdomain: 3d_armor_sfinv
-Armor=Броня

3d_armor_sfinv/locale/3d_armor_sfinv.uk.tr

@@ -1,2 +0,0 @@
-# textdomain: 3d_armor_sfinv
-Armor=Броня

3d_armor_stand/init.lua

@@ -62,7 +62,7 @@ local function update_entity(pos)
 		object = minetest.add_entity(pos, "3d_armor_stand:armor_entity")
 	end
 	if object then
-		local texture = "blank.png"
+		local texture = "3d_armor_trans.png"
 		local textures = {}
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -144,9 +144,8 @@ minetest.register_node("3d_armor_stand:top", {
 	buildable_to = false,
 	drop = "",
 	groups = {not_in_creative_inventory = 1},
-	is_ground_content = false,
 	on_blast = function() end,
-	tiles = {"blank.png"},
+	tiles = {"3d_armor_trans.png"},
 })
 
 minetest.register_node("3d_armor_stand:armor_stand", {
@@ -166,7 +165,6 @@ minetest.register_node("3d_armor_stand:armor_stand", {
 		},
 	},
 	groups = {choppy=2, oddly_breakable_by_hand=2},
-	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@@ -236,7 +234,6 @@ minetest.register_node("3d_armor_stand:locked_armor_stand", {
 		},
 	},
 	groups = {choppy=2, oddly_breakable_by_hand=2},
-	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@@ -302,85 +299,6 @@ minetest.register_node("3d_armor_stand:locked_armor_stand", {
 	end,
 })
 
-minetest.register_node("3d_armor_stand:shared_armor_stand", {
-	description = S("Shared Armor Stand"),
-	drawtype = "mesh",
-	mesh = "3d_armor_stand.obj",
-	tiles = {"3d_armor_stand_shared.png"},
-	use_texture_alpha = "clip",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-0.25, -0.4375, -0.25, 0.25, 1.4, 0.25},
-			{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
-		},
-	},
-	groups = {choppy=2, oddly_breakable_by_hand=2},
-	is_ground_content = false,
-	sounds = default.node_sound_wood_defaults(),
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", armor_stand_formspec)
-		meta:set_string("infotext", S("Shared Armor Stand"))
-		local inv = meta:get_inventory()
-		for _, element in pairs(elements) do
-			inv:set_size("armor_"..element, 1)
-		end
-	end,
-	can_dig = function(pos, player)
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-		for _, element in pairs(elements) do
-			if not inv:is_empty("armor_"..element) then
-				return false
-			end
-		end
-		return true
-	end,
-	after_place_node = function(pos, placer)
-		minetest.add_entity(pos, "3d_armor_stand:armor_entity")
-		local meta = minetest.get_meta(pos)
-		meta:set_string("infotext", S("Shared Armor Stand"))
-		add_hidden_node(pos, placer)
-	end,
-	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		if not minetest.is_player(player) or minetest.is_protected(pos, player:get_player_name()) then
-			return 0
-		end
-		local def = stack:get_definition() or {}
-		local groups = def.groups or {}
-		if groups[listname] then
-			return 1
-		end
-		return 0
-	end,
-	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		if not minetest.is_player(player) or minetest.is_protected(pos, player:get_player_name()) then
-			return 0
-		end
-		return stack:get_count()
-	end,
-	allow_metadata_inventory_move = function(pos)
-		return 0
-	end,
-	on_metadata_inventory_put = function(pos)
-		update_entity(pos)
-	end,
-	on_metadata_inventory_take = function(pos)
-		update_entity(pos)
-	end,
-	after_destruct = function(pos)
-		update_entity(pos)
-		remove_hidden_node(pos)
-	end,
-	on_blast = function(pos)
-		-- Not affected by TNT
-	end,
-})
-
 minetest.register_entity("3d_armor_stand:armor_entity", {
 	initial_properties = {
 		physical = true,
@@ -388,7 +306,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
 		mesh = "3d_armor_entity.obj",
 		visual_size = {x=1, y=1},
 		collisionbox = {0,0,0,0,0,0},
-		textures = {"blank.png"},
+		textures = {"3d_armor_trans.png"},
 	},
 	_pos = nil,
 	on_activate = function(self)
@@ -410,7 +328,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
 })
 
 minetest.register_abm({
-	nodenames = {"3d_armor_stand:locked_armor_stand", "3d_armor_stand:shared_armor_stand", "3d_armor_stand:armor_stand"},
+	nodenames = {"3d_armor_stand:locked_armor_stand", "3d_armor_stand:armor_stand"},
 	interval = 15,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
@@ -437,9 +355,4 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "3d_armor_stand:shared_armor_stand",
-	recipe = {
-		{"3d_armor_stand:armor_stand", "default:copper_ingot"},
-	}
-})
+minetest.log("action", "[3d_armor_stand] loaded.")

3d_armor_stand/locale/3d_armor_stand.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: 3d_armor_stand
-Armor Stand Top=Armaĵtenila Supro
-Armor Stand=Armaĵtenilo
-Locked Armor Stand=Ŝlosita Armaĵtenilo
-Armor Stand (owned by @1)=Ŝlosita Armaĵtenilo (posedata de @1)
+Armor Stand Top=Kirasstando Supro
+Armor Stand=Kirasstando
+Locked Armor Stand=Ŝlosita Kirasstando
+Armor Stand (owned by @1)=Kirasstando (posedata de @1)

3d_armor_stand/locale/3d_armor_stand.es.tr

@@ -1,6 +0,0 @@
-# textdomain: 3d_armor_stand
-Armor Stand Top=
-Armor Stand=Soporte de armadura
-Locked Armor Stand=Soporte de armadura privado
-Shared Armor Stand=Soporte de armadura compartido
-Armor Stand (owned by @1)=Soporte de armadura (de @1)

3d_armor_stand/locale/3d_armor_stand.ru.tr

@@ -1,6 +0,0 @@
-# textdomain: 3d_armor_stand
-Armor Stand Top=Верх Стойки для Брони
-Armor Stand=Стойка для Брони
-Locked Armor Stand=Заблокированная Стойка для Брони
-Shared Armor Stand=Публичная Стойка для Брони
-Armor Stand (owned by @1)=Стойка для Брони (владалец: @1)

3d_armor_stand/locale/3d_armor_stand.uk.tr

@@ -1,5 +0,0 @@
-# textdomain: 3d_armor_stand
-Armor Stand Top=Верх Стійки для Броні
-Armor Stand=Стійка для Броні
-Locked Armor Stand=Закрита Стійка для Броні
-Armor Stand (owned by @1)=Стійка для Броні (власник @1)

3d_armor_stand/locale/template.txt

@@ -2,5 +2,4 @@
 Armor Stand Top=
 Armor Stand=
 Locked Armor Stand=
-Shared Armor Stand=
 Armor Stand (owned by @1)=

3d_armor_ui/init.lua

@@ -43,6 +43,9 @@ unified_inventory.register_page("armor", {
 			"image[3.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]"..
 			"label[6.0,"..(fy + 0.0)..";"..F(S("Level"))..": "..armor.def[name].level.."]"..
 			"label[6.0,"..(fy + 0.5)..";"..F(S("Heal"))..":  "..armor.def[name].heal.."]"..
+			"label[6.0,"..(fy + 2.0)..";"..F(S("Speed"))..":   "..armor.def[name].speed.."]"..
+			"label[6.0,"..(fy + 2.5)..";"..F(S("Jump"))..":    "..armor.def[name].jump.."]"..
+			"label[6.0,"..(fy + 3.0)..";"..F(S("Gravity"))..": "..armor.def[name].gravity.."]"..
 			"listring[current_player;main]"..
 			"listring[detached:"..name.."_armor;armor]"
 		if armor.config.fire_protect then
@@ -56,3 +59,5 @@ unified_inventory.register_page("armor", {
 		return {formspec=formspec}
 	end,
 })
+
+minetest.log("action", "[3d_armor_ui] loaded.")

3d_armor_ui/locale/3d_armor_ui.eo.tr

@@ -1,7 +1,7 @@
 # textdomain: 3d_armor_ui
-3D Armor=3D Armaĵoj
-Armor not initialized!=Armaĵoj ne pretigitaj!
-Armor=Armaĵo
+3D Armor=3D Kiraso
+Armor not initialized!=Kiraso ne pravigita!
+Armor=Kiraso
 Level=Nivelo
 Heal=Sanigi
 Fire=Fajro

3d_armor_ui/locale/3d_armor_ui.ru.tr

@@ -1,8 +0,0 @@
-# textdomain: 3d_armor_ui
-3D Armor=3D Броня
-Armor not initialized!=Броня не инициализирована!
-Armor=Броня
-Level=Уровень
-Heal=Исцеление
-Fire=Пламя
-Radiation=Излучение

3d_armor_ui/locale/3d_armor_ui.uk.tr

@@ -1,8 +0,0 @@
-# textdomain: 3d_armor_ui
-3D Armor=3D Броня
-Armor not initialized!=Броня не ініціалізована!
-Armor=Броня
-Level=Рівень
-Heal=Зцілення
-Fire=Вогонь
-Radiation=Радіація

armor_admin/init.lua

@@ -41,7 +41,7 @@ armor:register_armor(":3d_armor:chestplate_admin", {
 	description = S("Admin Chestplate"),
 	inventory_image = "3d_armor_inv_chestplate_admin.png",
 	armor_groups = {fleshy=100},
-	groups = {armor_torso=1, armor_heal=100, armor_use=0, armor_water=1,
+	groups = {armor_torso=1, armor_heal=100, armor_use=0,
 			not_in_creative_inventory=1},
 	on_drop = function(itemstack, dropper, pos)
 		return
@@ -61,7 +61,7 @@ armor:register_armor(":3d_armor:leggings_admin", {
 	description = S("Admin Leggings"),
 	inventory_image = "3d_armor_inv_leggings_admin.png",
 	armor_groups = {fleshy=100},
-	groups = {armor_legs=1, armor_heal=100, armor_use=0, armor_water=1,
+	groups = {armor_legs=1, armor_heal=100, armor_use=0,
 			not_in_creative_inventory=1},
 	on_drop = function(itemstack, dropper, pos)
 		return
@@ -82,7 +82,7 @@ armor:register_armor(":3d_armor:boots_admin", {
 	inventory_image = "3d_armor_inv_boots_admin.png",
 	armor_groups = {fleshy=100},
 	groups = {armor_feet=1, armor_heal=100, armor_use=0, physics_speed=1,
-			armor_water=1, not_in_creative_inventory=1},
+			not_in_creative_inventory=1},
 	on_drop = function(itemstack, dropper, pos)
 		return
 	end,

armor_admin/locale/armor_admin.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_admin
 Admin Helmet=Administra Kasko
-Admin Chestplate=Administra Kiraso
+Admin Chestplate=Administra Brustkiraso
 Admin Leggings=Administra Pantalono
-Admin Boots=Administraj Botoj
+Admin Boots=Administra Botoj

armor_admin/locale/armor_admin.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_admin
-Admin Helmet=Шлем Админа
-Admin Chestplate=Нагрудник Админа
-Admin Leggings=Поножи Админа
-Admin Boots=Ботинки Админа
+Admin Helmet=шлем админа
+Admin Chestplate=бронежилет админа
+Admin Leggings=гамаши админа
+Admin Boots=ботинки админа

armor_admin/locale/armor_admin.uk.tr

@@ -1,5 +0,0 @@
-# textdomain: armor_admin
-Admin Helmet=Шолом адміна
-Admin Chestplate=Броня адміна
-Admin Leggings=Штани адміна
-Admin Boots=Взуття адміна

armor_bronze/locale/armor_bronze.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_bronze
 Bronze Helmet=Bronza Kasko
-Bronze Chestplate=Bronza Kiraso
+Bronze Chestplate=Bronza Brustkiraso
 Bronze Leggings=Bronza Pantalono
-Bronze Boots=Bronzaj Botoj
+Bronze Boots=Bronza Botoj

armor_bronze/locale/armor_bronze.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_bronze
-Bronze Helmet=Бронзовый Шлем
-Bronze Chestplate=Бронзовый Нагрудник
-Bronze Leggings=Бронзовые Поножи
-Bronze Boots=Бронзовые Ботинки
+Bronze Helmet=бронзовый шлем
+Bronze Chestplate=бронзовый бронежилет
+Bronze Leggings=бронзовые гамаши
+Bronze Boots=бронзовые ботинки

armor_bronze/locale/armor_bronze.uk.tr

@@ -1,5 +0,0 @@
-# textdomain: armor_bronze
-Bronze Helmet=Бронзовий шолом
-Bronze Chestplate=Бронзова броня
-Bronze Leggings=Бронзові штани
-Bronze Boots=Бронзове взуття

armor_cactus/locale/armor_cactus.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_cactus
 Cactus Helmet=Kakta Kasko
-Cactus Chestplate=Kakta Kiraso
+Cactus Chestplate=Kakta Brustkiraso
 Cactus Leggings=Kakta Pantalono
-Cactus Boots=Kaktaj Botoj
+Cactus Boots=Kakta Botoj

armor_cactus/locale/armor_cactus.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_cactus
-Cactus Helmet=Кактусовый Шлем
-Cactus Chestplate=Кактусовый Нагрудник
-Cactus Leggings=Кактусовые Поножи
-Cactus Boots=Кактусовые Ботинки
+Cactus Helmet=кактусовый шлем
+Cactus Chestplate=кактусовый бронежилет
+Cactus Leggings=кактусовые гамаши
+Cactus Boots=кактусовые ботинки

armor_cactus/locale/armor_cactus.uk.tr

@@ -1,5 +0,0 @@
-# textdomain: armor_cactus
-Cactus Helmet=Кактусовий шолом
-Cactus Chestplate=Кактусова броня
-Cactus Leggings=Кактусові штани
-Cactus Boots=Кактусове взуття

armor_crystal/locale/armor_crystal.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_crystal
 Crystal Helmet=Kristala Kasko
-Crystal Chestplate=Kristala Kiraso
+Crystal Chestplate=Kristala Brustkiraso
 Crystal Leggings=Kristala Pantalono
-Crystal Boots=Kristalaj Botoj
+Crystal Boots=Kristala Botoj

armor_crystal/locale/armor_crystal.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_crystal
-Crystal Helmet=Кристальный Шлем
-Crystal Chestplate=Кристальный Нагрудник
-Crystal Leggings=Кристальные Поножи
-Crystal Boots=Кристальные Ботинки
+Crystal Helmet=кристалловый шлем
+Crystal Chestplate=кристалловый бронежилет
+Crystal Leggings=кристалловые гамаши
+Crystal Boots=кристалловые ботинки

armor_crystal/locale/armor_crystal.uk.tr

@@ -1,5 +0,0 @@
-# textdomain: armor_crystal
-Crystal Helmet=Кришталевий шолом
-Crystal Chestplate=Кришталева броня
-Crystal Leggings=Кришталеві штани
-Crystal Boots=Кришталеве взуття

armor_diamond/locale/armor_diamond.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_diamond
 Diamond Helmet=Diamanta Kasko
-Diamond Chestplate=Diamanta Kiraso
+Diamond Chestplate=Diamanta Brustkiraso
 Diamond Leggings=Diamanta Pantalono
-Diamond Boots=Diamantaj Botoj
+Diamond Boots=Diamanta Botoj

armor_diamond/locale/armor_diamond.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_diamond
-Diamond Helmet=Алмазный Шлем
-Diamond Chestplate=Алмазный Нагрудник
-Diamond Leggings=Алмазные Поножи
-Diamond Boots=Алмазные Ботинки
+Diamond Helmet=алмазный шлем
+Diamond Chestplate=алмазный бронежилет
+Diamond Leggings=алмазные гамаши
+Diamond Boots=алмазные ботинки

armor_diamond/locale/armor_diamond.uk.tr

@@ -1,5 +0,0 @@
-# textdomain: armor_diamond
-Diamond Helmet=Діамантовий шолом
-Diamond Chestplate=Діамантова броня
-Diamond Leggings=Діамантові штани
-Diamond Boots=Діамантове взуття