Merge branch 'master' into leather_horse_armor

mods/HELP/doc/doc_items/locale/doc_items.pt_BR.tr

@@ -53,8 +53,8 @@ Range: 4=Range: 4
 Rating @1=Classificação @1
 # @1 is minimal rating, @2 is maximum rating
 Rating @1-@2=Classificação @1-@2
-The fall damage on this block is increased by @1%.=O dano por queda nesse bloco é aumentado em @ 1%.
-The fall damage on this block is reduced by @1%.=O dano por queda nesse bloco é reduzido em @ 1%.
+The fall damage on this block is increased by @1%.=O dano por queda nesse bloco é aumentado em @1%.
+The fall damage on this block is reduced by @1%.=O dano por queda nesse bloco é reduzido em @1%.
 This block allows light to propagate with a small loss of brightness, and sunlight can even go through losslessly.=Esse bloco permite que a luz se propague com uma pequena perda de brilho, e a luz solar pode até passar sem perdas.
 This block allows light to propagate with a small loss of brightness.=Esse bloco permite que a luz se propague com uma pequena perda de brilho.
 This block allows sunlight to propagate without loss in brightness.=Esse bloco permite que a luz solar se propague sem perda de brilho.
@@ -78,7 +78,7 @@ This block connects to this block: @1.=Esse bloco se conecta a esse bloco: @1.
 This block decreases your breath and causes a drowning damage of @1 hit point every 2 seconds.=Esse bloco diminui a sua respiração e causa um dano por afogamento de @1 ponto de vida a cada 2 segundos.
 This block decreases your breath and causes a drowning damage of @1 hit points every 2 seconds.=Esse bloco diminui a sua respiração e causa um dano por afogamento de @1 pontos de vida a cada 2 segundos.
 This block is a light source with a light level of @1.=Esse bloco é uma fonte de luz com um nível de luz de @1.
-This block glows faintly with a light level of @1.=Esse bloco tem um brilho fraco com um nível de luz de @ 1.
+This block glows faintly with a light level of @1.=Esse bloco tem um brilho fraco com um nível de luz de @1.
 This block is a building block for creating various buildings.=Esse bloco é um bloco de construção para criar vários edifícios.
 This block is a liquid with these properties:=Esse bloco é um líquido com as seguintes propriedades:
 This block is affected by gravity and can fall.=Esse bloco é afetado pela gravidade e pode cair.
@@ -123,7 +123,7 @@ any level=qualquer nível
 level 0=nível 0
 level 0-@1=nivel 0-@1
 unknown=desconhecido
-Unknown item (@1)=Item desconhecido
+Unknown item (@1)=Item desconhecido (@1)
 • @1: @2=
 • @1: @2 HP=
 • @1: @2, @3=

mods/ITEMS/mcl_bamboo/bamboo_base.lua

