Merge testing into compatibility

mods/CORE/mcl_util/init.lua

@@ -417,6 +417,7 @@ function mcl_util.deal_damage(target, damage, mcl_reason)
 			-- target:punch(puncher, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy = damage}}, vector.direction(puncher:get_pos(), target:get_pos()), damage)
 			if luaentity.health > 0 then
 				luaentity.health = luaentity.health - damage
+				luaentity.pause_timer = 0.4
 			end
 			return
 		end

mods/ENTITIES/extra_mobs/dolphin.lua

@@ -246,4 +246,4 @@ water-16,
 water)
 
 --spawn egg
-mobs:register_egg("extra_mobs:dolphin", S("dolphin"), "extra_mobs_spawn_icon_dolphin.png", 0)
+mobs:register_egg("extra_mobs:dolphin", S("Dolphin"), "extra_mobs_spawn_icon_dolphin.png", 0)

mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr

@@ -0,0 +1,17 @@
+# textdomain:extra_mobs
+Hoglin=Hoglin
+piglin=Piglin
+piglin Brute=Piglin Barbare
+Strider=Arpenteur
+Fox=Renard
+Cod=Poisson
+Salmon=Saumon
+dolphin=Dauphin
+Glow Squid=Pieuvre Lumineuse
+Glow Ink Sac=Sac d'Encre Lumineuse
+Use it to craft the Glow Item Frame.=Utilisez le pour fabriquer le Cadre à Objet Lumineux
+Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame.=Utiliser le Sac d'Encre Lumineuse et le Cadre à Objet normal pour fabriquer le Cadre à Objet Lumineux.
+Glow Item Frame=Cadre à Objet Lumineux
+Can hold an item and glows=Peut exposer un objet et éclairer
+Glow Item frames are decorative blocks in which items can be placed.=les Cadres à Objet Lumineux sont des blocs décoratifs pouvant contenir des objets.
+Just place any item on the item frame. Use the item frame again to retrieve the item.=Placer n'importe quel objet sur le cadre. Récupérer l'objet en faisant un clic droit sur le cadre.

mods/ENTITIES/extra_mobs/piglin.lua

@@ -296,5 +296,5 @@ minetest.LIGHT_MAX+1,
 mobs_mc.spawn_height.nether_min, 
 mobs_mc.spawn_height.nether_max)
 -- spawn eggs
-mobs:register_egg("extra_mobs:piglin", S("piglin"), "extra_mobs_spawn_icon_piglin.png", 0)
-mobs:register_egg("extra_mobs:piglin_brute", S("piglin Brute"), "extra_mobs_spawn_icon_piglin.png", 0)
+mobs:register_egg("extra_mobs:piglin", S("Piglin"), "extra_mobs_spawn_icon_piglin.png", 0)
+mobs:register_egg("extra_mobs:piglin_brute", S("Piglin Brute"), "extra_mobs_spawn_icon_piglin.png", 0)

mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr

@@ -6,6 +6,7 @@ Boats are used to travel on the surface of water.=Les bateaux sont utilisés pou
 Dark Oak Boat=Bateau en Chêne Noir
 Jungle Boat=Bateau en Acajou
 Oak Boat=Bateau en Chêne
+Obsidian Boat=Bateau en Obsidienne
 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.=Faites un clic droit sur une source d'eau pour placer le bateau. Faites un clic droit sur le bateau pour y entrer. Utilisez [Gauche] et [Droite] pour diriger, [Avant] pour accélérer et [Arrière] pour ralentir ou reculer. Utilisez [Sneak] pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet.
 Spruce Boat=Bateau en Sapin
 Water vehicle=Véhicule aquatique

mods/ENTITIES/mcl_item_entity/init.lua

@@ -65,6 +65,8 @@ mcl_item_entity.register_pickup_achievement("tree", "mcl:mineWood")
 mcl_item_entity.register_pickup_achievement("mcl_mobitems:blaze_rod", "mcl:blazeRod")
 mcl_item_entity.register_pickup_achievement("mcl_mobitems:leather", "mcl:killCow")
 mcl_item_entity.register_pickup_achievement("mcl_core:diamond", "mcl:diamonds")
+mcl_item_entity.register_pickup_achievement("mcl_core:crying_obsidian", "mcl:whosCuttingOnions")
+mcl_item_entity.register_pickup_achievement("mcl_nether:ancient_debris", "mcl:hiddenInTheDepths")
 
 local function check_pickup_achievements(object, player)
 	if has_awards then

mods/ENTITIES/mcl_mobs/api.txt

@@ -227,6 +227,11 @@ functions needed for the mob to work properly which contains the following:
                      older mobs.
 	  'pushable'	Allows players, & other mobs to push the mob.
 
+    'spawn_with_armor' If set to true, the mob has a small chance of spawning with
+                        random matched armor. If set to a string, the string represents
+                        the material type of the armor. Any materials used by
+                        mcl_armor will work. Example: "gold"
+                        It is assumed that the first texture is for armor.
 
 
     MineClone 2 extensions:

mods/ENTITIES/mcl_mobs/api/api.lua

@@ -375,6 +375,7 @@ function mobs:register_mob(name, def)
 		--moves the wrong way
 		swap_y_with_x = def.swap_y_with_x or false,
 		reverse_head_yaw = def.reverse_head_yaw or false,
+		_spawn_with_armor = def.spawn_with_armor,
 
 		--END HEAD CODE VARIABLES
 

mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua

@@ -13,8 +13,13 @@ mobs.can_despawn = function(self)
 	if self.tamed or self.bred or self.nametag then return false end
 	local mob_pos = self.object:get_pos()
 	if not mob_pos then return true end
+	local players = minetest_get_connected_players()
+	if #players == 0 then return false end
+	-- If no players, probably this is being called from get_staticdata() at server shutdown time
+	-- Minetest is to buggy (as of 5.5) to delete entities at server shutdown time anyway
+	
 	local distance = 999
-	for _, player in pairs(minetest_get_connected_players()) do
+	for _, player in pairs(players) do
 		if player and player:get_hp() > 0 then
 			local player_pos = player:get_pos()
 			local new_distance = vector_distance(player_pos, mob_pos)
@@ -62,6 +67,102 @@ mobs.mob_staticdata = function(self)
 	return minetest.serialize(tmp)
 end
 
+mobs.armor_setup = function(self)
+	if not self._armor_items then
+		local armor = {}
+		-- Source: https://minecraft.fandom.com/wiki/Zombie
+		local materials = {
+			{name = "leather", chance = 0.3706},
+			{name = "gold", chance = 0.4873},
+			{name = "chain", chance = 0.129},
+			{name = "iron", chance = 0.0127},
+			{name = "diamond", chance = 0.0004}
+		}
+		local types = {
+			{name = "helmet", chance = 0.15},
+			{name = "chestplate", chance = 0.75},
+			{name = "leggings", chance = 0.75},
+			{name = "boots", chance = 0.75}
+		}
+		
+		local material
+		if type(self._spawn_with_armor) == "string" then
+			material = self._spawn_with_armor
+		else
+			local chance = 0
+			for i, m in pairs(materials) do
+				chance = chance + m.chance
+				if math.random() <= chance then
+					material = m.name
+					break
+				end
+			end
+		end
+		
+		for i, t in pairs(types) do
+			if math.random() <= t.chance then
+				armor[t.name] = material
+			else
+				break
+			end
+		end
+		
+		-- Save armor items in lua entity
+		self._armor_items = {}
+		for atype, material in pairs(armor) do
+			local item = "mcl_armor:" .. atype .. "_" .. material
+			self._armor_items[atype] = item
+		end
+		
+		-- Setup armor drops
+		for atype, material in pairs(armor) do
+			local wear = math.random(1, 65535)
+			local item = "mcl_armor:" .. atype .. "_" .. material .. " 1 " .. wear
+			self.drops = table.copy(self.drops)
+			table.insert(self.drops, {
+				name = item,
+				chance = 1/0.085, -- 8.5%
+				min = 1,
+				max = 1,
+				looting = "rare",
+				looting_factor = 0.01 / 3,
+			})
+		end
+		
+		-- Configure textures
+		local t = ""
+		local first_image = true
+		for atype, material in pairs(armor) do
+			if not first_image then
+				t = t .. "^"
+			end
+			t = t .. "mcl_armor_" .. atype .. "_" .. material .. ".png"
+			first_image = false
+		end
+		if t ~= "" then
+			self.base_texture = table.copy(self.base_texture)
+			self.base_texture[1] = t
+		end
+		
+		-- Configure damage groups based on armor
+		-- Source: https://minecraft.fandom.com/wiki/Armor#Armor_points
+		local points = 2
+		for atype, material in pairs(armor) do
+			local item_name = "mcl_armor:" .. atype .. "_" .. material
+			points = points + minetest.get_item_group(item_name, "mcl_armor_points")
+		end
+		local armor_strength = 100 - 4 * points
+		local armor_groups = self.object:get_armor_groups()
+		armor_groups.fleshy = armor_strength
+		self.armor = armor_groups
+		
+		-- Helmet protects mob from sun damage
+		if armor.helmet then
+			self.ignited_by_sunlight = false
+		end
+	end
+end
+
 
 -- activate mob and reload settings
 mobs.mob_activate = function(self, staticdata, def, dtime)
@@ -104,6 +205,11 @@ mobs.mob_activate = function(self, staticdata, def, dtime)
 		self.base_colbox = self.collisionbox
 		self.base_selbox = self.selectionbox
 	end
+	
+	-- Setup armor on mobs
+	if self._spawn_with_armor then
+		mobs.armor_setup(self)
+	end
 
 	-- for current mobs that dont have this set
 	if not self.base_selbox then

mods/ENTITIES/mobs_mc/rabbit.lua

@@ -76,6 +76,7 @@ local function spawn_rabbit(pos)
 	local biome_data = minetest.get_biome_data(pos)
 	local biome_name = biome_data and minetest.get_biome_name(biome_data.biome) or ""
 	local mob = minetest.add_entity(pos, mob_name)
+	if not mob then return end
 	local self = mob:get_luaentity()
 	local texture
 	if biome_name:find("Desert") then

mods/ENTITIES/mobs_mc/zombie.lua

@@ -204,6 +204,7 @@ local zombie = {
 	attack_type = "punch",
 	punch_timer_cooloff = 0.5,
 	harmed_by_heal = true,
+	spawn_with_armor = true,
 }
 
 mobs:register_mob("mobs_mc:zombie", zombie)

mods/ENVIRONMENT/lightning/init.lua

