Merge remote-tracking branch 'origin/master' into mapgen

CREDITS.md

@@ -9,7 +9,7 @@
 ## Maintainers
 * Fleckenstein
 * kay27
-* oilboi
+* jordan4ibanez
 
 ## Developers
 * bzoss
@@ -74,7 +74,7 @@
 * Rochambeau
 * rubenwardy
 * stu
-* oilboi
+* jordan4ibanez
 * 4aiman
 * Kahrl
 * Krock

mods/ENTITIES/mcl_boats/init.lua

@@ -394,7 +394,7 @@ for b=1, #boat_ids do
 	if b == 1 then
 		help = true
 		longdesc = S("Boats are used to travel on the surface of water.")
-		usagehelp = S("Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.")
+		usagehelp = S("Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.")
 		helpname = S("Boat")
 	end
 	tt_help = S("Water vehicle")

mods/ENTITIES/mcl_boats/locale/mcl_boats.de.tr

@@ -6,6 +6,7 @@ Boats are used to travel on the surface of water.=Boote werden benutzt, um sich
 Dark Oak Boat=Schwarzeichenboot
 Jungle Boat=Dschungelboot
 Oak Boat=Eichenboot
-Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Rechtsklicken Sie auf eine Wasserquelle, um das Boot zu platzieren. Rechtsklicken Sie auf das Boot, um es zu betreten. Mit [Links] und [Rechts] lenken, mit [Vorwärts] und [Rückwärts] Geschwindigkeit regeln oder rückwärts fahren. Rechtsklicken Sie erneut auf das Boot, um es zu verlassen, schlagen Sie das Boot, um es als Gegenstand fallen zu lassen.
+Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Rechtsklicken Sie auf eine Wasserquelle, um das Boot zu platzieren. Rechtsklicken Sie auf das Boot, um es zu betreten. Mit [Links] und [Rechts] lenken, mit [Vorwärts] und [Rückwärts] Geschwindigkeit regeln oder rückwärts fahren. Nutzen sie [Schleichen], um das Boot zu verlassen, schlagen Sie das Boot, um es als Gegenstand fallen zu lassen.
 Spruce Boat=Fichtenboot
 Water vehicle=Wasserfahrzeug
+Sneak to dismount=Zum Aussteigen schleichen

mods/ENTITIES/mcl_boats/locale/template.txt

@@ -6,6 +6,7 @@ Boats are used to travel on the surface of water.=
 Dark Oak Boat=
 Jungle Boat=
 Oak Boat=
-Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=
+Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=
 Spruce Boat=
 Water vehicle=
+Sneak to dismount=

mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.de.tr

@@ -33,3 +33,4 @@ Activates minecarts when powered=Aktiviert Loren, wenn bestromt
 Emits redstone power when a minecart is detected=Gibt ein Redstonesignal aus, wenn eine Lore erfasst wird
 Vehicle for fast travel on rails=Fahrzeug zum schnellen Transport auf Schienen
 Can be ignited by tools or powered activator rail=Kann mit Werkzeugen oder bestromten Aktivierungsschienen angezündet werden
+Sneak to dismount=Zum Aussteigen schleichen

mods/ITEMS/mcl_banners/locale/mcl_banners.de.tr

@@ -22,7 +22,7 @@ Magenta=magenta
 Orange Banner=Orange Banner
 Orange=orange
 Purple Banner=Violettes Banner
-Purple=violett
+Violet=violett
 Brown Banner=Braunes Banner
 Brown=braun
 Pink Banner=Rosa Banner

mods/ITEMS/mcl_banners/locale/mcl_banners.fr.tr

@@ -73,5 +73,5 @@ You can copy the pattern of a banner by placing two banners of the same color in
 @1 Base Indented=Pied dentelé (@1)t
 @1 Chief Indented=Tête dentelée (@1)
 And one additional layer=Et une couche supplémentaire
-And @1 additional layer(s)=Et @1 couche(s) supplémentaire(s)
+And @1 additional layers=Et @1 couches supplémentaires
 Paintable decoration=Décoration à peindre