@@ -203,11 +203,11 @@ local bamboo_def = {
 		if node_above_name ~= "mcl_core:water_source" and node_above_name ~= "mcl_core:lava_source"
 				and node_above_name ~= "mcl_nether:nether_lava_source" then
 			local _, position = minetest.item_place(place_item, placer, pointed_thing, fdir)
-			if not minetest.is_creative_enabled(placer:get_player_name()) then
-				itemstack:take_item(1)
-			end
-			if rand_height and rand_height > 1 then
-				if position then
+			if position then
+				if not minetest.is_creative_enabled(placer:get_player_name()) then
+					itemstack:take_item(1)
+				end
+				if rand_height and rand_height > 1 then
 					mcl_bamboo.mcl_log("Setting Height Data...")
 					meta = minetest.get_meta(position)
 					if meta then

mods/ITEMS/mcl_bamboo/locale/mcl_bamboo.ru.tr

@@ -0,0 +1,45 @@
+# textdomain: mcl_bamboo
+
+### bamboo_base.lua ###
+
+Bamboo=Бамбук
+Bamboo Mosaic Plank=Бамбуковая мозаика
+Bamboo Plank=Бамбуковые доски
+Stripped Bamboo Block=Блок обтёсанного бамбука
+Bamboo Block=Блок бамбука
+
+### bamboo_items.lua ###
+
+A bamboo button is a redstone component made out of stone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second.=Бамбуковая кнопка - это компонент красного камня, который изготовлен из краснокаменной руды. Ее можно нажать, чтобы обеспечить питание красному камню. При нажатии он приводит в действие соседние компоненты красного камня на 1 секунду.
+
+A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.=Деревянная нажимная пластина - это компонент красного камня, который снабжает окружающие блоки энергией красного камня, в то время как любой подвижный объект (включая выпавшие предметы, игроков и мобов) стоит на ней.
+
+Bamboo=Бамбук
+Bamboo Button=Бамбуковая кнопка
+Bamboo Door=Бамбуковая дверь
+Bamboo Fence=Бамбуковый забор
+Bamboo Fence Gate=Бамбуковая калитка
+Bamboo Mosaic Slab=Плита из бамбуковой мозаики
+Bamboo Mosaic Stair=Ступеньки из бамбуковой мозаики
+Bamboo Plank Slab=Бамбуковая плита из досок
+Bamboo Plank Stair=Бамбуковые ступеньки из досок
+Bamboo Pressure Plate=Бамбуковая нажимная плита
+Bamboo Slab=Бамбуковая плита
+Bamboo Stair=Бамбуковые ступеньки
+Bamboo Trapdoor=Бамбуковый люк
+Double Bamboo Mosaic Slab=Двойная бамбуковая мозаичная плита
+Double Bamboo Plank Slab=Двойная бамбуковая дощатая плита
+Double Bamboo Slab=Двойная бамбуковая плита
+Double Stripped Bamboo Slab=Двойная обтесанная бамбуковая плита
+Scaffolding=Строительные леса
+Scaffolding (horizontal)=Строительные леса (горизонтальный)
+Scaffolding block used to climb up or out across areas.=Блок строительных лесов, используемый для подъема вверх или перемещения по другим участкам.
+Stripped Bamboo Slab=Обтесанная бамбуковая плита
+Stripped Bamboo Stair=Обтесанные бамбуковые ступеньки
+
+To open or close the trapdoor, rightclick it or send a redstone signal to it.=Чтобы открыть или закрыть люк, щелкните по нему правой кнопкой мыши или отправьте на него сигнал redstone.
+
+Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.=Деревянные люки - это горизонтальные барьеры, которые можно открывать и закрывать вручную или по сигналу красного камня. Они занимают верхнюю или нижнюю часть блока, в зависимости от того, как они были размещены. Когда они открыты, по ним можно подниматься, как по лестнице.
+
+Wooden doors are 2-block high barriers which can be opened or closed by hand and by a redstone signal.=Деревянные двери представляют собой барьеры высотой в 2 блока, которые можно открывать или закрывать вручную и по сигналу redstone.
+To open or close a wooden door, rightclick it or supply its lower half with a redstone signal.=Чтобы открыть или закрыть деревянную дверь, щелкните по ней правой кнопкой мыши или снабдите ее нижнюю половину сигналом красного камня.

mods/ITEMS/mcl_beacons/locale/mcl_beacons.ru.tr

@@ -0,0 +1,6 @@
+# textdomain: mcl_beacons
+Beacon=Маяк
+Beacon:=Маяк:
+Primary Power:=Основной эффект:
+Inventory:=Инвентарь:
+

mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.ru.tr

@@ -0,0 +1,29 @@
+# textdomain: mcl_blackstone
+Blackstone=Чернит
+Polished Blackstone=Полированный чернит
+Chiseled Polished Blackstone=Резной полированный чернит
+Polished Blackstone Bricks=Полированный чернокаменный кирпич 
+Basalt=Базальт
+Polished Basalt=Полированный базальт
+Blackstone Slab=Чернитная плита
+Polished Blackstone Slab=Плита из полированного чернита
+Chiseled Polished Blackstone Slab=Резная полированная чернитная плита
+Polished Blackstone Brick Slab=Плита из полированно-чернитного кирпича
+Blackstone Stair=Чернитные ступеньки
+Polished Blackstone Stair=Ступеньки из полированно-чернитного кирпича
+Chiseled Polished Blackstone Stair=Резные полированные чернитные ступеньки
+Polished Blackstone Brick Stair=Ступеньки из полированно-чернитного кирпича
+Quartz Bricks=Кварцевые кирпичи
+Soul Torch=Факел душ
+Torches are light sources which can be placed at the side or on the top of most blocks.=Факелы - это источники света, которые могут быть размещены сбоку или сверху большинства блоков.
+Soul Lantern=Фонарь душ
+Soul Soil=Почва душ
+Eternal Soul Fire=Пламя душ
+Gilded Blackstone=Золочёный чернит
+Nether Gold Ore=Незерская золотая руда
+Smooth Basalt=Гладкий базальт
+Blackstone Wall=Чернитная стена
+Double Blackstone Slab=Двойная чернитная плита
+Polished Double Blackstone Slab=Полированная двойная чернитная плита
+Double Chiseled Polished Blackstone Slab=Двойная резная полированная чернитная плита
+Double Polished Blackstone Brick Slab=Двойная плита из полированно-чернитного кирпича

mods/ITEMS/mcl_bows/crossbow.lua

@@ -105,8 +105,20 @@ local function player_shoot_arrow(wielditem, player, power, damage, is_critical)
 	local yaw = player:get_look_horizontal()
 
 	if has_multishot_enchantment then
-		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir.x, y=dir.y, z=dir.z + .2}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
-		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir.x, y=dir.y, z=dir.z - .2}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
+		-- calculate rotation by 10 degrees 'left' and 'right' of facing direction
+		local pitch = player:get_look_vertical()
+		local pitch_c = math.cos(pitch)
+		local pitch_s = math.sin(pitch)
+		local yaw_c = math.cos(yaw + math.pi / 2)
+		local yaw_s = math.sin(yaw + math.pi / 2)
+
+		local rot_left =  {x =   yaw_c * pitch_s * math.pi / 18, y =   pitch_c * math.pi / 18, z =   yaw_s * pitch_s * math.pi / 18}
+		local rot_right = {x = - yaw_c * pitch_s * math.pi / 18, y = - pitch_c * math.pi / 18, z = - yaw_s * pitch_s * math.pi / 18}
+		local dir_left = vector.rotate(dir, rot_left)
+		local dir_right = vector.rotate(dir, rot_right)
+
+		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir_left.x, y=dir_left.y, z=dir_left.z}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
+		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir_right.x, y=dir_right.y, z=dir_right.z}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
 		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, dir, yaw, player, power, damage, is_critical, player:get_wielded_item(), true)
 	else
 		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, dir, yaw, player, power, damage, is_critical, player:get_wielded_item(), true)

