Merge master into testing

mods/ITEMS/mcl_doors/locale/mcl_doors.de.tr

@@ -7,6 +7,8 @@ Birch Door=Birkentür
 Dark Oak Door=Schwarzeichentür
 Jungle Door=Dschungeltür
 Spruce Door=Fichtentür
+Crimson Door=
+Warped Door=
 Iron Door=Eisentür
 Iron doors are 2-block high barriers which can only be opened or closed by a redstone signal, but not by hand.=Eisentüren sind 2 Blöcke hohe Barrieren, die nur von einem Redstone-Signal geöffnet oder geschlossen werden können.
 To open or close an iron door, supply its lower half with a redstone signal.=Um eine Eisentür zu öffnen oder zu schließen, versorgen Sie die untere Hälfte mit einem Redstone-Signal.
@@ -16,6 +18,8 @@ Birch Trapdoor=Birkenfalltür
 Spruce Trapdoor=Fichtenfalltür
 Dark Oak Trapdoor=Schwarzeichenfalltür
 Jungle Trapdoor=Dschungelfalltür
+Crimson Trapdoor=
+Warped Trapdoor=
 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.=Holzfalltüren sind horizontale Barrieren, die von Hand oder mit einem Redstone-Signal geöffnet oder geschlossen werden können. Sie belegen den oberen oder unteren Teil eines Blocks, je nachdem, wie sie platziert wurden. Wenn geöffnet, können sie wie eine Leiter erklommen werden.
 To open or close the trapdoor, rightclick it or send a redstone signal to it.=Um die Falltür zu öffnen oder zu schließen, rechtsklicken Sie sie oder schicken Sie ein Redstone-Signal zu ihr.
 Iron Trapdoor=Eisenfalltür

mods/ITEMS/mcl_doors/locale/mcl_doors.es.tr

@@ -7,6 +7,8 @@ Birch Door=Puerta de abedul
 Dark Oak Door=Puerta de roble oscuro
 Jungle Door=Puerta de jungla
 Spruce Door=Puerta de abeto
+Crimson Door=
+Warped Door=
 Iron Door=Puerta de Hierro
 Iron doors are 2-block high barriers which can only be opened or closed by a redstone signal, but not by hand.=Las puertas de hierro son barreras altas de 2 bloques que solo se pueden abrir o cerrar mediante una señal de redstone, no a mano.
 To open or close an iron door, supply its lower half with a redstone signal.=Para abrir o cerrar una puerta de hierro, suministre a su mitad inferior una señal de redstone.
@@ -16,6 +18,8 @@ Birch Trapdoor=Trampilla de abedul
 Spruce Trapdoor=Trampilla de abeto
 Dark Oak Trapdoor=Trampilla de roble oscuro
 Jungle Trapdoor=Trampilla de jungla
+Crimson Trapdoor=
+Warped Trapdoor=
 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.=Las trampillas de madera son barreras horizontales que se pueden abrir y cerrar a mano o una señal de redstone. Ocupan la parte superior o inferior de un bloque, dependiendo de cómo se hayan colocado. Cuando están abiertos, se pueden subir como una escalera.
 To open or close the trapdoor, rightclick it or send a redstone signal to it.=Para abrir o cerrar la trampilla, haga clic derecho o envíele una señal de redstone.
 Iron Trapdoor=Trampilla de hierro

mods/ITEMS/mcl_doors/locale/mcl_doors.fr.tr

@@ -7,6 +7,8 @@ Birch Door=Porte en Bouleau
 Dark Oak Door=Porte en Chêne Noir
 Jungle Door=Porte en Acajou
 Spruce Door=Porte en Sapin
+Crimson Door=Porte Ecarlate
+Warped Door=Porte Tordue
 Iron Door=Porte en Fer
 Iron doors are 2-block high barriers which can only be opened or closed by a redstone signal, but not by hand.=Les portes en fer sont des barrières hautes à 2 blocs qui ne peuvent être ouvertes ou fermées que par un signal redstone, mais pas à la main.
 To open or close an iron door, supply its lower half with a redstone signal.=Pour ouvrir ou fermer une porte en fer, fournir à sa moitié inférieure un signal redstone.