@@ -238,8 +238,8 @@ after(5, function(dtime)
 end)
 
 minetest.register_chatcommand("lightning", {
-	params = "[<X> <Y> <Z>]",
-	description = S("Let lightning strike at the specified position or yourself"),
+	params = "[<X> <Y> <Z> | <player name>]",
+	description = S("Let lightning strike at the specified position or player. No parameter will strike yourself."),
 	privs = { maphack = true },
 	func = function(name, param)
 		local pos = {}
@@ -247,21 +247,21 @@ minetest.register_chatcommand("lightning", {
 		pos.x = tonumber(pos.x)
 		pos.y = tonumber(pos.y)
 		pos.z = tonumber(pos.z)
+		local player_to_strike
 		if not (pos.x and pos.y and pos.z) then
 			pos = nil
+			player_to_strike = minetest.get_player_by_name(param)
+			if not player_to_strike and param == "" then
+				player_to_strike = minetest.get_player_by_name(name)
+			end
 		end
-		if name == "" and pos == nil then
+		if not player_to_strike and pos == nil then
 			return false, "No position specified and unknown player"
 		end
 		if pos then
 			lightning.strike(pos)
-		else
-			local player = minetest.get_player_by_name(name)
-			if player then
-				lightning.strike(player:get_pos())
-			else
-				return false, S("No position specified and unknown player")
-			end
+		elseif player_to_strike then
+			lightning.strike(player_to_strike:get_pos())
 		end
 		return true
 	end,

mods/ENVIRONMENT/lightning/locale/template.txt

@@ -1,4 +1,4 @@
 # textdomain: lightning
 @1 was struck by lightning.=
-Let lightning strike at the specified position or yourself=
+Let lightning strike at the specified position or player. No parameter will strike yourself.=
 No position specified and unknown player=

mods/HUD/mcl_achievements/init.lua

@@ -101,6 +101,18 @@ awards.register_achievement("mcl:bookcase", {
 	}
 })
 
+awards.register_achievement("mcl:buildIronPickaxe", {
+	title = S("Isn't It Iron Pick"),
+	-- TODO: This achievement should support all non-wood pickaxes
+	description = S("Craft a iron pickaxe using sticks and iron."),
+	icon = "default_tool_steelpick.png",
+	trigger = {
+		type = "craft",
+		item = "mcl_tools:pick_iron",
+		target = 1
+	}
+})
+
 -- Item pickup achievements: These are awarded when picking up a certain item.
 -- The achivements are manually given in the mod mcl_item_entity.
 awards.register_achievement("mcl:diamonds", {
@@ -125,6 +137,24 @@ awards.register_achievement("mcl:mineWood", {
 	icon = "default_tree.png",
 })
 
+awards.register_achievement("mcl:whosCuttingOnions", {
+	title = S("Who is Cutting Onions?"),
+	description = S("Pick up a crying obsidian from the floor."),
+	icon = "default_obsidian.png^mcl_core_crying_obsidian.png",
+})
+
+awards.register_achievement("mcl:hiddenInTheDepths", {
+	title = S("Hidden in the Depths"),
+	description = S("Pick up an Ancient Debris from the floor."),
+	icon = "mcl_nether_ancient_debris_side.png",
+})
+
+awards.register_achievement("mcl:notQuiteNineLives", {
+	title = S('Not Quite "Nine" Lives'),
+	description = S("Charge a Respawn Anchor to the maximum."),
+	icon = "respawn_anchor_side4.png",
+})
+
 -- Smelting achivements: These are awarded when picking up an item from a furnace
 -- output. They are given in mcl_furnaces.
 awards.register_achievement("mcl:acquireIron", {
@@ -163,6 +193,12 @@ awards.register_achievement("mcl:buildNetherPortal", {
 	icon = "default_obsidian.png",
 })
 
+awards.register_achievement("mcl:enterEndPortal", {
+	title = S("The End?"),
+	description = S("Or the beginning?\nHint: Enter an end portal."),
+	icon = "mcl_end_end_stone.png",
+})
+
 -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.)
 
 if non_pc_achievements then

mods/HUD/mcl_achievements/locale/mcl_achievements.fr.tr

@@ -10,7 +10,7 @@ Craft a stone pickaxe using sticks and cobblestone.=Fabriquez une pioche en pier
 Craft a wooden sword using wooden planks and sticks on a crafting table.=Fabriquez une épée en bois à l'aide de planches et de bâtons en bois sur un établi.
 DIAMONDS!=DIAMANTS!
 Delicious Fish=Délicieux Poisson
-Dispense With This=Dispenser de ça
+Dispense With This=Dispensé de ça
 Eat a cooked porkchop.=Mangez du porc cuit.
 Eat a cooked rabbit.=Mangez du lapin cuit.
 Get really desperate and eat rotten flesh.=Soyez vraiment désespéré et mangez de la chair pourrie.
@@ -47,3 +47,19 @@ Use a crafting table to craft a wooden hoe from wooden planks and sticks.=Utilis
 Use a crafting table to craft a wooden pickaxe from wooden planks and sticks.=Utilisez un établi pour fabriquer une pioche en bois à partir de planches et de bâtons en bois.
 Use obsidian and a fire starter to construct a Nether portal.=Utilisez de l'obsidienne et un briquet pour construire un portail du Nether.
 Use wheat to craft a bread.=Utilisez du blé pour fabriquer un pain.
+Stone Age=L'Age de Pierre
+Mine a stone with new pickaxe.=Miner de la roche avec une nouvelle pioche
+Hot Stuff=Chaud Devant !
+Put lava in a bucket.=Remplir un Seau de lave
+Ice Bucket Challenge=Le défi du seau d'eau glacée
+Obtain an obsidian block.=Obtenir un bloc d'obsidienne
+Isn't It Iron Pick=Bonne Pioche !
+Craft a iron pickaxe using sticks and iron.=Fabriquer une pioche de fer avec des batons et du fer
+Who is Cutting Onions?=Qui épluche des oignons ?
+Pick up a crying obsidian from the floor.=Ramasser une obsidienne pleureuse sur le sol.
+Hidden in the Depths=Caché dans les profondeurs
+Pick up an Ancient Debris from the floor.=Ramasser un Ancien Débris
+Not Quite "Nine" Lives=Presque "neuf" vies
+Charge a Respawn Anchor to the maximum.=Charger une Ancre de Réapparition au maximum.
+The End?=L'End ?
+Or the beginning?\nHint: Enter an end portal.=Ou le commencement ?\nAstuce : Entrer dans un portail de l'End.

mods/HUD/mcl_achievements/locale/template.txt

@@ -53,3 +53,13 @@ Hot Stuff=
 Put lava in a bucket.=
 Ice Bucket Challenge=
 Obtain an obsidian block.=
+Isn't It Iron Pick=
+Craft a iron pickaxe using sticks and iron.=
+Who is Cutting Onions?=
+Pick up a crying obsidian from the floor.=
+Hidden in the Depths=
+Pick up an Ancient Debris from the floor.=
+Not Quite "Nine" Lives=
+Charge a Respawn Anchor to the maximum.=
+The End?=
+Or the beginning?\nHint: Enter an end portal.=

mods/HUD/mcl_experience/locale/mlc_experience.fr.tr

@@ -5,3 +5,4 @@ Error: Too many parameters!=Erreur: Trop de paramètres!
 Error: Incorrect value of XP=Erreur: Valeur incorrecte de XP
 Error: Player not found=Erreur: Joueur introuvable
 Added @1 XP to @2, total: @3, experience level: @4=Ajout de @1 XP à @2, total: @3, niveau d'expérience: @4
+Bottle o' Enchanting=Fiole d'expérience

mods/HUD/mcl_info/init.lua

@@ -89,7 +89,7 @@ minetest.register_chatcommand("debug",{
 			minetest.chat_send_player(name, S("Error! Possible values are integer numbers from @1 to @2", 0, 3))
 			return
 		end
-		if dbg == default_dbg then
+		if dbg == default_debug then
 			player_dbg[name] = nil
 		else
 			player_dbg[name] = dbg

mods/HUD/mcl_info/locale/mcl_info.fr.tr

@@ -0,0 +1,4 @@
+# textdomain: mcl_info
+Set debug bit mask: 0 @= disable, 1 @= biome name, 2 @= coordinates, 3 @= all=Réglage du masque de débugage : 0 @= désactiver, 1 @= nom de biome, 2 @= coordonnées, 3 @= tout=
+Error! Possible values are integer numbers from @1 to @2=Erreur ! Les valeurs autorisées sont des nombres entiers de @1 à @2
+Debug bit mask set to @1=Masque de débugage réglé à @1

mods/ITEMS/REDSTONE/mcl_bells/locale/mcl_bells.fr.tr

@@ -0,0 +1,2 @@
+# textdomain: mcl_observers
+Bell=Cloche

mods/ITEMS/REDSTONE/mcl_target/init.lua

@@ -0,0 +1,70 @@
+local S = minetest.get_translator("mcl_target")
+
+local mod_farming = minetest.get_modpath("mcl_farming")
+
+mcl_target = {}
+
+function mcl_target.hit(pos, time)
+	minetest.set_node(pos, {name="mcl_target:target_on"})
+	mesecon.receptor_on(pos, mesecon.rules.alldirs)
+
+	local timer = minetest.get_node_timer(pos)
+	timer:start(time)
+end
+
+minetest.register_node("mcl_target:target_off", {
+	description = S("Target"),
+	_doc_items_longdesc = S("A target is a block that provides a temporary redstone charge when hit by a projectile."),
+	_doc_items_usagehelp = S("Throw a projectile on the target to activate it."),
+	tiles = {"mcl_target_target_top.png", "mcl_target_target_top.png", "mcl_target_target_side.png"},
+	groups = {hoey = 1},
+	sounds = mcl_sounds.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.1},
+	}),
+	mesecons = {
+		receptor = {
+			state = mesecon.state.off,
+			rules = mesecon.rules.alldirs,
+		},
+	},
+	_mcl_blast_resistance = 0.5,
+	_mcl_hardness = 0.5,
+})
+
+minetest.register_node("mcl_target:target_on", {
+	description = S("Target"),
+	_doc_items_create_entry = false,
+	tiles = {"mcl_target_target_top.png", "mcl_target_target_top.png", "mcl_target_target_side.png"},
+	groups = {hoey = 1, not_in_creative_inventory = 1},
+	drop = "mcl_target:target_off",
+	sounds = mcl_sounds.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.1},
+	}),
+	on_timer = function(pos, elapsed)
+		local node = minetest.get_node(pos)
+		if node.name == "mcl_target:target_on" then --has not been dug
+			minetest.set_node(pos, {name="mcl_target:target_off"})
+			mesecon.receptor_off(pos, mesecon.rules.alldirs)
+		end
+	end,
+	mesecons = {
+		receptor = {
+			state = mesecon.state.on,
+			rules = mesecon.rules.alldirs,
+		},
+	},
+	_mcl_blast_resistance = 0.5,
+	_mcl_hardness = 0.5,
+})
+
+
+if mod_farming then
+	minetest.register_craft({
+		output = "mcl_target:target_off",
+		recipe = {
+			{"",                  "mesecons:redstone",     ""},
+			{"mesecons:redstone", "mcl_farming:hay_block", "mesecons:redstone"},
+			{"",                  "mesecons:redstone",     ""},
+		},
+	})
+end

mods/ITEMS/REDSTONE/mcl_target/locale/mcl_target.fr.tr

@@ -0,0 +1,4 @@
+# textdomain: mcl_target
+Target=Cible
+A target is a block that provides a temporary redstone charge when hit by a projectile.=La cible est un bloc qui se comporte comme une source d'énergie temporaire quand elle est frappée par un projectile. 
+Throw a projectile on the target to activate it.=Lancer un projectile sur la cible pour l'activer.

mods/ITEMS/REDSTONE/mcl_target/locale/template.txt

@@ -0,0 +1,4 @@
+# textdomain: mcl_target
+Target=
+A target is a block that provides a temporary redstone charge when hit by a projectile.=
+Throw a projectile on the target to activate it.=

mods/ITEMS/REDSTONE/mcl_target/mod.conf

@@ -0,0 +1,3 @@
+name = mcl_target
+author = AFCMS
+depends = mesecons, mcl_sounds

mods/ITEMS/REDSTONE/mesecons_button/init.lua

@@ -216,6 +216,18 @@ mesecon.register_button(
 	S("A stone 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."),
 	"mesecons_button_push")
 
+mesecon.register_button(
+	"polished_blackstone",
+	S("Polished Blackstone Button"),
+	"mcl_blackstone_polished.png",
+	"mcl_blackstone:blackstone_polished",
+	mcl_sounds.node_sound_stone_defaults(),
+	{material_stone=1,handy=1,pickaxey=1},
+	1,
+	false,
+	S("A polished blackstone button is a redstone component made out of polished blackstone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second."),
+	"mesecons_button_push")
+
 local woods = {
 	{ "wood", "mcl_core:wood", "default_wood.png", S("Oak Button") },
 	{ "acaciawood", "mcl_core:acaciawood", "default_acacia_wood.png", S("Acacia Button") },
@@ -223,6 +235,8 @@ local woods = {
 	{ "darkwood", "mcl_core:darkwood", "mcl_core_planks_big_oak.png", S("Dark Oak Button") },
 	{ "sprucewood", "mcl_core:sprucewood", "mcl_core_planks_spruce.png", S("Spruce Button") },
 	{ "junglewood", "mcl_core:junglewood", "default_junglewood.png", S("Jungle Button") },
+	{ "warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood", "warped_hyphae_wood.png", S("Warped Hyphae Button") },
+	{ "crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood", "crimson_hyphae_wood.png", S("Crimson Hyphae Button") },
 }
 
 for w=1, #woods do

mods/ITEMS/REDSTONE/mesecons_button/locale/mesecons_button.fr.tr

@@ -1,6 +1,7 @@
 # textdomain: mesecons_button
 Use the button to push it.=Utilisez le bouton pour le pousser.
 Stone Button=Bouton de pierre
+Polished Blackstone Button=Bouton de Pierre Noire Polie
 A stone 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.=Un bouton en pierre est un composant Redstone en pierre qui peut être poussé pour fournir de la puissance Redstone. Lorsqu'il est poussé, il alimente les composants Redstone adjacents pendant 1 seconde.
 Oak Button=Bouton en Chêne
 Acacia Button=Bouton en Acacia
@@ -8,6 +9,8 @@ Birch Button=Bouton en Bouleau
 Dark Oak Button=Bouton en Chêne Noir
 Spruce Button=Bouton en Sapin
 Jungle Button=Bouton en Acajou
+Warped Hyphae Button=Bouton en Hyphae Tordu
+Crimson Hyphae Button=Bouton en Hyphae Ecarlate
 A wooden button is a redstone component made out of wood which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1.5 seconds. Wooden buttons may also be pushed by arrows.=Un bouton en bois est un composant de redstone en bois qui peut être poussé pour fournir une puissance de redstone. Lorsqu'il est poussé, il alimente les composants Redstone adjacents pendant 1,5 seconde. Les boutons en bois peuvent également être poussés par des flèches.
 Provides redstone power when pushed=Fournit une puissance de redstone lorsqu'il est poussé
 Push duration: @1s=Durée de poussée: @1s

mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt

@@ -1,6 +1,7 @@
 # textdomain: mesecons_button
 Use the button to push it.=
 Stone Button=
+Polished Blackstone Button=
 A stone 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.=
 Oak Button=
 Acacia Button=
@@ -8,6 +9,8 @@ Birch Button=
 Dark Oak Button=
 Spruce Button=
 Jungle Button=
+Warped Hyphae Button=
+Crimson Hyphae Button=
 A wooden button is a redstone component made out of wood which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1.5 seconds. Wooden buttons may also be pushed by arrows.=
 Provides redstone power when pushed=
 Push duration: @1s=

mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua

@@ -164,6 +164,8 @@ local woods = {
 	{ "darkwood", "mcl_core:darkwood", "mcl_core_planks_big_oak.png", S("Dark Oak Pressure Plate" )},
 	{ "sprucewood", "mcl_core:sprucewood", "mcl_core_planks_spruce.png", S("Spruce Pressure Plate") },
 	{ "junglewood", "mcl_core:junglewood", "default_junglewood.png", S("Jungle Pressure Plate") },
+	{ "warped_hyphae_wood", "mcl_mushrooom:warped_hyphae_wood", "warped_hyphae_wood.png", S("Warped Hyphae Pressure Plate")},
+	{ "crimson_hyphae_wood", "mcl_mushrooom:crimson_hyphae_wood", "crimson_hyphae_wood.png", S("Crimson Hyphae Pressure Plate")},
 }
 
 for w=1, #woods do
@@ -201,6 +203,19 @@ mesecon.register_pressure_plate(
 	{ player = true, mob = true },
 	S("A stone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else."))
 
+mesecon.register_pressure_plate(
+	"mesecons_pressureplates:pressure_plate_polished_blackstone",
+	S("Polished Blackstone Pressure Plate"),
+	{"mcl_blackstone_polished.png"},
+	{"mcl_blackstone_polished.png"},
+	"default_stone.png",
+	nil,
+	{{"mcl_blackstone:blackstone_polished", "mcl_blackstone:blackstone_polished"}},
+	mcl_sounds.node_sound_stone_defaults(),
+	{pickaxey=1, material_stone=1},
+	{ player = true, mob = true },
+	S("A polished blackstone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else."))
+
 mesecon.register_pressure_plate(
 	"mesecons_pressureplates:pressure_plate_gold",
 	S("Light-Weighted Pressure Plate"),
@@ -211,5 +226,18 @@ mesecon.register_pressure_plate(
 	{{"mcl_core:gold_ingot", "mcl_core:gold_ingot"}},
 	mcl_sounds.node_sound_metal_defaults(),
 	{pickaxey=1},
-	{ player = true, mob = true },
-	S("A light-weighted pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else."))
+	nil,
+	S("A light-weighted 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."))
+
+mesecon.register_pressure_plate(
+	"mesecons_pressureplates:pressure_plate_iron",
+	S("Heavy-Weighted Pressure Plate"),
+	{"default_steel_block.png"},
+	{"default_steel_block.png"},
+	"default_steel_block.png",
+	nil,
+	{{"mcl_core:iron_ingot", "mcl_core:iron_ingot"}},
+	mcl_sounds.node_sound_metal_defaults(),
+	{pickaxey=1},
+	nil,
+	S("A heavy-weighted 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."))

mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/mesecons_pressureplates.fr.tr

@@ -6,10 +6,18 @@ Birch Pressure Plate=Plaque de pression en Bouleau
 Dark Oak Pressure Plate=Plaque de pression en Chêne Noir
 Spruce Pressure Plate=Plaque de pression en Sapin
 Jungle Pressure Plate=Plaque de pression en Acajou
+Warped Hyphae Pressure Plate=Plaque de pression en Hyphae Tordue
+Crimson Hyphae Pressure Plate=Plaque de pression en Hyphae Ecarlate
 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.=Une plaque de pression en bois est un composant de redstone qui alimente ses blocs environnants en puissance de redstone tandis que tout objet mobile (y compris les objets lâchés, les joueurs et les mobs) repose dessus.
 Stone Pressure Plate=Plaque de pression en pierre
 A stone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.=Une plaque de pression en pierre est un composant de redstone qui alimente ses blocs environnants en puissance de redstone pendant qu'un joueur ou un mob se tient au-dessus. Il n'est déclenché par rien d'autre.
-Provides redstone power when pushed=Fournit une puissance de redstone lorsqu'il est poussé
+Polished Blackstone Pressure Plate=Plaque de pression en pierre noire polie
+A polished blackstone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.=Une plaque de pression en pierre noire polie est un composant de redstone qui alimente ses blocs environnants en puissance de redstone pendant qu'un joueur ou un mob se tient au-dessus. Il n'est déclenché par rien d'autre.
+Light-Weighted Pressure Plate=Plaque de pression pondérée légère
+A light-weighted 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.=Une plaque de pression pondérée légère est un composant de redstone qui alimente ses blocs environnants en puissance de redstone tandis que tout objet mobile (y compris les objets lâchés, les joueurs et les mobs) repose dessus.
+Heavy-Weighted Pressure Plate=Plaque de pression pondérée lourde
+A heavy-weighted 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.=Une plaque de pression pondérée lourde est un composant de redstone qui alimente ses blocs environnants en puissance de redstone tandis que tout objet mobile (y compris les objets lâchés, les joueurs et les mobs) repose dessus.
+Provides redstone power when pushed=Fournit une puissance de redstone lorsque poussé
 Pushable by players, mobs and objects=Poussable par les joueurs, les mobs et les objets
 Pushable by players and mobs=Poussable par les joueurs et les mobs
 Pushable by players=Poussable par les joueurs

mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt

@@ -6,9 +6,17 @@ Birch Pressure Plate=
 Dark Oak Pressure Plate=
 Spruce Pressure Plate=
 Jungle Pressure Plate=
+Warped Hyphae Pressure Plate=
+Crimson Hyphae Pressure Plate=
 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.=
 Stone Pressure Plate=
 A stone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.=
+Polished Blackstone Pressure Plate=
+A polished blackstone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.=
+Light-Weighted Pressure Plate=
+A light-weighted 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.=
+Heavy-Weighted Pressure Plate=
+A heavy-weighted 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.=
 Provides redstone power when pushed=
 Pushable by players, mobs and objects=
 Pushable by players and mobs=

mods/ITEMS/mcl_beds/init.lua

@@ -4,9 +4,11 @@ mcl_beds.pos = {}
 mcl_beds.bed_pos = {}
 
 local modpath = minetest.get_modpath("mcl_beds")
+local S = minetest.get_translator(minetest.get_current_modname())
 
 -- Load files
 
 dofile(modpath .. "/functions.lua")
 dofile(modpath .. "/api.lua")
 dofile(modpath .. "/beds.lua")
+dofile(modpath .. "/respawn_anchor.lua")

mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr

@@ -39,3 +39,4 @@ You're sleeping.=Tu dors.
 You will fall asleep when all players are in bed.=Vous vous endormirez lorsque tous les joueurs seront au lit.
 You're in bed.=Tu es au lit.
 Allows you to sleep=Vous permet de dormir
+Respawn Anchor=Ancre de Réapparition

mods/ITEMS/mcl_beds/locale/template.txt

@@ -40,3 +40,4 @@ You will fall asleep when all players are in bed.=
 You will fall asleep when @1% of all players are in bed.=
 You're in bed.=
 Allows you to sleep=
+Respawn Anchor=

mods/ITEMS/mcl_beds/mod.conf

@@ -2,4 +2,4 @@ name = mcl_beds
 author = BlockMen
 description =
 depends = playerphysics
-optional_depends = mcl_sounds, mcl_worlds, mcl_wool, mcl_dye, mcl_explosions, mcl_weather, mcl_spawn, doc
+optional_depends = mcl_sounds, mcl_worlds, mcl_wool, mcl_dye, mcl_explosions, mcl_weather, mcl_spawn, doc, mcl_nether

mods/ITEMS/mcl_beds/respawn_anchor.lua

@@ -0,0 +1,177 @@
+--TODO: Add sounds for the respawn anchor
+
+--Nether ends at y -29077
+--Nether roof at y -28933
+local S = minetest.get_translator(minetest.get_current_modname())
+--local mod_doc = minetest.get_modpath("doc") -> maybe add documentation ?
+
+minetest.register_node("mcl_beds:respawn_anchor",{
+	description=S("Respawn Anchor"),
+	tiles = {
+		"respawn_anchor_top_off.png",
+		"respawn_anchor_bottom.png",
+		"respawn_anchor_side0.png"
+	},
+	drawtype = "nodebox",
+	node_box=  { --Reused the composter nodebox, since it is basicly the same
+		type = "fixed",
+		fixed = {
+			{-0.5,   -0.5, -0.5,  -0.375, 0.5,   0.5},   -- Left wall
+			{ 0.375, -0.5, -0.5,   0.5,   0.5,   0.5},   -- Right wall
+			{-0.375, -0.5,  0.375, 0.375, 0.5,   0.5},   -- Back wall
+			{-0.375, -0.5, -0.5,   0.375, 0.5,  -0.375}, -- Front wall
+			{-0.5,   -0.5, -0.5,   0.5,   -0.47, 0.5},   -- Bottom level, -0.47 because -0.5 is so low that you can see the texture of the block below through
+		}
+	},
+	on_rightclick = function(pos, node, player, itemstack)
+		if itemstack.get_name(itemstack) == "mcl_nether:glowstone" then
+			minetest.set_node(pos, {name="mcl_beds:respawn_anchor_charged_1"})
+			itemstack:take_item()
+		else
+			if pos.y < -29077 or pos.y > -28933 then
+				mcl_explosions.explode(pos, 5, {drop_chance = 0, fire = true})
+			end
+		end
+	end,
+	groups = {pickaxey=1, material_stone=1},
+	_mcl_hardness = 22.5
+})
+minetest.register_node("mcl_beds:respawn_anchor_charged_1",{
+	description=S("Respawn Anchor"),
+	tiles = {
+		"portal.png",
+		"respawn_anchor_bottom.png",
+		"respawn_anchor_side1.png"
+	},
+	drawtype = "nodebox",
+	node_box=  { --Reused the composter nodebox, since it is basicly the same
+		type = "fixed",
+		fixed = {
+			{-0.5,   -0.5, -0.5,  -0.375, 0.5,   0.5},   -- Left wall
+			{ 0.375, -0.5, -0.5,   0.5,   0.5,   0.5},   -- Right wall
+			{-0.375, -0.5,  0.375, 0.375, 0.5,   0.5},   -- Back wall
+			{-0.375, -0.5, -0.5,   0.375, 0.5,  -0.375}, -- Front wall
+			{-0.5,   -0.5, -0.5,   0.5,   0.5, 0.5},   -- Bottom level
+		}
+	},
+	on_rightclick = function(pos, node, player, itemstack)
+		if itemstack.get_name(itemstack) == "mcl_nether:glowstone" then
+			minetest.set_node(pos, {name="mcl_beds:respawn_anchor_charged_2"})
+			itemstack:take_item()
+		else
+			if pos.y < -29077 or pos.y > -28933 then
+				mcl_explosions.explode(pos, 5, {drop_chance = 0, fire = true})
+			else
+				mcl_spawn.set_spawn_pos(player, pos, nil)
+			end
+		end
+	end,
+	groups = {pickaxey=1, material_stone=1, not_in_creative_inventory=1},
+	_mcl_hardness = 22.5
+})
+
+minetest.register_node("mcl_beds:respawn_anchor_charged_2",{
+	description=S("Respawn Anchor"),
+	tiles = {
+		"portal.png",
+		"respawn_anchor_bottom.png",
+		"respawn_anchor_side2.png"
+	},
+	drawtype = "nodebox",
+	node_box=  { --Reused the composter nodebox, since it is basicly the same
+		type = "fixed",
+		fixed = {
+			{-0.5,   -0.5, -0.5,  -0.375, 0.5,   0.5},   -- Left wall
+			{ 0.375, -0.5, -0.5,   0.5,   0.5,   0.5},   -- Right wall
+			{-0.375, -0.5,  0.375, 0.375, 0.5,   0.5},   -- Back wall
+			{-0.375, -0.5, -0.5,   0.375, 0.5,  -0.375}, -- Front wall
+			{-0.5,   -0.5, -0.5,   0.5,   0.5, 0.5},   -- Bottom level
+		}
+	},
+	on_rightclick = function(pos, node, player, itemstack)
+		if itemstack.get_name(itemstack) == "mcl_nether:glowstone" then
+			minetest.set_node(pos, {name="mcl_beds:respawn_anchor_charged_3"})
+			itemstack:take_item()
+		else
+			if pos.y < -29077 or pos.y > -28933 then
+				mcl_explosions.explode(pos, 5, {drop_chance = 0, fire = true})
+		else
+				mcl_spawn.set_spawn_pos(player, pos, nil)
+			end
+		end
+	end,
+	groups = {pickaxey=1, material_stone=1, not_in_creative_inventory=1},
+	_mcl_hardness = 22.5
+})
+
+minetest.register_node("mcl_beds:respawn_anchor_charged_3",{
+	description=S("Respawn Anchor"),
+	tiles = {
+		"portal.png",
+		"respawn_anchor_bottom.png",
+		"respawn_anchor_side3.png"
+	},
+	drawtype = "nodebox",
+	node_box=  { --Reused the composter nodebox, since it is basicly the same
+		type = "fixed",
+		fixed = {
+			{-0.5,   -0.5, -0.5,  -0.375, 0.5,   0.5},   -- Left wall
+			{ 0.375, -0.5, -0.5,   0.5,   0.5,   0.5},   -- Right wall
+			{-0.375, -0.5,  0.375, 0.375, 0.5,   0.5},   -- Back wall
+			{-0.375, -0.5, -0.5,   0.375, 0.5,  -0.375}, -- Front wall
+			{-0.5,   -0.5, -0.5,   0.5,   0.5, 0.5},   -- Bottom level
+		}
+	},
+	on_rightclick = function(pos, node, player, itemstack)
+		if itemstack.get_name(itemstack) == "mcl_nether:glowstone" then
+			minetest.set_node(pos, {name="mcl_beds:respawn_anchor_charged_4"})
+			itemstack:take_item()
+		else
+			if pos.y < -29077 or pos.y > -28933 then
+				mcl_explosions.explode(pos, 5, {drop_chance = 0, fire = true})
+			else
+				mcl_spawn.set_spawn_pos(player, pos, nil)
+			end
+		end
+	end,
+	groups = {pickaxey=1, material_stone=1, not_in_creative_inventory=1},
+	_mcl_hardness = 22.5
+})
+
+minetest.register_node("mcl_beds:respawn_anchor_charged_4",{
+	description=S("Respawn Anchor"),
+	tiles = {
+		"portal.png",
+		"respawn_anchor_bottom.png",
+		"respawn_anchor_side4.png"
+	},
+	drawtype = "nodebox",
+	node_box=  { --Reused the composter nodebox, since it is basicly the same
+		type = "fixed",
+		fixed = {
+		  {-0.5,   -0.5, -0.5,  -0.375, 0.5,   0.5},   -- Left wall
+			{ 0.375, -0.5, -0.5,   0.5,   0.5,   0.5},   -- Right wall
+			{-0.375, -0.5,  0.375, 0.375, 0.5,   0.5},   -- Back wall
+			{-0.375, -0.5, -0.5,   0.375, 0.5,  -0.375}, -- Front wall
+			{-0.5,   -0.5, -0.5,   0.5,   0.5, 0.5},   -- Bottom level
+		}
+	},
+	on_rightclick = function(pos, node, player, itemstack)
+		if pos.y < -29077 or pos.y > -28933 then
+			mcl_explosions.explode(pos, 5, {drop_chance = 0, fire = true})
+		else
+			mcl_spawn.set_spawn_pos(player, pos, nil)
+			awards.unlock(player:get_player_name(), "mcl:notQuiteNineLives")
+		end
+	end,
+	groups = {pickaxey=1, material_stone=1, not_in_creative_inventory=1},
+	_mcl_hardness = 22.5
+})
+
+minetest.register_craft({ output = "mcl_beds:respawn_anchor",
+	recipe = { 
+			{"mcl_core:crying_obsidian", "mcl_core:crying_obsidian", "mcl_core:crying_obsidian"},
+			{"mcl_nether:glowstone", "mcl_nether:glowstone", "mcl_nether:glowstone"},
+			{"mcl_core:crying_obsidian", "mcl_core:crying_obsidian", "mcl_core:crying_obsidian"} 
+		} 
+	}) 

mods/ITEMS/mcl_cauldrons/init.lua

@@ -128,8 +128,9 @@ minetest.register_craft({
 minetest.register_abm({
 	label = "cauldrons",
 	nodenames = {"group:cauldron_filled"},
-	interval = 0.5,
+	interval = 1,
 	chance = 1,
+	-- TODO: Move to playerinfo/playerplus/mob api
 	action = function(pos, node)
 		for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.4)) do
 			if mcl_burning.is_burning(obj) then

mods/ITEMS/mcl_compass/init.lua

@@ -1,3 +1,5 @@
+--TODO: Add advancement
+
 local S = minetest.get_translator(minetest.get_current_modname())
 
 mcl_compass = {}
@@ -9,28 +11,58 @@ local compass_frames = 32
 
 -- Timer for random compass spinning
 local random_timer = 0
-local random_timer_trigger = 0.5 -- random compass spinning tick in seconds. Increase if there are performance problems
+local random_timer_trigger = 0.5 -- random compass spinning tick in seconds. Incr	ease if there are performance problems
 
 local random_frame = math.random(0, compass_frames-1)
 
-function mcl_compass.get_compass_image(pos, dir)
+function mcl_compass.get_compass_image(pos, dir, x, y, z)
 	-- Compasses do not work in certain zones
-	if mcl_worlds.compass_works(pos) then
-		local spawn = {x=0,y=0,z=0}
-		local ssp = minetest.setting_get_pos("static_spawnpoint")
-		if ssp then
-			spawn = ssp
-			if type(spawn) ~= "table" or type(spawn.x) ~= "number" or type(spawn.y) ~= "number" or type(spawn.z) ~= "number" then
-				spawn = {x=0,y=0,z=0}
+	if mcl_worlds.compass_works(pos) and x ~= nil and y ~= nil and z ~= nil then
+		local _, dim = mcl_worlds.y_to_layer(y)
+		local _, playerdim = mcl_worlds.y_to_layer(pos.y)
+		
+		if dim == playerdim then --Check if player and compass target are in the same dimension, above check is just if the diemension is valid for the non lodestone compass	   
+			local spawn = {x=x,y=y,z=z}
+			local ssp = minetest.setting_get_pos("static_spawnpoint")
+			if ssp and x == 0 and y == 0 and z == 0 then
+				spawn = ssp
+				if type(spawn) ~= "table" or type(spawn.x) ~= "number" or type(spawn.y) ~= "number" or type(spawn.z) ~= "number" then
+					spawn = {x=0,y=0,z=0}
+				end
 			end
+			local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z))
+			if angle_north < 0 then angle_north = angle_north + 360 end
+			local angle_dir = -math.deg(dir)
+			local angle_relative = (angle_north - angle_dir + 180) % 360
+			return math.floor((angle_relative/11.25) + 0.5) % compass_frames
+		else
+			return random_frame
 		end
-		local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z))
-		if angle_north < 0 then angle_north = angle_north + 360 end
-		local angle_dir = -math.deg(dir)
-		local angle_relative = (angle_north - angle_dir + 180) % 360
-		return math.floor((angle_relative/11.25) + 0.5) % compass_frames
 	else
-		return random_frame
+		if x ~= 0 and y ~= 0 and z~= 0 and x ~= nil and y ~= nil and x~= nil then
+			local _, dim = mcl_worlds.y_to_layer(y)
+			local _, playerdim = mcl_worlds.y_to_layer(pos.y)
+			if dim == playerdim then --already explained that very same if statement above
+				local spawn = {x=x,y=y,z=z}
+				local ssp = minetest.setting_get_pos("static_spawnpoint")
+				if ssp and x == 0 and y == 0 and z == 0 then
+					spawn = ssp
+					if type(spawn) ~= "table" or type(spawn.x) ~= "number" or type(spawn.y) ~= "number" or type(spawn.z) ~= "number" then
+						spawn = {x=0,y=0,z=0}
+					end
+				end
+				local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z))
+				if angle_north < 0 then angle_north = angle_north + 360 end
+				local angle_dir = -math.deg(dir)
+				local angle_relative = (angle_north - angle_dir + 180) % 360
+				return math.floor((angle_relative/11.25) + 0.5) % compass_frames
+			else
+				return random_frame
+			end
+
+		else
+			return random_frame
+		end
 	end
 end
 