mods/ITEMS/mcl_cherry_blossom/locale/mcl_cherry_blossom.ru.tr

@@ -0,0 +1,24 @@
+# textdomain: mcl_cherry_blossom
+Cherry Log=Вишнёвое бревно
+The trunk of a cherry blossom tree.=Ствол цветущего вишневого дерева.
+Stripped Cherry Log=Обтёсанное вишнёвое бревно
+The stripped trunk of a cherry blossom tree.=Обтёсанный ствол цветущей вишни.
+Cherry Bark=Вишня
+This is a decorative block surrounded by the bark of a tree trunk.=Это декоративный блок, окруженный корой ствола дерева.
+Stripped Cherry Wood=Обтёсанная вишнёвая древесина
+The stripped wood of a cherry blossom tree.=Обтёсанная древесина цветущей вишни.
+Cherry Wood Planks=Вишнёвые доски
+Cherry Leaves=Вишнёвые листья
+Cherry blossom leaves are grown from cherry blossom trees.=Листья цветущей вишни выращивают на вишневых деревьях.
+Cherry Sapling=Саженец вишни
+Cherry blossom sapling can be planted to grow cherry trees.=Саженец цветущей вишни можно посадить для выращивания вишневых деревьев.
+Cherry Door=Вишнёвая дверь
+Cherry Trapdoor=Вишнёвый люк
+Cherry Stairs=Вишнёвые ступеньки
+Cherry Slab=Вишнёвая плита
+Double Cherry Slab=Двойная вишнёвая плита 
+Cherry Sign=Вишнёвая табличка
+Cherry Fence=Вишнёвый забор
+Cherry Gate=Вишнёвая калитка
+Cherry Pressure Plate=Вишнёвая нажимная плита
+Cherry Button=Вишнёвая кнопка