@@ -16,6 +18,8 @@ Birch Trapdoor=Trappe en Bouleau
 Spruce Trapdoor=Trappe en Sapin
 Dark Oak Trapdoor=Trappe en Chêne Noir
 Jungle Trapdoor=Trappe en Acajou
+Crimson Trapdoor=Trappe Ecarlate
+Warped Trapdoor=Trappe Tordue
 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.=Les trappes en bois sont des barrières horizontales qui peuvent être ouvertes et fermées à la main ou par un signal redstone. Elles occupent la partie supérieure ou inférieure d'un bloc, selon la façon dont elles ont été placées. Lorsqu'elles sont ouvertes, elles peuvent être montées comme une échelle.
 To open or close the trapdoor, rightclick it or send a redstone signal to it.=Pour ouvrir ou fermer la trappe, faites un clic droit dessus ou envoyez-lui un signal redstone.
 Iron Trapdoor=Trappe en Fer

mods/ITEMS/mcl_doors/locale/mcl_doors.pl.tr

@@ -7,6 +7,8 @@ Birch Door=Brzozowe drzwi
 Dark Oak Door=Ciemno-dębowe drzwi
 Jungle Door=Tropikalne drzwi
 Spruce Door=Świerkowe drzwi
+Crimson Door=
+Warped Door=
 Iron Door=Żelazne drzwi
 Iron doors are 2-block high barriers which can only be opened or closed by a redstone signal, but not by hand.=Żelazne drzwi są blokami o wysokości dwa, które mogą być otwarte lub zamknięte przez zasilanie czerwienitem, ale nie ręcznie.
 To open or close an iron door, supply its lower half with a redstone signal.=Aby otworzyć lub zamknąć żelazne drzwi zasil ich dolną część czerwienitem.
@@ -16,6 +18,8 @@ Birch Trapdoor=Brzozowa klapa
 Spruce Trapdoor=Świerkowa klapa
 Dark Oak Trapdoor=Ciemno-dębowa klapa
 Jungle Trapdoor=Tropikalna klapa
+Crimson Trapdoor=
+Warped Trapdoor=
 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.=Drewniane klapy są poziomymi barierami, które mogą być otwarte i zamknięte ręcznie bądź przez zasilenie czerwienitem. Zajmują główną lub dolną część bloku w zależności od tego jak zostaną postawione. Gdy są otwarte można się po nich wspinać jak po drabinie.
 To open or close the trapdoor, rightclick it or send a redstone signal to it.=Aby otworzyć lub zamknąć drewniane klapy, kliknij je prawym przyciskiem bądź zasil ich dolną połowę czerwienitem.
 Iron Trapdoor=Żelazna klapa

mods/ITEMS/mcl_doors/locale/mcl_doors.ru.tr

@@ -7,6 +7,8 @@ Birch Door=Берёзовая дверь
 Dark Oak Door=Дверь из тёмного дуба
 Jungle Door=Дверь из тропического дерева
 Spruce Door=Еловая дверь
+Crimson Door=
+Warped Door=
 Iron Door=Железная дверь
 Iron doors are 2-block high barriers which can only be opened or closed by a redstone signal, but not by hand.=Железные двери это барьеры высотой в 2 блока, которые можно открывать и закрывать только по сигналу редстоуна, но не вручную.
 To open or close an iron door, supply its lower half with a redstone signal.=Чтобы открыть или закрыть железную дверь, подайте на её нижнюю часть сигнал редстоуна.
@@ -16,6 +18,8 @@ Birch Trapdoor=Берёзовый люк
 Spruce Trapdoor=Еловый люк
 Dark Oak Trapdoor=Люк из тёмного дуба
 Jungle Trapdoor=Люк из тропического дерева