@@ -52,9 +84,39 @@ minetest.register_globalstep(function(dtime)
 		end
 		if has_compass(player) then
 			local pos = player:get_pos()
-			local compass_image = mcl_compass.get_compass_image(pos, player:get_look_horizontal())
 
 			for j,stack in pairs(player:get_inventory():get_list("main")) do
+				x = stack:get_meta():get_string("x") -- i know i could write the pos in meta, but i like this method more, and it is basicly the same, since else there would be one table with 3 values, and i have 3 values on their own
+				y = stack:get_meta():get_string("y")
+				z = stack:get_meta():get_string("z")
+				
+				x = tonumber(x)
+				y = tonumber(y)
+				z = tonumber(z)
+						
+				if x == nil or y == nil or z == nil then --checking if the compass has lodestone meta
+					compass_image = mcl_compass.get_compass_image(pos, player:get_look_horizontal(), 0, 0, 0) --no lodestone meta
+				else
+					checkblock = {x = x, y = y, z = z}
+					local function get_far_node(pos) --function that tries to read node normally, and does it even if its unloaded https://dev.minetest.net/minetest.get_node
+						local node = minetest.get_node(pos)
+						if node.name == "ignore" then
+							minetest.get_voxel_manip():read_from_map(pos, pos) 
+							node = minetest.get_node(pos)
+						end 
+						return node
+					end
+
+					if get_far_node(checkblock).name == "mcl_compass:lodestone" then --check if lodestone still exists
+						compass_image = mcl_compass.get_compass_image(pos, player:get_look_horizontal(), x, y, z)
+						compass_image = compass_image .. "_lodestone"
+					else -- lodestone got destroyed
+						compass_image = random_frame .. "_lodestone"
+					end
+
+					
+				end
+
 				if minetest.get_item_group(stack:get_name(), "compass") ~= 0 and
 						minetest.get_item_group(stack:get_name(), "compass")-1 ~= compass_image then
 					local itemname = "mcl_compass:"..compass_image
@@ -81,8 +143,8 @@ for i,img in ipairs(images) do
 		inv = 0
 	end
 	local use_doc, longdesc, tt
-    --Why is there no usage help? This should be fixed.
-    --local usagehelp
+	--Why is there no usage help? This should be fixed.
+	--local usagehelp
 	use_doc = i == stereotype_frame
 	if use_doc then
 		tt = S("Points to the world origin")
@@ -100,6 +162,18 @@ for i,img in ipairs(images) do
 		stack_max = 64,
 		groups = {not_in_creative_inventory=inv, compass=i, tool=1, disable_repair=1 }
 	})
