From 60fcafeee4fdeb9a236f141801fc95e103685178 Mon Sep 17 00:00:00 2001
From: Tianyang Zhang <tianyangzhang@protonmail.com>
Date: Thu, 15 Jul 2021 19:25:32 -0700
Subject: [PATCH 01/36] Update description of emerald

---
 mods/ITEMS/mcl_core/craftitems.lua        | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.de.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.es.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.fr.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.pl.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.ru.tr | 2 +-
 mods/ITEMS/mcl_core/locale/template.txt   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mods/ITEMS/mcl_core/craftitems.lua b/mods/ITEMS/mcl_core/craftitems.lua
index 03f30b7b9..836f21688 100644
--- a/mods/ITEMS/mcl_core/craftitems.lua
+++ b/mods/ITEMS/mcl_core/craftitems.lua
@@ -93,7 +93,7 @@ minetest.register_craftitem("mcl_core:gold_ingot", {
 
 minetest.register_craftitem("mcl_core:emerald", {
 	description = S("Emerald"),
-	_doc_items_longdesc = S("Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting."),
+	_doc_items_longdesc = S("Emeralds are used for trading with villagers."),
 	inventory_image = "mcl_core_emerald.png",
 	stack_max = 64,
 	groups = { craftitem=1 },
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
index 0a1cbad37..f5a28c76f 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Smaragd
 Emerald Ore=Smaragderz
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Smaragderz ist das Erz von Smaragden. Es ist sehr selten und kann nur einzeln gefunden werden, nicht in Ansammlungen.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Smaragde sind nicht besonders nützlich, aber man kann sie in der Fertigung durch Goldbarren eintauschen.
+Emeralds are used for trading with villagers.=Smaragde sind nicht besonders nützlich, aber man kann sie in der Fertigung durch Goldbarren eintauschen.
 Flint=Feuerstein
 Flint is a raw material.=Feuerstein ist ein Rohstoff.
 Flowing Lava=Fließende Lava
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
index 1e1029c0f..54ee95d16 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Esmeralda
 Emerald Ore=Mena de esmeralda
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=El mineral esmeralda es el mineral de las esmeraldas. Es muy raro y se puede encontrar solo, no en grupos.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Las esmeraldas no son muy útiles por sí mismas, pero pueden cambiarse por lingotes de oro haciendo artesanías.
+Emeralds are used for trading with villagers.=Las esmeraldas no son muy útiles por sí mismas, pero pueden cambiarse por lingotes de oro haciendo artesanías.
 Flint=Pedernal
 Flint is a raw material.=El pedernal es una materia prima.
 Flowing Lava=Lava que fluye
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
index 725025e48..84657c8a1 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 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 peut être trouvé seul, pas en filons.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Les émeraudes ne sont pas très utiles seules, mais elles peuvent être échangées contre des lingots d'or.
+Emeralds are used for trading with villagers.=Les émeraudes ne sont pas très utiles seules, mais elles peuvent être échangées contre des lingots d'or.
 Flint=Silex
 Flint is a raw material.=Le silex est une matière première.
 Flowing Lava=Lave qui coule
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
index 832a47830..90a75f810 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Szmaragd
 Emerald Ore=Ruda szmaragdu
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Ruda szmaragdu jest bardzo rzadka i występuje samotnie, nie w grupach.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Szmaragdy nie są zbyt użyteczne same w sobie, ale można z nich wytworzyć sztabki złota. 
+Emeralds are used for trading with villagers.=Szmaragdy nie są zbyt użyteczne same w sobie, ale można z nich wytworzyć sztabki złota. 
 Flint=Krzemień
 Flint is a raw material.=Krzemień jest surowym materiałem.
 Flowing Lava=Płynąca lawa
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
index f93db7c2c..07236037b 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Изумруд
 Emerald Ore=Изумрудная руда
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Изумрудная руда встречается очень редко и всегда по одному блоку.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Изумруды не очень полезны сами по себе, но их можно обменять на золотые слитки.
+Emeralds are used for trading with villagers.=Изумруды не очень полезны сами по себе, но их можно обменять на золотые слитки.
 Flint=Кремень
 Flint is a raw material.=Кремень это необработанный материал.
 Flowing Lava=Текущая лава
diff --git a/mods/ITEMS/mcl_core/locale/template.txt b/mods/ITEMS/mcl_core/locale/template.txt
index 2cb74f5d1..1e8ee04ce 100644
--- a/mods/ITEMS/mcl_core/locale/template.txt
+++ b/mods/ITEMS/mcl_core/locale/template.txt
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=
 Emerald Ore=
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=
+Emeralds are used for trading with villagers.=
 Flint=
 Flint is a raw material.=
 Flowing Lava=
-- 
2.40.1


From 559cf85c9449b77591603ca561618668a3fb027e Mon Sep 17 00:00:00 2001
From: Tianyang Zhang <tianyangzhang@protonmail.com>
Date: Mon, 19 Jul 2021 09:12:39 -0700
Subject: [PATCH 02/36] Improve description of emerald

---
 mods/ITEMS/mcl_core/craftitems.lua        | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.de.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.es.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.fr.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.pl.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.ru.tr | 2 +-
 mods/ITEMS/mcl_core/locale/template.txt   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mods/ITEMS/mcl_core/craftitems.lua b/mods/ITEMS/mcl_core/craftitems.lua
index 836f21688..85a078766 100644
--- a/mods/ITEMS/mcl_core/craftitems.lua
+++ b/mods/ITEMS/mcl_core/craftitems.lua
@@ -93,7 +93,7 @@ minetest.register_craftitem("mcl_core:gold_ingot", {
 
 minetest.register_craftitem("mcl_core:emerald", {
 	description = S("Emerald"),
-	_doc_items_longdesc = S("Emeralds are used for trading with villagers."),
+	_doc_items_longdesc = S("Emeralds are used in villager trades as currency."),
 	inventory_image = "mcl_core_emerald.png",
 	stack_max = 64,
 	groups = { craftitem=1 },
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
index f5a28c76f..8b75dfd40 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Smaragd
 Emerald Ore=Smaragderz
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Smaragderz ist das Erz von Smaragden. Es ist sehr selten und kann nur einzeln gefunden werden, nicht in Ansammlungen.
-Emeralds are used for trading with villagers.=Smaragde sind nicht besonders nützlich, aber man kann sie in der Fertigung durch Goldbarren eintauschen.
+Emeralds are used in villager trades as currency.=Smaragde sind nicht besonders nützlich, aber man kann sie in der Fertigung durch Goldbarren eintauschen.
 Flint=Feuerstein
 Flint is a raw material.=Feuerstein ist ein Rohstoff.
 Flowing Lava=Fließende Lava
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
index 54ee95d16..d77f45dc2 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Esmeralda
 Emerald Ore=Mena de esmeralda
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=El mineral esmeralda es el mineral de las esmeraldas. Es muy raro y se puede encontrar solo, no en grupos.
-Emeralds are used for trading with villagers.=Las esmeraldas no son muy útiles por sí mismas, pero pueden cambiarse por lingotes de oro haciendo artesanías.
+Emeralds are used in villager trades as currency.=Las esmeraldas no son muy útiles por sí mismas, pero pueden cambiarse por lingotes de oro haciendo artesanías.
 Flint=Pedernal
 Flint is a raw material.=El pedernal es una materia prima.
 Flowing Lava=Lava que fluye
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
index 84657c8a1..4d6a3ed43 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 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 peut être trouvé seul, pas en filons.
-Emeralds are used for trading with villagers.=Les émeraudes ne sont pas très utiles seules, mais elles peuvent être échangées contre des lingots d'or.
+Emeralds are used in villager trades as currency.=Les émeraudes ne sont pas très utiles seules, mais elles peuvent être échangées contre des lingots d'or.
 Flint=Silex
 Flint is a raw material.=Le silex est une matière première.
 Flowing Lava=Lave qui coule
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
index 90a75f810..f8dbbde6b 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Szmaragd
 Emerald Ore=Ruda szmaragdu
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Ruda szmaragdu jest bardzo rzadka i występuje samotnie, nie w grupach.
-Emeralds are used for trading with villagers.=Szmaragdy nie są zbyt użyteczne same w sobie, ale można z nich wytworzyć sztabki złota. 
+Emeralds are used in villager trades as currency.=Szmaragdy nie są zbyt użyteczne same w sobie, ale można z nich wytworzyć sztabki złota. 
 Flint=Krzemień
 Flint is a raw material.=Krzemień jest surowym materiałem.
 Flowing Lava=Płynąca lawa
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
index 07236037b..ad9d863b2 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Изумруд
 Emerald Ore=Изумрудная руда
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Изумрудная руда встречается очень редко и всегда по одному блоку.
-Emeralds are used for trading with villagers.=Изумруды не очень полезны сами по себе, но их можно обменять на золотые слитки.
+Emeralds are used in villager trades as currency.=Изумруды не очень полезны сами по себе, но их можно обменять на золотые слитки.
 Flint=Кремень
 Flint is a raw material.=Кремень это необработанный материал.
 Flowing Lava=Текущая лава
diff --git a/mods/ITEMS/mcl_core/locale/template.txt b/mods/ITEMS/mcl_core/locale/template.txt
index 1e8ee04ce..19d156711 100644
--- a/mods/ITEMS/mcl_core/locale/template.txt
+++ b/mods/ITEMS/mcl_core/locale/template.txt
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=
 Emerald Ore=
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=
-Emeralds are used for trading with villagers.=
+Emeralds are used in villager trades as currency.=
 Flint=
 Flint is a raw material.=
 Flowing Lava=
-- 
2.40.1


From 89ff666a6a7a456daf22a224f42ba7a34919aeec Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 12 Sep 2021 12:21:18 +0000
Subject: [PATCH 03/36] Add playersSleepingPercentage server setting (Fix #920)

---
 mods/ITEMS/mcl_beds/functions.lua | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index e196f69ad..fd8a6d7cd 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -9,6 +9,7 @@ local weather_mod = minetest.get_modpath("mcl_weather")
 local explosions_mod = minetest.get_modpath("mcl_explosions")
 local spawn_mod = minetest.get_modpath("mcl_spawn")
 local worlds_mod = minetest.get_modpath("mcl_worlds")
+local players_in_bed_setting = tonumber(minetest.settings:get("mcl_playersSleepingPercentage"))
 
 -- Helper functions
 
@@ -34,19 +35,10 @@ local function is_night_skip_enabled()
 end
 
 local function check_in_beds(players)
-	local in_bed = mcl_beds.player
 	if not players then
 		players = minetest.get_connected_players()
 	end
-
-	for n, player in pairs(players) do
-		local name = player:get_player_name()
-		if not in_bed[name] then
-			return false
-		end
-	end
-
-	return #players > 0
+	return players_in_bed_setting <= (#mcl_beds.player * 100) / #players
 end
 
 -- These monsters do not prevent sleep
@@ -198,8 +190,8 @@ end
 local function update_formspecs(finished, ges)
 	local ges = ges or #minetest.get_connected_players()
 	local form_n = "size[12,5;true]"
-	local all_in_bed = ges == player_in_bed
-	local night_skip = is_night_skip_enabled()
+	local all_in_bed = players_in_bed_setting <= (player_in_bed * 100) / ges
+	local night_skip = is_night_skip_enabled() and players_in_bed_setting <= 100
 	local button_leave = "button_exit[4,3;4,0.75;leave;"..F(S("Leave bed")).."]"
 	local button_abort = "button_exit[4,3;4,0.75;leave;"..F(S("Abort sleep")).."]"
 	local bg_presleep = "bgcolor[#00000080;true]"
@@ -212,7 +204,7 @@ local function update_formspecs(finished, ges)
 		return
 	elseif not is_sp then
 		local text = S("Players in bed: @1/@2", player_in_bed, ges)
-		if not night_skip then
+		if not night_skip or players_in_bed_setting > 100 then
 			text = text .. "\n" .. S("Note: Night skip is disabled.")
 			form_n = form_n .. bg_presleep
 			form_n = form_n .. button_leave
@@ -221,7 +213,13 @@ local function update_formspecs(finished, ges)
 			form_n = form_n .. bg_sleep
 			form_n = form_n .. button_abort
 		else
-			text = text .. "\n" .. S("You will fall asleep when all players are in bed.")
+			local comment = "You will fall asleep when "
+			if players_in_bed_setting == 100 then
+				comment = comment .. "all players are in bed."
+			else
+				comment = comment .. players_in_bed_setting .. "% of all players are in bed."
+			end
+			text = text .. "\n" .. S(comment)
 			form_n = form_n .. bg_presleep
 			form_n = form_n .. button_leave
 		end
-- 
2.40.1


From 0bc9ab9233811b508e1aa29c4b1ea421b47fead3 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 12 Sep 2021 12:23:28 +0000
Subject: [PATCH 04/36] Add playersSleepingPercentage setting to
 settingtypes.txt

---
 settingtypes.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/settingtypes.txt b/settingtypes.txt
index f605019ad..89e11833f 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -33,6 +33,11 @@ mcl_tnt_griefing (TNT destroys blocks) bool true
 # This setting is only read at startup.
 enable_bed_respawn (Respawn at bed) bool true
 
+# How many players have to sleep to skip the night, in percent.
+# Setting to 0 will mean 1 player is always enough to skip the night. Setting above 100 will prevent skipping the night.
+# 100 by default.
+mcl_playersSleepingPercentage (Players Sleeping Percentage) int 100
+
 # If enabled, the night can be skipped if all players are in bed.
 # This setting is only read at startup.
 enable_bed_night_skip (Skip night when sleeping) bool true
-- 
2.40.1


From cd84c472dcb67b32b74397f87c00503b7414fc77 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 12 Sep 2021 12:49:39 +0000
Subject: [PATCH 05/36] Add translation support.

---
 mods/ITEMS/mcl_beds/functions.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index fd8a6d7cd..01ccec851 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -215,11 +215,11 @@ local function update_formspecs(finished, ges)
 		else
 			local comment = "You will fall asleep when "
 			if players_in_bed_setting == 100 then
-				comment = comment .. "all players are in bed."
+				comment = S(comment .. "all players are in bed.")
 			else
-				comment = comment .. players_in_bed_setting .. "% of all players are in bed."
+				comment = S(comment .. "@1% of all players are in bed.", players_in_bed_setting)
 			end
-			text = text .. "\n" .. S(comment)
+			text = text .. "\n" .. comment
 			form_n = form_n .. bg_presleep
 			form_n = form_n .. button_leave
 		end
-- 
2.40.1


From 9f9799d96e699a0b64bce5fee061deeb040b3aa4 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 12 Sep 2021 12:50:54 +0000
Subject: [PATCH 06/36] Update template.txt in mcl_beds

---
 mods/ITEMS/mcl_beds/locale/template.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/ITEMS/mcl_beds/locale/template.txt b/mods/ITEMS/mcl_beds/locale/template.txt
index 8301dfa33..5525bd91b 100644
--- a/mods/ITEMS/mcl_beds/locale/template.txt
+++ b/mods/ITEMS/mcl_beds/locale/template.txt
@@ -37,5 +37,6 @@ Players in bed: @1/@2=
 Note: Night skip is disabled.=
 You're sleeping.=
 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=
-- 
2.40.1


From 410b7c7844b674a062e1726a058e992698b9b34e Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 12 Sep 2021 12:52:26 +0000
Subject: [PATCH 07/36] Update german translation for mcl_beds

---
 mods/ITEMS/mcl_beds/locale/mcl_beds.de.tr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/ITEMS/mcl_beds/locale/mcl_beds.de.tr b/mods/ITEMS/mcl_beds/locale/mcl_beds.de.tr
index 16592115e..eb6967941 100644
--- a/mods/ITEMS/mcl_beds/locale/mcl_beds.de.tr
+++ b/mods/ITEMS/mcl_beds/locale/mcl_beds.de.tr
@@ -37,5 +37,6 @@ Players in bed: @1/@2=Spieler im Bett: @1/@2
 Note: Night skip is disabled.=Anmerkung: Überspringen der Nacht deaktiviert.
 You're sleeping.=Sie schlafen.
 You will fall asleep when all players are in bed.=Sie werden einschlafen, wenn alle Spieler im Bett sind.
+You will fall asleep when @1% of all players are in bed.=Sie werden einschlafen, wenn @1% der Spieler im Bett sind.
 You're in bed.=Sie sind im Bett.
 Allows you to sleep=Zum Einschafen
-- 
2.40.1


From 0e15accada59737c415a0920e93b65a39e5aa2ae Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 19 Sep 2021 11:15:19 +0000
Subject: [PATCH 08/36] Enable fly in creative mode

---
 mods/MISC/mcl_privs/init.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mods/MISC/mcl_privs/init.lua b/mods/MISC/mcl_privs/init.lua
index 63694ab11..5a23c00fb 100644
--- a/mods/MISC/mcl_privs/init.lua
+++ b/mods/MISC/mcl_privs/init.lua
@@ -3,3 +3,14 @@ local S = minetest.get_translator(minetest.get_current_modname())
 minetest.register_privilege("maphack", {
 	description = S("Can place and use advanced blocks like mob spawners, command blocks and barriers."),
 })
+
+minetest.register_on_joinplayer(function(player)
+	local name = user:get_player_name()
+	local fly = false
+	if minetest.is_creative_enabled(name) then
+		fly = true
+	end
+	minetest.set_player_privs(name, {
+		fly = fly,
+	})
+end)
-- 
2.40.1


From 18a83fa5d725c51563a2f35bf818b7c9b9041680 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 19 Sep 2021 11:18:09 +0000
Subject: [PATCH 09/36] Fix typo

---
 mods/MISC/mcl_privs/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/MISC/mcl_privs/init.lua b/mods/MISC/mcl_privs/init.lua
index 5a23c00fb..091ddb65e 100644
--- a/mods/MISC/mcl_privs/init.lua
+++ b/mods/MISC/mcl_privs/init.lua
@@ -5,7 +5,7 @@ minetest.register_privilege("maphack", {
 })
 
 minetest.register_on_joinplayer(function(player)
-	local name = user:get_player_name()
+	local name = player:get_player_name()
 	local fly = false
 	if minetest.is_creative_enabled(name) then
 		fly = true
-- 
2.40.1


From fed43586f202cd71fe374560f90b42bef18361ec Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 19 Sep 2021 11:28:07 +0000
Subject: [PATCH 10/36] fix typo

---
 mods/MISC/mcl_privs/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/MISC/mcl_privs/init.lua b/mods/MISC/mcl_privs/init.lua
index 091ddb65e..1d1465676 100644
--- a/mods/MISC/mcl_privs/init.lua
+++ b/mods/MISC/mcl_privs/init.lua
@@ -6,7 +6,7 @@ minetest.register_privilege("maphack", {
 
 minetest.register_on_joinplayer(function(player)
 	local name = player:get_player_name()
-	local fly = false
+	local fly = nil
 	if minetest.is_creative_enabled(name) then
 		fly = true
 	end
-- 
2.40.1


From f10d579d9c45bdddb7f2ae1935d74821b9c6a8b3 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 19 Sep 2021 12:07:21 +0000
Subject: [PATCH 11/36] Only change fly priv on join if it wasn't revoked or
 granted

---
 mods/MISC/mcl_privs/init.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mods/MISC/mcl_privs/init.lua b/mods/MISC/mcl_privs/init.lua
index 1d1465676..c63f7c5c5 100644
--- a/mods/MISC/mcl_privs/init.lua
+++ b/mods/MISC/mcl_privs/init.lua
@@ -6,6 +6,10 @@ minetest.register_privilege("maphack", {
 
 minetest.register_on_joinplayer(function(player)
 	local name = player:get_player_name()
+
+	local meta = player:get_meta()
+	if meta:get_int("fly_changed") == 1 then return end
+
 	local fly = nil
 	if minetest.is_creative_enabled(name) then
 		fly = true
@@ -14,3 +18,13 @@ minetest.register_on_joinplayer(function(player)
 		fly = fly,
 	})
 end)
+
+for _, action in pairs({ "grant", "revoke" }) do
+	minetest["register_on_priv_" .. action](function(name, _, priv)
+		if priv == "fly" then
+			local player = minetest.get_player_by_name(name)
+			local meta = player:get_meta()
+			meta:set_int("fly_changed", 1)
+		end
+	end)
+end
\ No newline at end of file
-- 
2.40.1


From c6003398b5f4149b3eaffe585fde40e8374c721b Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 19 Sep 2021 13:14:36 +0000
Subject: [PATCH 12/36] Remove chain armor recipes, because villagers spawn now

---
 mods/MISC/mcl_temp_helper_recipes/init.lua | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua
index 420cd6c2e..b7607946d 100644
--- a/mods/MISC/mcl_temp_helper_recipes/init.lua
+++ b/mods/MISC/mcl_temp_helper_recipes/init.lua
@@ -35,40 +35,6 @@ minetest.register_craft({
 	},
 })
 
-minetest.register_craft({
-	output = "mcl_armor:helmet_chain",
-	recipe = {
-		{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },
-		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
-	}
-})
-
-minetest.register_craft({
-	output = "mcl_armor:leggings_chain",
-	recipe = {
-		{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },
-		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
-		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
-	}
-})
-
-minetest.register_craft({
-	output = "mcl_armor:boots_chain",
-	recipe = {
-		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
-		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
-	}
-})
-
-minetest.register_craft({
-	output = "mcl_armor:chestplate_chain",
-	recipe = {
-		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
-		{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },
-		{ "xpanes:bar_flat", "xpanes:bar_flat", "xpanes:bar_flat" },
-	}
-})
-
 -- Make red sand, red sandstone and more craftable in v6
 -- NOTE: When you change these, also update mcl_craftguide for the "v6" icon in
 -- the craft guide!
-- 
2.40.1


From 3e54acce9db66ff7d330cbcffe20c8ae8ffcd91a Mon Sep 17 00:00:00 2001
From: AFCMS <afcm.contact@gmail.com>
Date: Mon, 20 Sep 2021 09:47:24 +0200
Subject: [PATCH 13/36] fix emerald help text translation

---
 mods/ITEMS/mcl_core/locale/mcl_core.de.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.es.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.fr.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.pl.tr | 2 +-
 mods/ITEMS/mcl_core/locale/mcl_core.ru.tr | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
index 0a1cbad37..b064cebbe 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Smaragd
 Emerald Ore=Smaragderz
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Smaragderz ist das Erz von Smaragden. Es ist sehr selten und kann nur einzeln gefunden werden, nicht in Ansammlungen.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Smaragde sind nicht besonders nützlich, aber man kann sie in der Fertigung durch Goldbarren eintauschen.
+Emeralds are used in villager trades as currency.=
 Flint=Feuerstein
 Flint is a raw material.=Feuerstein ist ein Rohstoff.
 Flowing Lava=Fließende Lava
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
index 1e1029c0f..1937babd3 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Esmeralda
 Emerald Ore=Mena de esmeralda
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=El mineral esmeralda es el mineral de las esmeraldas. Es muy raro y se puede encontrar solo, no en grupos.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Las esmeraldas no son muy útiles por sí mismas, pero pueden cambiarse por lingotes de oro haciendo artesanías.
+Emeralds are used in villager trades as currency.=
 Flint=Pedernal
 Flint is a raw material.=El pedernal es una materia prima.
 Flowing Lava=Lava que fluye
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
index 725025e48..64aadd6db 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 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 peut être trouvé seul, pas en filons.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Les émeraudes ne sont pas très utiles seules, mais elles peuvent être échangées contre des lingots d'or.
+Emeralds are used in villager trades as currency.=Les émeraudes sont utilisées pour faire des échanges avec les villageois.
 Flint=Silex
 Flint is a raw material.=Le silex est une matière première.
 Flowing Lava=Lave qui coule
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
index 832a47830..68dfbd3d0 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Szmaragd
 Emerald Ore=Ruda szmaragdu
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Ruda szmaragdu jest bardzo rzadka i występuje samotnie, nie w grupach.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Szmaragdy nie są zbyt użyteczne same w sobie, ale można z nich wytworzyć sztabki złota. 
+Emeralds are used in villager trades as currency.=
 Flint=Krzemień
 Flint is a raw material.=Krzemień jest surowym materiałem.
 Flowing Lava=Płynąca lawa
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
index f93db7c2c..2d5b5462c 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Изумруд
 Emerald Ore=Изумрудная руда
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Изумрудная руда встречается очень редко и всегда по одному блоку.
-Emeralds are not very useful on their own, but they can exchanged for gold ingots by crafting.=Изумруды не очень полезны сами по себе, но их можно обменять на золотые слитки.
+Emeralds are used in villager trades as currency.=
 Flint=Кремень
 Flint is a raw material.=Кремень это необработанный материал.
 Flowing Lava=Текущая лава
-- 
2.40.1


From e0c7e938dea19a3df5efd9fa73b61c85d17640ed Mon Sep 17 00:00:00 2001
From: AFCMS <afcms@noreply.git.minetest.land>
Date: Mon, 20 Sep 2021 07:55:51 +0000
Subject: [PATCH 14/36] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?=
 =?UTF-8?q?cl=5Fcore/locale/mcl=5Fcore.fr.tr'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mods/ITEMS/mcl_core/locale/mcl_core.fr.tr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
index 4d6a3ed43..64aadd6db 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 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 peut être trouvé seul, pas en filons.
-Emeralds are used in villager trades as currency.=Les émeraudes ne sont pas très utiles seules, mais elles peuvent être échangées contre des lingots d'or.
+Emeralds are used in villager trades as currency.=Les émeraudes sont utilisées pour faire des échanges avec les villageois.
 Flint=Silex
 Flint is a raw material.=Le silex est une matière première.
 Flowing Lava=Lave qui coule
-- 
2.40.1


From e8134345d4476be032117723b5397926ff6d5199 Mon Sep 17 00:00:00 2001
From: AFCMS <afcms@noreply.git.minetest.land>
Date: Mon, 20 Sep 2021 07:56:25 +0000
Subject: [PATCH 15/36] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?=
 =?UTF-8?q?cl=5Fcore/locale/mcl=5Fcore.de.tr'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mods/ITEMS/mcl_core/locale/mcl_core.de.tr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
index 8b75dfd40..b064cebbe 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Smaragd
 Emerald Ore=Smaragderz
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Smaragderz ist das Erz von Smaragden. Es ist sehr selten und kann nur einzeln gefunden werden, nicht in Ansammlungen.
-Emeralds are used in villager trades as currency.=Smaragde sind nicht besonders nützlich, aber man kann sie in der Fertigung durch Goldbarren eintauschen.
+Emeralds are used in villager trades as currency.=
 Flint=Feuerstein
 Flint is a raw material.=Feuerstein ist ein Rohstoff.
 Flowing Lava=Fließende Lava
-- 
2.40.1


From b2af00db2201f1ddc20c0b9650c983402aaa10b7 Mon Sep 17 00:00:00 2001
From: AFCMS <afcms@noreply.git.minetest.land>
Date: Mon, 20 Sep 2021 07:57:04 +0000
Subject: [PATCH 16/36] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?=
 =?UTF-8?q?cl=5Fcore/locale/mcl=5Fcore.es.tr'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mods/ITEMS/mcl_core/locale/mcl_core.es.tr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
index d77f45dc2..1937babd3 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Esmeralda
 Emerald Ore=Mena de esmeralda
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=El mineral esmeralda es el mineral de las esmeraldas. Es muy raro y se puede encontrar solo, no en grupos.
-Emeralds are used in villager trades as currency.=Las esmeraldas no son muy útiles por sí mismas, pero pueden cambiarse por lingotes de oro haciendo artesanías.
+Emeralds are used in villager trades as currency.=
 Flint=Pedernal
 Flint is a raw material.=El pedernal es una materia prima.
 Flowing Lava=Lava que fluye
-- 
2.40.1


From e36a8c5acf48d473db9ae5807b176b94a779e15c Mon Sep 17 00:00:00 2001
From: AFCMS <afcms@noreply.git.minetest.land>
Date: Mon, 20 Sep 2021 07:58:25 +0000
Subject: [PATCH 17/36] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?=
 =?UTF-8?q?cl=5Fcore/locale/mcl=5Fcore.pl.tr'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mods/ITEMS/mcl_core/locale/mcl_core.pl.tr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
index f8dbbde6b..68dfbd3d0 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Szmaragd
 Emerald Ore=Ruda szmaragdu
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Ruda szmaragdu jest bardzo rzadka i występuje samotnie, nie w grupach.
-Emeralds are used in villager trades as currency.=Szmaragdy nie są zbyt użyteczne same w sobie, ale można z nich wytworzyć sztabki złota. 
+Emeralds are used in villager trades as currency.=
 Flint=Krzemień
 Flint is a raw material.=Krzemień jest surowym materiałem.
 Flowing Lava=Płynąca lawa
-- 
2.40.1


From b0cf07a020ba353545465b8909fd88ad8725c4cd Mon Sep 17 00:00:00 2001
From: AFCMS <afcms@noreply.git.minetest.land>
Date: Mon, 20 Sep 2021 07:59:00 +0000
Subject: [PATCH 18/36] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?=
 =?UTF-8?q?cl=5Fcore/locale/mcl=5Fcore.ru.tr'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mods/ITEMS/mcl_core/locale/mcl_core.ru.tr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
index ad9d863b2..2d5b5462c 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr
@@ -95,7 +95,7 @@ Dirt acts as a soil for a few plants. When in light, this block may grow a grass
 Emerald=Изумруд
 Emerald Ore=Изумрудная руда
 Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Изумрудная руда встречается очень редко и всегда по одному блоку.
-Emeralds are used in villager trades as currency.=Изумруды не очень полезны сами по себе, но их можно обменять на золотые слитки.
+Emeralds are used in villager trades as currency.=
 Flint=Кремень
 Flint is a raw material.=Кремень это необработанный материал.
 Flowing Lava=Текущая лава
-- 
2.40.1


From 89e90b13eb53085a801c37c639a796a0a917cac0 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Mon, 20 Sep 2021 14:16:59 +0000
Subject: [PATCH 19/36] Use on_newplayer

---
 mods/MISC/mcl_privs/init.lua | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/mods/MISC/mcl_privs/init.lua b/mods/MISC/mcl_privs/init.lua
index c63f7c5c5..302557f86 100644
--- a/mods/MISC/mcl_privs/init.lua
+++ b/mods/MISC/mcl_privs/init.lua
@@ -4,12 +4,9 @@ minetest.register_privilege("maphack", {
 	description = S("Can place and use advanced blocks like mob spawners, command blocks and barriers."),
 })
 
-minetest.register_on_joinplayer(function(player)
+minetest.register_on_newplayer(function(player)
 	local name = player:get_player_name()
 
-	local meta = player:get_meta()
-	if meta:get_int("fly_changed") == 1 then return end
-
 	local fly = nil
 	if minetest.is_creative_enabled(name) then
 		fly = true
@@ -18,13 +15,3 @@ minetest.register_on_joinplayer(function(player)
 		fly = fly,
 	})
 end)
-
-for _, action in pairs({ "grant", "revoke" }) do
-	minetest["register_on_priv_" .. action](function(name, _, priv)
-		if priv == "fly" then
-			local player = minetest.get_player_by_name(name)
-			local meta = player:get_meta()
-			meta:set_int("fly_changed", 1)
-		end
-	end)
-end
\ No newline at end of file
-- 
2.40.1


From df1d8077e6123cef815bc4f30dd02838b9b84dec Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Tue, 21 Sep 2021 18:07:36 +0000
Subject: [PATCH 20/36] Some fixes for mcl_beds

- remove enable_bed_night_skip setting (mcl_playersSleepingPercentage setting can be used to enable disable night skip)
- make it possible to change mcl_playersSleepingPercentage ingame
- fix weird bug which allowed only numbers <= 0
---
 mods/ITEMS/mcl_beds/functions.lua | 39 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index 01ccec851..e7306b40a 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -9,36 +9,36 @@ local weather_mod = minetest.get_modpath("mcl_weather")
 local explosions_mod = minetest.get_modpath("mcl_explosions")
 local spawn_mod = minetest.get_modpath("mcl_spawn")
 local worlds_mod = minetest.get_modpath("mcl_worlds")
-local players_in_bed_setting = tonumber(minetest.settings:get("mcl_playersSleepingPercentage"))
 
 -- Helper functions
 
 local function get_look_yaw(pos)
 	local n = minetest.get_node(pos)
-	if n.param2 == 1 then
-		return math.pi / 2, n.param2
-	elseif n.param2 == 3 then
-		return -math.pi / 2, n.param2
-	elseif n.param2 == 0 then
-		return math.pi, n.param2
+	local param = n.param2
+	if param == 1 then
+		return math.pi / 2, param
+	elseif param == 3 then
+		return -math.pi / 2, param
+	elseif param == 0 then
+		return math.pi, param
 	else
-		return 0, n.param2
+		return 0, param
 	end
 end
 
+local function players_in_bed_setting()
+	return tonumber(minetest.settings:get("mcl_playersSleepingPercentage"))
+end
+
 local function is_night_skip_enabled()
-	local enable_night_skip = minetest.settings:get_bool("enable_bed_night_skip")
-	if enable_night_skip == nil then
-		enable_night_skip = true
-	end
-	return enable_night_skip
+	return players_in_bed_setting() <= 100
 end
 
 local function check_in_beds(players)
 	if not players then
 		players = minetest.get_connected_players()
 	end
-	return players_in_bed_setting <= (#mcl_beds.player * 100) / #players
+	return players_in_bed_setting() <= (player_in_bed * 100) / #players
 end
 
 -- These monsters do not prevent sleep
@@ -190,8 +190,8 @@ end
 local function update_formspecs(finished, ges)
 	local ges = ges or #minetest.get_connected_players()
 	local form_n = "size[12,5;true]"
-	local all_in_bed = players_in_bed_setting <= (player_in_bed * 100) / ges
-	local night_skip = is_night_skip_enabled() and players_in_bed_setting <= 100
+	local all_in_bed = players_in_bed_setting() <= (player_in_bed * 100) / ges
+	local night_skip = is_night_skip_enabled()
 	local button_leave = "button_exit[4,3;4,0.75;leave;"..F(S("Leave bed")).."]"
 	local button_abort = "button_exit[4,3;4,0.75;leave;"..F(S("Abort sleep")).."]"
 	local bg_presleep = "bgcolor[#00000080;true]"
@@ -204,7 +204,7 @@ local function update_formspecs(finished, ges)
 		return
 	elseif not is_sp then
 		local text = S("Players in bed: @1/@2", player_in_bed, ges)
-		if not night_skip or players_in_bed_setting > 100 then
+		if not night_skip then
 			text = text .. "\n" .. S("Note: Night skip is disabled.")
 			form_n = form_n .. bg_presleep
 			form_n = form_n .. button_leave
@@ -214,10 +214,10 @@ local function update_formspecs(finished, ges)
 			form_n = form_n .. button_abort
 		else
 			local comment = "You will fall asleep when "
-			if players_in_bed_setting == 100 then
+			if players_in_bed_setting() == 100 then
 				comment = S(comment .. "all players are in bed.")
 			else
-				comment = S(comment .. "@1% of all players are in bed.", players_in_bed_setting)
+				comment = S(comment .. "@1% of all players are in bed.", players_in_bed_setting())
 			end
 			text = text .. "\n" .. comment
 			form_n = form_n .. bg_presleep
@@ -347,7 +347,6 @@ function mcl_beds.on_rightclick(pos, player, is_top)
 	end
 end
 
-
 -- Callbacks
 minetest.register_on_joinplayer(function(player)
 	local meta = player:get_meta()
-- 
2.40.1


From 71f448537cb523c9f8287b630ccce6f1ddd91cca Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Tue, 21 Sep 2021 18:14:24 +0000
Subject: [PATCH 21/36] Remove unused setting from settingtypes.txt

---
 settingtypes.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/settingtypes.txt b/settingtypes.txt
index 89e11833f..542711675 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -36,11 +36,9 @@ enable_bed_respawn (Respawn at bed) bool true
 # How many players have to sleep to skip the night, in percent.
 # Setting to 0 will mean 1 player is always enough to skip the night. Setting above 100 will prevent skipping the night.
 # 100 by default.
+# The setting can be changed ingame using `/set mcl_playersSleepingPercentage <number>`
 mcl_playersSleepingPercentage (Players Sleeping Percentage) int 100
 
-# If enabled, the night can be skipped if all players are in bed.
-# This setting is only read at startup.
-enable_bed_night_skip (Skip night when sleeping) bool true
 # Normally, players drop all their items when they die. Enable this
 # setting, so players always keep their inventory on death.
 mcl_keepInventory (Keep inventory on death) bool false
-- 
2.40.1


From e83438e42cb677e6336f52e5e17973fcbef5663c Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Tue, 21 Sep 2021 18:19:07 +0000
Subject: [PATCH 22/36] Update mcl_bed README.txt

---
 mods/ITEMS/mcl_beds/README.txt | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/mods/ITEMS/mcl_beds/README.txt b/mods/ITEMS/mcl_beds/README.txt
index cda6ebd92..34b493702 100644
--- a/mods/ITEMS/mcl_beds/README.txt
+++ b/mods/ITEMS/mcl_beds/README.txt
@@ -12,15 +12,7 @@ Authors of media (textures)
 BlockMen (CC BY-SA 3.0)
 
 This mod adds a bed to Minetest which allows to skip the night.
-To sleep, rightclick the bed. If playing in singleplayer mode the night gets skipped
-immediately. If playing multiplayer you get shown how many other players are in bed too,
-if all players are sleeping the night gets skipped. The night skip can be forced if more
-than 50% of the players are lying in bed and use this option.
-
-Another feature is a controlled respawning. If you have slept in bed (not just lying in
-it) your respawn point is set to the beds location and you will respawn there after
+To sleep, rightclick the bed.
+Another feature is a controlled respawning. If you have slept in bed your respawn point is set to the beds location and you will respawn there after
 death.
-You can disable the respawn at beds by setting "enable_bed_respawn = false" in
-minetest.conf.
-You can disable the night skip feature by setting "enable_bed_night_skip = false" in
-minetest.conf or by using the /set command in-game.
+Use the mcl_playersSleepingPercentage setting to enable/disable night skipping or set a percentage of how many players need to sleep to skip the night.
\ No newline at end of file
-- 
2.40.1


From 8697b38d60325f289eb75fd19b83e86e877946bc Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Mon, 27 Sep 2021 20:00:11 +0000
Subject: [PATCH 23/36] Remove on_newplayer ...

---
 mods/MISC/mcl_privs/init.lua | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/mods/MISC/mcl_privs/init.lua b/mods/MISC/mcl_privs/init.lua
index 302557f86..c63f7c5c5 100644
--- a/mods/MISC/mcl_privs/init.lua
+++ b/mods/MISC/mcl_privs/init.lua
@@ -4,9 +4,12 @@ minetest.register_privilege("maphack", {
 	description = S("Can place and use advanced blocks like mob spawners, command blocks and barriers."),
 })
 
-minetest.register_on_newplayer(function(player)
+minetest.register_on_joinplayer(function(player)
 	local name = player:get_player_name()
 
+	local meta = player:get_meta()
+	if meta:get_int("fly_changed") == 1 then return end
+
 	local fly = nil
 	if minetest.is_creative_enabled(name) then
 		fly = true
@@ -15,3 +18,13 @@ minetest.register_on_newplayer(function(player)
 		fly = fly,
 	})
 end)
+
+for _, action in pairs({ "grant", "revoke" }) do
+	minetest["register_on_priv_" .. action](function(name, _, priv)
+		if priv == "fly" then
+			local player = minetest.get_player_by_name(name)
+			local meta = player:get_meta()
+			meta:set_int("fly_changed", 1)
+		end
+	end)
+end
\ No newline at end of file
-- 
2.40.1


From 03be73656648136fdabff2dd68c6e44ed184f475 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Mon, 27 Sep 2021 20:13:12 +0000
Subject: [PATCH 24/36] Dont skip night if no players are in bed

---
 mods/ITEMS/mcl_beds/functions.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index e7306b40a..e2bece033 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -38,6 +38,9 @@ local function check_in_beds(players)
 	if not players then
 		players = minetest.get_connected_players()
 	end
+	if player_in_bed < 0 then
+		return false
+	end
 	return players_in_bed_setting() <= (player_in_bed * 100) / #players
 end
 
-- 
2.40.1


From 16c73c1cb652b02f77e6140e9ad41f602d5f29aa Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Tue, 28 Sep 2021 13:16:19 +0000
Subject: [PATCH 25/36] Add forgotten `=`

---
 mods/ITEMS/mcl_beds/functions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index e2bece033..062219294 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -38,7 +38,7 @@ local function check_in_beds(players)
 	if not players then
 		players = minetest.get_connected_players()
 	end
-	if player_in_bed < 0 then
+	if player_in_bed <= 0 then
 		return false
 	end
 	return players_in_bed_setting() <= (player_in_bed * 100) / #players
-- 
2.40.1


From e9437e9e1e623a493ecf2abbac91fefd775c5aa4 Mon Sep 17 00:00:00 2001
From: AFCMS <afcm.contact@gmail.com>
Date: Wed, 29 Sep 2021 21:06:51 +0200
Subject: [PATCH 26/36] fix crash then using function in `_mcl_armor_[texture,
 preview]` tool field

---
 mods/ITEMS/mcl_enchanting/engine.lua | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mods/ITEMS/mcl_enchanting/engine.lua b/mods/ITEMS/mcl_enchanting/engine.lua
index d2a749947..6050aeed2 100644
--- a/mods/ITEMS/mcl_enchanting/engine.lua
+++ b/mods/ITEMS/mcl_enchanting/engine.lua
@@ -270,8 +270,14 @@ function mcl_enchanting.initialize()
 			new_def.groups.not_in_creative_inventory = 1
 			new_def.groups.not_in_craft_guide = 1
 			new_def.groups.enchanted = 1
-			new_def._mcl_armor_texture = new_def._mcl_armor_texture and new_def._mcl_armor_texture .. mcl_enchanting.overlay
-			new_def._mcl_armor_preview = new_def._mcl_armor_preview and new_def._mcl_armor_preview .. mcl_enchanting.overlay
+
+			if new_def._mcl_armor_texture and not type(new_def._mcl_armor_texture) == "function" then
+				new_def._mcl_armor_texture = new_def._mcl_armor_texture .. mcl_enchanting.overlay
+			end
+			if new_def._mcl_armor_preview and not type(new_def._mcl_armor_preview) == "function" then
+				new_def._mcl_armor_preview = new_def._mcl_armor_preview .. mcl_enchanting.overlay
+			end
+
 			new_def._mcl_enchanting_enchanted_tool = new_name
 			new_def.after_use = get_after_use_callback(itemdef)
 			local register_list = register_item_list
-- 
2.40.1


From a410d173069baf3d38f5fe5a704e4db562e5dd8a Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 30 Sep 2021 20:14:13 +0000
Subject: [PATCH 27/36] Fix that all of new players' default_privs are removed

---
 mods/MISC/mcl_privs/init.lua | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mods/MISC/mcl_privs/init.lua b/mods/MISC/mcl_privs/init.lua
index c63f7c5c5..f06ff3582 100644
--- a/mods/MISC/mcl_privs/init.lua
+++ b/mods/MISC/mcl_privs/init.lua
@@ -6,7 +6,6 @@ minetest.register_privilege("maphack", {
 
 minetest.register_on_joinplayer(function(player)
 	local name = player:get_player_name()
-
 	local meta = player:get_meta()
 	if meta:get_int("fly_changed") == 1 then return end
 
@@ -14,12 +13,12 @@ minetest.register_on_joinplayer(function(player)
 	if minetest.is_creative_enabled(name) then
 		fly = true
 	end
-	minetest.set_player_privs(name, {
-		fly = fly,
-	})
+	local player_privs = minetest.get_player_privs(name)
+	player_privs.fly = fly
+	minetest.set_player_privs(name, player_privs)
 end)
 
-for _, action in pairs({ "grant", "revoke" }) do
+for _, action in pairs({"grant", "revoke"}) do
 	minetest["register_on_priv_" .. action](function(name, _, priv)
 		if priv == "fly" then
 			local player = minetest.get_player_by_name(name)
-- 
2.40.1


From 8e3f9d216944d258cd385223db037ef1882deb63 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 9 Sep 2021 09:22:27 +0000
Subject: [PATCH 28/36] add basic lightning API

---
 mods/ENVIRONMENT/lightning/init.lua | 75 ++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua
index 3d5955d6e..3230f0b0a 100644
--- a/mods/ENVIRONMENT/lightning/init.lua
+++ b/mods/ENVIRONMENT/lightning/init.lua
@@ -24,13 +24,14 @@ local get_objects_inside_radius = minetest.get_objects_inside_radius
 local get_item_group = minetest.get_item_group
 
 lightning = {
-    interval_low = 17,
-    interval_high = 503,
-    range_h = 100,
-    range_v = 50,
-    size = 100,
-    -- disable this to stop lightning mod from striking
-    auto = true,
+	interval_low = 17,
+	interval_high = 503,
+	range_h = 100,
+	range_v = 50,
+	size = 100,
+	-- disable this to stop lightning mod from striking
+	auto = true,
+	on_strike_functions = {},
 }
 
 local rng = PcgRandom(32321123312123)
@@ -54,6 +55,18 @@ end
 
 minetest.register_globalstep(revertsky)
 
+-- lightning strike API
+
+-- See README.md
+--[[
+	lightning.register_on_strike(function(pos, pos2, objects)
+		-- code
+	end)
+]]
+function lightning.register_on_strike(func)
+	table.insert(lightning.on_strike_functions, func)
+end
+
 -- select a random strike point, midpoint
 local function choose_pos(pos)
 	if not pos then
@@ -79,14 +92,14 @@ local function choose_pos(pos)
 		pos.z = math.floor(pos.z - (lightning.range_h / 2) + rng:next(1, lightning.range_h))
 	end
 
-	local b, pos2 = line_of_sight(pos, {x = pos.x, y = pos.y - lightning.range_v, z = pos.z}, 1)
+	local b, pos2 = line_of_sight(pos, { x = pos.x, y = pos.y - lightning.range_v, z = pos.z }, 1)
 
 	-- nothing but air found
 	if b then
 		return nil, nil
 	end
 
-	local n = get_node({x = pos2.x, y = pos2.y - 1/2, z = pos2.z})
+	local n = get_node({ x = pos2.x, y = pos2.y - 1/2, z = pos2.z })
 	if n.name == "air" or n.name == "ignore" then
 		return nil, nil
 	end
@@ -94,7 +107,6 @@ local function choose_pos(pos)
 	return pos, pos2
 end
 
--- lightning strike API
 -- * pos: optional, if not given a random pos will be chosen
 -- * returns: bool - success if a strike happened
 function lightning.strike(pos)
@@ -108,21 +120,30 @@ function lightning.strike(pos)
 	if not pos then
 		return false
 	end
+	local objects = get_objects_inside_radius(pos2, 3.5)
+	if lightning.on_strike_functions then
+		for _, func in pairs(lightning.on_strike_functions) do
+			func(pos, pos2, objects)
+		end
+	end
+end
 
+
+
+lightning.register_on_strike(function(pos, pos2, objects)
+	local particle_pos = vector.offset(pos2, 0, (lightning.size / 2) + 0.5, 0)
+	local particle_size = lightning.size * 10
+	local time = 0.2
 	add_particlespawner({
 		amount = 1,
-		time = 0.2,
+		time = time,
 		-- make it hit the top of a block exactly with the bottom
-		minpos = {x = pos2.x, y = pos2.y + (lightning.size / 2) + 1/2, z = pos2.z },
-		maxpos = {x = pos2.x, y = pos2.y + (lightning.size / 2) + 1/2, z = pos2.z },
-		minvel = {x = 0, y = 0, z = 0},
-		maxvel = {x = 0, y = 0, z = 0},
-		minacc = {x = 0, y = 0, z = 0},
-		maxacc = {x = 0, y = 0, z = 0},
-		minexptime = 0.2,
-		maxexptime = 0.2,
-		minsize = lightning.size * 10,
-		maxsize = lightning.size * 10,
+		minpos = particle_pos,
+		maxpos = particle_pos,
+		minexptime = time,
+		maxexptime = time,
+		minsize = particle_size,
+		maxsize = particle_size,
 		collisiondetection = true,
 		vertical = true,
 		-- to make it appear hitting the node that will get set on fire, make sure
@@ -135,10 +156,7 @@ function lightning.strike(pos)
 	sound_play({ name = "lightning_thunder", gain = 10 }, { pos = pos, max_hear_distance = 500 }, true)
 
 	-- damage nearby objects, transform mobs
-    -- TODO: use an API insteed of hardcoding this behaviour
-	local objs = get_objects_inside_radius(pos2, 3.5)
-	for o=1, #objs do
-		local obj = objs[o]
+	for _, obj in pairs(objects) do
 		local lua = obj:get_luaentity()
 		-- pig → zombie pigman (no damage)
 		if lua and lua.name == "mobs_mc:pig" then
@@ -155,7 +173,7 @@ function lightning.strike(pos)
 			end
 			obj:set_properties({textures = lua.base_texture})
 		-- villager → witch (no damage)
-		--elseif lua and lua.name == "mobs_mc:villager" then
+		-- elseif lua and lua.name == "mobs_mc:villager" then
 		-- Witches are incomplete, this code is unused
 		-- TODO: Enable this code when witches are working.
 		--[[
@@ -172,7 +190,7 @@ function lightning.strike(pos)
 			obj:set_yaw(rot)
 			-- Other objects: Just damage
 		else
-			mcl_util.deal_damage(obj, 5, {type = "lightning_bolt"})
+			mcl_util.deal_damage(obj, 5, { type = "lightning_bolt" })
 		end
 	end
 
@@ -223,8 +241,7 @@ function lightning.strike(pos)
 			end
 		end
 	end
-
-end
+end)
 
 -- if other mods disable auto lightning during initialization, don't trigger the first lightning.
 after(5, function(dtime)
-- 
2.40.1


From e4af02ea526ef32da38ca7094f13b1c7c128bc83 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 9 Sep 2021 09:54:58 +0000
Subject: [PATCH 29/36] Add function to replace mobs

---
 mods/CORE/mcl_util/init.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mods/CORE/mcl_util/init.lua b/mods/CORE/mcl_util/init.lua
index a7504af08..363b9b5fe 100644
--- a/mods/CORE/mcl_util/init.lua
+++ b/mods/CORE/mcl_util/init.lua
@@ -538,3 +538,12 @@ function mcl_util.get_object_name(object)
 		return luaentity.nametag and luaentity.nametag ~= "" and luaentity.nametag or luaentity.description or luaentity.name
 	end
 end
+
+function mcl_util.replace_mob(obj, mob)
+	local rot = obj:get_yaw()
+	local pos = obj:get_pos()
+	obj:remove()
+	obj = minetest.add_entity(pos, mob)
+	obj:set_yaw(rot)
+	return obj
+end
-- 
2.40.1


From 463fe2af5f3343dcecefec9eb5147f34ec04cb3d Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 9 Sep 2021 09:57:36 +0000
Subject: [PATCH 30/36] use mcl_util.replace_mob function to simplify lightning
 code

---
 mods/ENVIRONMENT/lightning/init.lua | 38 +++++++----------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua
index 3230f0b0a..5568e63fc 100644
--- a/mods/ENVIRONMENT/lightning/init.lua
+++ b/mods/ENVIRONMENT/lightning/init.lua
@@ -128,8 +128,6 @@ function lightning.strike(pos)
 	end
 end
 
-
-
 lightning.register_on_strike(function(pos, pos2, objects)
 	local particle_pos = vector.offset(pos2, 0, (lightning.size / 2) + 0.5, 0)
 	local particle_size = lightning.size * 10
@@ -158,37 +156,19 @@ lightning.register_on_strike(function(pos, pos2, objects)
 	-- damage nearby objects, transform mobs
 	for _, obj in pairs(objects) do
 		local lua = obj:get_luaentity()
-		-- pig → zombie pigman (no damage)
 		if lua and lua.name == "mobs_mc:pig" then
-			local rot = obj:get_yaw()
-			obj:remove()
-			obj = add_entity(pos2, "mobs_mc:pigman")
-			obj:set_yaw(rot)
-			-- mooshroom: toggle color red/brown (no damage)
+			mcl_util.replace_mob(obj, "mobs_mc:pigman")
 		elseif lua and lua.name == "mobs_mc:mooshroom" then
 			if lua.base_texture[1] == "mobs_mc_mooshroom.png" then
 				lua.base_texture = { "mobs_mc_mooshroom_brown.png", "mobs_mc_mushroom_brown.png" }
 			else
 				lua.base_texture = { "mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png" }
 			end
-			obj:set_properties({textures = lua.base_texture})
-		-- villager → witch (no damage)
-		-- elseif lua and lua.name == "mobs_mc:villager" then
-		-- Witches are incomplete, this code is unused
-		-- TODO: Enable this code when witches are working.
-		--[[
-			local rot = obj:get_yaw()
-			obj:remove()
-			obj = minetest.add_entity(pos2, "mobs_mc:witch")
-			obj:set_yaw(rot)
-		]]
-		-- charged creeper
+			obj:set_properties({ textures = lua.base_texture })
+		elseif lua and lua.name == "mobs_mc:villager" then
+			mcl_util.replace_mob(obj, "mobs_mc:witch")
 		elseif lua and lua.name == "mobs_mc:creeper" then
-			local rot = obj:get_yaw()
-			obj:remove()
-			obj = add_entity(pos2, "mobs_mc:creeper_charged")
-			obj:set_yaw(rot)
-			-- Other objects: Just damage
+			mcl_util.replace_mob(obj, "mobs_mc:creeper_charged")
 		else
 			mcl_util.deal_damage(obj, 5, { type = "lightning_bolt" })
 		end
@@ -204,7 +184,7 @@ lightning.register_on_strike(function(pos, pos2, objects)
 		local name = player:get_player_name()
 		if ps[name] == nil then
 			ps[name] = {p = player, sky = sky}
-			mcl_weather.skycolor.add_layer("lightning", {{r=255,g=255,b=255}}, true)
+			mcl_weather.skycolor.add_layer("lightning", { { r = 255, g = 255, b = 255 } }, true)
 			mcl_weather.skycolor.active = true
 		end
 	end
@@ -219,7 +199,7 @@ lightning.register_on_strike(function(pos, pos2, objects)
 	if rng:next(1,100) <= 3 then
 		skeleton_lightning = true
 	end
-	if get_item_group(get_node({x = pos2.x, y = pos2.y - 1, z = pos2.z}).name, "liquid") < 1 then
+	if get_item_group(get_node({ x = pos2.x, y = pos2.y - 1, z = pos2.z }).name, "liquid") < 1 then
 		if get_node(pos2).name == "air" then
 			-- Low chance for a lightning to spawn skeleton horse + skeletons
 			if skeleton_lightning then
@@ -228,7 +208,7 @@ lightning.register_on_strike(function(pos, pos2, objects)
 				local angle, posadd
 				angle = math.random(0, math.pi*2)
 				for i=1,3 do
-					posadd = {x=math.cos(angle),y=0,z=math.sin(angle)}
+					posadd = { x=math.cos(angle),y=0,z=math.sin(angle) }
 					posadd = vector.normalize(posadd)
 					local mob = add_entity(vector.add(pos2, posadd), "mobs_mc:skeleton")
 					mob:set_yaw(angle-math.pi/2)
@@ -237,7 +217,7 @@ lightning.register_on_strike(function(pos, pos2, objects)
 
 			-- Cause a fire
 			else
-				set_node(pos2, {name = "mcl_fire:fire"})
+				set_node(pos2, { name = "mcl_fire:fire" })
 			end
 		end
 	end
-- 
2.40.1


From fe91d7f3e0a5c629cb1f3abad593671ee851ee39 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 9 Sep 2021 10:07:45 +0000
Subject: [PATCH 31/36] use mcl_util.replace_mob function to simplify dispenser
 code

---
 mods/ITEMS/REDSTONE/mcl_dispensers/init.lua | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
index 82d53c806..47acacbb9 100644
--- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
@@ -203,12 +203,8 @@ local dispenserdef = {
 									else
 										minetest.add_item(droppos, mobs_mc.items.mushroom_red .. " 5")
 									end
-									local oldyaw = obj:get_yaw()
-									obj:remove()
-									local cow = minetest.add_entity(pos, "mobs_mc:cow")
-									cow:set_yaw(oldyaw)
-									obj = cow
-									entity = cow:get_luaentity()
+									obj = mcl_util.replace_mob(obj, "mobs_mc:cow")
+									entity = obj:get_luaentity()
 									used = true
 								end
 								if used then
-- 
2.40.1


From 9188467a6adfdc6bd8edfeb8f156c510ce7ab1b0 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 9 Sep 2021 12:31:19 +0000
Subject: [PATCH 32/36] add API.md for lightning mod

---
 mods/ENVIRONMENT/lightning/API.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 mods/ENVIRONMENT/lightning/API.md

diff --git a/mods/ENVIRONMENT/lightning/API.md b/mods/ENVIRONMENT/lightning/API.md
new file mode 100644
index 000000000..6a4dd11cf
--- /dev/null
+++ b/mods/ENVIRONMENT/lightning/API.md
@@ -0,0 +1,31 @@
+# lightning
+Lightning mod for MineClone2 with the following API:
+
+## lightning.register_on_strike(function(pos, pos2, objects))
+Custom function called when a lightning strikes.
+
+* `pos`: impact position
+* `pos2`: rounded node position where fire is placed
+* `objects`: table with ObjectRefs of all objects within a radius of 3.5 around pos2
+
+## lightning.strike(pos)
+Let a lightning strike.
+
+* pos: optional, if not given a random pos will be chosen
+* returns: bool - success if a strike happened
+
+
+### Examples:
+
+```
+lightning.register_on_strike(function(pos, pos2, objects)
+        for _, obj in pairs(objects) do
+                obj:remove()
+        end
+        minetest.add_entity(pos, "mobs_mc:sheep")
+end)
+
+minetest.register_on_respawnplayer(function(player)
+        lightning.strike(player:get_pos())
+end)
+```
\ No newline at end of file
-- 
2.40.1


From 72ea9069bd848eb4bcbd030bc32b859370c5cef5 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 9 Sep 2021 12:35:05 +0000
Subject: [PATCH 33/36] correct lightning API.md a bit

---
 mods/ENVIRONMENT/lightning/API.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/ENVIRONMENT/lightning/API.md b/mods/ENVIRONMENT/lightning/API.md
index 6a4dd11cf..ad4f0a3b4 100644
--- a/mods/ENVIRONMENT/lightning/API.md
+++ b/mods/ENVIRONMENT/lightning/API.md
@@ -11,8 +11,8 @@ Custom function called when a lightning strikes.
 ## lightning.strike(pos)
 Let a lightning strike.
 
-* pos: optional, if not given a random pos will be chosen
-* returns: bool - success if a strike happened
+* `pos`: optional, if not given a random pos will be chosen
+* `returns`: bool - success if a strike happened
 
 
 ### Examples:
-- 
2.40.1


From 03829dd51884c92fae3d8ee0dd04f3dad1155dec Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 9 Sep 2021 12:35:50 +0000
Subject: [PATCH 34/36] fix typo

---
 mods/ENVIRONMENT/lightning/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua
index 5568e63fc..b234092af 100644
--- a/mods/ENVIRONMENT/lightning/init.lua
+++ b/mods/ENVIRONMENT/lightning/init.lua
@@ -57,7 +57,7 @@ minetest.register_globalstep(revertsky)
 
 -- lightning strike API
 
--- See README.md
+-- See API.md
 --[[
 	lightning.register_on_strike(function(pos, pos2, objects)
 		-- code
-- 
2.40.1


From 0584d16569103bb5cd15c5e5041efb842d5b8784 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Thu, 9 Sep 2021 13:21:33 +0000
Subject: [PATCH 35/36] add lightning API support for mobs

---
 mods/ENVIRONMENT/lightning/init.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua
index b234092af..83494462f 100644
--- a/mods/ENVIRONMENT/lightning/init.lua
+++ b/mods/ENVIRONMENT/lightning/init.lua
@@ -156,6 +156,10 @@ lightning.register_on_strike(function(pos, pos2, objects)
 	-- damage nearby objects, transform mobs
 	for _, obj in pairs(objects) do
 		local lua = obj:get_luaentity()
+		if lua and lua._on_strike then
+			lua._on_strike(lua, pos, pos2, objects)
+		end
+		-- remove this when mob API is done
 		if lua and lua.name == "mobs_mc:pig" then
 			mcl_util.replace_mob(obj, "mobs_mc:pigman")
 		elseif lua and lua.name == "mobs_mc:mooshroom" then
-- 
2.40.1


From 9ccf8de606c4ce4e6b903ac3ce6727d01f3d5160 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sat, 9 Oct 2021 14:41:56 +0000
Subject: [PATCH 36/36] Fix crash on startup if mcl_playersSleepingPercentage
 is not defined (#1874)

---
 mods/ITEMS/mcl_beds/functions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index 062219294..b8478fc1f 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -27,7 +27,7 @@ local function get_look_yaw(pos)
 end
 
 local function players_in_bed_setting()
-	return tonumber(minetest.settings:get("mcl_playersSleepingPercentage"))
+	return tonumber(minetest.settings:get("mcl_playersSleepingPercentage")) or 100
 end
 
 local function is_night_skip_enabled()
-- 
2.40.1