+Crimson Trapdoor=
+Warped Trapdoor=
 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.=Деревянные люки это горизонтальные барьеры, которые можно открывать и закрывать вручную и по сигналу редстоуна. Они занимают верхнюю или нижнюю часть блока, в зависимости от того, как они были установлены. В открытом состоянии по ним можно карабкаться, как по лестницам.
 To open or close the trapdoor, rightclick it or send a redstone signal to it.=Чтобы открыть или закрыть деревянные люк, кликните по нему правой клавишей либо подайте на него сигнал редстоуна.
 Iron Trapdoor=Железный люк

mods/ITEMS/mcl_doors/locale/template.txt

@@ -7,6 +7,8 @@ Birch Door=
 Dark Oak Door=
 Jungle Door=
 Spruce Door=
+Crimson Door=
+Warped Door=
 Iron Door=
 Iron doors are 2-block high barriers which can only be opened or closed by a redstone signal, but not by hand.=
 To open or close an iron door, supply its lower half with a redstone signal.=
@@ -16,6 +18,8 @@ Birch Trapdoor=
 Spruce Trapdoor=
 Dark Oak Trapdoor=
 Jungle Trapdoor=
+Crimson Trapdoor=
+Warped Trapdoor=
 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.=
 To open or close the trapdoor, rightclick it or send a redstone signal to it.=
 Iron Trapdoor=

mods/ITEMS/mcl_doors/register.lua

@@ -143,6 +143,52 @@ minetest.register_craft({
 	}
 })
 