+	
+	minetest.register_craftitem(itemstring .. "_lodestone", {
+		description = S("Lodestone Compass"),
+		_tt_help = tt,
+		_doc_items_create_entry = use_doc,
+		_doc_items_longdesc = longdesc,
+		--_doc_items_usagehelp = usagehelp,
+		inventory_image = img .. "^[colorize:purple:50",
+		wield_image = img .. "^[colorize:purple:50",
+		stack_max = 64,
+		groups = {not_in_creative_inventory=1, compass=i, tool=1, disable_repair=1 }
+	})
 
 	-- Help aliases. Makes sure the lookup tool works correctly
 	if not use_doc and doc_mod then
@@ -116,9 +190,42 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "mcl_compass:lodestone",
+	recipe = {
+		{"mcl_core:stonebrickcarved","mcl_core:stonebrickcarved","mcl_core:stonebrickcarved"},
+		{"mcl_core:stonebrickcarved", "mcl_nether:netherite_ingot", "mcl_core:stonebrickcarved"},
+		{"mcl_core:stonebrickcarved", "mcl_core:stonebrickcarved", "mcl_core:stonebrickcarved"}
+	}
+})
+
 minetest.register_alias("mcl_compass:compass", "mcl_compass:"..stereotype_frame)
 
 -- Export stereotype item for other mods to use
 mcl_compass.stereotype = "mcl_compass:"..tostring(stereotype_frame)
 
 
+minetest.register_node("mcl_compass:lodestone",{
+	description=S("Lodestone"),
+	on_rightclick = function(pos, node, player, itemstack)
+		if itemstack.get_name(itemstack).match(itemstack.get_name(itemstack),"mcl_compass:") then
+			if itemstack.get_name(itemstack) ~= "mcl_compass:lodestone" then
+				itemstack:get_meta():set_string("x", pos.x)
+				itemstack:get_meta():set_string("y", pos.y)
+				itemstack:get_meta():set_string("z", pos.z)
+			end
+		end
+	end,
+	tiles = {
+		"lodestone_top.png",
+		"lodestone_bottom.png",
+		"lodestone_side1.png",
+		"lodestone_side2.png",
+		"lodestone_side3.png",
+		"lodestone_side4.png"
+	},
+	groups = {pickaxey=1, material_stone=1},
+	_mcl_hardness = 1.5,
+	_mcl_blast_resistance = 6,
+	sounds = mcl_sounds.node_sound_stone_defaults()
+})

mods/ITEMS/mcl_compass/locale/mcl_compass.fr.tr

@@ -2,3 +2,5 @@
 Compasses are tools which point to the world origin (X@=0, Z@=0) or the spawn point in the Overworld.=Les boussoles sont des outils qui pointent vers l'origine du monde (X@=0,Z@=0) ou le point d'apparition dans l'Overworld.
 Compass=Boussole
 Points to the world origin=Pointe vers l'origine mondiale
+Lodestone Compass=Boussole magnétisée
+Lodestone=Magnétite

mods/ITEMS/mcl_compass/locale/template.txt

@@ -2,3 +2,5 @@
 Compasses are tools which point to the world origin (X@=0, Z@=0) or the spawn point in the Overworld.=
 Compass=
 Points to the world origin=
+Lodestone Compass=
+Lodestone=

mods/ITEMS/mcl_compass/mod.conf

@@ -1,4 +1,4 @@
 name = mcl_compass
 description = A compass item which points towards the world origin.
-depends = mcl_core, mcl_worlds, mesecons
-optional_depends = doc
+depends = mcl_core, mcl_worlds, mesecons, mcl_nether, mcl_sounds
+optional_depends = doc

mods/ITEMS/mcl_core/README.txt

@@ -21,6 +21,14 @@ MIT License.
 The textures are taken from the Minecraft resource pack “Faithful 1.11” by Vattic and
 xMrVizzy and contributers.
 
+
+CC BY-SA 4.0
+
+mcl_core_lava_spark.png is based on the Pixel Perfection resource pack for Minecraft 1.11,
+authored by XSSheep.
+Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
+License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
+
 Sounds
 ======
 All sounds included in this mod are under the MIT License.

mods/ITEMS/mcl_core/functions.lua

@@ -54,6 +54,137 @@ minetest.register_abm({
 	end,
 })
 
+
+--
+-- Production of sparks from lava
+--
+
+local LAVA_SPARK_ABM_INTERVAL = 5
+local lava_spark_limit = minetest.settings:get("mcl_core_lava_spark_limit")
+if lava_spark_limit == nil then
+	lava_spark_limit = 10
+else
+	lava_spark_limit = tonumber(lava_spark_limit)
+end
+local lava_spark_chance = 0
+local lava_spark_abm_census = 0
+local lava_spark_census = 0
+
+function mcl_core.lava_spark_set_chance()
+	lava_spark_chance = lava_spark_limit / lava_spark_abm_census
+	minetest.after(LAVA_SPARK_ABM_INTERVAL, mcl_core.lava_spark_set_chance)
+	lava_spark_abm_census = 0
+	lava_spark_census = 0
+end
+
+if lava_spark_limit > 0 then
+	mcl_core.lava_spark_set_chance()
+
+	minetest.register_abm({
+		label = "Lava produce sparks",
+		nodenames = {"group:lava"},
+		neighbors = {"air"},
+		interval = LAVA_SPARK_ABM_INTERVAL,
+		chance = 18,
+		action = function(pos, node)
+			local above = minetest.get_node(vector.new(pos.x, pos.y + 1, pos.z))
+			if above.name ~= "air" then return end
+		
+			lava_spark_abm_census = lava_spark_abm_census + 1
+		
+			if lava_spark_census >= lava_spark_limit then return end
+			if math.random() > lava_spark_chance then return end
+		
+			lava_spark_census = lava_spark_census + 1
+			minetest.after(math.random() * LAVA_SPARK_ABM_INTERVAL, mcl_core.lava_spark_add, pos)
+		end
+	})
+end
+
+function mcl_core.lava_spark_add(pos)
+	local node = minetest.get_node(pos)
+	if minetest.get_node_group(node.name, "lava") == 0 then return end
+	
+	local above = minetest.get_node(vector.new(pos.x, pos.y + 1, pos.z))
+	if above.name ~= "air" then return end
+	
+	local pos_addend = vector.new(
+		(math.random() - 0.5) * 0.8,
+		(math.random() - 0.5) * 0.8,
+		(math.random() - 0.5) * 0.8
+	)
+	local spark_pos = vector.add(pos, pos_addend)
+	local spark = minetest.add_entity(spark_pos, "mcl_core:lava_spark")
+	if not spark then return end
+	
+	local velocity = vector.new(
+		(math.random() - 0.5) * 3,
+		(math.random() + 2) * 2,
+		(math.random() - 0.5) * 3
+	)
+	spark:set_velocity(velocity)
+	
+	spark:set_acceleration(vector.new(0, -9, 0))
+	
+	-- Set a random size
+	local size = 0.2 + math.random() * 0.2
+	local props = spark:get_properties()
+	if not props then return end
+	props.visual_size = vector.new(size, size, size)
+	spark:set_properties(props)
+	
+	local luaentity = spark:get_luaentity()
+	if not luaentity then return end
+	luaentity._life_timer = 0.4 + math.random()
+end
+
+minetest.register_entity("mcl_core:lava_spark", {
+	physical = true,
+	visual = "sprite",
+	collide_with_objects = true,
+	textures = {"mcl_core_lava_spark.png"},
+	glow = 10,
+	static_save = false,
+	_smoke_timer = 0.1,
+	_life_timer = 1,
+	on_step = function(self, dtime)
+		if not self or not self.object then return end
+
+		self._life_timer = self._life_timer - dtime
+		if self._life_timer <= 0 then
+			self.object:remove()
+			return
+		end
+
+
+		self._smoke_timer = self._smoke_timer - dtime
+		if self._smoke_timer > 0 then return end
+		self._smoke_timer = 0.2 + math.random() * 0.3
+		
+		local pos = self.object:get_pos()
+
+		-- Add smoke
+		minetest.add_particlespawner({
+			amount = 3,
+			time = 0.001,
+			minpos = pos,
+			maxpos = pos,
+			minvel = vector.new(-0.1, 1, -0.1),
+			maxvel = vector.new(0.1, 1.5, 0.1),
+			minexptime = 0.1,
+			maxexptime = 0.6,
+			minsize = 0.5,
+			maxsize = 1.5,
+			texture = "mcl_particles_smoke_anim.png",
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 8,
+				aspect_h = 8,
+			}
+		})
+	end
+})
+
 --
 -- Papyrus and cactus growing
 --

mods/ITEMS/mcl_core/locale/mcl_core.fr.tr

@@ -92,6 +92,7 @@ Diorite=Diorite
 Diorite is an igneous rock.=La diorite est une roche volcanique.
 Dirt=Terre
 Dirt acts as a soil for a few plants. When in light, this block may grow a grass or mycelium cover if such blocks are nearby.=La terre agit comme un sol pour quelques plantes. Lorsqu'il est à la lumière, ce bloc peut faire pousser une couverture d'herbe ou de mycélium si ces blocs sont à proximité.
+Enchanted Golden Apple=Pomme Dorée Enchantée
 Emerald=Emeraude
 Emerald Ore=Minerai d'Emeraude
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Le minerai d'émeraude produit des émeraudes. Il est très rare et ne peut être trouvé que seul, pas en filons.
@@ -154,6 +155,8 @@ Oak Wood Planks=Planches de Chêne
 Oak leaves are grown from oak trees.=Les feuilles de chêne sont cultivées à partir de chênes.
 Obsidian=Obsidienne
 Obsidian is an extremely hard mineral with an enourmous blast-resistance. Obsidian is formed when water meets lava.=L'obsidienne est un minéral extrêmement dur avec une énorme résistance à l'explosion. L'obsidienne se forme lorsque l'eau rencontre la lave.
+Crying Obsidian=Obsidienne Pleureuse
+Crying obsidian is a luminous obsidian that can generate as part of ruined portals.=L'obsidienne pleureuse est de l'obsidienne lumineuse générée comme composant des portails en ruines.
 One of the most common blocks in the world, almost the entire underground consists of stone. It sometimes contains ores. Stone may be created when water meets lava.=L'un des blocs les plus courants au monde, presque tout le sous-sol est en pierre. Il contient parfois des minerais. La pierre peut être créée lorsque l'eau rencontre la lave.
 Orange Stained Glass=Verre Orange
 Packed Ice=Glace Compactée
@@ -202,20 +205,45 @@ Stained glass is a decorative and mostly transparent block which comes in variou
 Stick=Bâton
 Sticks are a very versatile crafting material; used in countless crafting recipes.=Les bâtons sont un matériau d'artisanat très polyvalent; utilisé dans d'innombrables recettes d'artisanat.
 Stone=Roche
+Stripped Acacia Log=Bois d'Acacia
+Stripped Acacia Wood=Bois Ecorché d'Acacia
+Stripped Birch Log=Bois de Bouleau
+Stripped Birch Wood=Bois Ecorché de Bouleau
+Stripped Dark Oak Log=Bois de Chêne Noir
+Stripped Dark Oak Wood=Bois Ecorché de Chêne Noir
+Stripped Jungle Log=Bois d'Acajou
+Stripped Jungle Wood=Bois Ecorché d'Acajou
+Stripped Oak Log=Bois de Chêne
+Stripped Oak Wood=Bois Ecorché de Chêne
+Stripped Spruce Log=Bois de Sapin
+Stripped Spruce Wood=Bois Ecorché de Sapin
 Stone Bricks=Pierre Taillée
 Sugar=Sucre
 Sugar Canes=Canne à Sucre
 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.=Les cannes à sucre sont une plante qui a certaines utilisations dans l'artisanat. Les cannes à sucre poussent lentement jusqu'à 3 blocs lorsqu'elles sont à côté de l'eau et sont placées sur un bloc d'herbe, de terre, de sable, de sable rouge, de podzol ou de terre stérile. Lorsqu'une canne à sucre est cassée, toutes les cannes à sucre connectées au-dessus se brisent également.
 Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=Les cannes à sucre ne peuvent être placées que sur d'autres cannes à sucre et sur des blocs sur lesquels elles poussent.
 Sugar comes from sugar canes and is used to make sweet foods.=Le sucre provient des cannes à sucre et est utilisé pour fabriquer des aliments sucrés.
+The stripped trunk of an acacia tree.=Le tronc écorché d'un acacia.
+The stripped trunk of a birch tree.=Le tronc écorché d'un bouleau.
+The stripped trunk of a dark oak tree.=Le tronc écorché d'un chêne noir.
+The stripped trunk of a jungle tree.=Le tronc écorché d'un acajou.
+The stripped trunk of an oak tree.=Le tronc écorché d'un chêne.
+The stripped trunk of a spruce tree.=Le tronc écorché d'un sapin.
 The trunk of a birch tree.=Le tronc d'un bouleau.
 The trunk of a dark oak tree.=Le tronc d'un chêne noir.
 The trunk of a jungle tree.=Le tronc d'un acajou.
 The trunk of a spruce tree.=Le tronc d'un sapin.
 The trunk of an acacia.=Le tronc d'un acacia
 The trunk of an oak tree.=Le tronc d'un chêne.
+The stripped wood of an acacia tree.=Les planches écorchée d'un acacia.
+The stripped wood of a birch tree.=Les planches écorchée d'un bouleau.
+The stripped wood of a dark oak tree.=Les planches écorchée d'un chêne noir.
+The stripped wood of a jungle tree.=Les planches écorchée d'un acajou.
+The stripped wood of an oak tree.=Les planches écorchée d'un chêne.
+The stripped wood of a spruce tree.=Les planches écorchée d'un sapin.
 This block consists of a couple of loose stones and can't support itself.=Ce bloc se compose de quelques pierres lâches et ne peut pas se soutenir.
 This is a decorative block surrounded by the bark of a tree trunk.=Il s'agit d'un bloc décoratif entouré par l'écorce d'un tronc d'arbre.
+This is a decorative block.=Il s'agit d'un bloc décoratif.
 This is a full block of snow. Snow of this thickness is usually found in areas of extreme cold.=Ceci est un bloc de neige complet. La neige de cette épaisseur se trouve généralement dans les zones de froid extrême.
 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.=Il s'agit d'un morceau de cactus que l'on trouve couramment dans les zones sèches, en particulier dans les déserts. Au fil du temps, les cactus pousseront jusqu'à 3 blocs de haut sur le sable ou le sable rouge. Un cactus blesse les êtres vivants qui le touchent avec des dégâts de 1 HP toutes les demi-secondes. Lorsqu'un bloc de cactus est brisé, tous les blocs de cactus connectés au-dessus se brisent également.
 This stone contains pure gold, a rare metal.=Cette pierre contient de l'or pur, un métal rare.