mods/ITEMS/mcl_banners/locale/mcl_banners.ru.tr

@@ -73,5 +73,5 @@ You can copy the pattern of a banner by placing two banners of the same color in
 @1 Base Indented=@1 Инвертированный основной
 @1 Chief Indented=@1 Инвертированный главный
 And one additional layer=И один индивидуальный слой
-And @1 additional layer(s)=И @1 дополнительный(х) слой(я,ёв)
+And @1 additional layers=И @1 дополнительныйх слойёв
 Paintable decoration=Художественное украшение

mods/ITEMS/mcl_banners/locale/template.txt

@@ -73,5 +73,5 @@ You can copy the pattern of a banner by placing two banners of the same color in
 @1 Base Indented=
 @1 Chief Indented=
 And one additional layer=
-And @1 additional layer(s)=
+And @1 additional layers=
 Paintable decoration=

mods/ITEMS/mcl_cauldrons/init.lua

@@ -47,7 +47,7 @@ minetest.register_node("mcl_cauldrons:cauldron", {
 	description = S("Cauldron"),
 	_tt_help = S("Stores water"),
 	_doc_items_longdesc = S("Cauldrons are used to store water and slowly fill up under rain."),
-	_doc_items_usagehelp = S("Place a water pucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water."),
+	_doc_items_usagehelp = S("Place a water bucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water."),
 	wield_image = "mcl_cauldrons_cauldron.png",
 	inventory_image = "mcl_cauldrons_cauldron.png",
 	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,

mods/ITEMS/mcl_cauldrons/locale/mcl_cauldrons.de.tr

@@ -1,7 +1,7 @@
 # textdomain: mcl_cauldron
 Cauldron=Kessel
-Cauldrons are used to store water and slowly fill up under rain.=Kessel werden benutzt, um Wasser zu lagern, im Regen werden sie langsam aufgefüllt.
+Cauldrons are used to store water and slowly fill up under rain. They can also be used to wash off banners.=Kessel werden benutzt, um Wasser zu lagern, im Regen werden sie langsam aufgefüllt. Kessel können auch verwendet werden, um Banner abzuwaschen.
-Place a water pucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water.=Platzieren Sie einen Wassereinmer in den Kessel, um ihn mit Wasser zu füllen. Platzieren Sie einen leeren Eimer auf einen vollen Kessel, um das Wasser aufzusammeln. Platzieren Sie eine Wasserflasche in den Kessel, um ihn zu einem Drittel mit Wasser zu füllen.
+Place a water bucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water. Use an emblazoned banner on a cauldron with water to wash off its top layer.=Platzieren Sie einen Wassereinmer in den Kessel, um ihn mit Wasser zu füllen. Platzieren Sie einen leeren Eimer auf einen vollen Kessel, um das Wasser aufzusammeln. Platzieren Sie eine Wasserflasche in den Kessel, um ihn zu einem Drittel mit Wasser zu füllen. Benutzen Sie ein bemaltes Banner auf den Kessel, um die oberste Schicht abzuwaschen.
 Cauldron (1/3 Water)=Kessel (1/3 Wasser)
 Cauldron (2/3 Water)=Kessel (2/3 Wasser)
 Cauldron (3/3 Water)=Kessel (3/3 Wasser)

mods/ITEMS/mcl_cauldrons/locale/mcl_cauldrons.es.tr

@@ -1,7 +1,7 @@
 # textdomain: mcl_cauldron
 Cauldron=Caldera
 Cauldrons are used to store water and slowly fill up under rain.=Los calderos se usan para almacenar agua y llenarse lentamente bajo la lluvia.
-Place a water pucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water.=Coloque un cubo de agua en el caldero para llenarlo con agua. Coloque un cubo vacío en un caldero lleno para recuperar el agua. Coloque una botella de agua en el caldero para llenar el caldero hasta un tercio con agua. Coloque una botella de vidrio en un caldero con agua para recuperar un tercio del agua.
+Place a water bucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water.=Coloque un cubo de agua en el caldero para llenarlo con agua. Coloque un cubo vacío en un caldero lleno para recuperar el agua. Coloque una botella de agua en el caldero para llenar el caldero hasta un tercio con agua. Coloque una botella de vidrio en un caldero con agua para recuperar un tercio del agua.
 Cauldron (1/3 Water)=Caldera (1/3 de agua)
 Cauldron (2/3 Water)=Caldera (2/3 de agua)
 Cauldron (3/3 Water)=Caldera (3/3 de agua)

mods/ITEMS/mcl_cauldrons/locale/mcl_chaudrons.fr.tr

@@ -1,7 +1,7 @@
 # textdomain: mcl_cauldron
 Cauldron=Chaudrons
 Cauldrons are used to store water and slowly fill up under rain. They can also be used to wash off banners.=Les chaudrons sont utilisés pour stocker l'eau et se remplissent lentement sous la pluie. Ils peuvent également être utilisés pour laver les bannières.
-Place a water pucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water. Use an emblazoned banner on a cauldron with water to wash off its top layer.=Placez une marmite d'eau dans le chaudron pour le remplir d'eau. Placez un seau vide sur un chaudron plein pour récupérer l'eau. Placez une bouteille d'eau dans le chaudron pour remplir le chaudron au tiers avec de l'eau. Placez une bouteille en verre dans un chaudron avec de l'eau pour récupérer un tiers de l'eau. Utilisez une bannière blasonnée sur un chaudron avec de l'eau pour laver sa couche supérieure.
+Place a water bucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water. Use an emblazoned banner on a cauldron with water to wash off its top layer.=Placez une marmite d'eau dans le chaudron pour le remplir d'eau. Placez un seau vide sur un chaudron plein pour récupérer l'eau. Placez une bouteille d'eau dans le chaudron pour remplir le chaudron au tiers avec de l'eau. Placez une bouteille en verre dans un chaudron avec de l'eau pour récupérer un tiers de l'eau. Utilisez une bannière blasonnée sur un chaudron avec de l'eau pour laver sa couche supérieure.
 Cauldron (1/3 Water)=Chaudron (1/3 d'eau)
 Cauldron (2/3 Water)=Chaudron (2/3 d'eau)
 Cauldron (3/3 Water)=Chaudron (3/3 d'eau)

mods/ITEMS/mcl_cauldrons/locale/mcl_chaudrons.ru.tr

@@ -1,7 +1,7 @@
 # textdomain: mcl_cauldron
 Cauldron=Котёл
 Cauldrons are used to store water and slowly fill up under rain. They can also be used to wash off banners.=Котлы используются для хранения воды и медленного наполнения под дождём. Они также могут использоваться для промывания флагов.
-Place a water pucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water. Use an emblazoned banner on a cauldron with water to wash off its top layer.=Попытайтесь поместить ведро воды в котёл, чтобы наполнить его водой. Попытка поместить пустое ведро приведёт к освобождению котла. Поместите в котёл бутылку воды, чтобы наполнить его на треть.
+Place a water bucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water. Use an emblazoned banner on a cauldron with water to wash off its top layer.=Попытайтесь поместить ведро воды в котёл, чтобы наполнить его водой. Попытка поместить пустое ведро приведёт к освобождению котла. Поместите в котёл бутылку воды, чтобы наполнить его на треть.
 Cauldron (1/3 Water)=Котёл (1/3 воды)
 Cauldron (2/3 Water)=Котёл (2/3 воды)
 Cauldron (3/3 Water)=Котёл (3/3 воды)

mods/ITEMS/mcl_cauldrons/locale/template.txt

@@ -1,7 +1,7 @@
 # textdomain: mcl_cauldron
 Cauldron=
 Cauldrons are used to store water and slowly fill up under rain. They can also be used to wash off banners.=
-Place a water pucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water. Use an emblazoned banner on a cauldron with water to wash off its top layer.=
+Place a water bucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water. Use an emblazoned banner on a cauldron with water to wash off its top layer.=
 Cauldron (1/3 Water)=
 Cauldron (2/3 Water)=
 Cauldron (3/3 Water)=

mods/ITEMS/mcl_core/locale/mcl_core.de.tr

@@ -202,20 +202,39 @@ Stained glass is a decorative and mostly transparent block which comes in variou
 Stick=Stock
 Sticks are a very versatile crafting material; used in countless crafting recipes.=Stöcke sind ein vielseitiges Material, sie werden in zahllosen Fertigungsrezepten gebraucht.
 Stone=Stein
+Stripped Acacia Log=Entrindeter Akazienstamm
+Stripped Acacia Wood=Entrindetes Akazienholz
+Stripped Birch Log=Entrindeter Birkenstamm
+Stripped Birch Wood=Entrindetes Birkenholz
+Stripped Dark Oak Log=Entrindeter Schwarzeichenstamm
+Stripped Dark Oak Wood=Entrindetes Schwarzeichenholz
+Stripped Jungle Log=Entrindeter Dschungelbaumstamm
+Stripped Jungle Wood=Entrindetes Dschungelholz
+Stripped Oak Log=Entrindeter Eichenstamm
+Stripped Oak Wood=Entrindetes Eichenholz
+Stripped Spruce Log=Entrindeter Fichtenstamm
+Stripped Spruce Wood=Entrindetes Fichtenholz
 Stone Bricks=Steinziegel
 Sugar=Zucker
 Sugar Canes=Zuckerrohr
 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.=Zuckerrohr ist eine Pflanze, die in der Herstellung gebraucht wird. Zuckerrohr wird in der Nähe von Wasser bis zu 3 zusätzliche Blöcke wachsen lassen, wenn sie sich neben Wasser befinden und auf einem Grasblock, auf Erde, Sand, roten Sand, Podsol oder grobe Erde platziert wurden. Wird ein Zuckerrohr abgebrochen, werden alle verbundenen Zuckerrohrblöcke ebenfalls abbrechen.
 Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=Zuckerrohr kann nur auf Zuckerrohr platziert werden und auf Blöcken, auf denen Zuckerrohr wachsen würde.
 Sugar comes from sugar canes and is used to make sweet foods.=Zucker kommt von Zuckerrohr und wird benutzt, um süße Lebensmittel zu machen.
+The stripped trunk of an acacia tree.=Der entrindete Stamm einer Akazie.
+The stripped trunk of an birch tree.=Der entrindete Stamm einer Birke.
+The stripped trunk of an dark oak tree.=Der entrindete Stamm einer Schwarzeiche.
+The stripped trunk of an jungle tree.=Der entrindete Stamm eines Dschungelbaums.
+The stripped trunk of an oak tree.=Der entrindete Stamm einer Eiche.
+The stripped trunk of an spruce tree.=Der entrindete Stamm einer Fichte.
 The trunk of a birch tree.=Der Baumstamm einer Birke.
 The trunk of a dark oak tree.=Der Baumstamm einer Schwarzeiche.
 The trunk of a jungle tree.=Der Baumstamm eines Dschungelbaums.
 The trunk of a spruce tree.=Der Baumstamm einer Fichte.
 The trunk of an acacia.=Der Baumstamm einer Akazie.
 The trunk of an oak tree.=Der Baumstamm einer Eiche.
-This block consists of a couple of loose stones and can't support itself.=Diser Block besteht aus ein paar losen Steinchen und kann sich nicht selbst tragen.
+This block consists of a couple of loose stones and can't support itself.=Dieser Block besteht aus ein paar losen Steinchen und kann sich nicht selbst tragen.
 This is a decorative block surrounded by the bark of a tree trunk.=Dies ist ein dekorativer Block, der von der Rinde eines Baumstamms umgeben ist.
+This is a decorative block.=Dies ist ein dekorativer Block.
 This is a full block of snow. Snow of this thickness is usually found in areas of extreme cold.=Ein ganzer Block aus Schnee. Schnee von dieser Dicke wird üblicherweise in Gebieten extremer Kälte gefunden.
 This is a piece of cactus commonly found in dry areas, especially deserts. Over time, cacti will grow up to 3 blocks high on sand or red sand. A cactus hurts living beings touching it with a damage of 1 HP every half second. When a cactus block is broken, all cactus blocks connected above it will break as well.=Dies ist ein Teil eines Kaktus, der für gewöhnlich in trockenen Gebieten wächst, vorallem Wüsten. Im Laufe der Zeit werden Kakteen auf bis zu 3 Blöcke hoch auf Sand oder rotem Sand wachsen. Ein Kaktus verletzt Lebewesen, die ihn berühren, er richtet jede halbe Sekunden 1 Schaden an. Wenn ein Kaktusblock bricht, werden alle Kaktusblöcke darüber auch abbrechen.
 This stone contains pure gold, a rare metal.=Dieser Stein enthält pures Gold, ein seltenes Metall.

mods/ITEMS/mcl_core/locale/template.txt

@@ -202,12 +202,30 @@ Stained glass is a decorative and mostly transparent block which comes in variou
 Stick=
 Sticks are a very versatile crafting material; used in countless crafting recipes.=
 Stone=
+Stripped Acacia Log=
+Stripped Acacia Wood=
+Stripped Birch Log=
+Stripped Birch Wood=
+Stripped Dark Oak Log=
+Stripped Dark Oak Wood=
+Stripped Jungle Log=
+Stripped Jungle Wood=
+Stripped Oak Log=
+Stripped Oak Wood=
+Stripped Spruce Log=
+Stripped Spruce Wood=
 Stone Bricks=
 Sugar=
 Sugar Canes=
 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.=
 Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=
 Sugar comes from sugar canes and is used to make sweet foods.=
+The stripped trunk of an acacia tree.=
+The stripped trunk of an birch tree.=
+The stripped trunk of an dark oak tree.=
+The stripped trunk of an jungle tree.=
+The stripped trunk of an oak tree.=
+The stripped trunk of an spruce tree.=
 The trunk of a birch tree.=
 The trunk of a dark oak tree.=
 The trunk of a jungle tree.=
@@ -216,6 +234,7 @@ The trunk of an acacia.=
 The trunk of an oak tree.=
 This block consists of a couple of loose stones and can't support itself.=
 This is a decorative block surrounded by the bark of a tree trunk.=
+This is a decorative block.=
 This is a full block of snow. Snow of this thickness is usually found in areas of extreme cold.=
 This is a piece of cactus commonly found in dry areas, especially deserts. Over time, cacti will grow up to 3 blocks high on sand or red sand. A cactus hurts living beings touching it with a damage of 1 HP every half second. When a cactus block is broken, all cactus blocks connected above it will break as well.=
 This stone contains pure gold, a rare metal.=

mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.fr.tr

@@ -76,8 +76,8 @@ Reflects some of the damage taken when hit, at the cost of reducing durability w
 Unbreaking=Solidité
 Increases item durability.=Augmente la durabilité des objets.
 Inventory=Inventaire
-@1 × Lapis Lazuli=@1 × Lapis Lazuli
+@1 Lapis Lazuli=@1 Lapis Lazuli
-Enchantment levels: @1=Niveaux d'enchantement: @1 
+@1 Enchantment Levels=@1 Niveaux d'enchantement
 Level requirement: @1=Niveau requis: @1
 Enchant an item=Enchanter un objet
 <player> <enchantment> [<level>]=<joueur> <enchantement> [<niveau>]

mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.ru.tr

@@ -76,8 +76,8 @@ Reflects some of the damage taken when hit, at the cost of reducing durability w
 Unbreaking=Нерушимость
 Increases item durability.=Увеличивает прочность предмета.
 Inventory=Инвентарь
-@1 × Lapis Lazuli=@1 × Ляпис-лазурь
+@1 Lapis Lazuli=@1 Ляпис-лазурь
-Enchantment levels: @1=Уровень зачаровывания: @1
+@1 Enchantment Levels=@1 Уровень зачаровывания
 Level requirement: @1=Требуемый уровень: @1
 Enchant an item=Зачаровать предмет
 <player> <enchantment> [<level>]=<игрок> <зачарование> [<уровень>]

mods/ITEMS/mcl_enchanting/locale/template.txt

@@ -76,8 +76,8 @@ Reflects some of the damage taken when hit, at the cost of reducing durability w
 Unbreaking=
 Increases item durability.=
 Inventory=
-@1 × Lapis Lazuli=
+@1 Lapis Lazuli=
-Enchantment levels: @1=
+@1 Enchantment Levels=
 Level requirement: @1=
 Enchant an item=
 <player> <enchantment> [<level>]=

mods/ITEMS/mcl_fireworks/locale/template.txt

@@ -0,0 +1,3 @@
+# textdomain: mcl_fireworks
+Firework Rocket=
+Flight Duration:=

mods/ITEMS/mcl_flowerpots/locale/mcl_flowerpots.de.tr

@@ -1,6 +1,6 @@
 # textdomain: mcl_flowerpots
 Dandelion Flower Pot=Blumentopf mit Löwenzahn
-Poppy Floer Pot=Blumentopf mit Mohn
+Poppy Flower Pot=Blumentopf mit Mohn
 Blue Orchid Flower Pot=Blumentopf mit blauer Orchidee
 Allium Flower Pot=Blumentopf mit Sternlauch
 Azure Bluet Flower Pot=Blumentopf mit Porzellansternchen

mods/ITEMS/mcl_flowerpots/locale/mcl_flowerpots.es.tr

@@ -1,6 +1,6 @@
 # textdomain: mcl_flowerpots
 Dandelion Flower Pot=Maceta con diente de león
-Poppy Floer Pot=Maceta con amapola
+Poppy Flower Pot=Maceta con amapola
 Blue Orchid Flower Pot=Maceta con orquídeas azules
 Allium Flower Pot=Maceta con puerro
 Azure Bluet Flower Pot=Maceta con flor azul celeste

mods/PLAYER/mcl_playerplus/init.lua

@@ -4,6 +4,7 @@ mcl_playerplus = {
 	elytra = {},
 }
 
+local player_velocity_old = {x=0, y=0, z=0}
 local get_connected_players = minetest.get_connected_players
 local dir_to_yaw = minetest.dir_to_yaw
 local get_item_group = minetest.get_item_group
@@ -195,6 +196,12 @@ minetest.register_globalstep(function(dtime)
 			and (fly_node == "air" or fly_node == "ignore")
 
 		if elytra.active then
+			if player_velocity.x < (player_velocity_old.x - 10) or player_velocity.x > (player_velocity_old.x + 10) then
+				player:set_hp(player:get_hp() - (math.abs(player_velocity_old.x) * 0.2))
+			end
+			if player_velocity.z < (player_velocity_old.z - 10) or player_velocity.z > (player_velocity_old.z + 10) then
+				player:set_hp(player:get_hp() - (math.abs(player_velocity_old.z) * 0.2))
+			end
 			mcl_player.player_set_animation(player, "fly")
 			if player_velocity.y < -1.5 then
 				player:add_velocity({x=0, y=0.17, z=0})
@@ -240,6 +247,7 @@ minetest.register_globalstep(function(dtime)
 			playerphysics.remove_physics_factor(player, "gravity", "mcl_playerplus:elytra")
 		end
 
+		player_velocity_old = player:get_velocity() or player:get_player_velocity()
 		-- controls right and left arms pitch when shooting a bow
 		if string.find(wielded:get_name(), "mcl_bows:bow") and control.RMB and not control.LMB and not control.up and not control.down and not control.left and not control.right then
 			player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(pitch+90,-30,pitch * -1 * .35))