+--- Crimson Door --
+mcl_doors:register_door("mcl_doors:crimson_door", {
+	description = S("Crimson Door"),
+	_doc_items_longdesc = wood_longdesc,
+	_doc_items_usagehelp = wood_usagehelp,
+	inventory_image = "mcl_doors_door_crimson.png",
+	groups = {handy=1,axey=1, material_wood=1, flammable=-1},
+	_mcl_hardness = 3,
+	_mcl_blast_resistance = 3,
+	tiles_bottom = {"mcl_doors_door_crimson_lower.png", "mcl_doors_door_crimson_side_lower.png"},
+	tiles_top = {"mcl_doors_door_crimson_upper.png", "mcl_doors_door_crimson_side_upper.png"},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+})
+
+minetest.register_craft({
+	output = "mcl_doors:crimson_door 3",
+	recipe = {
+		{"mcl_mushroom:crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood"},
+		{"mcl_mushroom:crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood"},
+		{"mcl_mushroom:crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood"}
+	}
+})
+
+--- Warped Door --
+mcl_doors:register_door("mcl_doors:warped_door", {
+	description = S("Warped Door"),
+	_doc_items_longdesc = wood_longdesc,
+	_doc_items_usagehelp = wood_usagehelp,
+	inventory_image = "mcl_doors_door_warped.png",
+	groups = {handy=1,axey=1, material_wood=1, flammable=-1},
+	_mcl_hardness = 3,
+	_mcl_blast_resistance = 3,
+	tiles_bottom = {"mcl_doors_door_warped_lower.png", "mcl_doors_door_warped_side_lower.png"},
+	tiles_top = {"mcl_doors_door_warped_upper.png", "mcl_doors_door_warped_side_upper.png"},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+})
+
+minetest.register_craft({
+	output = "mcl_doors:warped_door 3",
+	recipe = {
+		{"mcl_mushroom:warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood"},
+		{"mcl_mushroom:warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood"},
+		{"mcl_mushroom:warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood"}
+	}
+})
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "mcl_doors:wooden_door",
@@ -174,6 +220,18 @@ minetest.register_craft({
 	burntime = 10,
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_doors:crimson_door",
+	burntime = 10,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_doors:warped_door",
+	burntime = 10,
+})
+
 --- Iron Door ---
 mcl_doors:register_door("mcl_doors:iron_door", {
 	description = S("Iron Door"),
@@ -212,6 +270,8 @@ local woods = {
 	{ "spruce_trapdoor", S("Spruce Trapdoor"), "mcl_doors_trapdoor_spruce.png", "mcl_doors_trapdoor_spruce_side.png", "mcl_core:sprucewood" },
 	{ "dark_oak_trapdoor", S("Dark Oak Trapdoor"), "mcl_doors_trapdoor_dark_oak.png", "mcl_doors_trapdoor_dark_oak_side.png", "mcl_core:darkwood" },
 	{ "jungle_trapdoor", S("Jungle Trapdoor"), "mcl_doors_trapdoor_jungle.png", "mcl_doors_trapdoor_jungle_side.png", "mcl_core:junglewood" },
+	{ "crimson_trapdoor", S("Crimson Trapdoor"), "mcl_doors_trapdoor_crimson.png", "mcl_doors_trapdoor_crimson_side.png", "mcl_mushroom:crimson_hyphae_wood" },
+	{ "warped_trapdoor", S("Warped Trapdoor"), "mcl_doors_trapdoor_warped.png", "mcl_doors_trapdoor_warped_side.png", "mcl_mushroom:warped_hyphae_wood" },
 }
 
 for w=1, #woods do

mods/ITEMS/mcl_flowerpots/init.lua

@@ -214,3 +214,29 @@ mcl_flowerpots.register_potted_flower("mcl_core:deadbush", {
 	desc = S("Dead Bush"),
 	image = "default_dry_shrub.png",
 })
+
+-- Add the possibility to pot nether fungi and roots, depend to mcl_mushroom
+
+mcl_flowerpots.register_potted_flower("mcl_mushroom:warped_fungus", {
+	name = "warped_fungus",
+	desc = S("Warped Fungus Mushroom"),
+	image = "farming_warped_fungus.png",
+})
+
+mcl_flowerpots.register_potted_flower("mcl_mushroom:crimson_fungus", {
+	name = "crimson_fungus",
+	desc = S("Crimson Fungus Mushroom"),
+	image = "farming_crimson_fungus.png",
+})
+
+mcl_flowerpots.register_potted_flower("mcl_mushroom:warped_roots", {
+	name = "warped_roots",
+	desc = S("Warped Roots"),
+	image = "warped_roots.png",
+})
+
+mcl_flowerpots.register_potted_flower("mcl_mushroom:crimson_roots", {
+	name = "crimson_roots",
+	desc = S("Crimson Roots"),
+	image = "crimson_roots.png",
+})

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

@@ -20,6 +20,10 @@ Birch Sapling Flower Pot=Blumentopf mit Birkensetzling
 Dead Bush Flower Pot=Blumentopf mit totem Busch
 Fern Flower Pot=Blumentopf mit Farn
 Cactus Flower Pot=Blumentopf mit Kaktus
+Warped Fungus Mushroom Flower Pot=
+Crimson Fungus Mushroom Flower Pot=
+Warped Roots Flower Pot=
+Crimson Roots Flower Pot=
 Flower Pot=Blumentopf
 Flower pots are decorative blocks in which flowers and other small plants can be placed.=Blumentöpfe sind dekorative Blöcke, in die Blumen und andere kleine Pflanzen platziert werden können.
 Just place a plant on the flower pot. Flower pots can hold small flowers (not higher than 1 block), saplings, ferns, dead bushes, mushrooms and cacti. Rightclick a potted plant to retrieve the plant.=Platzieren Sie einfach eine Pflanze auf den Blumentopf. Blumentöpfe können kleine Blumen (nicht höher als 1 Block), Setzlinge, Farne, tote Büsche, Pilze und Kakteen halten. Rechtsklicken Sie auf eine Topfpflanze, um sie zurück zu erhalten.

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

@@ -20,6 +20,10 @@ Birch Sapling Flower Pot=Maceta con abedul
 Dead Bush Flower Pot=Maceta con arbusto muerto
 Fern Flower Pot=Maceta con helecho
 Cactus Flower Pot=Maceta con cactus
+Warped Fungus Mushroom Flower Pot=
+Crimson Fungus Mushroom Flower Pot=
+Warped Roots Flower Pot=
+Crimson Roots Flower Pot=
 Flower Pot=Maceta
 Flower pots are decorative blocks in which flowers and other small plants can be placed.=Las macetas son bloques decorativos en los que se pueden colocar flores y otras plantas pequeñas.
 Just place a plant on the flower pot. Flower pots can hold small flowers (not higher than 1 block), saplings, ferns, dead bushes, mushrooms and cacti. Rightclick a potted plant to retrieve the plant.=Simplemente coloque una planta en la maceta. Las macetas pueden contener flores pequeñas (no más de 1 bloque), árboles jóvenes, helechos, arbustos muertos, hongos y cactus. Haga clic derecho en una planta en maceta para recuperar la planta.

mods/ITEMS/mcl_flowerpots/locale/mcl_flowerpots.fr.tr

@@ -17,9 +17,13 @@ Jungle Sapling Flower Pot=Pousse d'Acajou en Pot
 Dark Oak Sapling Flower Pot=Pousse de Chêne Noir en Pot
 Spruce Sapling Flower Pot=Pousse de Sapin en Pot
 Birch Sapling Flower Pot=Pousse de Bouleau en Pot
-Dead Bush Flower Pot=Buisson Mort en Pot
+Dead Bush Flower Pot=Arbuste Mort en Pot
 Fern Flower Pot=Fougère en Pot
 Cactus Flower Pot=Cactus en Pot
+Warped Fungus Mushroom Flower Pot=Champignon Tordu en Pot
+Crimson Fungus Mushroom Flower Pot=Champignon Ecarlate en Pot
+Warped Roots Flower Pot=Racines Tordues en Pot
+Crimson Roots Flower Pot=Racines Ecarlates en Pot
 Flower Pot=Pot de Fleurs
 Flower pots are decorative blocks in which flowers and other small plants can be placed.=Les pots de fleurs sont des blocs décoratifs dans lesquels des fleurs et d'autres petites plantes peuvent être placées.
 Just place a plant on the flower pot. Flower pots can hold small flowers (not higher than 1 block), saplings, ferns, dead bushes, mushrooms and cacti. Rightclick a potted plant to retrieve the plant.=Placez simplement une plante sur le pot de fleurs. Les pots de fleurs peuvent contenir de petites fleurs (pas plus d'un bloc), des pousses, des fougères, des buissons morts, des champignons et des cactus. Cliquez avec le bouton droit sur une plante en pot pour récupérer la plante.

mods/ITEMS/mcl_flowerpots/locale/mcl_flowerpots.pl.tr

@@ -20,6 +20,10 @@ Birch Sapling Flower Pot=Doniczka z sadzonką brzozy
 Dead Bush Flower Pot=Doniczka z martwym buszem
 Fern Flower Pot=Doniczka z paprocią
 Cactus Flower Pot=Doniczka z kaktusem
+Warped Fungus Mushroom Flower Pot=
+Crimson Fungus Mushroom Flower Pot=
+Warped Roots Flower Pot=
+Crimson Roots Flower Pot=
 Flower Pot=Doniczka
 Flower pots are decorative blocks in which flowers and other small plants can be placed.=Doniczki są dekoracyjnymi blokami w których mogą zostać postawione kwiaty i inne małe rośliny.
 Just place a plant on the flower pot. Flower pots can hold small flowers (not higher than 1 block), saplings, ferns, dead bushes, mushrooms and cacti. Rightclick a potted plant to retrieve the plant.=Po prostu umieść roślinę w doniczce. Mogę one przechowywać małe kwiaty (nie większe niż 1 blok), sadzonki, paprocie, martwe busze, grzyby i kaktusy. Kliknij prawym przyciskiem w doniczkę aby odzyskać roślinę.

mods/ITEMS/mcl_flowerpots/locale/mcl_flowerpots.ru.tr

@@ -20,6 +20,10 @@ Birch Sapling Flower Pot=Саженец берёзы в горшке
 Dead Bush Flower Pot=Мёртвый куст в горшке
 Fern Flower Pot=Папоротник в горшке
 Cactus Flower Pot=Кактус в горшке
+Warped Fungus Mushroom Flower Pot=
+Crimson Fungus Mushroom Flower Pot=
+Warped Roots Flower Pot=
+Crimson Roots Flower Pot=
 Flower Pot=Цветочный горшок
 Flower pots are decorative blocks in which flowers and other small plants can be placed.=Цветочные горшки это декоративные блоки, в которые можно посадить цветы и другие небольшие растения.
 Just place a plant on the flower pot. Flower pots can hold small flowers (not higher than 1 block), saplings, ferns, dead bushes, mushrooms and cacti. Rightclick a potted plant to retrieve the plant.=Просто поместите растение в цветочный горшок. Цветочные горшки могут выдержать небольшие цветы (не выше 1 блока), саженцы, папоротники, мёртвые кусты, грибы и кактусы. Кликните правой по горшёчному растению, чтобы вытащить его из горшка.

mods/ITEMS/mcl_flowerpots/locale/template.txt

@@ -20,6 +20,10 @@ Birch Sapling Flower Pot=
 Dead Bush Flower Pot=
 Fern Flower Pot=
 Cactus Flower Pot=
+Warped Fungus Mushroom Flower Pot=
+Crimson Fungus Mushroom Flower Pot=
+Warped Roots Flower Pot=
+Crimson Roots Flower Pot=
 Flower Pot=
 Flower pots are decorative blocks in which flowers and other small plants can be placed.=
 Just place a plant on the flower pot. Flower pots can hold small flowers (not higher than 1 block), saplings, ferns, dead bushes, mushrooms and cacti. Rightclick a potted plant to retrieve the plant.=

mods/ITEMS/mclx_fences/init.lua

@@ -1,6 +1,6 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 
--- Red Nether Brick Fence
+-- Red Nether Brick Fence and Fence Gate
 
 mcl_fences.register_fence_and_fence_gate(
 	"red_nether_brick_fence",
@@ -13,6 +13,8 @@ mcl_fences.register_fence_and_fence_gate(
 	mcl_sounds.node_sound_stone_defaults(), "mcl_fences_nether_brick_fence_gate_open", "mcl_fences_nether_brick_fence_gate_close", 1, 1,
 	"mcl_fences_fence_gate_red_nether_brick.png")
 
+-- Nether Brick Fence Gate
+
 mcl_fences.register_fence_gate(
 	"nether_brick_fence",
 	S("Nether Brick Fence Gate"),
@@ -22,6 +24,33 @@ mcl_fences.register_fence_gate(
 	minetest.registered_nodes["mcl_nether:nether_brick"]._mcl_blast_resistance,
 	mcl_sounds.node_sound_stone_defaults(), "mcl_fences_nether_brick_fence_gate_open", "mcl_fences_nether_brick_fence_gate_close", 1, 1)
 
+-- Crimson Wood Fence and Fence Gate
+
+mcl_fences.register_fence_and_fence_gate(
+	"crimson_wood_fence",
+	S("Crimson Hyphae Wood Fence"), S("Crimson Hyphae Wood Fence Gate"),
+	"mcl_fences_fence_crimson.png",
+	{handy=1,axey=1, flammable=2,fence_wood=1, fire_encouragement=5, fire_flammability=20},
+	minetest.registered_nodes["mcl_core:wood"]._mcl_hardness,
+	minetest.registered_nodes["mcl_core:wood"]._mcl_blast_resistance,
+	{"group:fence_wood"},
+	mcl_sounds.node_sound_wood_defaults(), "mcl_fences_nether_brick_gate_open", "mcl_fences_nether_brick_fence_gate_close", 1, 1,
+	"mcl_fences_fence_gate_crimson.png")
+
+-- Warped Wood Fence and Fence Gate
+
+mcl_fences.register_fence_and_fence_gate(
+	"warped_wood_fence",
+	S("Warped Hyphae Wood Fence"), S("Warped Hyphae Wood Fence Gate"),
+	"mcl_fences_fence_warped.png",
+	{handy=1,axey=1, flammable=2,fence_wood=1, fire_encouragement=5, fire_flammability=20},
+	minetest.registered_nodes["mcl_core:wood"]._mcl_hardness,
+	minetest.registered_nodes["mcl_core:wood"]._mcl_blast_resistance,
+	{"group:fence_wood"},
+	mcl_sounds.node_sound_wood_defaults(), "mcl_fences_nether_brick_fence_gate_open", "mcl_fences_nether_brick_fence_gate_close", 1, 1,
+	"mcl_fences_fence_gate_warped.png")
+
+
 -- Crafting
 
 minetest.register_craft({
@@ -33,14 +62,23 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "mclx_fences:red_nether_brick_fence_gate",
+	output = "mclx_fences:crimson_wood_fence 3",
 	recipe = {
-		{"mcl_nether:nether_wart_item", "mcl_nether:red_nether_brick", "mcl_nether:netherbrick"},
-		{"mcl_nether:netherbrick", "mcl_nether:red_nether_brick", "mcl_nether:nether_wart_item"},
+		{"mcl_mushroom:crimson_hyphae_wood", "mcl_core:stick", "mcl_mushroom:crimson_hyphae_wood"},
+		{"mcl_mushroom:crimson_hyphae_wood", "mcl_core:stick", "mcl_mushroom:crimson_hyphae_wood"},
 	}
 })
+
 minetest.register_craft({
-	output = "mclx_fences:red_nether_brick_fence_gate",
+	output = "mclx_fences:warped_wood_fence 3",
+	recipe = {
+		{"mcl_mushroom:warped_hyphae_wood", "mcl_core:stick", "mcl_mushroom:warped_hyphae_wood"},
+		{"mcl_mushroom:warped_hyphae_wood", "mcl_core:stick", "mcl_mushroom:warped_hyphae_wood"},
+	}
+})
+
+minetest.register_craft({
+	output = "mclx_fences:red_nether_brick_fence_gate 2",
 	recipe = {
 		{"mcl_nether:netherbrick", "mcl_nether:red_nether_brick", "mcl_nether:nether_wart_item"},
 		{"mcl_nether:nether_wart_item", "mcl_nether:red_nether_brick", "mcl_nether:netherbrick"},
@@ -55,6 +93,21 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "mclx_fences:crimson_wood_fence_gate",
+	recipe = {
+		{"mcl_core:stick", "mcl_mushroom:crimson_hyphae_wood", "mcl_core:stick"},
+		{"mcl_core:stick", "mcl_mushroom:crimson_hyphae_wood", "mcl_core:stick"},
+	}
+})
+
+minetest.register_craft({
+	output = "mclx_fences:warped_wood_fence_gate",
+	recipe = {
+		{"mcl_core:stick", "mcl_mushroom:warped_hyphae_wood", "mcl_core:stick"},
+		{"mcl_core:stick", "mcl_mushroom:warped_hyphae_wood", "mcl_core:stick"},
+	}
+})
 
 -- Aliases for mcl_supplemental
 minetest.register_alias("mcl_supplemental:red_nether_brick_fence", "mclx_fences:red_nether_brick_fence")
@@ -64,3 +117,13 @@ minetest.register_alias("mcl_supplemental:nether_brick_fence_gate_open", "mclx_f
 
 minetest.register_alias("mcl_supplemental:red_nether_brick_fence_gate", "mclx_fences:red_nether_brick_fence_gate")
 minetest.register_alias("mcl_supplemental:red_nether_brick_fence_gate_open", "mclx_fences:red_nether_brick_fence_gate_open")
+
+minetest.register_alias("mcl_supplemental:crimson_wood_fence", "mclx_fences:crimson_wood_fence")
+
+minetest.register_alias("mcl_supplemental:crimson_wood_fence_gate", "mclx_fences:crimson_wood_fence_gate")
+minetest.register_alias("mcl_supplemental:crimson_wood_fence_gate_open", "mclx_fences:crimson_wood_fence_gate_open")
+
+minetest.register_alias("mcl_supplemental:warped_wood_fence", "mclx_fences:warped_wood_fence")
+
+minetest.register_alias("mcl_supplemental:warped_wood_fence_gate", "mclx_fences:warped_wood_fence_gate")
+minetest.register_alias("mcl_supplemental:warped_wood_fence_gate_open", "mclx_fences:warped_wood_fence_gate_open")

mods/ITEMS/mclx_fences/locale/mclx_fences.de.tr

@@ -2,3 +2,7 @@
 Red Nether Brick Fence=Roter Netherziegelzaun
 Red Nether Brick Fence Gate=Rotes Netherziegelzauntor
 Nether Brick Fence Gate=Netherziegelzauntor
+Crimson Hyphae Wood Fence=
+Crimson Hyphae Wood Fence Gate=
+Warped Hyphae Wood Fence=
+Warped Hyphae Wood Fence Gate=

mods/ITEMS/mclx_fences/locale/mclx_fences.es.tr

@@ -2,3 +2,7 @@
 Red Nether Brick Fence=Valla de ladrillo abisal rojo
 Red Nether Brick Fence Gate=Puerta de ladrillo abisal rojo
 Nether Brick Fence Gate=Puerta de ladrillo abisal
+Crimson Hyphae Wood Fence=
+Crimson Hyphae Wood Fence Gate=
+Warped Hyphae Wood Fence=
+Warped Hyphae Wood Fence Gate=

mods/ITEMS/mclx_fences/locale/mclx_fences.fr.tr

@@ -2,3 +2,7 @@
 Red Nether Brick Fence=Barrière en Brique Rouge du Nether
 Red Nether Brick Fence Gate=Portillon en Brique Rouge du Nether
 Nether Brick Fence Gate=Portillon en Brique du Nether
+Crimson Hyphae Wood Fence=Barrière Ecarlate
+Crimson Hyphae Wood Fence Gate=Portillon Ecarlate
+Warped Hyphae Wood Fence=Barrière Tordue
+Warped Hyphae Wood Fence Gate=Portillon Tordu

mods/ITEMS/mclx_fences/locale/mclx_fences.pl.tr

@@ -2,3 +2,7 @@
 Red Nether Brick Fence=Płot z czerwonej netherowej cegły
 Red Nether Brick Fence Gate=Furtka z czerwonej netherowej cegły
 Nether Brick Fence Gate=Furtka z netherowej cegły
+Crimson Hyphae Wood Fence=
+Crimson Hyphae Wood Fence Gate=
+Warped Hyphae Wood Fence=
+Warped Hyphae Wood Fence Gate=

mods/ITEMS/mclx_fences/locale/mclx_fences.ru.tr

@@ -2,3 +2,7 @@
 Red Nether Brick Fence=Забор из адского красного кирпича
 Red Nether Brick Fence Gate=Калитка из адского красного кирпича
 Nether Brick Fence Gate=Калитка из адского кирпича
+Crimson Hyphae Wood Fence=
+Crimson Hyphae Wood Fence Gate=
+Warped Hyphae Wood Fence=
+Warped Hyphae Wood Fence Gate=

mods/ITEMS/mclx_fences/locale/template.txt

@@ -2,3 +2,7 @@
 Red Nether Brick Fence=
 Red Nether Brick Fence Gate=
 Nether Brick Fence Gate=
+Crimson Hyphae Wood Fence=
+Crimson Hyphae Wood Fence Gate=
+Warped Hyphae Wood Fence=
+Warped Hyphae Wood Fence Gate=