@@ -256,3 +284,7 @@ Slows down movement=Ralentit le mouvement
 2×2 saplings @= large tree=2×2 pousses @= grand arbre
 Grows on sand or dirt next to water=Pousse sur le sable ou la terre près de l'eau
 Stackable=Empilable
+Moss=Mousse
+Moss Carpet=Tapis de Mousse
+A moss block is a natural block that can be spread to some other blocks by using bone meal.=Un bloc de mousse est un bloc naturel qui peut se propager à d'autres blocs en utilisant de la farine d'os.
+Moss Carpets are a thin decorative variant of the moss block.=Les tapis de mousse sont une fine variante décorative du bloc de mousse.

mods/ITEMS/mcl_core/locale/template.txt

@@ -284,3 +284,7 @@ Slows down movement=
 2×2 saplings @= large tree=
 Grows on sand or dirt next to water=
 Stackable=
+Moss=
+Moss Carpet=
+A moss block is a natural block that can be spread to some other blocks by using bone meal.=
+Moss Carpets are a thin decorative variant of the moss block.=

mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.fr.tr

@@ -7,3 +7,7 @@ Burning Furnace=Four Allumé
 Recipe book=Livre de Recette
 Inventory=Inventaire
 Uses fuel to smelt or cook items=Utilise du carburant pour fondre ou cuire des articles
+Blast Furnace=Haut Fourneau
+Blast Furnaces cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.=Un haut fourneau peut cuire ou fondre plusieurs objets, en quelque chose d'autre, en utilisant du carburant, plus vite qu'un four normal.
+Smoker=Fumoir
+Smokers cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.=Le Fumoir peut cuire ou fondre plusieurs objets, en quelque chose d'autre, en utilisant du carburant, plus vite qu'un four normal.

mods/ITEMS/mcl_furnaces/locale/template.txt

@@ -7,3 +7,7 @@ Burning Furnace=
 Recipe book=
 Inventory=
 Uses fuel to smelt or cook items=
+Blast Furnace=
+Blast Furnaces cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.=
+Smoker=
+Smokers cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.=

mods/ITEMS/mcl_lanterns/init.lua

@@ -1,5 +1,5 @@
-local S = minetest.get_translator("mcl_lanterns")
-local modpath = minetest.get_modpath("mcl_lanterns")
+local S = minetest.get_translator(minetest.get_current_modname())
+local modpath = minetest.get_modpath(minetest.get_current_modname())
 
 mcl_lanterns = {}
 

mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr

@@ -0,0 +1,6 @@
+# textdomain: mcl_lanterns
+Chain=Chaine
+Chains are metallic decoration blocks.=Les chaines sont des blocs de décoration métalliques.
+Lantern=Lanterne
+Lanterns are light sources which can be placed on the top or the bottom of most blocks.=Les lanternes sont des sources de lumières qui peuvent être placées au sommet ou en-dessous de la plupart des blocs.
+Soul Lantern=Lanterne des âmes

mods/ITEMS/mcl_lanterns/local/template.txt

@@ -0,0 +1,6 @@
+# textdomain: mcl_lanterns
+Chain=
+Chains are metallic decoration blocks.=
+Lantern=
+Lanterns are light sources which can be placed on the top or the bottom of most blocks.=
+Soul Lantern=

mods/ITEMS/mcl_lanterns/register.lua