mods/ITEMS/mcl_core/locale/mcl_core.pt_BR.tr

@@ -217,8 +217,7 @@ Stripped Spruce Wood=Madeira de Pinheiro Descascada
 Stone Bricks=Tijolo de Rocha
 Sugar=Açúcar
 Sugar Canes=Cana de Açúcar
-Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.=
-Canas de açúcar são plantas que possui alguns usos em fabricações. Canas de açúcar crescerão lentamente até 3 blocos quando estão próximas da água e são colocadas em blocos de grama, terra, areia, areia vermelha, podzol ou terra infértil.
+Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.=Canas de açúcar são plantas que possui alguns usos em fabricações. Canas de açúcar crescerão lentamente até 3 blocos quando estão próximas da água e são colocadas em blocos de grama, terra, areia, areia vermelha, podzol ou terra infértil. Quando uma cana de açúcar é quebrada, todas as canas de açúcar conectadas acima também se quebrarão.
 Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=Canas de açúcar só podem ser colocados emcima de outras canas de açúcar ou sobre blocos em qual elas podem crescer.
 Sugar comes from sugar canes and is used to make sweet foods.=Açúcar vem de canas de açúcar e é utilizado para fazer doces comidas.
 The stripped trunk of an acacia tree.=O tronco descascado de uma acácia.

mods/ITEMS/mcl_crimson/init.lua

@@ -681,7 +681,7 @@ mcl_doors:register_trapdoor("mcl_crimson:crimson_trapdoor", {
 	_doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."),
 	_doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."),
 	tile_front = "mcl_crimson_crimson_trapdoor.png",
-	tile_side = "mcl_crimson_crimson_hyphae_wood.png",
+	tile_side = "mcl_crimson_crimson_trapdoor_side.png",
 	wield_image = "mcl_crimson_crimson_trapdoor.png",
 	groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1},
 	_mcl_hardness = 3,
@@ -719,7 +719,7 @@ mcl_doors:register_trapdoor("mcl_crimson:warped_trapdoor", {
 	_doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."),
 	_doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."),
 	tile_front = "mcl_crimson_warped_trapdoor.png",
-	tile_side = "mcl_crimson_warped_hyphae_wood.png",
+	tile_side = "mcl_crimson_warped_trapdoor_side.png",
 	wield_image = "mcl_crimson_warped_trapdoor.png",
 	groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1},
 	_mcl_hardness = 3,

mods/ITEMS/mcl_mangrove/init.lua

@@ -298,7 +298,7 @@ mcl_doors:register_trapdoor("mcl_mangrove:mangrove_trapdoor", {
 	_doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."),
 	_doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."),
 	tile_front = "mcl_mangrove_trapdoor.png",
-	tile_side = "mcl_mangrove_planks.png",
+	tile_side = "mcl_mangrove_trapdoor_side.png",
 	wield_image = "mcl_mangrove_trapdoor.png",
 	groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1},
 	_mcl_hardness = 3,