@@ -1,4 +1,4 @@
-local S = minetest.get_translator("mcl_lanterns")
+local S = minetest.get_translator(minetest.get_current_modname())
 
 mcl_lanterns.register_lantern("lantern", {
 	description = S("Lantern"),

mods/ITEMS/mcl_mushroom/init.lua

@@ -3,7 +3,7 @@ local S = minetest.get_translator("mcl_mushroom")
 -- function grow()
 function grow_twisting_vines(pos, moreontop)
 	local y = pos.y + 1
-	      while not (moreontop == 0) do
+		while not (moreontop == 0) do
 			if minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air" then
 				minetest.set_node({x = pos.x, y = y, z = pos.z}, {name="mcl_mushroom:twisting_vines"})
 				moreontop = moreontop - 1
@@ -13,18 +13,18 @@ function grow_twisting_vines(pos, moreontop)
 			else
 				moreontop = 0
 			end
-	      end
+	end
 end
 
 
 -- Warped fungus
 -- Crimson fungus
---Functions and Biomes
+-- Functions and Biomes
 
 -- WARNING: The most comments are in german. Please Translate with an translater if you don't speak good german
 
 minetest.register_node("mcl_mushroom:warped_fungus", {
-  description = S("Warped Fungus Mushroom"),
+	description = S("Warped Fungus Mushroom"),
 	drawtype = "plantlike",
 	tiles = { "farming_warped_fungus.png" },
 	inventory_image = "farming_warped_fungus.png",
@@ -33,7 +33,6 @@ minetest.register_node("mcl_mushroom:warped_fungus", {
 	paramtype = "light",
 	walkable = false,
 	groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, compostability=65},
-
 	light_source = 1,
 	selection_box = {
 		type = "fixed",
@@ -43,22 +42,22 @@ minetest.register_node("mcl_mushroom:warped_fungus", {
 	on_rightclick = function(pos, node, pointed_thing, itemstack)
 
 	if pointed_thing:get_wielded_item():get_name() == "mcl_dye:white" then
-	      itemstack:take_item()
-	      local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
-	      if nodepos.name == "mcl_mushroom:warped_nylium" or nodepos.name == "mcl_nether:netherrack" then
+		itemstack:take_item()
+	    local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
+		if nodepos.name == "mcl_mushroom:warped_nylium" or nodepos.name == "mcl_nether:netherrack" then
 	        local random = math.random(1, 5)
 	        if random == 1 then
 	          generate_warped_tree(pos)
 	        end
-	      end
-	    end
-	  end,
-  _mcl_blast_resistance = 0,
-  stack_max = 64,
+		end
+	end
+	end,
+	_mcl_blast_resistance = 0,
+	stack_max = 64,
 })
 
 minetest.register_node("mcl_mushroom:twisting_vines", {
-  description = S("Twisting Vines"),
+	description = S("Twisting Vines"),
 	drawtype = "plantlike",
 	tiles = { "twisting_vines_plant.png" },
 	inventory_image = "twisting_vines.png",
@@ -92,15 +91,15 @@ minetest.register_node("mcl_mushroom:twisting_vines", {
 	_mcl_shears_drop = true,
 	_mcl_silk_touch_drop = true,
 	_mcl_fortune_drop = { items = {{items = {"mcl_mushroom:twisting_vines"}, rarity = 3},},
-	 											items = {{items = {"mcl_mushroom:twisting_vines"}, rarity = 1.8181818181818181},},
-												"mcl_mushroom:twisting_vines",
-												"mcl_mushroom:twisting_vines"},
-  _mcl_blast_resistance = 0,
-  stack_max = 64,
+		items = {{items = {"mcl_mushroom:twisting_vines"}, rarity = 1.8181818181818181},},
+		"mcl_mushroom:twisting_vines",
+		"mcl_mushroom:twisting_vines"},
+	_mcl_blast_resistance = 0,
+	stack_max = 64,
 })
 
 minetest.register_node("mcl_mushroom:nether_sprouts", {
-  description = S("Nether Sprouts"),
+	description = S("Nether Sprouts"),
 	drawtype = "plantlike",
 	tiles = { "nether_sprouts.png" },
 	inventory_image = "nether_sprouts.png",
@@ -117,12 +116,12 @@ minetest.register_node("mcl_mushroom:nether_sprouts", {
 	drop = "",
 	_mcl_shears_drop = true,
 	_mcl_silk_touch_drop = false,
-  _mcl_blast_resistance = 0,
-  stack_max = 64,
+	_mcl_blast_resistance = 0,
+	stack_max = 64,
 })
 
 minetest.register_node("mcl_mushroom:warped_roots", {
-  description = S("Warped Roots"),
+	description = S("Warped Roots"),
 	drawtype = "plantlike",
 	tiles = { "warped_roots.png" },
 	inventory_image = "warped_roots.png",
@@ -137,104 +136,107 @@ minetest.register_node("mcl_mushroom:warped_roots", {
 	},
 	node_placement_prediction = "",
 	_mcl_silk_touch_drop = false,
-  _mcl_blast_resistance = 0,
-  stack_max = 64,
+	_mcl_blast_resistance = 0,
+	stack_max = 64,
 })
 
 minetest.register_node("mcl_mushroom:warped_wart_block", {
-  description = S("Warped Wart Block"),
-  tiles = {"warped_wart_block.png"},
-  groups = {handy=1,hoe=7,swordy=1, compostability=85, deco_block=1, },
-  stack_max = 64,
-  _mcl_hardness = 2,
+	description = S("Warped Wart Block"),
+	tiles = {"warped_wart_block.png"},
+	groups = {handy=1,hoe=7,swordy=1, compostability=85, deco_block=1, },
+	stack_max = 64,
+	_mcl_hardness = 2,
 })
 
 minetest.register_node("mcl_mushroom:shroomlight", {
-  description = S("Shroomlight"),
-  tiles = {"shroomlight.png"},
-  groups = {handy=1,hoe=7,swordy=1, leaves=1, deco_block=1, compostability=65, },
-  stack_max = 64,
-  _mcl_hardness = 2,
-  -- this is 15 in Minecraft
-  light_source = 14,
+	description = S("Shroomlight"),
+	tiles = {"shroomlight.png"},
+	groups = {handy=1,hoe=7,swordy=1, leaves=1, deco_block=1, compostability=65, },
+	stack_max = 64,
+	_mcl_hardness = 2,
+	-- this is 15 in Minecraft
+	light_source = 14,
 })
 
 minetest.register_node("mcl_mushroom:warped_hyphae", {
-  description = S("Warped Hyphae"),
-  tiles = {"warped_hyphae.png",
-           "warped_hyphae.png",
-           "warped_hyphae_side.png",
-           "warped_hyphae_side.png",
-           "warped_hyphae_side.png",
-           "warped_hyphae_side.png",
-         },
-  groups = {handy=5,axey=1, bark=1, building_block=1, material_wood=1,},
-  paramtype2 = "facedir",
-  stack_max = 64,
-  _mcl_hardness = 2,
+	description = S("Warped Hyphae"),
+	tiles = {
+		"warped_hyphae.png",
+        "warped_hyphae.png",
+        "warped_hyphae_side.png",
+        "warped_hyphae_side.png",
+        "warped_hyphae_side.png",
+        "warped_hyphae_side.png",
+    },
+	groups = {handy=5,axey=1, bark=1, building_block=1, material_wood=1,},
+	paramtype2 = "facedir",
+	stack_max = 64,
+	_mcl_hardness = 2,
 })
 
 minetest.register_node("mcl_mushroom:warped_nylium", {
-  description = S("Warped Nylium"),
-  tiles = {"warped_nylium.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png^warped_nylium_side.png",
-           "mcl_nether_netherrack.png^warped_nylium_side.png",
-           "mcl_nether_netherrack.png^warped_nylium_side.png",
-           "mcl_nether_netherrack.png^warped_nylium_side.png",
-         },
-  groups = {pickaxey=1, building_block=1, material_stone=1},
-  paramtype2 = "facedir",
-  stack_max = 64,
-  _mcl_hardness = 0.4,
-  _mcl_blast_resistance = 0.4,
-  is_ground_content = true,
-  drop = "mcl_nether:netherrack",
-  _mcl_silk_touch_drop = true,
+	description = S("Warped Nylium"),
+	tiles = {
+		"warped_nylium.png",
+		"mcl_nether_netherrack.png",
+		"mcl_nether_netherrack.png^warped_nylium_side.png",
+		"mcl_nether_netherrack.png^warped_nylium_side.png",
+		"mcl_nether_netherrack.png^warped_nylium_side.png",
+		"mcl_nether_netherrack.png^warped_nylium_side.png",
+    },
+	groups = {pickaxey=1, building_block=1, material_stone=1},
+	paramtype2 = "facedir",
+	stack_max = 64,
+	_mcl_hardness = 0.4,
+	_mcl_blast_resistance = 0.4,
+	is_ground_content = true,
+	drop = "mcl_nether:netherrack",
+	_mcl_silk_touch_drop = true,
 })
 
 minetest.register_node("mcl_mushroom:warped_checknode", {
-  description = S("Warped Checknode - only to check!"),
-  tiles = {"mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-         },
-  groups = {pickaxey=1, building_block=1, material_stone=1, not_in_creative_inventory=1},
-  paramtype2 = "facedir",
-  stack_max = 64,
-  _mcl_hardness = 0.4,
-  _mcl_blast_resistance = 0.4,
-  is_ground_content = true,
-  drop = "mcl_nether:netherrack"
+	description = S("Warped Checknode - only to check!"),
+	tiles = {
+		"mcl_nether_netherrack.png",
+		"mcl_nether_netherrack.png",
+		"mcl_nether_netherrack.png",
+		"mcl_nether_netherrack.png",
+		"mcl_nether_netherrack.png",
+		"mcl_nether_netherrack.png",
+    },
+	groups = {pickaxey=1, building_block=1, material_stone=1, not_in_creative_inventory=1},
+	paramtype2 = "facedir",
+	stack_max = 64,
+	_mcl_hardness = 0.4,
+	_mcl_blast_resistance = 0.4,
+	is_ground_content = true,
+	drop = "mcl_nether:netherrack"
 })
 
 minetest.register_node("mcl_mushroom:warped_hyphae_wood", {
-  description = S("Warped Hyphae Wood"),
-  tiles = {"warped_hyphae_wood.png"},
-  groups = {handy=5,axey=1, flammable=3,wood=1,building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=20},
-  paramtype2 = "facedir",
-  stack_max = 64,
-  _mcl_hardness = 2,
+	description = S("Warped Hyphae Wood"),
+	tiles = {"warped_hyphae_wood.png"},
+	groups = {handy=5,axey=1, flammable=3,wood=1,building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=20},
+	--paramtype2 = "facedir",
+	stack_max = 64,
+	_mcl_hardness = 2,
 })
 
-mcl_stairs.register_stair_and_slab_simple("warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood", S("Warped Stair"), S("Warped Slab"), S("Double Warped Slab"))
+mcl_stairs.register_stair_and_slab_simple("warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood", S("Warped Stair"), S("Warped Slab"), S("Double Warped Slab"), "woodlike")
 
 minetest.register_craft({
-  output = "mcl_mushroom:warped_hyphae_wood 4",
-  recipe = {
-    {"mcl_mushroom:warped_hyphae"},
-  }
+	output = "mcl_mushroom:warped_hyphae_wood 4",
+	recipe = {
+		{"mcl_mushroom:warped_hyphae"},
+	}
 })
 
 minetest.register_craft({
-  output = "mcl_mushroom:warped_nylium 2",
-  recipe = {
-    {"mcl_mushroom:warped_wart_block"},
-    {"mcl_nether:netherrack"},
-  }
+	output = "mcl_mushroom:warped_nylium 2",
+	recipe = {
+		{"mcl_mushroom:warped_wart_block"},
+		{"mcl_nether:netherrack"},
+	}
 })
 
 minetest.register_abm({
@@ -245,42 +247,41 @@ minetest.register_abm({
 	action = function(pos)
     local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
     if nodepos.name == "mcl_mushroom:warped_nylium" or nodepos.name == "mcl_nether:netherrack" then
-      if pos.y < -28400 then
-        generate_warped_tree(pos)
-      end
+		if pos.y < -28400 then
+			generate_warped_tree(pos)
+		end
     end
-  end
+	end
 })
 
 minetest.register_abm({
 	label = "mcl_mushroom:warped_checknode",
 	nodenames = {"mcl_mushroom:warped_checknode"},
-	interval = 0.1,
+	interval = 1,
 	chance = 1,
 	action = function(pos)
     local nodepos = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z})
     if nodepos.name == "air" then
-      minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_mushroom:warped_nylium" })
-      local randomg = math.random(1, 400)
-      if randomg <= 5 then
-        minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_fungus" })
-      elseif randomg > 5 and randomg <= 15 then
-        local pos1 = { x = pos.x, y = pos.y + 1, z = pos.z }
-        generate_warped_tree(pos1)
-			elseif randomg > 15 and randomg <= 45 then
-				grow_twisting_vines({ x = pos.x, y = pos.y, z = pos.z } ,math.random(1, 4))
-			elseif randomg > 45 and randomg <= 50 then
-				minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_fungus" })
-			elseif randomg > 50 and randomg <= 150 then
-				minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:nether_sprouts" })
-			elseif randomg > 150 and randomg <= 250 then
-				minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_roots" })
-      end
-
+		minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_mushroom:warped_nylium" })
+		local randomg = math.random(1, 400)
+		if randomg <= 5 then
+			minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_fungus" })
+		elseif randomg > 5 and randomg <= 15 then
+			local pos1 = { x = pos.x, y = pos.y + 1, z = pos.z }
+			generate_warped_tree(pos1)
+		elseif randomg > 15 and randomg <= 45 then
+			grow_twisting_vines({ x = pos.x, y = pos.y, z = pos.z } ,math.random(1, 4))
+		elseif randomg > 45 and randomg <= 50 then
+			minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_fungus" })
+		elseif randomg > 50 and randomg <= 150 then
+			minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:nether_sprouts" })
+		elseif randomg > 150 and randomg <= 250 then
+			minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_roots" })
+		end
     else
-      minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" })
+		minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" })
     end
-  end
+	end
 })
 
 
@@ -297,7 +298,7 @@ minetest.register_abm({
 
 
 minetest.register_node("mcl_mushroom:crimson_fungus", {
-  description = S("Crimson Fungus Mushroom"),
+	description = S("Crimson Fungus Mushroom"),
 	drawtype = "plantlike",
 	tiles = { "farming_crimson_fungus.png" },
 	inventory_image = "farming_crimson_fungus.png",
@@ -306,7 +307,6 @@ minetest.register_node("mcl_mushroom:crimson_fungus", {
 	paramtype = "light",
 	walkable = false,
 	groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,enderman_takable=1,deco_block=1, compostability=65},
-
 	light_source = 1,
 	selection_box = {
 		type = "fixed",
@@ -315,23 +315,22 @@ minetest.register_node("mcl_mushroom:crimson_fungus", {
 	node_placement_prediction = "",
 	on_rightclick = function(pos, node, pointed_thing, itemstack)
     if pointed_thing:get_wielded_item():get_name() == "mcl_dye:white" then
-      itemstack:take_item()
-      local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
-      if nodepos.name == "mcl_mushroom:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then
-        local random = math.random(1, 5)
-        if random == 1 then
-          generate_crimson_tree(pos)
-        end
-      end
+		itemstack:take_item()
+		local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
+		if nodepos.name == "mcl_mushroom:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then
+			local random = math.random(1, 5)
+			if random == 1 then
+				generate_crimson_tree(pos)
+			end
+		end
     end
-  end,
+	end,
 	_mcl_blast_resistance = 0,
-
-  stack_max = 64,
+	stack_max = 64,
 })
 
 minetest.register_node("mcl_mushroom:crimson_roots", {
-  description = S("Crimson Roots"),
+	description = S("Crimson Roots"),
 	drawtype = "plantlike",
 	tiles = { "crimson_roots.png" },
 	inventory_image = "crimson_roots.png",
@@ -346,87 +345,90 @@ minetest.register_node("mcl_mushroom:crimson_roots", {
 	},
 	node_placement_prediction = "",
 	_mcl_silk_touch_drop = false,
-  _mcl_blast_resistance = 0,
-  stack_max = 64,
+	_mcl_blast_resistance = 0,
+	stack_max = 64,
 })
 
 minetest.register_node("mcl_mushroom:crimson_hyphae", {
-  description = S("Crimson Hyphae"),
-  tiles = {"crimson_hyphae.png",
-           "crimson_hyphae.png",
-           "crimson_hyphae_side.png",
-           "crimson_hyphae_side.png",
-           "crimson_hyphae_side.png",
-           "crimson_hyphae_side.png",
-         },
-  groups = {handy=5,axey=1, bark=1, building_block=1, material_wood=1,},
-  paramtype2 = "facedir",
-  stack_max = 64,
-  _mcl_hardness = 2,
+	description = S("Crimson Hyphae"),
+	tiles = {
+		"crimson_hyphae.png",
+		"crimson_hyphae.png",
+		"crimson_hyphae_side.png",
+		"crimson_hyphae_side.png",
+		"crimson_hyphae_side.png",
+		"crimson_hyphae_side.png",
+    },
+	groups = {handy=5,axey=1, bark=1, building_block=1, material_wood=1,},
+	paramtype2 = "facedir",
+	stack_max = 64,
+	_mcl_hardness = 2,
 })
 
 minetest.register_node("mcl_mushroom:crimson_hyphae_wood", {
-  description = S("Crimson Hyphae Wood"),
-  tiles = {"crimson_hyphae_wood.png"},
-  groups = {handy=5,axey=1, wood=1,building_block=1, material_wood=1,},
-  paramtype2 = "facedir",
-  stack_max = 64,
-  _mcl_hardness = 2,
+	description = S("Crimson Hyphae Wood"),
+	tiles = {"crimson_hyphae_wood.png"},
+	groups = {handy=5,axey=1, wood=1,building_block=1, material_wood=1,},
+	paramtype2 = "facedir",
+	stack_max = 64,
+	_mcl_hardness = 2,
 })
 
 minetest.register_node("mcl_mushroom:crimson_nylium", {
-  description = S("Crimson Nylium"),
-  tiles = {"crimson_nylium.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png^crimson_nylium_side.png",
-           "mcl_nether_netherrack.png^crimson_nylium_side.png",
-           "mcl_nether_netherrack.png^crimson_nylium_side.png",
-           "mcl_nether_netherrack.png^crimson_nylium_side.png",
-         },
-  groups = {pickaxey=1, building_block=1, material_stone=1},
-  paramtype2 = "facedir",
-  stack_max = 64,
-  _mcl_hardness = 0.4,
-  _mcl_blast_resistance = 0.4,
-  is_ground_content = true,
-  drop = "mcl_nether:netherrack",
-  _mcl_silk_touch_drop = true,
+	description = S("Crimson Nylium"),
+	tiles = {
+		"crimson_nylium.png",
+        "mcl_nether_netherrack.png",
+        "mcl_nether_netherrack.png^crimson_nylium_side.png",
+		"mcl_nether_netherrack.png^crimson_nylium_side.png",
+		"mcl_nether_netherrack.png^crimson_nylium_side.png",
+		"mcl_nether_netherrack.png^crimson_nylium_side.png",
+	},
+	groups = {pickaxey=1, building_block=1, material_stone=1},
+	paramtype2 = "facedir",
+	stack_max = 64,
+	_mcl_hardness = 0.4,
+	_mcl_blast_resistance = 0.4,
+	is_ground_content = true,
+	drop = "mcl_nether:netherrack",
+	_mcl_silk_touch_drop = true,
 })
 
 minetest.register_node("mcl_mushroom:crimson_checknode", {
-  description = S("Crimson Checknode - only to check!"),
-  tiles = {"mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-           "mcl_nether_netherrack.png",
-         },
-  groups = {pickaxey=1, building_block=1, material_stone=1, not_in_creative_inventory=1},
-  paramtype2 = "facedir",
-  stack_max = 64,
-  _mcl_hardness = 0.4,
-  _mcl_blast_resistance = 0.4,
-  is_ground_content = true,
-  drop = "mcl_nether:netherrack"
+	description = S("Crimson Checknode - only to check!"),
+	tiles = {
+		"mcl_nether_netherrack.png",
+        "mcl_nether_netherrack.png",
+        "mcl_nether_netherrack.png",
+        "mcl_nether_netherrack.png",
+        "mcl_nether_netherrack.png",
+        "mcl_nether_netherrack.png",
+    },
+	groups = {pickaxey=1, building_block=1, material_stone=1, not_in_creative_inventory=1},
+	paramtype2 = "facedir",
+	stack_max = 64,
+	_mcl_hardness = 0.4,
+	_mcl_blast_resistance = 0.4,
+	is_ground_content = true,
+	drop = "mcl_nether:netherrack"
 })
 
 minetest.register_craft({
-  output = "mcl_mushroom:crimson_hyphae_wood 4",
-  recipe = {
-    {"mcl_mushroom:crimson_hyphae"},
-  }
+	output = "mcl_mushroom:crimson_hyphae_wood 4",
+	recipe = {
+		{"mcl_mushroom:crimson_hyphae"},
+	}
 })
 
 minetest.register_craft({
-  output = "mcl_mushroom:crimson_nylium 2",
-  recipe = {
-    {"mcl_nether:nether_wart"},
-    {"mcl_nether:netherrack"},
-  }
+	output = "mcl_mushroom:crimson_nylium 2",
+	recipe = {
+		{"mcl_nether:nether_wart"},
+		{"mcl_nether:netherrack"},
+	}
 })
 
-mcl_stairs.register_stair_and_slab_simple("crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood", "Crimson Stair", "Crimson Slab", "Double Crimson Slab")
+mcl_stairs.register_stair_and_slab_simple("crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood", "Crimson Stair", "Crimson Slab", "Double Crimson Slab", "woodlike")
 
 minetest.register_abm({
 	label = "mcl_mushroom:crimson_fungus",
@@ -436,191 +438,219 @@ minetest.register_abm({
 	action = function(pos)
     local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
     if nodepos.name == "mcl_mushroom:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then
-      if pos.y < -28400 then
-        generate_crimson_tree(pos)
-      end
+		if pos.y < -28400 then
+			generate_crimson_tree(pos)
+		end
     end
-  end
+	end
 })
 
 minetest.register_abm({
 	label = "mcl_mushroom:crimson_checknode",
 	nodenames = {"mcl_mushroom:crimson_checknode"},
-	interval = 0.1,
+	interval = 1,
 	chance = 1,
 	action = function(pos)
     local nodepos = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z})
     if nodepos.name == "air" then
-      minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_mushroom:crimson_nylium" })
-			local randomg = math.random(1, 400)
-      if randomg <= 10 then
-        minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_fungus" })
-      elseif randomg > 10 and randomg <= 25 then
-        local pos1 = { x = pos.x, y = pos.y + 1, z = pos.z }
-        generate_crimson_tree(pos1)
-			elseif randomg > 25 and randomg <= 30 then
-	      minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_fungus" })
-			elseif randomg > 30 and randomg <= 130 then
-	      minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_roots" })
-      end
+		minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_mushroom:crimson_nylium" })
+		local randomg = math.random(1, 400)
+		if randomg <= 10 then
+			minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_fungus" })
+		elseif randomg > 10 and randomg <= 25 then
+			local pos1 = { x = pos.x, y = pos.y + 1, z = pos.z }
+			generate_crimson_tree(pos1)
+		elseif randomg > 25 and randomg <= 30 then
+			minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_fungus" })
+		elseif randomg > 30 and randomg <= 130 then
+			minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:crimson_roots" })
+		end
     else
-      minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" })
+		minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" })
     end
-  end
+	end
 })
 
 function generate_warped_tree(pos)
 	local breakgrow = false
 	local breakgrow2 = false
-  -- Baumgenerator
-  -- erste und zweite Etage
+	-- Tree generator
+	-- first and second layer
   	for x = pos.x - 2,pos.x + 2 do
-        	for y = pos.y + 3, pos.y + 4 do
-        	    for z = pos.z - 2, pos.z + 2 do
-        	        if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then breakgrow = true end
-        	    end
+        for y = pos.y + 3, pos.y + 4 do
+            for z = pos.z - 2, pos.z + 2 do
+        	    if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then 
+					breakgrow = true 
+				end
         	end
-    	end
+		end
+    end
 
-  	-- dritte und vierte Etage
+  	-- third and fourth layers
   	for x = pos.x - 1,pos.x + 1 do
-  	      for y = pos.y + 5, pos.y + 6 do
-  	          for z = pos.z - 1, pos.z + 1 do
-  	              if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then breakgrow = true end
-  	          end
-  	      end
-  	  end
+  	    for y = pos.y + 5, pos.y + 6 do
+			for z = pos.z - 1, pos.z + 1 do
+  	            if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then 
+					breakgrow = true 
+				end
+  	        end
+  	    end
+  	end
 
- 	 -- fünfte Etage
-	if not (minetest.get_node({x = pos.x, y = pos.y + 7, z = pos.z}).name == "air") then breakgrow = true end
+ 	-- fifth layer
+	if not (minetest.get_node({x = pos.x, y = pos.y + 7, z = pos.z}).name == "air") then 
+		breakgrow = true 
+	end
 
- 	 -- Holz
-	 if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:warped_fungus") then breakgrow = true end
- 	 for y = pos.y + 1, pos.y + 4 do
- 	   if not (minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air") then breakgrow = true end
- 	 end
-	 if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:warped_fungus") then breakgrow2 = true end
-  if breakgrow == false then
-	-- Warzen
-	-- erste und zweite Etage
-  	for x = pos.x - 2,pos.x + 2 do
-        	for y = pos.y + 3, pos.y + 4 do
-        	    for z = pos.z - 2, pos.z + 2 do
-        	        minetest.set_node({x = x, y = y, z = z}, { name = "mcl_mushroom:warped_wart_block" })
-        	    end
-        	end
-    	end
+ 	-- Wood
+	if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:warped_fungus") then 
+		breakgrow = true 
+	end
+ 	for y = pos.y + 1, pos.y + 4 do
+		if not (minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air") then 
+			breakgrow = true
+		end
+	end
+	if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:warped_fungus") then 
+		breakgrow2 = true 
+	end
+	if breakgrow == false then
+		-- Warts
+		-- first and second layer
+		for x = pos.x - 2,pos.x + 2 do
+			for y = pos.y + 3, pos.y + 4 do
+				for z = pos.z - 2, pos.z + 2 do
+					minetest.set_node({x = x, y = y, z = z}, { name = "mcl_mushroom:warped_wart_block" })
+				end
+			end
+		end
 
-  	-- dritte und vierte Etage
-  	for x = pos.x - 1,pos.x + 1 do
-  	      for y = pos.y + 5, pos.y + 6 do
-  	          for z = pos.z - 1, pos.z + 1 do
-  	              minetest.set_node({x = x, y = y, z = z}, { name = "mcl_mushroom:warped_wart_block" })
-  	          end
-  	      end
-  	  end
+		-- third and fourth layers
+		for x = pos.x - 1,pos.x + 1 do
+			for y = pos.y + 5, pos.y + 6 do
+				for z = pos.z - 1, pos.z + 1 do
+					minetest.set_node({x = x, y = y, z = z}, { name = "mcl_mushroom:warped_wart_block" })
+				end
+			end
+		end
 
- 	 -- fünfte Etage
- 	 minetest.set_node({x = pos.x, y = pos.y + 7, z = pos.z}, { name = "mcl_mushroom:warped_wart_block" })
+		-- fifth layer
+		minetest.set_node({x = pos.x, y = pos.y + 7, z = pos.z}, { name = "mcl_mushroom:warped_wart_block" })
 
- 	 -- Pilzlich
- 	 local randomgenerate = math.random(1, 2)
- 	 if randomgenerate == 1 then
- 	   local randomx = math.random(-2, 2)
- 	   local randomz = math.random(-2, 2)
- 	   minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
- 	 end
- 	 local randomgenerate = math.random(1, 8)
- 	 if randomgenerate == 4 then
- 	   local randomx = math.random(-2, 2)
- 	   local randomz = math.random(-2, 2)
- 	   minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
- 	 end
- 	 -- Holz
- 	 for y = pos.y, pos.y + 4 do
- 	   minetest.set_node({x = pos.x, y = y, z = pos.z}, { name = "mcl_mushroom:warped_hyphae" })
- 	   --print("Placed at " .. x .. " " .. y .. " " .. z)
- 	 end
-  else
-  	if breakgrow2 == false then minetest.set_node(pos,{ name = "mcl_mushroom:warped_fungus" }) end
-  end
+		-- Fungal
+		local randomgenerate = math.random(1, 2)
+		if randomgenerate == 1 then
+			local randomx = math.random(-2, 2)
+			local randomz = math.random(-2, 2)
+			minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
+		end
+		local randomgenerate = math.random(1, 8)
+		if randomgenerate == 4 then
+			local randomx = math.random(-2, 2)
+			local randomz = math.random(-2, 2)
+			minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
+		end
+		-- Wood
+		for y = pos.y, pos.y + 4 do
+			minetest.set_node({x = pos.x, y = y, z = pos.z}, { name = "mcl_mushroom:warped_hyphae" })
+			--print("Placed at " .. x .. " " .. y .. " " .. z)
+		end
+	else
+		if breakgrow2 == false then 
+			minetest.set_node(pos,{ name = "mcl_mushroom:warped_fungus" })
+		end
+	end
 end
 
 function generate_crimson_tree(pos)
 	local breakgrow = false
 	local breakgrow2 = false
-  -- Baumgenerator
-  -- erste und zweite Etage
+	-- Tree generator
+	-- first and second layer
   	for x = pos.x - 2,pos.x + 2 do
-        	for y = pos.y + 3, pos.y + 4 do
-        	    for z = pos.z - 2, pos.z + 2 do
-        	        if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then breakgrow = true end
-        	    end
+        for y = pos.y + 3, pos.y + 4 do
+        	for z = pos.z - 2, pos.z + 2 do
+        	    if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then 
+					breakgrow = true
+				end
         	end
-    	end
+		end
+    end
 
-  	-- dritte und vierte Etage
+  	-- third and fourth layers
   	for x = pos.x - 1,pos.x + 1 do
-  	      for y = pos.y + 5, pos.y + 6 do
-  	          for z = pos.z - 1, pos.z + 1 do
-  	              if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then breakgrow = true end
-  	          end
-  	      end
-  	  end
+  	    for y = pos.y + 5, pos.y + 6 do
+  	        for z = pos.z - 1, pos.z + 1 do
+  	            if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then 
+					breakgrow = true
+				end
+  	        end
+  	    end
+  	end
 
- 	 -- fünfte Etage
-	if not (minetest.get_node({x = pos.x, y = pos.y + 7, z = pos.z}).name == "air") then breakgrow = true end
+ 	-- fifth layer
+	if not (minetest.get_node({x = pos.x, y = pos.y + 7, z = pos.z}).name == "air") then 
+		breakgrow = true
+	end
 
- 	 -- Holz
-	 if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:crimson_fungus") then breakgrow = true end
- 	 for y = pos.y + 1, pos.y + 4 do
- 	   if not (minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air") then breakgrow = true end
- 	 end
-	 if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:crimson_fungus") then breakgrow2 = true end
-  if breakgrow == false then
-	-- Warzen
-	-- erste und zweite Etage
-  	for x = pos.x - 2,pos.x + 2 do
-        	for y = pos.y + 3, pos.y + 4 do
-        	    for z = pos.z - 2, pos.z + 2 do
-        	        minetest.set_node({x = x, y = y, z = z}, { name = "mcl_nether:nether_wart_block" })
-        	    end
-        	end
-    	end
+ 	-- Wood
+	if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:crimson_fungus") then 
+		breakgrow = true
+	end
+ 	for y = pos.y + 1, pos.y + 4 do
+		if not (minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air") then 
+			breakgrow = true
+		end
+ 	end
+	if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:crimson_fungus") then
+		breakgrow2 = true
+	end
+	if breakgrow == false then
+		-- Warts
+		-- first and second layer
+		for x = pos.x - 2,pos.x + 2 do
+			for y = pos.y + 3, pos.y + 4 do
+				for z = pos.z - 2, pos.z + 2 do
+					minetest.set_node({x = x, y = y, z = z}, { name = "mcl_nether:nether_wart_block" })
+				end
+			end
+		end
 
-  	-- dritte und vierte Etage
-  	for x = pos.x - 1,pos.x + 1 do
-  	      for y = pos.y + 5, pos.y + 6 do
-  	          for z = pos.z - 1, pos.z + 1 do
-  	              minetest.set_node({x = x, y = y, z = z}, { name = "mcl_nether:nether_wart_block" })
-  	          end
-  	      end
-  	  end
+		-- third and fourth layers
+		for x = pos.x - 1,pos.x + 1 do
+			for y = pos.y + 5, pos.y + 6 do
+				for z = pos.z - 1, pos.z + 1 do
+					minetest.set_node({x = x, y = y, z = z}, { name = "mcl_nether:nether_wart_block" })
+				end
+			end
+		end
 
- 	 -- fünfte Etage
- 	 minetest.set_node({x = pos.x, y = pos.y + 7, z = pos.z}, { name = "mcl_nether:nether_wart_block" })
+		-- fifth layer
+		minetest.set_node({x = pos.x, y = pos.y + 7, z = pos.z}, { name = "mcl_nether:nether_wart_block" })
 
- 	 -- Pilzlich
- 	 local randomgenerate = math.random(1, 2)
- 	 if randomgenerate == 1 then
- 	   local randomx = math.random(-2, 2)
- 	   local randomz = math.random(-2, 2)
- 	   minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
- 	 end
- 	 local randomgenerate = math.random(1, 8)
- 	 if randomgenerate == 4 then
- 	   local randomx = math.random(-2, 2)
- 	   local randomz = math.random(-2, 2)
- 	   minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
- 	 end
- 	 -- Holz
- 	 for y = pos.y, pos.y + 4 do
- 	   minetest.set_node({x = pos.x, y = y, z = pos.z}, { name = "mcl_mushroom:crimson_hyphae" })
- 	   --print("Placed at " .. x .. " " .. y .. " " .. z)
- 	 end
-  else
-  	if breakgrow2 == false then minetest.set_node(pos,{ name = "mcl_mushroom:crimson_fungus" }) end
-  end
+		-- Fungal
+		local randomgenerate = math.random(1, 2)
+		if randomgenerate == 1 then
+			local randomx = math.random(-2, 2)
+			local randomz = math.random(-2, 2)
+			minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
+		end
+		local randomgenerate = math.random(1, 8)
+		if randomgenerate == 4 then
+			local randomx = math.random(-2, 2)
+			local randomz = math.random(-2, 2)
+			minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
+		end
+		 -- Wood
+		for y = pos.y, pos.y + 4 do
+			minetest.set_node({x = pos.x, y = y, z = pos.z}, { name = "mcl_mushroom:crimson_hyphae" })
+			--print("Placed at " .. x .. " " .. y .. " " .. z)
+		end
+	else
+		if breakgrow2 == false then
+			minetest.set_node(pos,{ name = "mcl_mushroom:crimson_fungus" }) 
+		end
+	end
 end
 
 
@@ -662,45 +692,45 @@ minetest.register_decoration({
 })
 ]]
 minetest.register_ore({
-  ore_type        = "sheet",
-  ore             = "mcl_mushroom:warped_checknode",
-  -- Note: Stone is included only for v6 mapgen support. Netherrack is not generated naturally
-  -- in v6, but instead set with the on_generated function in mcl_mapgen_core.
-  wherein         = {"mcl_nether:netherrack", "mcl_core:stone"},
-  clust_scarcity  = 14 * 14 * 14,
-  clust_size      = 10,
-  y_min           = -29065,
-  y_max           = -28940,
-  noise_threshold = 0.0,
-  noise_params    = {
-    offset = 0.5,
-    scale = 0.1,
-    spread = {x = 8, y = 8, z = 8},
-    seed = 4996,
-    octaves = 1,
-    persist = 0.0
-  },
+	ore_type        = "sheet",
+	ore             = "mcl_mushroom:warped_checknode",
+	-- Note: Stone is included only for v6 mapgen support. Netherrack is not generated naturally
+	-- in v6, but instead set with the on_generated function in mcl_mapgen_core.
+	wherein         = {"mcl_nether:netherrack", "mcl_core:stone"},
+	clust_scarcity  = 14 * 14 * 14,
+	clust_size      = 10,
+	y_min           = -29065,
+	y_max           = -28940,
+	noise_threshold = 0.0,
+	noise_params    = {
+		offset      = 0.5,
+		scale       = 0.1,
+		spread      = {x = 8, y = 8, z = 8},
+		seed        = 4996,
+		octaves     = 1,
+		persist     = 0.0
+	},
 })
 
 minetest.register_ore({
-  ore_type        = "sheet",
-  ore             = "mcl_mushroom:crimson_checknode",
-  -- Note: Stone is included only for v6 mapgen support. Netherrack is not generated naturally
-  -- in v6, but instead set with the on_generated function in mcl_mapgen_core.
-  wherein         = {"mcl_nether:netherrack", "mcl_core:stone"},
-  clust_scarcity  = 10 * 10 * 10,
-  clust_size      = 10,
-  y_min           = -29065,
-  y_max           = -28940,
-  noise_threshold = 0.0,
-  noise_params    = {
-    offset = 1,
-    scale = 0.5,
-    spread = {x = 12, y = 12, z = 12},
-    seed = 12948,
-    octaves = 1,
-    persist = 0.0
-  },
+	ore_type        = "sheet",
+	ore             = "mcl_mushroom:crimson_checknode",
+	-- Note: Stone is included only for v6 mapgen support. Netherrack is not generated naturally
+	-- in v6, but instead set with the on_generated function in mcl_mapgen_core.
+	wherein         = {"mcl_nether:netherrack", "mcl_core:stone"},
+	clust_scarcity  = 10 * 10 * 10,
+	clust_size      = 10,
+	y_min           = -29065,
+	y_max           = -28940,
+	noise_threshold = 0.0,
+	noise_params    = {
+		offset      = 1,
+		scale       = 0.5,
+		spread      = {x = 12, y = 12, z = 12},
+		seed        = 12948,
+		octaves     = 1,
+		persist     = 0.0
+	},
 })
 
 

mods/ITEMS/mcl_nether/README.txt

@@ -0,0 +1,3 @@
+Mod mcl_nether : basic nether blocs, forked from Mineclone 2
+
+Texture of mcl_nether_netheritebloc.png from PixelPerfection Legacy by XSSheep edited by Nova_Wostra (CC-BY-SA 4.0)

mods/ITEMS/mcl_nether/init.lua

@@ -77,8 +77,7 @@ minetest.register_node("mcl_nether:netheriteblock", {
 	sounds = mcl_sounds.node_sound_stone_defaults(),
 	_mcl_blast_resistance = 1200,
 	_mcl_hardness = 50,
-	_mcl_silk_touch_drop = true,
-	_mcl_fortune_drop = mcl_core.fortune_drop_ore
+	_mcl_silk_touch_drop = true
 })
 
 -- For eternal fire on top of netherrack and magma blocks

mods/ITEMS/mcl_portals/portal_end.lua

@@ -235,6 +235,7 @@ function mcl_portals.end_portal_teleport(pos, node)
 			end
 
 			mcl_portals.end_teleport(obj, objpos)
+            awards.unlock(obj:get_player_name(), "mcl:enterEndPortal")
 
 		end
 	end
@@ -243,8 +244,9 @@ end
 minetest.register_abm({
 	label = "End portal teleportation",
 	nodenames = {"mcl_portals:portal_end"},
-	interval = 0.1,
+	interval = 1,
 	chance = 1,
+	-- TODO: Move to playerinfo/playerplus/mob api
 	action = mcl_portals.end_portal_teleport,
 })
 

mods/ITEMS/mcl_portals/portal_gateway.lua

@@ -106,9 +106,10 @@ local function teleport(pos, obj)
 end
 
 minetest.register_abm({
+	-- TODO: Move to playerinfo/playerplus/mob api
 	label = "End gateway portal teleportation",
 	nodenames = {"mcl_portals:portal_gateway"},
-	interval = 0.1,
+	interval = 1,
 	chance = 1,
 	action = function(pos)
 		if preparing[minetest.pos_to_string(pos)] then return end

mods/ITEMS/mcl_portals/portal_nether.lua

@@ -729,8 +729,8 @@ mcl_structures.register_structure({name = "nether_portal", place_function = mcl_
 minetest.register_abm({
 	label = "Nether portal teleportation and particles",
 	nodenames = {PORTAL},
-	interval = 0.8,
-	chance = 3,
+	interval = 1,
+	chance = 2,
 	action = function(pos, node)
 		-- Don't use call stack!
 		local upper_node_name = get_node({x = pos.x, y = pos.y + 1, z = pos.z}).name
@@ -811,6 +811,7 @@ minetest.register_abm({
 				})
 			end
 		end
+		-- TODO: Move to playerinfo/playerplus/mob api
 		for _, obj in pairs(minetest.get_objects_inside_radius(pos, 1)) do	--maikerumine added for objects to travel
 			local lua_entity = obj:get_luaentity()				--maikerumine added for objects to travel
 			if (obj:is_player() or lua_entity) and prevent_portal_chatter(obj) then

mods/MAPGEN/mcl_structures/init.lua

@@ -75,6 +75,7 @@ local function spawnstruct_function(name, param)
 
 	local pos = player:get_pos()
 	if not pos then return end
+	pos.y = math.floor(pos.y) + 1
 	local pr = PseudoRandom(math.floor(pos.x * 333 + pos.y * 19 - pos.z + 4))
 	pos = vector.round(pos)
 	local dir = minetest.yaw_to_dir(player:get_look_horizontal())

mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr

@@ -0,0 +1,3 @@
+# textdomain: mcl_villages
+Chiseled Stone Village Bricks=Pierre sculptée du village
+Map chunk @1 to @2 is not suitable for placing villages.=La partie de la carte de @1 à @2 n'est pas propice au placement d'un village.

mods/MISC/mcl_commands/locale/mcl_commands.fr.tr

@@ -21,6 +21,10 @@ Ban list: @1=Liste d'interdiction: @1
 Show who is logged on=Afficher qui est connecté
 Displays the world seed=Affiche la graine du monde
 Only peaceful mobs allowed!=Seuls les mobs pacifiques sont autorisés!
-@1[<name>]=@1[<name>]
+@1[<name>]=@1[<nom>]
 Set game mode for player or yourself=Choisir le mode de jeu pour vous ou pour les joueurs
 Error: No game mode specified.=Erreur : mode de jeu non spécifié.
+<sound> <target>=<son> <cible>
+Play a sound. Arguments: <sound>: name of the sound. <target>: Target.=Jouer un son. Arguments: <son>: nom d'un son. <cible>: Cible.
+Sound name is invalid!=Le nom du son est invalide !
+Target is invalid!!=La cible est invalide !

mods/PLAYER/mcl_death_drop/init.lua

@@ -1,56 +1,57 @@
-local random = math.random
-
-local ipairs = ipairs
-
-mcl_death_drop = {}
-
-mcl_death_drop.registered_dropped_lists = {}
-
-function mcl_death_drop.register_dropped_list(inv, listname, drop)
-	table.insert(mcl_death_drop.registered_dropped_lists, {inv = inv, listname = listname, drop = drop})
-end
-
-mcl_death_drop.register_dropped_list("PLAYER", "main", true)
-mcl_death_drop.register_dropped_list("PLAYER", "craft", true)
-mcl_death_drop.register_dropped_list("PLAYER", "armor", true)
-
-minetest.register_on_dieplayer(function(player)
-	local keep = minetest.settings:get_bool("mcl_keepInventory", false)
-	if keep == false then
-		-- Drop inventory, crafting grid and armor
-		local playerinv = player:get_inventory()
-		local pos = player:get_pos()
-		-- No item drop if in deep void
-		local _, void_deadly = mcl_worlds.is_in_void(pos)
-
-		for l=1,#mcl_death_drop.registered_dropped_lists do
-			local inv = mcl_death_drop.registered_dropped_lists[l].inv
-			if inv == "PLAYER" then
-				inv = playerinv
-			elseif type(inv) == "function" then
-				inv = inv(player)
-			end
-			local listname = mcl_death_drop.registered_dropped_lists[l].listname
-			local drop = mcl_death_drop.registered_dropped_lists[l].drop
-			if inv then
-				for i, stack in ipairs(inv:get_list(listname)) do
-					local x = random(0, 9)/3
-					local z = random(0, 9)/3
-					pos.x = pos.x + x
-					pos.z = pos.z + z
-					if not void_deadly and drop and not mcl_enchanting.has_enchantment(stack, "curse_of_vanishing") then
-						local def = minetest.registered_items[stack:get_name()]
-						if def and def.on_drop then
-							stack = def.on_drop(stack, player, pos)
-						end
-						minetest.add_item(pos, stack)
-					end
-					pos.x = pos.x - x
-					pos.z = pos.z - z
-				end
-				inv:set_list(listname, {})
-			end
-		end
-		mcl_armor.update(player)
-	end
-end)
+local random = math.random
+
+local ipairs = ipairs
+
+mcl_death_drop = {}
+
+mcl_death_drop.registered_dropped_lists = {}
+
+function mcl_death_drop.register_dropped_list(inv, listname, drop)
+	table.insert(mcl_death_drop.registered_dropped_lists, {inv = inv, listname = listname, drop = drop})
+end
+
+mcl_death_drop.register_dropped_list("PLAYER", "main", true)
+mcl_death_drop.register_dropped_list("PLAYER", "craft", true)
+mcl_death_drop.register_dropped_list("PLAYER", "armor", true)
+mcl_death_drop.register_dropped_list("PLAYER", "offhand", true)
+
+minetest.register_on_dieplayer(function(player)
+	local keep = minetest.settings:get_bool("mcl_keepInventory", false)
+	if keep == false then
+		-- Drop inventory, crafting grid and armor
+		local playerinv = player:get_inventory()
+		local pos = player:get_pos()
+		-- No item drop if in deep void
+		local _, void_deadly = mcl_worlds.is_in_void(pos)
+
+		for l=1,#mcl_death_drop.registered_dropped_lists do
+			local inv = mcl_death_drop.registered_dropped_lists[l].inv
+			if inv == "PLAYER" then
+				inv = playerinv
+			elseif type(inv) == "function" then
+				inv = inv(player)
+			end
+			local listname = mcl_death_drop.registered_dropped_lists[l].listname
+			local drop = mcl_death_drop.registered_dropped_lists[l].drop
+			if inv then
+				for i, stack in ipairs(inv:get_list(listname)) do
+					local x = random(0, 9)/3
+					local z = random(0, 9)/3
+					pos.x = pos.x + x
+					pos.z = pos.z + z
+					if not void_deadly and drop and not mcl_enchanting.has_enchantment(stack, "curse_of_vanishing") then
+						local def = minetest.registered_items[stack:get_name()]
+						if def and def.on_drop then
+							stack = def.on_drop(stack, player, pos)
+						end
+						minetest.add_item(pos, stack)
+					end
+					pos.x = pos.x - x
+					pos.z = pos.z - z
+				end
+				inv:set_list(listname, {})
+			end
+		end
+		mcl_armor.update(player)
+	end
+end)

mods/PLAYER/mcl_player/init.lua

@@ -113,10 +113,6 @@ function mcl_player.player_set_armor(player, texture, preview)
 	set_preview(player, "armor", preview)
 end
 
-function mcl_player.player_set_wielditem(player, texture)
-	set_texture(player, 3, texture)
-end
-
 function mcl_player.player_get_preview(player)
 	local preview = player:get_meta():get_string("mcl_player:skin_preview")
 	if preview == "" then

mods/PLAYER/mcl_playerplus/init.lua

@@ -329,15 +329,17 @@ minetest.register_globalstep(function(dtime)
 		end
 
 		if wielded_def and wielded_def._mcl_toollike_wield then
-			set_bone_position_conditional(player,"Wield_Item", vector.new(0,3.9,1.3), vector.new(90,0,0))
+			set_bone_position_conditional(player,"Wield_Item", vector.new(0,4.7,3.1), vector.new(90,-45,90))
 		elseif string.find(wielded:get_name(), "mcl_bows:bow") then
-			set_bone_position_conditional(player,"Wield_Item", vector.new(.5,4.5,-1.6), vector.new(90,0,20))
+			set_bone_position_conditional(player,"Wield_Item", vector.new(1,4,0), vector.new(90,130,115))
 		elseif string.find(wielded:get_name(), "mcl_bows:crossbow_loaded") then
-			set_bone_position_conditional(player,"Wield_Item", vector.new(-1.5,5.7,1.8), vector.new(64,90,0))
+			set_bone_position_conditional(player,"Wield_Item", vector.new(0,5.2,1.2), vector.new(0,180,73))
 		elseif string.find(wielded:get_name(), "mcl_bows:crossbow") then
-			set_bone_position_conditional(player,"Wield_Item", vector.new(-1.5,5.7,1.8), vector.new(90,90,0))
+			set_bone_position_conditional(player,"Wield_Item", vector.new(0,5.2,1.2), vector.new(0,180,45))
+		elseif wielded_def.inventory_image == "" then
+			set_bone_position_conditional(player,"Wield_Item", vector.new(0,6,2), vector.new(180,-45,0))
 		else
-			set_bone_position_conditional(player,"Wield_Item", vector.new(-1.5,4.9,1.8), vector.new(135,0,90))
+			set_bone_position_conditional(player,"Wield_Item", vector.new(0,5.3,2), vector.new(90,0,0))
 		end
 
 		-- controls right and left arms pitch when shooting a bow or blocking

mods/PLAYER/mcl_spawn/init.lua

@@ -452,10 +452,60 @@ function mcl_spawn.get_player_spawn_pos(player)
 		if bgroup ~= 1 and bgroup ~= 2 then
 			-- Bed is destroyed:
 			if player and player:is_player() then
-				player:get_meta():set_string("mcl_beds:spawn", "")
+
+                local function split(s, delimiter) --this is just a common function to split strings, since it is way harder to do in lua like in python, java etc.
+                    result = {};
+                    for match in (s..delimiter):gmatch("(.-)"..delimiter) do
+                        table.insert(result, match);
+                    end
+                    return result;
+                 end
+                s = split(player:get_meta():get_string("mcl_beds:spawn"), ",")
+                x = nil
+                y = nil
+                z = nil
+                for key, value in pairs(s) do
+                    if key == 1 then
+                        value = value:sub(2)
+                        x = tonumber(value)
+                    else
+                        if key == 2 then
+                            y = tonumber(value)
+                        else
+                            if key == 3 then
+                                value = value:sub(1, -2)
+                                z = tonumber(value)
+                            end
+                        end
+                    end
+                end
+                
+                checkblock = {x = x, y = y, z = z}
+                
+                if minetest.get_node(checkblock).name == "mcl_beds:respawn_anchor_charged_1" then
+                    minetest.set_node(checkblock, {name="mcl_beds:respawn_anchor"})
+                    player:set_pos(checkblock)
+                else
+                    if minetest.get_node(checkblock).name == "mcl_beds:respawn_anchor_charged_2" then
+                        minetest.set_node(checkblock, {name="mcl_beds:respawn_anchor_charged_1"})
+                        player:set_pos(checkblock)
+                    else
+                        if minetest.get_node(checkblock).name == "mcl_beds:respawn_anchor_charged_3" then
+                            minetest.set_node(checkblock, {name="mcl_beds:respawn_anchor_charged_2"})
+                            player:set_pos(checkblock)
+                        else
+                            if minetest.get_node(checkblock).name == "mcl_beds:respawn_anchor_charged_4" then
+                                minetest.set_node(checkblock, {name="mcl_beds:respawn_anchor_charged_3"})
+                                player:set_pos(checkblock)
+                            else
+                                player:get_meta():set_string("mcl_beds:spawn", "")
+                                minetest.chat_send_player(player:get_player_name(), S("Your spawn bed was missing or blocked, and you had no charged respawn anchor"))
+                                return mcl_spawn.get_world_spawn_pos(), false
+                            end
+                        end
+                    end
+                end	
 			end
-			minetest.chat_send_player(player:get_player_name(), S("Your spawn bed was missing or blocked."))
-			return mcl_spawn.get_world_spawn_pos(), false
 		end
 
 		-- Find spawning position on/near the bed free of solid or damaging blocks iterating a square spiral 15x15:
@@ -531,4 +581,4 @@ minetest.after(respawn_search_initial_delay, function()
 		storage:set_int("mcl_spawn_dir_step", dir_step)
 		storage:set_int("mcl_spawn_dir_ind", dir_ind)
 	end)
-end)
+end)

mods/PLAYER/mcl_wieldview/README.txt

@@ -3,19 +3,8 @@
 
 Makes hand wielded items visible to other players.
 
-default settings: [minetest.conf]
-
-# Set number of seconds between visible wielded item updates.
-wieldview_update_time = 2
-
-# Show nodes as tiles, disabled by default
-wieldview_node_tiles = false
-
 
 Info for modders
 ################
 
-Wield image transformation: To apply a simple transformation to the item in
-hand, add the group “wieldview_transform” to the item definition. The group
-rating equals one of the numbers used for the [transform texture modifier
-of the Lua API.
+Add items to the "no_wieldview" group with a raiting of 1 and it will not be shown by the wieldview.

mods/PLAYER/mcl_wieldview/init.lua

@@ -1,131 +1,47 @@
-local get_connected_players = minetest.get_connected_players
 local get_item_group = minetest.get_item_group
 
-mcl_wieldview = {
-	players = {}
-}
-
-function mcl_wieldview.get_item_texture(itemname)
-	if itemname == "" or minetest.get_item_group(itemname, "no_wieldview") ~= 0 then
-		return
-	end
-
-	local def = minetest.registered_items[itemname]
-	if not def then
-		return
-	end
-
-	local inv_image = def.inventory_image
-	if inv_image == "" then
-		return
-	end
-
-	local texture = inv_image
-
-	local transform = get_item_group(itemname, "wieldview_transform")
-	if transform then
-		-- This actually works with groups ratings because transform1, transform2, etc.
-		-- have meaning and transform0 is used for identidy, so it can be ignored
-		texture = texture .. "^[transform" .. transform
-	end
-
-	return texture
-end
-
-function mcl_wieldview.update_wielded_item(player)
-	if not player then
-		return
-	end
-	local itemstack = player:get_wielded_item()
-	local itemname = itemstack:get_name()
-
-	local def = mcl_wieldview.players[player]
-
-	if def and (def.item == itemname) then
-		return
-	end
-
-	local texture = mcl_wieldview.get_item_texture(itemname) or "blank.png"
-
-	local new_def = {
-		item = itemname,
-		texture = texture,
-	}
-	mcl_wieldview.players[player] = new_def
-
-	mcl_player.player_set_wielditem(player, texture)
-end
-
 minetest.register_on_joinplayer(function(player)
-	mcl_wieldview.players[player] = {item = "", texture = "blank.png"}
-
-	minetest.after(0, function()
-		if not player:is_player() then
-			return
-		end
-
-		mcl_wieldview.update_wielded_item(player)
-
-		local itementity = minetest.add_entity(player:get_pos(), "mcl_wieldview:wieldnode")
-		itementity:set_attach(player, "Hand_Right", vector.new(0, 1, 0), vector.new(90, 0, 45))
-		itementity:get_luaentity().wielder = player
-	end)
-end)
-
-minetest.register_on_leaveplayer(function(player)
-	mcl_wieldview.players[player] = nil
-end)
-
-minetest.register_globalstep(function()
-    local players = get_connected_players()
-	for i = 1, #players do
-		mcl_wieldview.update_wielded_item(players[i])
+	if not player or not player:is_player() then
+		return
 	end
+	local itementity = minetest.add_entity(player:get_pos(), "mcl_wieldview:wieldnode")
+	if not itementity then return end
+	itementity:set_attach(player, "Wield_Item", vector.new(0, 0, 0), vector.new(0, 0, 0))
+	--itementity:set_attach(player, "Hand_Right", vector.new(0, 1, 0), vector.new(90, 45, 90))
+	itementity:get_luaentity()._wielder = player
 end)
 
 minetest.register_entity("mcl_wieldview:wieldnode", {
-	initial_properties = {
-		hp_max           = 1,
-		visual           = "wielditem",
-		physical         = false,
-		textures         = {""},
-		automatic_rotate = 1.5,
-		is_visible       = true,
-		pointable        = false,
-		collide_with_objects = false,
-		static_save = false,
-		collisionbox = {-0.21, -0.21, -0.21, 0.21, 0.21, 0.21},
-		selectionbox = {-0.21, -0.21, -0.21, 0.21, 0.21, 0.21},
-		visual_size  = {x = 0.21, y = 0.21},
-	},
+	visual = "wielditem",
+	physical = false,
+	pointable = false,
+	collide_with_objects = false,
+	static_save = false,
+	visual_size  = {x = 0.21, y = 0.21},
 
-	itemstring = "",
+	_item = "",
 
 	on_step = function(self)
-		if self.wielder:is_player() then
-			local def = mcl_wieldview.players[self.wielder]
-			local itemstring = def.item
-
-			if self.itemstring ~= itemstring then
-				local itemdef = minetest.registered_items[itemstring]
-				self.object:set_properties({glow = itemdef and itemdef.light_source or 0})
-
-				-- wield item as cubic
-				if def.texture == "blank.png" then
-					self.object:set_properties({textures = {itemstring}})
-				-- wield item as flat
-				else
-					self.object:set_properties({textures = {""}})
-				end
-
-				if minetest.get_item_group(itemstring, "no_wieldview") ~= 0 then
-					self.object:set_properties({textures = {""}})
-				end
-
-				self.itemstring = itemstring
-			end
-		else
+		if not self._wielder or not self._wielder:is_player() then
 			self.object:remove()
 		end
+		local player = self._wielder
+		
+		local item = player:get_wielded_item():get_name()
+
+		if item == self._item then return end
+		
+		self._item = item
+		
+		if get_item_group(item, "no_wieldview") ~= 0 then
+			item = ""
+		end
+		
+		local item_def = minetest.registered_items[item]
+		self.object:set_properties({
+			glow = item_def and item_def.light_source or 0,
+			wield_item = item,
+			is_visible = item ~= ""
+		})
 	end,
 })

mods/PLAYER/mcl_wieldview/mod.conf

@@ -1,4 +1,3 @@
 name = mcl_wieldview
 author = stujones11
 description = Makes hand wielded items visible to other players.
-depends = mcl_player

settingtypes.txt

@@ -51,6 +51,10 @@ mcl_showDeathMessages (Show death messages) bool true
 # If disabled, all recipes will be shown.
 mcl_craftguide_progressive_mode	(Learn crafting recipes progressively) bool true
 
+# Limit the number of sparks produced by lava per 5 seconds to this number.
+# 0 will disable lava sparks altogeter with no ABM being registered.
+mcl_core_lava_spark_limit (Number of sparks lava can produce per 5 seconds) int 10
+
 [Mobs]
 # If enabled, mobs will spawn naturally. This does not affect
 # affect mob spawners.