diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1b5098a4f1..4c9bf3e384 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,17 +52,17 @@ Each mod must provide `mod.conf`.
 Each mod which add API functions should store functions inside a global table named like the mod.
 Public functions should not use self references but rather just access the table directly.
 Functions should be defined in this way:
-```
+```lua
 function mcl_xyz.stuff(param) end
 ```
 Insteed of this way:
-```
+```lua
 mcl_xyz.stuff = function(param) end
 ```
 Indentation must be unified, more likely with tabs.
 
 Time sensitive mods should make a local copy of most used API functions to improve performances.
-```
+```lua
 local vector = vector
 local get_node = minetest.get_node
 ```
diff --git a/mods/CORE/mcl_util/init.lua b/mods/CORE/mcl_util/init.lua
index a7504af08f..363b9b5fe8 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
diff --git a/mods/ENTITIES/mcl_boats/init.lua b/mods/ENTITIES/mcl_boats/init.lua
index 76ace7a45b..311b07882f 100644
--- a/mods/ENTITIES/mcl_boats/init.lua
+++ b/mods/ENTITIES/mcl_boats/init.lua
@@ -84,7 +84,7 @@ local function attach_object(self, obj)
 			end
 		end, name)
 		obj:set_look_horizontal(yaw)
-		mcl_tmp_message.message(obj, S("Sneak to dismount"))
+		mcl_title.set(obj, "actionbar", {text=S("Sneak to dismount"), color="white", stay=60})
 	else
 		obj:get_luaentity()._old_visual_size = visual_size
 	end
diff --git a/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr b/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr
index 04d6d9da92..785d50146c 100644
--- a/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr
+++ b/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
-Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=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. Cliquez de nouveau avec le bouton droit sur le bateau pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet.
+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
\ No newline at end of file
+Water vehicle=Véhicule aquatique
+Sneak to dismount=
\ No newline at end of file
diff --git a/mods/ENTITIES/mcl_boats/mod.conf b/mods/ENTITIES/mcl_boats/mod.conf
index a5d6cc8cb4..61463b6ec2 100644
--- a/mods/ENTITIES/mcl_boats/mod.conf
+++ b/mods/ENTITIES/mcl_boats/mod.conf
@@ -1,7 +1,7 @@
 name = mcl_boats
 author = PilzAdam
 description = Adds drivable boats.
-depends = mcl_player, flowlib
+depends = mcl_player, flowlib, mcl_title
 optional_depends = mcl_core, doc_identifier
 
 
diff --git a/mods/ENTITIES/mcl_burning/api.lua b/mods/ENTITIES/mcl_burning/api.lua
index 4cb19cca10..9699852053 100644
--- a/mods/ENTITIES/mcl_burning/api.lua
+++ b/mods/ENTITIES/mcl_burning/api.lua
@@ -67,14 +67,9 @@ function mcl_burning.set_on_fire(obj, burn_time)
 	end
 
 	if not storage.burn_time or burn_time >= storage.burn_time then
-		if obj:is_player() and not storage.fire_hud_id then
-			storage.fire_hud_id = obj:hud_add({
-				hud_elem_type = "image",
-				position = {x = 0.5, y = 0.5},
-				scale = {x = -100, y = -100},
-				text = "mcl_burning_entity_flame_animated.png^[opacity:180^[verticalframe:" .. mcl_burning.animation_frames .. ":" .. 1,
-				z_index = 1000,
-			})
+		if obj:is_player() then
+			mcl_burning.channels[obj]:send_all(tostring(mcl_burning.animation_frames))
+			mcl_burning.channels[obj]:send_all("start")
 		end
 		storage.burn_time = burn_time
 		storage.fire_damage_timer = 0
@@ -95,7 +90,6 @@ function mcl_burning.set_on_fire(obj, burn_time)
 		fire_entity:set_properties({visual_size = size})
 		fire_entity:set_attach(obj, "", offset, {x = 0, y = 0, z = 0})
 		local fire_luaentity = fire_entity:get_luaentity()
-		fire_luaentity:update_frame(obj, storage)
 
 		for _, other in pairs(minetest.get_objects_inside_radius(fire_entity:get_pos(), 0)) do
 			local other_luaentity = other:get_luaentity()
@@ -111,9 +105,7 @@ function mcl_burning.extinguish(obj)
 	if mcl_burning.is_burning(obj) then
 		local storage = mcl_burning.get_storage(obj)
 		if obj:is_player() then
-			if storage.fire_hud_id then
-				obj:hud_remove(storage.fire_hud_id)
-			end
+			mcl_burning.channels[obj]:send_all("stop")
 			mcl_burning.storage[obj] = {}
 		else
 			storage.burn_time = nil
@@ -143,4 +135,4 @@ function mcl_burning.tick(obj, dtime, storage)
 			end
 		end
 	end
-end
\ No newline at end of file
+end
diff --git a/mods/ENTITIES/mcl_burning/init.lua b/mods/ENTITIES/mcl_burning/init.lua
index 34b7ca2d4b..313e75dca7 100644
--- a/mods/ENTITIES/mcl_burning/init.lua
+++ b/mods/ENTITIES/mcl_burning/init.lua
@@ -7,6 +7,7 @@ local get_item_group = minetest.get_item_group
 
 mcl_burning = {
 	storage = {},
+	channels = {},
 	animation_frames = tonumber(minetest.settings:get("fire_animation_frames")) or 8
 }
 
@@ -54,12 +55,11 @@ minetest.register_on_joinplayer(function(player)
 	end
 
 	mcl_burning.storage[player] = storage
+	mcl_burning.channels[player] = minetest.mod_channel_join("mcl_burning:" .. player:get_player_name())
 end)
 
 minetest.register_on_leaveplayer(function(player)
-	local storage = mcl_burning.storage[player]
-	storage.fire_hud_id = nil
-	player:get_meta():set_string("mcl_burning:data", minetest.serialize(storage))
+	player:get_meta():set_string("mcl_burning:data", minetest.serialize(mcl_burning.storage[player]))
 	mcl_burning.storage[player] = nil
 end)
 
@@ -68,27 +68,28 @@ minetest.register_entity("mcl_burning:fire", {
 	initial_properties = {
 		physical = false,
 		collisionbox = {0, 0, 0, 0, 0, 0},
-		visual = "cube",
+		visual = "upright_sprite",
+		textures = {
+			name = "mcl_burning_entity_flame_animated.png",
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 1.0,
+			},
+		},
+		spritediv = {x = 1, y = mcl_burning.animation_frames},
 		pointable = false,
 		glow = -1,
 		backface_culling = false,
 	},
 	animation_frame = 0,
 	animation_timer = 0,
-	on_step = function(self, dtime)
-		local parent, storage = self:sanity_check()
-
-		if parent then
-			self.animation_timer = self.animation_timer + dtime
-			if self.animation_timer >= 0.1 then
-				self.animation_timer = 0
-				self.animation_frame = self.animation_frame + 1
-				if self.animation_frame > mcl_burning.animation_frames - 1 then
-					self.animation_frame = 0
-				end
-				self:update_frame(parent, storage)
-			end
-		else
+	on_activate = function(self)
+		self.object:set_sprite({x = 0, y = 0}, mcl_burning.animation_frames, 1.0 / mcl_burning.animation_frames)
+	end,
+	on_step = function(self)
+		if not self:sanity_check() then
 			self.object:remove()
 		end
 	end,
@@ -96,23 +97,15 @@ minetest.register_entity("mcl_burning:fire", {
 		local parent = self.object:get_attach()
 
 		if not parent then
-			return
+			return false
 		end
 
 		local storage = mcl_burning.get_storage(parent)
 
 		if not storage or not storage.burn_time then
-			return
+			return false
 		end
 
-		return parent, storage
-	end,
-	update_frame = function(self, parent, storage)
-		local frame_overlay = "^[opacity:180^[verticalframe:" .. mcl_burning.animation_frames .. ":" .. self.animation_frame
-		local fire_texture = "mcl_burning_entity_flame_animated.png" .. frame_overlay
-		self.object:set_properties({textures = {"blank.png", "blank.png", fire_texture, fire_texture, fire_texture, fire_texture}})
-		if parent:is_player() then
-			parent:hud_change(storage.fire_hud_id, "text", "mcl_burning_hud_flame_animated.png" .. frame_overlay)
-		end
+		return true
 	end,
 })
diff --git a/mods/ENTITIES/mcl_item_entity/init.lua b/mods/ENTITIES/mcl_item_entity/init.lua
index ab1ac57525..cfd141f046 100644
--- a/mods/ENTITIES/mcl_item_entity/init.lua
+++ b/mods/ENTITIES/mcl_item_entity/init.lua
@@ -480,7 +480,7 @@ minetest.register_entity(":__builtin:item", {
 	end,
 
 	get_staticdata = function(self)
-		return minetest.serialize({
+		local data = minetest.serialize({
 			itemstring = self.itemstring,
 			always_collect = self.always_collect,
 			age = self.age,
@@ -488,6 +488,39 @@ minetest.register_entity(":__builtin:item", {
 			_flowing = self._flowing,
 			_removed = self._removed,
 		})
+		-- sfan5 guessed that the biggest serializable item
+		-- entity would have a size of 65530 bytes. This has
+		-- been experimentally verified to be still too large.
+		--
+		-- anon5 has calculated that the biggest serializable
+		-- item entity has a size of exactly 65487 bytes:
+		--
+		-- 1. serializeString16 can handle max. 65535 bytes.
+		-- 2. The following engine metadata is always saved:
+		--    • 1 byte (version)
+		--    • 2 byte (length prefix)
+		--    • 14 byte “__builtin:item”
+		--    • 4 byte (length prefix)
+		--    • 2 byte (health)
+		--    • 3 × 4 byte = 12 byte (position)
+		--    • 4 byte (yaw)
+		--    • 1 byte (version 2)
+		--    • 2 × 4 byte = 8 byte (pitch and roll)
+		-- 3. This leaves 65487 bytes for the serialization.
+		if #data > 65487 then -- would crash the engine
+			local stack = ItemStack(self.itemstring)
+			stack:get_meta():from_table(nil)
+			self.itemstring = stack:to_string()
+			minetest.log(
+				"warning",
+				"Overlong item entity metadata removed: “" ..
+				self.itemstring ..
+				"” had serialized length of " ..
+				#data
+			)
+			return self:get_staticdata()
+		end
+		return data
 	end,
 
 	on_activate = function(self, staticdata, dtime_s)
@@ -575,7 +608,7 @@ minetest.register_entity(":__builtin:item", {
 		return true
 	end,
 
-	on_step = function(self, dtime)
+	on_step = function(self, dtime, moveresult)
 		if self._removed then
 			self.object:set_properties({
 				physical = false
@@ -642,6 +675,18 @@ minetest.register_entity(":__builtin:item", {
 			end
 		end
 
+		-- Destroy item when it collides with a cactus
+		if moveresult and moveresult.collides then
+			for _, collision in pairs(moveresult.collisions) do
+				local pos = collision.node_pos
+				if collision.type == "node" and minetest.get_node(pos).name == "mcl_core:cactus" then
+					self._removed = true
+					self.object:remove()
+					return
+				end
+			end
+		end
+
 		-- Push item out when stuck inside solid opaque node
 		if def and def.walkable and def.groups and def.groups.opaque == 1 then
 			local shootdir
diff --git a/mods/ENTITIES/mcl_minecarts/init.lua b/mods/ENTITIES/mcl_minecarts/init.lua
index e33e120a14..4d3873cc23 100644
--- a/mods/ENTITIES/mcl_minecarts/init.lua
+++ b/mods/ENTITIES/mcl_minecarts/init.lua
@@ -646,7 +646,7 @@ register_minecart(
 				if player then
 					mcl_player.player_set_animation(player, "sit" , 30)
 					player:set_eye_offset({x=0, y=-5.5, z=0},{x=0, y=-4, z=0})
-					mcl_tmp_message.message(clicker, S("Sneak to dismount"))
+					mcl_title.set(clicker, "actionbar", {text=S("Sneak to dismount"), color="white", stay=60})
 				end
 			end, name)
 		end
diff --git a/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.fr.tr b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.fr.tr
index 39cdfd0137..67ed5eb1b0 100644
--- a/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.fr.tr
+++ b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.fr.tr
@@ -33,3 +33,4 @@ Activates minecarts when powered=Active les wagonnets lorsqu'il est alimenté
 Emits redstone power when a minecart is detected=Émet de l'énergie redstone lorsqu'un wagonnet est détecté
 Vehicle for fast travel on rails=Véhicule pour voyager rapidement sur rails
 Can be ignited by tools or powered activator rail=Peut être allumé par des outils ou un rail d'activation motorisé
+Sneak to dismount=
\ No newline at end of file
diff --git a/mods/ENTITIES/mcl_minecarts/mod.conf b/mods/ENTITIES/mcl_minecarts/mod.conf
index 9fff9175df..3b8ae55514 100644
--- a/mods/ENTITIES/mcl_minecarts/mod.conf
+++ b/mods/ENTITIES/mcl_minecarts/mod.conf
@@ -1,6 +1,6 @@
 name = mcl_minecarts
 author = Krock
 description = Minecarts are vehicles to move players quickly on rails.
-depends = mcl_explosions, mcl_core, mcl_sounds, mcl_player, mcl_achievements, mcl_chests, mcl_furnaces, mesecons_commandblock, mcl_hoppers, mcl_tnt, mesecons
+depends = mcl_title, mcl_explosions, mcl_core, mcl_sounds, mcl_player, mcl_achievements, mcl_chests, mcl_furnaces, mesecons_commandblock, mcl_hoppers, mcl_tnt, mesecons
 optional_depends = doc_identifier, mcl_wip
 
diff --git a/mods/ENTITIES/mobs_mc/locale/template.txt b/mods/ENTITIES/mobs_mc/locale/template.txt
index 04ba9e4658..7b55c1b89e 100644
--- a/mods/ENTITIES/mobs_mc/locale/template.txt
+++ b/mods/ENTITIES/mobs_mc/locale/template.txt
@@ -28,6 +28,7 @@ Pig=
 Polar Bear=
 Rabbit=
 Killer Bunny=
+The Killer Bunny=
 Sheep=
 Shulker=
 Silverfish=
diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua
index 8c2675954f..51235a3f93 100644
--- a/mods/ENTITIES/mobs_mc/rabbit.lua
+++ b/mods/ENTITIES/mobs_mc/rabbit.lua
@@ -233,4 +233,4 @@ mobs:spawn(spawn_grass)
 mobs:register_egg("mobs_mc:rabbit", S("Rabbit"), "mobs_mc_spawn_icon_rabbit.png", 0)
 
 -- Note: This spawn egg does not exist in Minecraft
-mobs:register_egg("mobs_mc:killer_bunny", S("Killer Bunny"), "mobs_mc_spawn_icon_rabbit.png^[colorize:#FF0000:192", 0) -- TODO: Update inventory image
+mobs:register_egg("mobs_mc:killer_bunny", S("Killer Bunny"), "mobs_mc_spawn_icon_rabbit_caerbannog.png", 0) 
diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_rabbit_caerbannog.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_rabbit_caerbannog.png
new file mode 100644
index 0000000000..4244a83c6f
Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_rabbit_caerbannog.png differ
diff --git a/mods/ENVIRONMENT/lightning/API.md b/mods/ENVIRONMENT/lightning/API.md
new file mode 100644
index 0000000000..ad4f0a3b47
--- /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
diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua
index 3d5955d6e2..83494462f2 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 API.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,28 @@ 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,44 +154,27 @@ 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._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
-			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"})
+			mcl_util.deal_damage(obj, 5, { type = "lightning_bolt" })
 		end
 	end
 
@@ -186,7 +188,7 @@ function lightning.strike(pos)
 		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
@@ -201,7 +203,7 @@ function lightning.strike(pos)
 	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
@@ -210,7 +212,7 @@ function lightning.strike(pos)
 				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)
@@ -219,12 +221,11 @@ function lightning.strike(pos)
 
 			-- Cause a fire
 			else
-				set_node(pos2, {name = "mcl_fire:fire"})
+				set_node(pos2, { name = "mcl_fire:fire" })
 			end
 		end
 	end
-
-end
+end)
 
 -- if other mods disable auto lightning during initialization, don't trigger the first lightning.
 after(5, function(dtime)
diff --git a/mods/HELP/doc/doc_items/locale/doc_items.fr.tr b/mods/HELP/doc/doc_items/locale/doc_items.fr.tr
index 5d655404d3..824ceeeba2 100644
--- a/mods/HELP/doc/doc_items/locale/doc_items.fr.tr
+++ b/mods/HELP/doc/doc_items/locale/doc_items.fr.tr
@@ -2,7 +2,7 @@
 Using it as fuel turns it into: @1.=L'utiliser comme combustible le transforme en : @1.
 @1 seconds=@1 secondes
 # Item count times item name
-%@1×@2=%@1×@
+@1×@2=@1×@
 # Itemname (25%)
 @1 (@2%)=@1 (@2%)
 # Itemname (<0.5%)
diff --git a/mods/HELP/mcl_item_id/API.md b/mods/HELP/mcl_item_id/API.md
new file mode 100644
index 0000000000..a2f244e0cd
--- /dev/null
+++ b/mods/HELP/mcl_item_id/API.md
@@ -0,0 +1,24 @@
+# mcl_item_id
+Show the item ID of an item in the description.
+With this API, you can register a different name space than "mineclone" for your mod.
+
+## mcl_item_id.set_mod_namespace(modname, namespace)
+Set a name space for all items in a mod.
+
+* param1: the modname
+* param2: (optional) string of the desired name space, if nil, it is the name of the mod
+
+## mcl_item_id.get_mod_namespace(modname)
+Get the name space of a mod registered with mcl_item_id.set_mod_namespace(modname, namespace).
+
+* param1: the modname
+
+### Examples:
+
+The name of the mod is "mod" which registered an item called "mod:itemname".
+
+* mcl_item_id.set_mod_namespace("mod", "mymod") will show "mymod:itemname" in the description of "mod:itemname"
+* mcl_item_id.set_mod_namespace(minetest.get_current_modname()) will show "mod:itemname" in the description of "mod:itemname"
+* mcl_item_id.get_mod_namespace(minetest.get_current_modname()) will return "mod" 
+
+(If no namespace is set by a mod, mcl_item_id.get_mod_namespace(minetest.get_current_modname()) will return "mineclone")
diff --git a/mods/HELP/mcl_item_id/init.lua b/mods/HELP/mcl_item_id/init.lua
new file mode 100644
index 0000000000..f3e6d2735a
--- /dev/null
+++ b/mods/HELP/mcl_item_id/init.lua
@@ -0,0 +1,62 @@
+mcl_item_id = {
+    mod_namespaces = {},
+}
+
+local game = "mineclone"
+
+function mcl_item_id.set_mod_namespace(modname, namespace)
+    local namespace = namespace or modname
+    mcl_item_id.mod_namespaces[modname] = namespace
+end
+
+function mcl_item_id.get_mod_namespace(modname)
+    local namespace = mcl_item_id.mod_namespaces[modname]
+    if namespace then
+        return namespace
+    else
+        return game
+    end
+end
+
+local same_id = {
+    enchanting = { "table" },
+    experience = { "bottle" },
+    heads = { "skeleton", "zombie", "creeper", "wither_skeleton" },
+    mobitems = { "rabbit", "chicken" },
+    walls = {
+        "andesite", "brick", "cobble", "diorite", "endbricks",
+        "granite", "mossycobble", "netherbrick", "prismarine",
+        "rednetherbrick", "redsandstone", "sandstone", 
+        "stonebrick", "stonebrickmossy", 
+    },
+    wool = {
+        "black", "blue", "brown", "cyan", "green",
+        "grey", "light_blue", "lime", "magenta", "orange",
+        "pink", "purple", "red", "silver", "white", "yellow",
+    },
+}
+
+tt.register_snippet(function(itemstring)
+    local def = minetest.registered_items[itemstring]
+    local item_split = itemstring:find(":")
+    local id_string = itemstring:sub(item_split)
+    local id_modname = itemstring:sub(1, item_split - 1)
+    local new_id = game .. id_string
+    local mod_namespace = mcl_item_id.get_mod_namespace(id_modname)
+    for mod, ids in pairs(same_id) do
+        for _, id in pairs(ids) do
+            if itemstring == "mcl_" .. mod .. ":" .. id  then
+                new_id = game .. ":" .. id .. "_" .. mod:gsub("s", "")
+            end
+        end
+    end
+    if mod_namespace ~= game then
+        new_id = mod_namespace .. id_string
+    end
+    if mod_namespace ~= id_modname then
+        minetest.register_alias_force(new_id, itemstring)
+    end
+    if minetest.settings:get_bool("mcl_item_id_debug", false) then
+        return new_id, "#555555"
+    end
+end)
\ No newline at end of file
diff --git a/mods/HELP/mcl_item_id/mod.conf b/mods/HELP/mcl_item_id/mod.conf
new file mode 100644
index 0000000000..c45e17fd31
--- /dev/null
+++ b/mods/HELP/mcl_item_id/mod.conf
@@ -0,0 +1,3 @@
+name = mcl_item_id
+author = NO11
+depends = tt
\ No newline at end of file
diff --git a/mods/HELP/mcl_tt/locale/mcl_tt.de.tr b/mods/HELP/mcl_tt/locale/mcl_tt.de.tr
index 8f878afc72..54c376c3bb 100644
--- a/mods/HELP/mcl_tt/locale/mcl_tt.de.tr
+++ b/mods/HELP/mcl_tt/locale/mcl_tt.de.tr
@@ -45,3 +45,4 @@ Mining durability: @1=Grabehaltbarkeit: @1
 Block breaking strength: @1=Blockbruchstärke: @1
 @1 uses=@1 Verwendungen
 Unlimited uses=Unbegrenzte Verwendungen
+Durability: @1=Haltbarkeit: @1
diff --git a/mods/HELP/mcl_tt/locale/template.txt b/mods/HELP/mcl_tt/locale/template.txt
index 1259216c76..6fb735b139 100644
--- a/mods/HELP/mcl_tt/locale/template.txt
+++ b/mods/HELP/mcl_tt/locale/template.txt
@@ -45,3 +45,4 @@ Mining durability: @1=
 Block breaking strength: @1=
 @1 uses=
 Unlimited uses=
+Durability: @1=
diff --git a/mods/HELP/mcl_tt/snippets_mcl.lua b/mods/HELP/mcl_tt/snippets_mcl.lua
index 3c79f52e8a..825776f5f2 100644
--- a/mods/HELP/mcl_tt/snippets_mcl.lua
+++ b/mods/HELP/mcl_tt/snippets_mcl.lua
@@ -107,3 +107,8 @@ tt.register_snippet(function(itemstring)
 	end
 end)
 
+tt.register_snippet(function(itemstring, _, itemstack)
+	if itemstring:sub(1, 23) == "mcl_fishing:fishing_rod" or itemstring:sub(1, 12) == "mcl_bows:bow" then
+		return S("Durability: @1", S("@1 uses", mcl_util.calculate_durability(itemstack or ItemStack(itemstring))))
+	end
+end)
diff --git a/mods/HUD/hudbars/init.lua b/mods/HUD/hudbars/init.lua
index 08f1914ca0..505ff403b8 100644
--- a/mods/HUD/hudbars/init.lua
+++ b/mods/HUD/hudbars/init.lua
@@ -425,6 +425,7 @@ function hb.hide_hudbar(player, identifier)
 	local name = player:get_player_name()
 	local hudtable = hb.get_hudtable(identifier)
 	if hudtable == nil then return false end
+	if hudtable.hudstate[name].hidden == true then return true end
 	if hb.settings.bar_type == "progress_bar" then
 		if hudtable.hudids[name].icon then
 			player:hud_change(hudtable.hudids[name].icon, "scale", {x=0,y=0})
@@ -443,6 +444,7 @@ function hb.unhide_hudbar(player, identifier)
 	local name = player:get_player_name()
 	local hudtable = hb.get_hudtable(identifier)
 	if hudtable == nil then return false end
+	if hudtable.hudstate[name].hidden == false then return true end
 	local value = hudtable.hudstate[name].value
 	local max = hudtable.hudstate[name].max
 	if hb.settings.bar_type == "progress_bar" then
diff --git a/mods/HUD/mcl_credits/locale/mcl_credits.de.tr b/mods/HUD/mcl_credits/locale/mcl_credits.de.tr
index 6a38d18e62..fa26f5bc4a 100644
--- a/mods/HUD/mcl_credits/locale/mcl_credits.de.tr
+++ b/mods/HUD/mcl_credits/locale/mcl_credits.de.tr
@@ -7,6 +7,7 @@ Creator of MineClone2=Schöpfer von MineClone2
 Developers=Entwickler
 Jump to speed up (additionally sprint)=Springen, um zu beschleunigen (zusätzlich sprinten)
 Maintainers=Betreuer
+MineClone5=MineClone5
 Original Mod Authors=Original-Mod-Autoren
 Sneak to skip=Schleichen zum Überspringen
 Textures=Texturen
diff --git a/mods/HUD/mcl_credits/locale/mcl_credits.es.tr b/mods/HUD/mcl_credits/locale/mcl_credits.es.tr
new file mode 100644
index 0000000000..a8886286e7
--- /dev/null
+++ b/mods/HUD/mcl_credits/locale/mcl_credits.es.tr
@@ -0,0 +1,14 @@
+# textdomain: mcl_credits
+3D Models=
+A faithful Open Source clone of Minecraft=
+Contributors=
+Creator of MineClone=
+Creator of MineClone2=
+Developers=
+Jump to speed up (additionally sprint)=
+Maintainers=
+MineClone5=
+Original Mod Authors=
+Sneak to skip=
+Textures=
+Translations=
\ No newline at end of file
diff --git a/mods/HUD/mcl_credits/locale/mcl_credits.fr.tr b/mods/HUD/mcl_credits/locale/mcl_credits.fr.tr
new file mode 100644
index 0000000000..b34249eff1
--- /dev/null
+++ b/mods/HUD/mcl_credits/locale/mcl_credits.fr.tr
@@ -0,0 +1,14 @@
+# textdomain: mcl_credits
+3D Models=Modèles 3D
+A faithful Open Source clone of Minecraft=Un clone open source de Minecraft
+Contributors=Contributeurs
+Creator of MineClone=Créateur de MineClone
+Creator of MineClone2=Créateur de MineClone2
+Developers=Développeurs
+Jump to speed up (additionally sprint)=Saut pour accélérer (peut être combiné avec sprint)
+Maintainers=Mainteneurs
+MineClone5=MineClone5
+Original Mod Authors=Auteurs des mods originaux
+Sneak to skip=Shift pour passer
+Textures=Textures
+Translations=Traductions
\ No newline at end of file
diff --git a/mods/HUD/mcl_credits/locale/mcl_credits.pl.tr b/mods/HUD/mcl_credits/locale/mcl_credits.pl.tr
new file mode 100644
index 0000000000..a8886286e7
--- /dev/null
+++ b/mods/HUD/mcl_credits/locale/mcl_credits.pl.tr
@@ -0,0 +1,14 @@
+# textdomain: mcl_credits
+3D Models=
+A faithful Open Source clone of Minecraft=
+Contributors=
+Creator of MineClone=
+Creator of MineClone2=
+Developers=
+Jump to speed up (additionally sprint)=
+Maintainers=
+MineClone5=
+Original Mod Authors=
+Sneak to skip=
+Textures=
+Translations=
\ No newline at end of file
diff --git a/mods/HUD/mcl_credits/locale/mcl_credits.ru.tr b/mods/HUD/mcl_credits/locale/mcl_credits.ru.tr
new file mode 100644
index 0000000000..a8886286e7
--- /dev/null
+++ b/mods/HUD/mcl_credits/locale/mcl_credits.ru.tr
@@ -0,0 +1,14 @@
+# textdomain: mcl_credits
+3D Models=
+A faithful Open Source clone of Minecraft=
+Contributors=
+Creator of MineClone=
+Creator of MineClone2=
+Developers=
+Jump to speed up (additionally sprint)=
+Maintainers=
+MineClone5=
+Original Mod Authors=
+Sneak to skip=
+Textures=
+Translations=
\ No newline at end of file
diff --git a/mods/HUD/mcl_title/API.md b/mods/HUD/mcl_title/API.md
new file mode 100644
index 0000000000..37f1c279f5
--- /dev/null
+++ b/mods/HUD/mcl_title/API.md
@@ -0,0 +1,50 @@
+# mcl_title
+
+Allow mods to show messages in the hud of players.
+
+## mcl_title.set(player, type, data)
+
+Show a hud message of `type` to player `player` with `data` as params.
+
+The element will stay for the per-player param `stay` or `data.stay` (in gametick which is 1/20 second).
+
+Here is a usage exemple:
+
+```lua
+--show a title in the HUD with minecraft color "gold" 
+mcl_title.set(player, "title", {text="dummy text", color="gold"})
+
+--show a subtitle in the HUD with hex color "#612D2D" 
+mcl_title.set(player, "subtitle", {text="dummy subtitle", color="#612D2D"})
+
+--show an actionbar in the HUD (above the hotbar) with minecraft color "red"
+mcl_title.set(player, "subtitle", {text="dummy actionbar", color="red"})
+
+--show a title in the HUD with minecraft color "gold" staying for 3 seconds (override stay setting)
+mcl_title.set(player, "title", {text="dummy text", color="gold", stay=60})
+```
+
+## mcl_title.remove(player, type)
+
+Hide HUD element of type `type` for player `player`.
+
+## mcl_title.clear(player)
+
+Remove every title/subtitle/actionbar from a player.
+Basicaly run `mcl_title.remove(player, type)` for every type.
+
+## mcl_title.params_set(player, params)
+
+Allow mods to set `stay` and upcomming `fadeIn`/`fadeOut` params.
+
+```lua
+mcl_title.params_set(player, {stay = 600}) --elements with no 'data.stay' field will stay during 30s (600/20)
+```
+
+## mcl_title.params_get(player)
+
+Get `stay` and upcomming `fadeIn` and `fadeOut` params of a player as a table.
+
+```lua
+mcl_title.params_get(player)
+```
\ No newline at end of file
diff --git a/mods/HUD/mcl_title/init.lua b/mods/HUD/mcl_title/init.lua
new file mode 100644
index 0000000000..2ea1571c82
--- /dev/null
+++ b/mods/HUD/mcl_title/init.lua
@@ -0,0 +1,236 @@
+--Based on:
+--https://www.digminecraft.com/game_commands/title_command.php
+--https://youtu.be/oVrtQRO2hpY
+
+--TODO: use SSCSM to reduce lag and network trafic (just send modchannel messages)
+--TODO: fadeIn and fadeOut animation (needs engine change: SSCSM or native support)
+--TODO: allow obfuscating text (needs engine change: SSCSM or native support)
+--TODO: allow colorizing and styling of part of the text (NEEDS ENGINE CHANGE!!!)
+--TODO: exactly mc like layout
+
+--Note that the table storing timeouts use playername as index insteed of player objects (faster)
+--This is intended in order to speedup the process of removing HUD elements the the timeout is up
+
+local huds_idx = {}
+
+local hud_hide_timeouts = {}
+
+hud_hide_timeouts.title = {}
+hud_hide_timeouts.subtitle = {}
+hud_hide_timeouts.actionbar = {}
+
+huds_idx.title = {}
+huds_idx.subtitle = {}
+huds_idx.actionbar = {}
+
+mcl_title = {}
+mcl_title.defaults = {fadein = 10, stay = 70, fadeout = 20}
+mcl_title.layout = {}
+mcl_title.layout.title = {position = {x = 0.5, y = 0.5}, alignment = {x = 0, y = -1.3}, size = 7}
+mcl_title.layout.subtitle = {position = {x = 0.5, y = 0.5}, alignment = {x = 0, y = 1.7}, size = 4}
+mcl_title.layout.actionbar = {position = {x = 0.5, y = 1}, alignment = {x = 0, y = 0}, size = 1}
+
+local get_color = mcl_util.get_color
+
+--local string = string
+local pairs = pairs
+
+local function gametick_to_secondes(gametick)
+	if gametick then
+		return gametick / 20
+	else
+		return nil
+	end
+end
+
+--https://github.com/minetest/minetest/blob/b3b075ea02034306256b486dd45410aa765f035a/doc/lua_api.txt#L8477
+--[[
+local function style_to_bits(bold, italic)
+	if bold then
+		if italic then
+			return 3
+		else
+			return 1
+		end
+	else
+		if italic then
+			return 2
+		else
+			return 0
+		end
+	end
+end
+]]
+
+--PARAMS SYSTEM
+local player_params = {}
+
+minetest.register_on_joinplayer(function(player)
+	--local playername = player:get_player_name()
+	player_params[player] = {
+		stay = mcl_title.defaults.stay,
+		--fadeIn = mcl_title.defaults.fadein,
+		--fadeOut = mcl_title.defaults.fadeout,
+	}
+	local _, hex_color = get_color("white")
+	huds_idx.title[player] = player:hud_add({
+		hud_elem_type = "text",
+		position  = mcl_title.layout.title.position,
+		alignment = mcl_title.layout.title.alignment,
+		text      = "",
+		--style = 0,
+		size      = {x = mcl_title.layout.title.size},
+		number    = hex_color,
+		z_index   = 100,
+	})
+	huds_idx.subtitle[player] = player:hud_add({
+		hud_elem_type = "text",
+		position  = mcl_title.layout.subtitle.position,
+		alignment = mcl_title.layout.subtitle.alignment,
+		text      = "",
+		--style = 0,
+		size      = {x = mcl_title.layout.subtitle.size},
+		number    = hex_color,
+		z_index   = 100,
+	})
+	huds_idx.actionbar[player] = player:hud_add({
+		hud_elem_type = "text",
+		position  = mcl_title.layout.actionbar.position,
+		offset    = {x = 0, y = -210},
+		alignment = mcl_title.layout.actionbar.alignment,
+		--style = 0,
+		text      = "",
+		size      = {x = mcl_title.layout.actionbar.size},
+		number    = hex_color,
+		z_index   = 100,
+	})
+end)
+
+minetest.register_on_leaveplayer(function(player)
+	local playername = player:get_player_name()
+
+	--remove player params from the list
+	player_params[player] = nil
+
+	--remove HUD idx from the list (HUD elements are removed by the engine)
+	huds_idx.title[player] = nil
+	huds_idx.subtitle[player] = nil
+	huds_idx.actionbar[player] = nil
+
+	--remove timers from list
+	hud_hide_timeouts.title[playername] = nil
+	hud_hide_timeouts.subtitle[playername] = nil
+	hud_hide_timeouts.actionbar[playername] = nil
+end)
+
+function mcl_title.params_set(player, data)
+	player_params[player] = {
+		stay = data.stay or mcl_title.defaults.stay,
+		--fadeIn = data.fadeIn or mcl_title.defaults.fadein,
+		--fadeOut = data.fadeOut or mcl_title.defaults.fadeout,
+	}
+end
+
+function mcl_title.params_get(player)
+	return player_params[player]
+end
+
+--API FUNCTIONS
+
+function mcl_title.set(player, type, data)
+	if not data.color then
+		data.color = "white"
+	end
+	local _, hex_color = get_color(data.color)
+	if not hex_color then
+		return false
+	end
+
+	player:hud_change(huds_idx[type][player], "text", data.text)
+	player:hud_change(huds_idx[type][player], "number", hex_color)
+
+	--apply bold and italic
+	--player:hud_change(huds_idx[type][player], "style", style_to_bits(data.bold, data.italic))
+
+	hud_hide_timeouts[type][player:get_player_name()] = gametick_to_secondes(data.stay) or gametick_to_secondes(mcl_title.params_get(player).stay)
+	return true
+end
+
+function mcl_title.remove(player, type)
+	if player then
+		player:hud_change(huds_idx[type][player], "text", "")
+		--player:hud_change(huds_idx[type][player], "style", 0) --no styling
+	end
+end
+
+function mcl_title.clear(player)
+	mcl_title.remove(player, "title")
+	mcl_title.remove(player, "subtitle")
+	mcl_title.remove(player, "actionbar")
+end
+
+minetest.register_on_dieplayer(function(player)
+	mcl_title.clear(player)
+end)
+
+minetest.register_globalstep(function(dtime)
+	local new_timeouts = {
+		title = {},
+		subtitle = {},
+		actionbar = {},
+	}
+	for element, content in pairs(hud_hide_timeouts) do
+		for name, timeout in pairs(content) do
+			timeout = timeout - dtime
+			if timeout <= 0 then
+				local player = minetest.get_player_by_name(name)
+				mcl_title.remove(player, element)
+			else
+				new_timeouts[element][name] = timeout
+			end
+		end
+	end
+	hud_hide_timeouts = new_timeouts
+end)
+
+
+--DEBUG STUFF!!
+--[[
+minetest.register_chatcommand("title", {
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		mcl_title.set(player, "title", {text=param, color="gold", bold=true, italic=true})
+	end,
+})
+
+minetest.register_chatcommand("subtitle", {
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		mcl_title.set(player, "subtitle", {text=param, color="gold"})
+	end,
+})
+
+minetest.register_chatcommand("actionbar", {
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		mcl_title.set(player, "actionbar", {text=param, color="gold"})
+	end,
+})
+
+minetest.register_chatcommand("timeout", {
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		mcl_title.params_set(player, {stay = 600})
+	end,
+})
+
+minetest.register_chatcommand("all", {
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		mcl_title.params_set(player, {stay = 600})
+		mcl_title.set(player, "title", {text=param, color="gold"})
+		mcl_title.set(player, "subtitle", {text=param, color="gold"})
+		mcl_title.set(player, "actionbar", {text=param, color="gold"})
+	end,
+})
+]]
\ No newline at end of file
diff --git a/mods/HUD/mcl_title/mod.conf b/mods/HUD/mcl_title/mod.conf
new file mode 100644
index 0000000000..0f29a8118c
--- /dev/null
+++ b/mods/HUD/mcl_title/mod.conf
@@ -0,0 +1,4 @@
+name = mcl_title
+description = Add an API to add in HUD title 
+depends = mcl_colors
+author = AFCMS
\ No newline at end of file
diff --git a/mods/HUD/mcl_tmp_message/API.md b/mods/HUD/mcl_tmp_message/API.md
deleted file mode 100644
index 0a3fc06a33..0000000000
--- a/mods/HUD/mcl_tmp_message/API.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# mcl_temp_message
-
-Allow mods to show short messages in the hud of players.
-
-## mcl_tmp_message.message(player, message)
-
-Show above the hotbar a hud message <message> to player <player>.
\ No newline at end of file
diff --git a/mods/HUD/mcl_tmp_message/init.lua b/mods/HUD/mcl_tmp_message/init.lua
deleted file mode 100644
index 1456cd5922..0000000000
--- a/mods/HUD/mcl_tmp_message/init.lua
+++ /dev/null
@@ -1,44 +0,0 @@
-mcl_tmp_message = {}
-
-local huds = {}
-local hud_hide_timeouts = {}
-
-function mcl_tmp_message.message(player, message)
-	local name = player:get_player_name()
-	player:hud_change(huds[name], "text", message)
-	hud_hide_timeouts[name] = 3
-end
-
-minetest.register_on_joinplayer(function(player)
-	huds[player:get_player_name()] = player:hud_add({
-		hud_elem_type = "text",
-		position = {x=0.5, y=1},
-		offset = {x = 0, y = -210},
-		alignment = {x=0, y=0},
-		number = 0xFFFFFF ,
-		text = "",
-		z_index = 100,
-	})
-end)
-
-minetest.register_on_leaveplayer(function(player)
-	local name = player:get_player_name()
-	huds[name] = nil
-	hud_hide_timeouts[name] = nil
-end)
-
-minetest.register_globalstep(function(dtime)
-	local new_timeouts = {}
-	for name, timeout in pairs(hud_hide_timeouts) do
-		timeout = timeout - dtime
-		if timeout <= 0 then
-			local player = minetest.get_player_by_name(name)
-			if player then
-				player:hud_change(huds[name], "text", "")
-			end
-		else
-			new_timeouts[name] = timeout
-		end
-	end
-	hud_hide_timeouts = new_timeouts
-end)
diff --git a/mods/HUD/mcl_tmp_message/mod.conf b/mods/HUD/mcl_tmp_message/mod.conf
deleted file mode 100644
index ad453643e8..0000000000
--- a/mods/HUD/mcl_tmp_message/mod.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-name = mcl_tmp_message
-author = Fleckenstein
-description = A simple API to show a temporary message to a player 
diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
index 7c2c073939..47acacbb9a 100644
--- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
@@ -168,6 +168,56 @@ local dispenserdef = {
 						end
 
 						inv:set_stack("main", stack_id, stack)
+
+					-- Use shears on sheeps
+					elseif igroups.shears then
+						for _, obj in pairs(minetest.get_objects_inside_radius(droppos, 1)) do
+							local entity = obj:get_luaentity()
+							if entity and not entity.child and not entity.gotten then
+								local entname = entity.name
+								local pos = obj:get_pos()
+								local used, texture = false
+								if entname == "mobs_mc:sheep" then
+									minetest.add_item(pos, entity.drops[2].name .. " " .. math.random(1, 3))
+									if not entity.color then
+										entity.color = "unicolor_white"
+									end
+									entity.base_texture = { "blank.png", "mobs_mc_sheep.png" }
+									texture = entity.base_texture
+									entity.drops = {
+										{ name = mobs_mc.items.mutton_raw, chance = 1, min = 1, max = 2 },
+									}
+									used = true
+								elseif entname == "mobs_mc:snowman" then
+									texture = {
+										"mobs_mc_snowman.png",
+										"blank.png", "blank.png",
+										"blank.png", "blank.png",
+										"blank.png", "blank.png",
+									}
+									used = true
+								elseif entname == "mobs_mc:mooshroom" then
+									local droppos = vector.offset(pos, 0, 1.4, 0)
+									if entity.base_texture[1] == "mobs_mc_mooshroom_brown.png" then
+										minetest.add_item(droppos, mobs_mc.items.mushroom_brown .. " 5")
+									else
+										minetest.add_item(droppos, mobs_mc.items.mushroom_red .. " 5")
+									end
+									obj = mcl_util.replace_mob(obj, "mobs_mc:cow")
+									entity = obj:get_luaentity()
+									used = true
+								end
+								if used then
+									obj:set_properties({ textures = texture })
+									entity.gotten = true
+									minetest.sound_play("mcl_tools_shears_cut", { pos = pos }, true)
+									stack:add_wear(65535 / stackdef._mcl_diggroups.shearsy.uses)
+									inv:set_stack("main", stack_id, stack)
+									break
+								end
+							end
+						end
+
 					-- Spawn Egg
 					elseif igroups.spawn_egg then
 						-- Spawn mob
diff --git a/mods/ITEMS/mcl_anvils/init.lua b/mods/ITEMS/mcl_anvils/init.lua
index fbf6fb7513..d3b32b8449 100644
--- a/mods/ITEMS/mcl_anvils/init.lua
+++ b/mods/ITEMS/mcl_anvils/init.lua
@@ -53,6 +53,15 @@ local function get_consumed_materials(tool, material)
 	return materials_used
 end
 
+local function contains(table, value)
+	for _, i in pairs(table) do
+		if i == value then
+			return true
+		end
+	end
+	return false
+end
+
 -- Given 2 input stacks, tells you which is the tool and which is the material.
 -- Returns ("tool", input1, input2) if input1 is tool and input2 is material.
 -- Returns ("material", input2, input1) if input1 is material and input2 is tool.
@@ -60,9 +69,15 @@ end
 local function distinguish_tool_and_material(input1, input2)
 	local def1 = input1:get_definition()
 	local def2 = input2:get_definition()
-	if def1.type == "tool" and def1._repair_material then
+	local r1 = def1._repair_material
+	local r2 = def2._repair_material
+	if def1.type == "tool" and r1 and type(r1) == "table" and contains(r1, input2) then
 		return "tool", input1, input2
-	elseif def2.type == "tool" and def2._repair_material then
+	elseif def2.type == "tool" and r2 and type(r2) == "table" and contains(r2, input1) then
+		return "material", input2, input1
+	elseif def1.type == "tool" and r1 then
+		return "tool", input1, input2
+	elseif def2.type == "tool" and r2 then
 		return "material", input2, input1
 	else
 		return nil
@@ -121,11 +136,28 @@ local function update_anvil_slots(meta)
 			local distinguished, tool, material = distinguish_tool_and_material(input1, input2)
 			if distinguished then
 				local tooldef = tool:get_definition()
+				local repair = tooldef._repair_material
 				local has_correct_material = false
-				if string.sub(tooldef._repair_material, 1, 6) == "group:" then
-					has_correct_material = minetest.get_item_group(material:get_name(), string.sub(tooldef._repair_material, 7)) ~= 0
-				elseif material:get_name() == tooldef._repair_material then
-					has_correct_material = true
+				local material_name = material:get_name()
+				if type(repair) == "string" then
+					if string.sub(repair, 1, 6) == "group:" then
+						has_correct_material = minetest.get_item_group(material_name, string.sub(repair, 7)) ~= 0
+					elseif material_name == repair then
+						has_correct_material = true
+					end
+				else
+					if contains(repair, material_name) then
+						has_correct_material = true
+					else
+						for _, r in pairs(repair) do
+							if string.sub(r, 1, 6) == "group:" then
+								if minetest.get_item_group(material_name, string.sub(r, 7)) ~= 0 then
+									has_correct_material = true
+								end
+
+							end
+						end
+					end
 				end
 				if has_correct_material and tool:get_wear() > 0 then
 					local materials_used = get_consumed_materials(tool, material)
@@ -284,6 +316,12 @@ local function damage_anvil_by_falling(pos, distance)
 	end
 end
 
+local anvilbox = {
+	type = "fixed",
+	fixed = {
+		{ -8 / 16, -8 / 16, -6 / 16, 8 / 16, 8 / 16, 6 / 16 },
+	},
+}
 local anvildef = {
 	groups = {pickaxey=1, falling_node=1, falling_node_damage=1, crush_after_fall=1, deco_block=1, anvil=1},
 	tiles = {"mcl_anvils_anvil_top_damaged_0.png^[transformR90", "mcl_anvils_anvil_base.png", "mcl_anvils_anvil_side.png"},
@@ -297,11 +335,14 @@ local anvildef = {
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-8/16, 2/16, -5/16, 8/16, 8/16, 5/16}, --  top
-			{-5/16, -4/16, -2/16, 5/16, 5/16, 2/16}, -- middle
-			{-8/16, -8/16, -5/16, 8/16, -4/16, 5/16}, -- base
+			{ -6 / 16, -8 / 16, -6 / 16, 6 / 16, -4 / 16, 6 / 16 },
+			{ -5 / 16, -4 / 16, -4 / 16, 5 / 16, -3 / 16, 4 / 16 },
+			{ -4 / 16, -3 / 16, -2 / 16, 4 / 16, 2 / 16, 2 / 16 },
+			{ -8 / 16, 2 / 16, -5 / 16, 8 / 16, 8 / 16, 5 / 16 },
 		}
 	},
+	selection_box = anvilbox,
+	collision_box = anvilbox,
 	sounds = mcl_sounds.node_sound_metal_defaults(),
 	_mcl_blast_resistance = 1200,
 	_mcl_hardness = 5,
diff --git a/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_0.png b/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_0.png
index 84c64e9159..43938aa726 100644
Binary files a/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_0.png and b/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_0.png differ
diff --git a/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_1.png b/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_1.png
index 61c2ac6abd..e8cfbe5b7b 100644
Binary files a/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_1.png and b/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_1.png differ
diff --git a/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_2.png b/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_2.png
index 5f5cfbffa6..096f65eac2 100644
Binary files a/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_2.png and b/mods/ITEMS/mcl_anvils/textures/mcl_anvils_anvil_top_damaged_2.png differ
diff --git a/mods/ITEMS/mcl_armor/mod.conf b/mods/ITEMS/mcl_armor/mod.conf
index 9264e8362f..fad2e494c5 100644
--- a/mods/ITEMS/mcl_armor/mod.conf
+++ b/mods/ITEMS/mcl_armor/mod.conf
@@ -1,5 +1,5 @@
 name = mcl_armor
 author = stu
 description = Adds craftable armor that is visible to other players.
-depends = mcl_core, mcl_player, mcl_enchanting
+depends = mcl_core, mcl_player, mcl_enchanting, mcl_damage
 optional_depends = mcl_fire, ethereal, bakedclay
diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_boots_gold.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_boots_gold.png
index dc452d4137..ef1f9fa87c 100644
Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_boots_gold.png and b/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_boots_gold.png differ
diff --git a/mods/ITEMS/mcl_beds/README.txt b/mods/ITEMS/mcl_beds/README.txt
index cda6ebd92b..34b493702f 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
diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index dc9afe2bae..b8478fc1fb 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -14,39 +14,34 @@ local worlds_mod = minetest.get_modpath("mcl_worlds")
 
 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")) or 100
+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)
-	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
+	if player_in_bed <= 0 then
+		return false
 	end
-
-	return #players > 0
+	return players_in_bed_setting() <= (player_in_bed * 100) / #players
 end
 
 -- These monsters do not prevent sleep
@@ -198,7 +193,7 @@ 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 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")).."]"
@@ -221,7 +216,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 = S(comment .. "all players are in bed.")
+			else
+				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
 			form_n = form_n .. button_leave
 		end
@@ -330,7 +331,7 @@ function mcl_beds.on_rightclick(pos, player, is_top)
 			message = select(2, lay_down(player, ppos, other))
 		end
 		if message then
-			mcl_tmp_message.message(player, message)
+			mcl_title.set(player, "actionbar", {text=message, color="white", stay=60})
 		end
 	else
 		lay_down(player, nil, nil, false)
@@ -349,7 +350,6 @@ function mcl_beds.on_rightclick(pos, player, is_top)
 	end
 end
 
-
 -- Callbacks
 minetest.register_on_joinplayer(function(player)
 	local meta = player:get_meta()
diff --git a/mods/ITEMS/mcl_beds/locale/mcl_beds.de.tr b/mods/ITEMS/mcl_beds/locale/mcl_beds.de.tr
index 16592115e8..eb6967941f 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
diff --git a/mods/ITEMS/mcl_beds/locale/template.txt b/mods/ITEMS/mcl_beds/locale/template.txt
index 8301dfa335..5525bd91bc 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=
diff --git a/mods/ITEMS/mcl_bows/arrow.lua b/mods/ITEMS/mcl_bows/arrow.lua
index 9a22ee622c..3437076173 100644
--- a/mods/ITEMS/mcl_bows/arrow.lua
+++ b/mods/ITEMS/mcl_bows/arrow.lua
@@ -43,7 +43,7 @@ S("An arrow fired from a bow has a regular damage of 1-9. At full charge, there'
 S("Arrows might get stuck on solid blocks and can be retrieved again. They are also capable of pushing wooden buttons."),
 	_doc_items_usagehelp = S("To use arrows as ammunition for a bow, just put them anywhere in your inventory, they will be used up automatically. To use arrows as ammunition for a dispenser, place them in the dispenser's inventory. To retrieve an arrow that sticks in a block, simply walk close to it."),
 	inventory_image = "mcl_bows_arrow_inv.png",
-	groups = { ammo=1, ammo_bow=1, ammo_bow_regular=1 },
+	groups = { ammo=1, ammo_bow=1, ammo_bow_regular=1, ammo_crossbow=1 },
 	_on_dispense = function(itemstack, dispenserpos, droppos, dropnode, dropdir)
 		-- Shoot arrow
 		local shootpos = vector.add(dispenserpos, vector.multiply(dropdir, 0.51))
@@ -324,7 +324,9 @@ function ARROW_ENTITY.on_step(self, dtime)
 				end
 				if not obj:is_player() then
 					mcl_burning.extinguish(self.object)
-					self.object:remove()
+					if self._piercing == 0 then
+						self.object:remove()
+					end
 				end
 				return
 			end
diff --git a/mods/ITEMS/mcl_bows/crossbow.lua b/mods/ITEMS/mcl_bows/crossbow.lua
new file mode 100644
index 0000000000..e3124156b2
--- /dev/null
+++ b/mods/ITEMS/mcl_bows/crossbow.lua
@@ -0,0 +1,454 @@
+local S = minetest.get_translator(minetest.get_current_modname())
+
+mcl_bows_s = {}
+
+-- local arrows = {
+-- 	["mcl_bows:arrow"] = "mcl_bows:arrow_entity",
+-- }
+
+local GRAVITY = 9.81
+local BOW_DURABILITY = 385
+
+-- Charging time in microseconds
+local _BOW_CHARGE_TIME_HALF = 350000 -- bow level 1
+local _BOW_CHARGE_TIME_FULL = 900000 -- bow level 2 (full charge)
+
+local BOW_CHARGE_TIME_HALF = 350000 -- bow level 1
+local BOW_CHARGE_TIME_FULL = 900000 -- bow level 2 (full charge)
+
+-- Factor to multiply with player speed while player uses bow
+-- This emulates the sneak speed.
+local PLAYER_USE_CROSSBOW_SPEED = tonumber(minetest.settings:get("movement_speed_crouch")) / tonumber(minetest.settings:get("movement_speed_walk"))
+
+-- TODO: Use Minecraft speed (ca. 53 m/s)
+-- Currently nerfed because at full speed the arrow would easily get out of the range of the loaded map.
+local BOW_MAX_SPEED = 68
+
+local function play_load_sound(id, pos)
+	minetest.sound_play("mcl_bows_crossbow_drawback_"..id, {pos=pos, max_hear_distance=12}, true)
+end
+
+--[[ Store the charging state of each player.
+keys: player name
+value:
+nil = not charging or player not existing
+number: currently charging, the number is the time from minetest.get_us_time
+             in which the charging has started
+]]
+local bow_load = {}
+
+-- Another player table, this one stores the wield index of the bow being charged
+local bow_index = {}
+
+function mcl_bows_s.shoot_arrow_crossbow(arrow_item, pos, dir, yaw, shooter, power, damage, is_critical, crossbow_stack, collectable)
+	local obj = minetest.add_entity({x=pos.x,y=pos.y,z=pos.z}, arrow_item.."_entity")
+	if power == nil then
+		power = BOW_MAX_SPEED --19
+	end
+	if damage == nil then
+		damage = 3
+	end
+	local knockback
+	if crossbow_stack then
+		local enchantments = mcl_enchanting.get_enchantments(crossbow_stack)
+		if enchantments.piercing then
+			obj:get_luaentity()._piercing = 1 * enchantments.piercing
+		else
+			obj:get_luaentity()._piercing = 0
+		end
+	end
+	obj:set_velocity({x=dir.x*power, y=dir.y*power, z=dir.z*power})
+	obj:set_acceleration({x=0, y=-GRAVITY, z=0})
+	obj:set_yaw(yaw-math.pi/2)
+	local le = obj:get_luaentity()
+	le._shooter = shooter
+	le._source_object = shooter
+	le._damage = damage
+	le._is_critical = is_critical
+	le._startpos = pos
+	le._knockback = knockback
+	le._collectable = collectable
+	minetest.sound_play("mcl_bows_crossbow_shoot", {pos=pos, max_hear_distance=16}, true)
+	if shooter and shooter:is_player() then
+		if obj:get_luaentity().player == "" then
+			obj:get_luaentity().player = shooter
+		end
+		obj:get_luaentity().node = shooter:get_inventory():get_stack("main", 1):get_name()
+	end
+	return obj
+end
+
+local function get_arrow(player)
+	local inv = player:get_inventory()
+	local arrow_stack, arrow_stack_id
+	for i=1, inv:get_size("main") do
+		local it = inv:get_stack("main", i)
+		if not it:is_empty() and minetest.get_item_group(it:get_name(), "ammo_crossbow") ~= 0 then
+			arrow_stack = it
+			arrow_stack_id = i
+			break
+		end
+	end
+	return arrow_stack, arrow_stack_id
+end
+
+local function player_shoot_arrow(itemstack, player, power, damage, is_critical)
+	local has_multishot_enchantment = mcl_enchanting.has_enchantment(player:get_wielded_item(), "multishot")
+	local arrow_itemstring = wielditem:get_meta():get("arrow")
+
+	if not arrow_itemstring then
+		return false
+	end
+
+	local playerpos = player:get_pos()
+	local dir = player:get_look_dir()
+	local yaw = player:get_look_horizontal()
+
+	if has_multishot_enchantment then
+		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir.x, y=dir.y, z=dir.z + .2}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
+		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir.x, y=dir.y, z=dir.z - .2}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
+		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, dir, yaw, player, power, damage, is_critical, player:get_wielded_item(), true)
+	else
+		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, dir, yaw, player, power, damage, is_critical, player:get_wielded_item(), true)
+	end
+	return true
+end
+
+-- Bow item, uncharged state
+minetest.register_tool("mcl_bows:crossbow", {
+	description = S("Corssbow"),
+	_tt_help = S("Launches arrows"),
+	_doc_items_longdesc = S("Bows are ranged weapons to shoot arrows at your foes.").."\n"..
+S("The speed and damage of the arrow increases the longer you charge. The regular damage of the arrow is between 1 and 9. At full charge, there's also a 20% of a critical hit, dealing 10 damage instead."),
+	_doc_items_usagehelp = S("To use the bow, you first need to have at least one arrow anywhere in your inventory (unless in Creative Mode). Hold down the right mouse button to charge, release to shoot."),
+	_doc_items_durability = BOW_DURABILITY,
+	inventory_image = "mcl_bows_crossbow.png",
+	wield_scale = mcl_vars.tool_wield_scale,
+	stack_max = 1,
+	range = 4,
+	-- Trick to disable digging as well
+	on_use = function() return end,
+	on_place = function(itemstack, player, pointed_thing)
+		if pointed_thing and pointed_thing.type == "node" then
+			-- Call on_rightclick if the pointed node defines it
+			local node = minetest.get_node(pointed_thing.under)
+			if player and not player:get_player_control().sneak then
+				if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
+					return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, player, itemstack) or itemstack
+				end
+			end
+		end
+
+		itemstack:get_meta():set_string("active", "true")
+		return itemstack
+	end,
+	on_secondary_use = function(itemstack)
+		itemstack:get_meta():set_string("active", "true")
+		return itemstack
+	end,
+	groups = {weapon=1,weapon_ranged=1,crossbow=1,enchantability=1},
+	_mcl_uses = 326,
+})
+
+minetest.register_tool("mcl_bows:crossbow_loaded", {
+	description = S("Corssbow"),
+	_tt_help = S("Launches arrows"),
+	_doc_items_longdesc = S("Corssbow are ranged weapons to shoot arrows at your foes.").."\n"..
+S("The speed and damage of the arrow increases the longer you charge. The regular damage of the arrow is between 1 and 9. At full charge, there's also a 20% of a critical hit, dealing 10 damage instead."),
+	_doc_items_usagehelp = S("To use the corssbow, you first need to have at least one arrow anywhere in your inventory (unless in Creative Mode). Hold down the right mouse button to charge, release to load an arrow into the chamber, then to shoot press left mouse."),
+	_doc_items_durability = BOW_DURABILITY,
+	inventory_image = "mcl_bows_crossbow_3.png",
+	wield_scale = mcl_vars.tool_wield_scale,
+	stack_max = 1,
+	range = 4,
+	-- Trick to disable digging as well
+	on_use = function() return end,
+	on_place = function(itemstack, player, pointed_thing)
+		if pointed_thing and pointed_thing.type == "node" then
+			-- Call on_rightclick if the pointed node defines it
+			local node = minetest.get_node(pointed_thing.under)
+			if player and not player:get_player_control().sneak then
+				if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
+					return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, player, itemstack) or itemstack
+				end
+			end
+		end
+
+		itemstack:get_meta():set_string("active", "true")
+		return itemstack
+	end,
+	on_secondary_use = function(itemstack)
+		itemstack:get_meta():set_string("active", "true")
+		return itemstack
+	end,
+	groups = {weapon=1,weapon_ranged=1,crossbow=1,enchantability=1},
+	_mcl_uses = 326,
+})
+
+-- Iterates through player inventory and resets all the bows in "charging" state back to their original stage
+local function reset_bows(player)
+	local inv = player:get_inventory()
+	local list = inv:get_list("main")
+	for place, stack in pairs(list) do
+		if stack:get_name() == "mcl_bows:crossbow" or stack:get_name() == "mcl_bows:crossbow_enchanted" then
+			stack:get_meta():set_string("active", "")
+		elseif stack:get_name()=="mcl_bows:crossbow_0" or stack:get_name()=="mcl_bows:crossbow_1" or stack:get_name()=="mcl_bows:crossbow_2" then
+			stack:set_name("mcl_bows:crossbow")
+			stack:get_meta():set_string("active", "")
+			list[place] = stack
+		elseif stack:get_name()=="mcl_bows:crossbow_0_enchanted" or stack:get_name()=="mcl_bows:crossbow_1_enchanted" or stack:get_name()=="mcl_bows:crossbow_2_enchanted" then
+			stack:set_name("mcl_bows:crossbow_enchanted")
+			stack:get_meta():set_string("active", "")
+			list[place] = stack
+		end
+	end
+	inv:set_list("main", list)
+end
+
+-- Resets the bow charging state and player speed. To be used when the player is no longer charging the bow
+local function reset_bow_state(player, also_reset_bows)
+	bow_load[player:get_player_name()] = nil
+	bow_index[player:get_player_name()] = nil
+	if minetest.get_modpath("playerphysics") then
+		playerphysics.remove_physics_factor(player, "speed", "mcl_bows:use_crossbow")
+	end
+	if also_reset_bows then
+		reset_bows(player)
+	end
+end
+
+-- Bow in charging state
+for level=0, 2 do
+	minetest.register_tool("mcl_bows:crossbow_"..level, {
+		description = S("Crossbow"),
+		_doc_items_create_entry = false,
+		inventory_image = "mcl_bows_crossbow_"..level..".png",
+		wield_scale = mcl_vars.tool_wield_scale,
+		stack_max = 1,
+		range = 0, -- Pointing range to 0 to prevent punching with bow :D
+		groups = {not_in_creative_inventory=1, not_in_craft_guide=1, bow=1, enchantability=1},
+		-- Trick to disable digging as well
+		on_use = function() return end,
+		on_drop = function(itemstack, dropper, pos)
+			reset_bow_state(dropper)
+			itemstack:get_meta():set_string("active", "")
+			if mcl_enchanting.is_enchanted(itemstack:get_name()) then
+				itemstack:set_name("mcl_bows:crossbow_enchanted")
+			else
+				itemstack:set_name("mcl_bows:crossbow")
+			end
+			minetest.item_drop(itemstack, dropper, pos)
+			itemstack:take_item()
+			return itemstack
+		end,
+		-- Prevent accidental interaction with itemframes and other nodes
+		on_place = function(itemstack)
+			return itemstack
+		end,
+		_mcl_uses = 385,
+	})
+end
+
+
+controls.register_on_release(function(player, key, time)
+	if key~="RMB" then return end
+	--local inv = minetest.get_inventory({type="player", name=player:get_player_name()})
+	local wielditem = player:get_wielded_item()
+	if wielditem:get_name()=="mcl_bows:crossbow_2" and get_arrow(player) or wielditem:get_name()=="mcl_bows:crossbow_2" and minetest.is_creative_enabled(player:get_player_name()) or wielditem:get_name()=="mcl_bows:crossbow_2_enchanted" and get_arrow(player) or wielditem:get_name()=="mcl_bows:crossbow_2_enchanted" and minetest.is_creative_enabled(player:get_player_name()) then
+		local arrow_stack, arrow_stack_id = get_arrow(player)
+		local arrow_itemstring
+
+		if minetest.is_creative_enabled(player:get_player_name()) then
+			if arrow_stack then
+				arrow_itemstring = arrow_stack:get_name()
+			else
+				arrow_itemstring = "mcl_bows:arrow"
+			end
+		else
+			arrow_itemstring = arrow_stack:get_name()
+			arrow_stack:take_item()
+			player:get_inventory():set_stack("main", arrow_stack_id, arrow_stack)
+		end
+
+		wielditem:get_meta():set_string("arrow", arrow_itemstring)
+
+		if wielditem:get_name()=="mcl_bows:crossbow_2" then
+			wielditem:set_name("mcl_bows:crossbow_loaded")
+		else
+			wielditem:set_name("mcl_bows:crossbow_loaded_enchanted")
+		end
+		player:set_wielded_item(wielditem)
+		minetest.sound_play("mcl_bows_crossbow_load", {pos=player:get_pos(), max_hear_distance=16}, true)
+	else
+		reset_bow_state(player, true)
+	end
+end)
+
+controls.register_on_press(function(player, key, time)
+	if key~="LMB" then return end
+		wielditem = player:get_wielded_item()
+		if wielditem:get_name()=="mcl_bows:crossbow_loaded" or wielditem:get_name()=="mcl_bows:crossbow_loaded_enchanted" then
+		local enchanted = mcl_enchanting.is_enchanted(wielditem:get_name())
+		local speed, damage
+		local p_load = bow_load[player:get_player_name()]
+		local charge
+		-- Type sanity check
+		if type(p_load) == "number" then
+			charge = minetest.get_us_time() - p_load
+		else
+			-- In case something goes wrong ...
+			-- Just assume minimum charge.
+			charge = 0
+			minetest.log("warning", "[mcl_bows] Player "..player:get_player_name().." fires arrow with non-numeric bow_load!")
+		end
+		charge = math.max(math.min(charge, BOW_CHARGE_TIME_FULL), 0)
+
+		local charge_ratio = charge / BOW_CHARGE_TIME_FULL
+		charge_ratio = math.max(math.min(charge_ratio, 1), 0)
+
+		-- Calculate damage and speed
+		-- Fully charged
+		local is_critical = false
+		speed = BOW_MAX_SPEED
+		local r = math.random(1,5)
+		if r == 1 then
+			-- 20% chance for critical hit
+			damage = 10
+			is_critical = true
+		else
+			damage = 9
+		end
+
+		local has_shot = player_shoot_arrow(wielditem, player, speed, damage, is_critical)
+
+		if enchanted then
+			wielditem:set_name("mcl_bows:crossbow_enchanted")
+		else
+			wielditem:set_name("mcl_bows:crossbow")
+		end
+
+		if has_shot and not minetest.is_creative_enabled(player:get_player_name()) then
+			local durability = BOW_DURABILITY
+			local unbreaking = mcl_enchanting.get_enchantment(wielditem, "unbreaking")
+			local multishot = mcl_enchanting.get_enchantment(wielditem, "multishot")
+			if unbreaking > 0 then
+				durability = durability * (unbreaking + 1)
+			end
+			if multishot then
+				durability = durability / 3
+			end
+			wielditem:add_wear(65535/durability)
+		end
+		player:set_wielded_item(wielditem)
+		reset_bow_state(player, true)
+	end
+end)
+
+controls.register_on_hold(function(player, key, time)
+	local name = player:get_player_name()
+	local creative = minetest.is_creative_enabled(name)
+	if key ~= "RMB" then
+		return
+	end
+	--local inv = minetest.get_inventory({type="player", name=name})
+	local wielditem = player:get_wielded_item()
+	local enchantments = mcl_enchanting.get_enchantments(wielditem)
+	if enchantments.quick_charge then
+		BOW_CHARGE_TIME_HALF = _BOW_CHARGE_TIME_HALF - (enchantments.quick_charge * 0.13 * 1000000 * .5)
+		BOW_CHARGE_TIME_FULL = _BOW_CHARGE_TIME_FULL - (enchantments.quick_charge * 0.13 * 1000000)
+	else
+		BOW_CHARGE_TIME_HALF = _BOW_CHARGE_TIME_HALF
+		BOW_CHARGE_TIME_FULL = _BOW_CHARGE_TIME_FULL
+	end
+
+	if bow_load[name] == nil and (wielditem:get_name()=="mcl_bows:crossbow" or wielditem:get_name()=="mcl_bows:crossbow_enchanted") and wielditem:get_meta():get("active") and (creative or get_arrow(player)) then
+		local enchanted = mcl_enchanting.is_enchanted(wielditem:get_name())
+		if enchanted then
+			wielditem:set_name("mcl_bows:crossbow_0_enchanted")
+			play_load_sound(0, player:get_pos())
+		else
+			wielditem:set_name("mcl_bows:crossbow_0")
+			play_load_sound(0, player:get_pos())
+		end
+		player:set_wielded_item(wielditem)
+		if minetest.get_modpath("playerphysics") then
+			-- Slow player down when using bow
+			playerphysics.add_physics_factor(player, "speed", "mcl_bows:use_crossbow", PLAYER_USE_CROSSBOW_SPEED)
+		end
+		bow_load[name] = minetest.get_us_time()
+		bow_index[name] = player:get_wield_index()
+	else
+		if player:get_wield_index() == bow_index[name] then
+			if type(bow_load[name]) == "number" then
+				if wielditem:get_name() == "mcl_bows:crossbow_0" and minetest.get_us_time() - bow_load[name] >= BOW_CHARGE_TIME_HALF then
+					wielditem:set_name("mcl_bows:crossbow_1")
+					play_load_sound(1, player:get_pos())
+				elseif wielditem:get_name() == "mcl_bows:crossbow_0_enchanted" and minetest.get_us_time() - bow_load[name] >= BOW_CHARGE_TIME_HALF then
+					wielditem:set_name("mcl_bows:crossbow_1_enchanted")
+					play_load_sound(1, player:get_pos())
+				elseif wielditem:get_name() == "mcl_bows:crossbow_1" and minetest.get_us_time() - bow_load[name] >= BOW_CHARGE_TIME_FULL then
+					wielditem:set_name("mcl_bows:crossbow_2")
+					play_load_sound(2, player:get_pos())
+				elseif wielditem:get_name() == "mcl_bows:crossbow_1_enchanted" and minetest.get_us_time() - bow_load[name] >= BOW_CHARGE_TIME_FULL then
+					wielditem:set_name("mcl_bows:crossbow_2_enchanted")
+					play_load_sound(2, player:get_pos())
+				end
+			else
+				if wielditem:get_name() == "mcl_bows:crossbow_0" or wielditem:get_name() == "mcl_bows:crossbow_1" or wielditem:get_name() == "mcl_bows:crossbow_2" then
+					wielditem:set_name("mcl_bows:crossbow")
+					play_load_sound(1, player:get_pos())
+				elseif wielditem:get_name() == "mcl_bows:crossbow_0_enchanted" or wielditem:get_name() == "mcl_bows:crossbow_1_enchanted" or wielditem:get_name() == "mcl_bows:crossbow_2_enchanted" then
+					wielditem:set_name("mcl_bows:crossbow_enchanted")
+					play_load_sound(1, player:get_pos())
+				end
+			end
+			player:set_wielded_item(wielditem)
+		else
+			reset_bow_state(player, true)
+		end
+	end
+end)
+
+minetest.register_globalstep(function(dtime)
+	for _, player in pairs(minetest.get_connected_players()) do
+		local name = player:get_player_name()
+		local wielditem = player:get_wielded_item()
+		local wieldindex = player:get_wield_index()
+		--local controls = player:get_player_control()
+		if type(bow_load[name]) == "number" and ((wielditem:get_name()~="mcl_bows:crossbow_0" and wielditem:get_name()~="mcl_bows:crossbow_1" and wielditem:get_name()~="mcl_bows:crossbow_2" and wielditem:get_name()~="mcl_bows:crossbow_0_enchanted" and wielditem:get_name()~="mcl_bows:crossbow_1_enchanted" and wielditem:get_name()~="mcl_bows:crossbow_2_enchanted") or wieldindex ~= bow_index[name]) then
+			reset_bow_state(player, true)
+		end
+	end
+end)
+
+minetest.register_on_joinplayer(function(player)
+	reset_bows(player)
+end)
+
+minetest.register_on_leaveplayer(function(player)
+	reset_bow_state(player, true)
+end)
+
+if minetest.get_modpath("mcl_core") and minetest.get_modpath("mcl_mobitems") then
+	minetest.register_craft({
+		output = "mcl_bows:crossbow",
+		recipe = {
+			{"mcl_core:stick", "mcl_core:iron_ingot", "mcl_core:stick"},
+			{"mcl_mobitems:string", "mcl_bows:arrow", "mcl_mobitems:string"},
+			{"", "mcl_core:stick", ""},
+		}
+	})
+end
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "group:bow",
+	burntime = 15,
+})
+
+-- Add entry aliases for the Help
+if minetest.get_modpath("doc") then
+	doc.add_entry_alias("tools", "mcl_bows:crossbow", "tools", "mcl_bows:crossbow_0")
+	doc.add_entry_alias("tools", "mcl_bows:crossbow", "tools", "mcl_bows:crossbow_1")
+	doc.add_entry_alias("tools", "mcl_bows:crossbow", "tools", "mcl_bows:crossbow_2")
+end
diff --git a/mods/ITEMS/mcl_bows/init.lua b/mods/ITEMS/mcl_bows/init.lua
index a2745d9508..d5b06dac7c 100644
--- a/mods/ITEMS/mcl_bows/init.lua
+++ b/mods/ITEMS/mcl_bows/init.lua
@@ -1,5 +1,11 @@
+--Bow
 dofile(minetest.get_modpath("mcl_bows") .. "/arrow.lua")
 dofile(minetest.get_modpath("mcl_bows") .. "/bow.lua")
+dofile(minetest.get_modpath("mcl_bows") .. "/rocket.lua")
 
+--Crossbow
+dofile(minetest.get_modpath("mcl_bows") .. "/crossbow.lua")
+
+--Compatiblility with older MineClone worlds
 minetest.register_alias("mcl_throwing:bow", "mcl_bows:bow")
 minetest.register_alias("mcl_throwing:arrow", "mcl_bows:arrow")
diff --git a/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.b3d b/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.b3d
new file mode 100644
index 0000000000..0a34f1eaa6
Binary files /dev/null and b/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.b3d differ
diff --git a/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.mtl b/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.mtl
new file mode 100644
index 0000000000..f231bdf4c1
--- /dev/null
+++ b/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.mtl
@@ -0,0 +1,10 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl None
+Ns 500
+Ka 0.8 0.8 0.8
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
diff --git a/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.obj b/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.obj
new file mode 100644
index 0000000000..e2bd11d347
--- /dev/null
+++ b/mods/ITEMS/mcl_bows/models/mcl_bows_rocket.obj
@@ -0,0 +1,1016 @@
+# Blender v3.0.0 Alpha OBJ File: ''
+# www.blender.org
+mtllib mcl_bows_rocket.mtl
+o Plane
+v -1.414214 -0.063116 0.000000
+v 0.000000 -0.063116 1.414214
+v -0.000000 -0.063116 -1.414214
+v 1.414214 -0.063116 -0.000000
+v -1.414214 -0.062205 0.000000
+v 0.000000 -0.062205 1.414214
+v -0.000000 -0.062205 -1.414214
+v 1.414214 -0.062205 -0.000000
+v -1.414214 -0.060838 0.000000
+v 0.000000 -0.060838 1.414214
+v -0.000000 -0.060838 -1.414214
+v 1.414214 -0.060838 -0.000000
+v -1.414214 -0.059926 0.000000
+v 0.000000 -0.059926 1.414214
+v -0.000000 -0.059926 -1.414214
+v 1.414214 -0.059926 -0.000000
+v -1.414214 -0.058559 0.000000
+v 0.000000 -0.058559 1.414214
+v -0.000000 -0.058559 -1.414214
+v 1.414214 -0.058559 -0.000000
+v -1.414214 -0.057648 0.000000
+v 0.000000 -0.057648 1.414214
+v -0.000000 -0.057648 -1.414214
+v 1.414214 -0.057648 -0.000000
+v -1.414214 -0.056281 0.000000
+v 0.000000 -0.056281 1.414214
+v -0.000000 -0.056281 -1.414214
+v 1.414214 -0.056281 -0.000000
+v -1.414214 -0.055369 0.000000
+v 0.000000 -0.055369 1.414214
+v -0.000000 -0.055369 -1.414214
+v 1.414214 -0.055369 -0.000000
+v -1.414214 -0.054002 0.000000
+v 0.000000 -0.054002 1.414214
+v -0.000000 -0.054002 -1.414214
+v 1.414214 -0.054002 -0.000000
+v -1.414214 -0.053091 0.000000
+v 0.000000 -0.053091 1.414214
+v -0.000000 -0.053091 -1.414214
+v 1.414214 -0.053091 -0.000000
+v -1.414214 -0.051723 0.000000
+v 0.000000 -0.051723 1.414214
+v -0.000000 -0.051723 -1.414214
+v 1.414214 -0.051723 -0.000000
+v -1.414214 -0.050812 0.000000
+v 0.000000 -0.050812 1.414214
+v -0.000000 -0.050812 -1.414214
+v 1.414214 -0.050812 -0.000000
+v -1.414214 -0.049445 0.000000
+v 0.000000 -0.049445 1.414214
+v -0.000000 -0.049445 -1.414214
+v 1.414214 -0.049445 -0.000000
+v -1.414214 -0.048533 0.000000
+v 0.000000 -0.048533 1.414214
+v -0.000000 -0.048533 -1.414214
+v 1.414214 -0.048533 -0.000000
+v -1.414214 -0.047166 0.000000
+v 0.000000 -0.047166 1.414214
+v -0.000000 -0.047166 -1.414214
+v 1.414214 -0.047166 -0.000000
+v -1.414214 -0.046255 0.000000
+v 0.000000 -0.046255 1.414214
+v -0.000000 -0.046255 -1.414214
+v 1.414214 -0.046255 -0.000000
+v -1.414214 -0.044888 0.000000
+v 0.000000 -0.044888 1.414214
+v -0.000000 -0.044888 -1.414214
+v 1.414214 -0.044888 -0.000000
+v -1.414214 -0.043976 0.000000
+v 0.000000 -0.043976 1.414214
+v -0.000000 -0.043976 -1.414214
+v 1.414214 -0.043976 -0.000000
+v -1.414214 -0.042609 0.000000
+v 0.000000 -0.042609 1.414214
+v -0.000000 -0.042609 -1.414214
+v 1.414214 -0.042609 -0.000000
+v -1.414214 -0.041698 0.000000
+v 0.000000 -0.041698 1.414214
+v -0.000000 -0.041698 -1.414214
+v 1.414214 -0.041698 -0.000000
+v -1.414214 -0.040331 0.000000
+v 0.000000 -0.040331 1.414214
+v -0.000000 -0.040331 -1.414214
+v 1.414214 -0.040331 -0.000000
+v -1.414214 -0.039419 0.000000
+v 0.000000 -0.039419 1.414214
+v -0.000000 -0.039419 -1.414214
+v 1.414214 -0.039419 -0.000000
+v -1.414214 -0.038052 0.000000
+v 0.000000 -0.038052 1.414214
+v -0.000000 -0.038052 -1.414214
+v 1.414214 -0.038052 -0.000000
+v -1.414214 -0.037141 0.000000
+v 0.000000 -0.037141 1.414214
+v -0.000000 -0.037141 -1.414214
+v 1.414214 -0.037141 -0.000000
+v -1.414214 -0.035773 0.000000
+v 0.000000 -0.035773 1.414214
+v -0.000000 -0.035773 -1.414214
+v 1.414214 -0.035773 -0.000000
+v -1.414214 -0.034862 0.000000
+v 0.000000 -0.034862 1.414214
+v -0.000000 -0.034862 -1.414214
+v 1.414214 -0.034862 -0.000000
+v -1.414214 -0.033495 0.000000
+v 0.000000 -0.033495 1.414214
+v -0.000000 -0.033495 -1.414214
+v 1.414214 -0.033495 -0.000000
+v -1.414214 -0.032583 0.000000
+v 0.000000 -0.032583 1.414214
+v -0.000000 -0.032583 -1.414214
+v 1.414214 -0.032583 -0.000000
+v -1.414214 -0.031216 0.000000
+v 0.000000 -0.031216 1.414214
+v -0.000000 -0.031216 -1.414214
+v 1.414214 -0.031216 -0.000000
+v -1.414214 -0.030305 0.000000
+v 0.000000 -0.030305 1.414214
+v -0.000000 -0.030305 -1.414214
+v 1.414214 -0.030305 -0.000000
+v -1.414214 -0.028938 0.000000
+v 0.000000 -0.028938 1.414214
+v -0.000000 -0.028938 -1.414214
+v 1.414214 -0.028938 -0.000000
+v -1.414214 -0.028026 0.000000
+v 0.000000 -0.028026 1.414214
+v -0.000000 -0.028026 -1.414214
+v 1.414214 -0.028026 -0.000000
+v -1.414214 -0.026659 0.000000
+v 0.000000 -0.026659 1.414214
+v -0.000000 -0.026659 -1.414214
+v 1.414214 -0.026659 -0.000000
+v -1.414214 -0.025748 0.000000
+v 0.000000 -0.025748 1.414214
+v -0.000000 -0.025748 -1.414214
+v 1.414214 -0.025748 -0.000000
+v -1.414214 -0.024381 0.000000
+v 0.000000 -0.024381 1.414214
+v -0.000000 -0.024381 -1.414214
+v 1.414214 -0.024381 -0.000000
+v -1.414214 -0.023469 0.000000
+v 0.000000 -0.023469 1.414214
+v -0.000000 -0.023469 -1.414214
+v 1.414214 -0.023469 -0.000000
+v -1.414214 -0.022102 0.000000
+v 0.000000 -0.022102 1.414214
+v -0.000000 -0.022102 -1.414214
+v 1.414214 -0.022102 -0.000000
+v -1.414214 -0.021191 0.000000
+v 0.000000 -0.021191 1.414214
+v -0.000000 -0.021191 -1.414214
+v 1.414214 -0.021191 -0.000000
+v -1.414214 -0.019824 0.000000
+v 0.000000 -0.019824 1.414214
+v -0.000000 -0.019824 -1.414214
+v 1.414214 -0.019824 -0.000000
+v -1.414214 -0.018912 0.000000
+v 0.000000 -0.018912 1.414214
+v -0.000000 -0.018912 -1.414214
+v 1.414214 -0.018912 -0.000000
+v -1.414214 -0.017545 0.000000
+v 0.000000 -0.017545 1.414214
+v -0.000000 -0.017545 -1.414214
+v 1.414214 -0.017545 -0.000000
+v -1.414214 -0.016634 0.000000
+v 0.000000 -0.016634 1.414214
+v -0.000000 -0.016634 -1.414214
+v 1.414214 -0.016634 -0.000000
+v -1.414214 -0.015266 0.000000
+v 0.000000 -0.015266 1.414214
+v -0.000000 -0.015266 -1.414214
+v 1.414214 -0.015266 -0.000000
+v -1.414214 -0.014355 0.000000
+v 0.000000 -0.014355 1.414214
+v -0.000000 -0.014355 -1.414214
+v 1.414214 -0.014355 -0.000000
+v -1.414214 -0.012988 0.000000
+v 0.000000 -0.012988 1.414214
+v -0.000000 -0.012988 -1.414214
+v 1.414214 -0.012988 -0.000000
+v -1.414214 -0.012076 0.000000
+v 0.000000 -0.012076 1.414214
+v -0.000000 -0.012076 -1.414214
+v 1.414214 -0.012076 -0.000000
+v -1.414214 -0.010709 0.000000
+v 0.000000 -0.010709 1.414214
+v -0.000000 -0.010709 -1.414214
+v 1.414214 -0.010709 -0.000000
+v -1.414214 -0.009798 0.000000
+v 0.000000 -0.009798 1.414214
+v -0.000000 -0.009798 -1.414214
+v 1.414214 -0.009798 -0.000000
+v -1.414214 -0.008431 0.000000
+v 0.000000 -0.008431 1.414214
+v -0.000000 -0.008431 -1.414214
+v 1.414214 -0.008431 -0.000000
+v -1.414214 -0.007519 0.000000
+v 0.000000 -0.007519 1.414214
+v -0.000000 -0.007519 -1.414214
+v 1.414214 -0.007519 -0.000000
+v -1.414214 -0.006152 0.000000
+v 0.000000 -0.006152 1.414214
+v -0.000000 -0.006152 -1.414214
+v 1.414214 -0.006152 -0.000000
+v -1.414214 -0.005241 0.000000
+v 0.000000 -0.005241 1.414214
+v -0.000000 -0.005241 -1.414214
+v 1.414214 -0.005241 -0.000000
+v -1.414214 -0.003874 0.000000
+v 0.000000 -0.003874 1.414214
+v -0.000000 -0.003874 -1.414214
+v 1.414214 -0.003874 -0.000000
+v -1.414214 -0.002962 0.000000
+v 0.000000 -0.002962 1.414214
+v -0.000000 -0.002962 -1.414214
+v 1.414214 -0.002962 -0.000000
+v -1.414214 -0.001595 0.000000
+v 0.000000 -0.001595 1.414214
+v -0.000000 -0.001595 -1.414214
+v 1.414214 -0.001595 -0.000000
+v -1.414214 -0.000684 0.000000
+v 0.000000 -0.000684 1.414214
+v -0.000000 -0.000684 -1.414214
+v 1.414214 -0.000684 -0.000000
+v -1.414214 0.000684 0.000000
+v 0.000000 0.000684 1.414214
+v -0.000000 0.000684 -1.414214
+v 1.414214 0.000684 -0.000000
+v -1.414214 0.001595 0.000000
+v 0.000000 0.001595 1.414214
+v -0.000000 0.001595 -1.414214
+v 1.414214 0.001595 -0.000000
+v -1.414214 0.002962 0.000000
+v 0.000000 0.002962 1.414214
+v -0.000000 0.002962 -1.414214
+v 1.414214 0.002962 -0.000000
+v -1.414214 0.003874 0.000000
+v 0.000000 0.003874 1.414214
+v -0.000000 0.003874 -1.414214
+v 1.414214 0.003874 -0.000000
+v -1.414214 0.005241 0.000000
+v 0.000000 0.005241 1.414214
+v -0.000000 0.005241 -1.414214
+v 1.414214 0.005241 -0.000000
+v -1.414214 0.006152 0.000000
+v 0.000000 0.006152 1.414214
+v -0.000000 0.006152 -1.414214
+v 1.414214 0.006152 -0.000000
+v -1.414214 0.007519 0.000000
+v 0.000000 0.007519 1.414214
+v -0.000000 0.007519 -1.414214
+v 1.414214 0.007519 -0.000000
+v -1.414214 0.008431 0.000000
+v 0.000000 0.008431 1.414214
+v -0.000000 0.008431 -1.414214
+v 1.414214 0.008431 -0.000000
+v -1.414214 0.009798 0.000000
+v 0.000000 0.009798 1.414214
+v -0.000000 0.009798 -1.414214
+v 1.414214 0.009798 -0.000000
+v -1.414214 0.010709 0.000000
+v 0.000000 0.010709 1.414214
+v -0.000000 0.010709 -1.414214
+v 1.414214 0.010709 -0.000000
+v -1.414214 0.012076 0.000000
+v 0.000000 0.012076 1.414214
+v -0.000000 0.012076 -1.414214
+v 1.414214 0.012076 -0.000000
+v -1.414214 0.012988 0.000000
+v 0.000000 0.012988 1.414214
+v -0.000000 0.012988 -1.414214
+v 1.414214 0.012988 -0.000000
+v -1.414214 0.014355 0.000000
+v 0.000000 0.014355 1.414214
+v -0.000000 0.014355 -1.414214
+v 1.414214 0.014355 -0.000000
+v -1.414214 0.015266 0.000000
+v 0.000000 0.015266 1.414214
+v -0.000000 0.015266 -1.414214
+v 1.414214 0.015266 -0.000000
+v -1.414214 0.016634 0.000000
+v 0.000000 0.016634 1.414214
+v -0.000000 0.016634 -1.414214
+v 1.414214 0.016634 -0.000000
+v -1.414214 0.017545 0.000000
+v 0.000000 0.017545 1.414214
+v -0.000000 0.017545 -1.414214
+v 1.414214 0.017545 -0.000000
+v -1.414214 0.018912 0.000000
+v 0.000000 0.018912 1.414214
+v -0.000000 0.018912 -1.414214
+v 1.414214 0.018912 -0.000000
+v -1.414214 0.019824 0.000000
+v 0.000000 0.019824 1.414214
+v -0.000000 0.019824 -1.414214
+v 1.414214 0.019824 -0.000000
+v -1.414214 0.021191 0.000000
+v 0.000000 0.021191 1.414214
+v -0.000000 0.021191 -1.414214
+v 1.414214 0.021191 -0.000000
+v -1.414214 0.022102 0.000000
+v 0.000000 0.022102 1.414214
+v -0.000000 0.022102 -1.414214
+v 1.414214 0.022102 -0.000000
+v -1.414214 0.023469 0.000000
+v 0.000000 0.023469 1.414214
+v -0.000000 0.023469 -1.414214
+v 1.414214 0.023469 -0.000000
+v -1.414214 0.024381 0.000000
+v 0.000000 0.024381 1.414214
+v -0.000000 0.024381 -1.414214
+v 1.414214 0.024381 -0.000000
+v -1.414214 0.025748 0.000000
+v 0.000000 0.025748 1.414214
+v -0.000000 0.025748 -1.414214
+v 1.414214 0.025748 -0.000000
+v -1.414214 0.026659 0.000000
+v 0.000000 0.026659 1.414214
+v -0.000000 0.026659 -1.414214
+v 1.414214 0.026659 -0.000000
+v -1.414214 0.028026 0.000000
+v 0.000000 0.028026 1.414214
+v -0.000000 0.028026 -1.414214
+v 1.414214 0.028026 -0.000000
+v -1.414214 0.028938 0.000000
+v 0.000000 0.028938 1.414214
+v -0.000000 0.028938 -1.414214
+v 1.414214 0.028938 -0.000000
+v -1.414214 0.030305 0.000000
+v 0.000000 0.030305 1.414214
+v -0.000000 0.030305 -1.414214
+v 1.414214 0.030305 -0.000000
+v -1.414214 0.031216 0.000000
+v 0.000000 0.031216 1.414214
+v -0.000000 0.031216 -1.414214
+v 1.414214 0.031216 -0.000000
+v -1.414214 0.032584 0.000000
+v 0.000000 0.032584 1.414214
+v -0.000000 0.032584 -1.414214
+v 1.414214 0.032584 -0.000000
+v -1.414214 0.033495 0.000000
+v 0.000000 0.033495 1.414214
+v -0.000000 0.033495 -1.414214
+v 1.414214 0.033495 -0.000000
+v -1.414214 0.034862 0.000000
+v 0.000000 0.034862 1.414214
+v -0.000000 0.034862 -1.414214
+v 1.414214 0.034862 -0.000000
+v -1.414214 0.035774 0.000000
+v 0.000000 0.035774 1.414214
+v -0.000000 0.035774 -1.414214
+v 1.414214 0.035774 -0.000000
+v -1.414214 0.037141 0.000000
+v 0.000000 0.037141 1.414214
+v -0.000000 0.037141 -1.414214
+v 1.414214 0.037141 -0.000000
+v -1.414214 0.038052 0.000000
+v 0.000000 0.038052 1.414214
+v -0.000000 0.038052 -1.414214
+v 1.414214 0.038052 -0.000000
+v -1.414214 0.039419 0.000000
+v 0.000000 0.039419 1.414214
+v -0.000000 0.039419 -1.414214
+v 1.414214 0.039419 -0.000000
+v -1.414214 0.040331 0.000000
+v 0.000000 0.040331 1.414214
+v -0.000000 0.040331 -1.414214
+v 1.414214 0.040331 -0.000000
+v -1.414214 0.041698 0.000000
+v 0.000000 0.041698 1.414214
+v -0.000000 0.041698 -1.414214
+v 1.414214 0.041698 -0.000000
+v -1.414214 0.042609 0.000000
+v 0.000000 0.042609 1.414214
+v -0.000000 0.042609 -1.414214
+v 1.414214 0.042609 -0.000000
+v -1.414214 0.043976 0.000000
+v 0.000000 0.043976 1.414214
+v -0.000000 0.043976 -1.414214
+v 1.414214 0.043976 -0.000000
+v -1.414214 0.044888 0.000000
+v 0.000000 0.044888 1.414214
+v -0.000000 0.044888 -1.414214
+v 1.414214 0.044888 -0.000000
+v -1.414214 0.046255 0.000000
+v 0.000000 0.046255 1.414214
+v -0.000000 0.046255 -1.414214
+v 1.414214 0.046255 -0.000000
+v -1.414214 0.047166 0.000000
+v 0.000000 0.047166 1.414214
+v -0.000000 0.047166 -1.414214
+v 1.414214 0.047166 -0.000000
+v -1.414214 0.048533 0.000000
+v 0.000000 0.048533 1.414214
+v -0.000000 0.048533 -1.414214
+v 1.414214 0.048533 -0.000000
+v -1.414214 0.049445 0.000000
+v 0.000000 0.049445 1.414214
+v -0.000000 0.049445 -1.414214
+v 1.414214 0.049445 -0.000000
+v -1.414214 0.050812 0.000000
+v 0.000000 0.050812 1.414214
+v -0.000000 0.050812 -1.414214
+v 1.414214 0.050812 -0.000000
+v -1.414214 0.051723 0.000000
+v 0.000000 0.051723 1.414214
+v -0.000000 0.051723 -1.414214
+v 1.414214 0.051723 -0.000000
+v -1.414214 0.053091 0.000000
+v 0.000000 0.053091 1.414214
+v -0.000000 0.053091 -1.414214
+v 1.414214 0.053091 -0.000000
+v -1.414214 0.054002 0.000000
+v 0.000000 0.054002 1.414214
+v -0.000000 0.054002 -1.414214
+v 1.414214 0.054002 -0.000000
+v -1.414214 0.055369 0.000000
+v 0.000000 0.055369 1.414214
+v -0.000000 0.055369 -1.414214
+v 1.414214 0.055369 -0.000000
+v -1.414214 0.056281 0.000000
+v 0.000000 0.056281 1.414214
+v -0.000000 0.056281 -1.414214
+v 1.414214 0.056281 -0.000000
+v -1.414214 0.057648 0.000000
+v 0.000000 0.057648 1.414214
+v -0.000000 0.057648 -1.414214
+v 1.414214 0.057648 -0.000000
+v -1.414214 0.058559 0.000000
+v 0.000000 0.058559 1.414214
+v -0.000000 0.058559 -1.414214
+v 1.414214 0.058559 -0.000000
+v -1.414214 0.059926 0.000000
+v 0.000000 0.059926 1.414214
+v -0.000000 0.059926 -1.414214
+v 1.414214 0.059926 -0.000000
+v -1.414214 0.060838 0.000000
+v 0.000000 0.060838 1.414214
+v -0.000000 0.060838 -1.414214
+v 1.414214 0.060838 -0.000000
+v -1.414214 0.062205 0.000000
+v 0.000000 0.062205 1.414214
+v -0.000000 0.062205 -1.414214
+v 1.414214 0.062205 -0.000000
+v -1.414214 0.063116 0.000000
+v 0.000000 0.063116 1.414214
+v -0.000000 0.063116 -1.414214
+v 1.414214 0.063116 -0.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+usemtl None
+s off
+f 1/1/1 3/2/1 4/3/1 2/4/1
+f 5/5/2 6/6/2 8/7/2 7/8/2
+f 9/9/1 11/10/1 12/11/1 10/12/1
+f 13/13/2 14/14/2 16/15/2 15/16/2
+f 17/17/1 19/18/1 20/19/1 18/20/1
+f 21/21/2 22/22/2 24/23/2 23/24/2
+f 25/25/1 27/26/1 28/27/1 26/28/1
+f 29/29/2 30/30/2 32/31/2 31/32/2
+f 33/33/1 35/34/1 36/35/1 34/36/1
+f 37/37/2 38/38/2 40/39/2 39/40/2
+f 41/41/1 43/42/1 44/43/1 42/44/1
+f 45/45/2 46/46/2 48/47/2 47/48/2
+f 49/49/1 51/50/1 52/51/1 50/52/1
+f 53/53/2 54/54/2 56/55/2 55/56/2
+f 57/57/1 59/58/1 60/59/1 58/60/1
+f 61/61/2 62/62/2 64/63/2 63/64/2
+f 65/65/1 67/66/1 68/67/1 66/68/1
+f 69/69/2 70/70/2 72/71/2 71/72/2
+f 73/73/1 75/74/1 76/75/1 74/76/1
+f 77/77/2 78/78/2 80/79/2 79/80/2
+f 81/81/1 83/82/1 84/83/1 82/84/1
+f 85/85/2 86/86/2 88/87/2 87/88/2
+f 89/89/1 91/90/1 92/91/1 90/92/1
+f 93/93/2 94/94/2 96/95/2 95/96/2
+f 97/97/1 99/98/1 100/99/1 98/100/1
+f 101/101/2 102/102/2 104/103/2 103/104/2
+f 105/105/1 107/106/1 108/107/1 106/108/1
+f 109/109/2 110/110/2 112/111/2 111/112/2
+f 113/113/1 115/114/1 116/115/1 114/116/1
+f 117/117/2 118/118/2 120/119/2 119/120/2
+f 121/121/1 123/122/1 124/123/1 122/124/1
+f 125/125/2 126/126/2 128/127/2 127/128/2
+f 129/129/1 131/130/1 132/131/1 130/132/1
+f 133/133/2 134/134/2 136/135/2 135/136/2
+f 137/137/1 139/138/1 140/139/1 138/140/1
+f 141/141/2 142/142/2 144/143/2 143/144/2
+f 145/145/1 147/146/1 148/147/1 146/148/1
+f 149/149/2 150/150/2 152/151/2 151/152/2
+f 153/153/1 155/154/1 156/155/1 154/156/1
+f 157/157/2 158/158/2 160/159/2 159/160/2
+f 161/161/1 163/162/1 164/163/1 162/164/1
+f 165/165/2 166/166/2 168/167/2 167/168/2
+f 169/169/1 171/170/1 172/171/1 170/172/1
+f 173/173/2 174/174/2 176/175/2 175/176/2
+f 177/177/1 179/178/1 180/179/1 178/180/1
+f 181/181/2 182/182/2 184/183/2 183/184/2
+f 185/185/1 187/186/1 188/187/1 186/188/1
+f 189/189/2 190/190/2 192/191/2 191/192/2
+f 193/193/1 195/194/1 196/195/1 194/196/1
+f 197/197/2 198/198/2 200/199/2 199/200/2
+f 201/201/1 203/202/1 204/203/1 202/204/1
+f 205/205/2 206/206/2 208/207/2 207/208/2
+f 209/209/1 211/210/1 212/211/1 210/212/1
+f 213/213/2 214/214/2 216/215/2 215/216/2
+f 217/217/1 219/218/1 220/219/1 218/220/1
+f 221/221/2 222/222/2 224/223/2 223/224/2
+f 225/225/1 227/226/1 228/227/1 226/228/1
+f 229/229/2 230/230/2 232/231/2 231/232/2
+f 233/233/1 235/234/1 236/235/1 234/236/1
+f 237/237/2 238/238/2 240/239/2 239/240/2
+f 241/241/1 243/242/1 244/243/1 242/244/1
+f 245/245/2 246/246/2 248/247/2 247/248/2
+f 249/249/1 251/250/1 252/251/1 250/252/1
+f 253/253/2 254/254/2 256/255/2 255/256/2
+f 257/257/1 259/258/1 260/259/1 258/260/1
+f 261/261/2 262/262/2 264/263/2 263/264/2
+f 265/265/1 267/266/1 268/267/1 266/268/1
+f 269/269/2 270/270/2 272/271/2 271/272/2
+f 273/273/1 275/274/1 276/275/1 274/276/1
+f 277/277/2 278/278/2 280/279/2 279/280/2
+f 281/281/1 283/282/1 284/283/1 282/284/1
+f 285/285/2 286/286/2 288/287/2 287/288/2
+f 289/289/1 291/290/1 292/291/1 290/292/1
+f 293/293/2 294/294/2 296/295/2 295/296/2
+f 297/297/1 299/298/1 300/299/1 298/300/1
+f 301/301/2 302/302/2 304/303/2 303/304/2
+f 305/305/1 307/306/1 308/307/1 306/308/1
+f 309/309/2 310/310/2 312/311/2 311/312/2
+f 313/313/1 315/314/1 316/315/1 314/316/1
+f 317/317/2 318/318/2 320/319/2 319/320/2
+f 321/321/1 323/322/1 324/323/1 322/324/1
+f 325/325/2 326/326/2 328/327/2 327/328/2
+f 329/329/1 331/330/1 332/331/1 330/332/1
+f 333/333/2 334/334/2 336/335/2 335/336/2
+f 337/337/1 339/338/1 340/339/1 338/340/1
+f 341/341/2 342/342/2 344/343/2 343/344/2
+f 345/345/1 347/346/1 348/347/1 346/348/1
+f 349/349/2 350/350/2 352/351/2 351/352/2
+f 353/353/1 355/354/1 356/355/1 354/356/1
+f 357/357/2 358/358/2 360/359/2 359/360/2
+f 361/361/1 363/362/1 364/363/1 362/364/1
+f 365/365/2 366/366/2 368/367/2 367/368/2
+f 369/369/1 371/370/1 372/371/1 370/372/1
+f 373/373/2 374/374/2 376/375/2 375/376/2
+f 377/377/1 379/378/1 380/379/1 378/380/1
+f 381/381/2 382/382/2 384/383/2 383/384/2
+f 385/385/1 387/386/1 388/387/1 386/388/1
+f 389/389/2 390/390/2 392/391/2 391/392/2
+f 393/393/1 395/394/1 396/395/1 394/396/1
+f 397/397/2 398/398/2 400/399/2 399/400/2
+f 401/401/1 403/402/1 404/403/1 402/404/1
+f 405/405/2 406/406/2 408/407/2 407/408/2
+f 409/409/1 411/410/1 412/411/1 410/412/1
+f 413/413/2 414/414/2 416/415/2 415/416/2
+f 417/417/1 419/418/1 420/419/1 418/420/1
+f 421/421/2 422/422/2 424/423/2 423/424/2
+f 425/425/1 427/426/1 428/427/1 426/428/1
+f 429/429/2 430/430/2 432/431/2 431/432/2
+f 433/433/1 435/434/1 436/435/1 434/436/1
+f 437/437/2 438/438/2 440/439/2 439/440/2
+f 441/441/1 443/442/1 444/443/1 442/444/1
+f 445/445/2 446/446/2 448/447/2 447/448/2
diff --git a/mods/ITEMS/mcl_bows/rocket.lua b/mods/ITEMS/mcl_bows/rocket.lua
new file mode 100644
index 0000000000..678aba4d42
--- /dev/null
+++ b/mods/ITEMS/mcl_bows/rocket.lua
@@ -0,0 +1,706 @@
+local S = minetest.get_translator(minetest.get_current_modname())
+
+local math = math
+local vector = vector
+
+-- Time in seconds after which a stuck arrow is deleted
+local ARROW_TIMEOUT = 1
+-- Time after which stuck arrow is rechecked for being stuck
+local STUCK_RECHECK_TIME = 0.1
+
+--local GRAVITY = 9.81
+
+local YAW_OFFSET = -math.pi/2
+
+local function dir_to_pitch(dir)
+	--local dir2 = vector.normalize(dir)
+	local xz = math.abs(dir.x) + math.abs(dir.z)
+	return -math.atan2(-dir.y, xz)
+end
+
+local function random_arrow_positions(positions, placement)
+	if positions == "x" then
+		return math.random(-4, 4)
+	elseif positions == "y" then
+		return math.random(0, 10)
+	end
+	if placement == "front" and positions == "z" then
+		return 3
+	elseif placement == "back" and positions == "z" then
+		return -3
+	end
+	return 0
+end
+
+local function damage_explosion(self, damagemulitplier)
+	mcl_explosions.explode(self.object:get_pos(), 3, {})
+	local objects = minetest.get_objects_inside_radius(self.object:get_pos(), 8)
+	for _,obj in pairs(objects) do
+		if obj:is_player() then
+			mcl_util.deal_damage(obj, damagemulitplier - vector.distance(self.object:get_pos(), obj:get_pos()), {type = "explosion"})
+		elseif obj:get_luaentity()._cmi_is_mob then
+			obj:punch(self.object, 1.0, {
+				full_punch_interval=1.0,
+				damage_groups={fleshy=damagemulitplier - vector.distance(self.object:get_pos(), obj:get_pos())},
+			}, self.object:get_velocity())
+		end
+	end
+end
+
+local function particle_explosion(self)
+	local particle_pattern = math.random(1, 3)
+	local fpitch = 0
+	local true_type = ""
+	local type = math.random(1,2)
+	local size = math.random(1,3)
+	local colors = {"red", "yellow", "blue", "green", "white"}
+	local this_colors = {colors[math.random(#colors)], colors[math.random(#colors)], colors[math.random(#colors)]}
+
+	if size == 1 then
+		fpitch = math.random(200, 300)
+	elseif size == 2 then
+		fpitch = math.random(100, 130)
+	else
+		fpitch = math.random(60, 70)
+	end
+
+	if type == 1 then
+		true_type = "Popper"
+	else
+		true_type = "Floof"
+	end
+
+	if type == 1 then
+		minetest.sound_play("mcl_bows_firework", {
+			pos = self.object:get_pos(),
+			max_hear_distance = 100,
+			gain = 3.0,
+			pitch = fpitch/100
+		}, true)
+	else
+		minetest.sound_play("mcl_bows_firework_soft", {
+			pos = self.object:get_pos(),
+			max_hear_distance = 100,
+			gain = 4.0,
+			pitch = fpitch/100
+		}, true)
+	end
+
+	if particle_pattern == 1 then
+		minetest.add_particlespawner({
+				amount = 400 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-7 * size,-7 * size,-7 * size),
+				maxvel = vector.new(7 * size,7 * size,7 * size),
+				minexptime = .6 * size / 2,
+				maxexptime = .9 * size / 2,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[1]..".png",
+				glow = 14,
+		})
+		minetest.add_particlespawner({
+				amount = 400 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-2 * size,-2 * size,-2 * size),
+				maxvel = vector.new(2 * size,2 * size,2 * size),
+				minexptime = .6 * size / 2,
+				maxexptime = .9 * size / 2,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[2]..".png",
+				glow = 14,
+		})
+		minetest.add_particlespawner({
+				amount = 100 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-14 * size,-14 * size,-14 * size),
+				maxvel = vector.new(14 * size,14 * size,14 * size),
+				minexptime = .6 * size / 2,
+				maxexptime = .9 * size / 2,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[3]..".png",
+				glow = 14,
+		})
+	elseif particle_pattern == 2 then
+
+		minetest.add_particlespawner({
+				amount = 240 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-5 * size,-5 * size,-5 * size),
+				maxvel = vector.new(5 * size,5 * size,5 * size),
+				minexptime = .6 * size / 2,
+				maxexptime = .9 * size / 2,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[1]..".png",
+				glow = 14,
+		})
+		minetest.add_particlespawner({
+				amount = 500 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-2 * size,-2 * size,-2 * size),
+				maxvel = vector.new(2 * size,2 * size,2 * size),
+				minexptime = .6 * size / 2,
+				maxexptime = .9 * size / 2,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[2]..".png",
+				glow = 14,
+		})
+		minetest.add_particlespawner({
+				amount = 350 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-3 * size,-3 * size,-3 * size),
+				maxvel = vector.new(3 * size,3 * size,3 * size),
+				minexptime = .6 * size / 2,
+				maxexptime = .9 * size / 2,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[3]..".png",
+				glow = 14,
+		})
+	elseif particle_pattern == 3 then
+
+		minetest.add_particlespawner({
+				amount = 400 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-6 * size,-4 * size,-6 * size),
+				maxvel = vector.new(6 * size,4 * size,6 * size),
+				minexptime = .6 * size,
+				maxexptime = .9 * size,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[1]..".png",
+				glow = 14,
+		})
+		minetest.add_particlespawner({
+				amount = 120 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-8 * size,6 * size,-8 * size),
+				maxvel = vector.new(8 * size,6 * size,8 * size),
+				minexptime = .6 * size,
+				maxexptime = .9 * size,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[2]..".png",
+				glow = 14,
+		})
+		minetest.add_particlespawner({
+				amount = 130 * size,
+				time = 0.0001,
+				minpos = self.object:get_pos(),
+				maxpos = self.object:get_pos(),
+				minvel = vector.new(-3 * size,3 * size,-3 * size),
+				maxvel = vector.new(3 * size,3 * size,3 * size),
+				minexptime = .6 * size,
+				maxexptime = .9 * size,
+				minsize = 2 * size,
+				maxsize = 3 * size,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_firework_"..this_colors[3]..".png",
+				glow = 14,
+		})
+	end
+
+	return size
+
+end
+
+local mod_awards = minetest.get_modpath("awards") and minetest.get_modpath("mcl_achievements")
+local mod_button = minetest.get_modpath("mesecons_button")
+
+minetest.register_craftitem("mcl_bows:rocket", {
+	description = S("Arrow"),
+	_tt_help = S("Ammunition").."\n"..S("Damage from bow: 1-10").."\n"..S("Damage from dispenser: 3"),
+	_doc_items_longdesc = S("Arrows are ammunition for bows and dispensers.").."\n"..
+S("An arrow fired from a bow has a regular damage of 1-9. At full charge, there's a 20% chance of a critical hit dealing 10 damage instead. An arrow fired from a dispenser always deals 3 damage.").."\n"..
+S("Arrows might get stuck on solid blocks and can be retrieved again. They are also capable of pushing wooden buttons."),
+	_doc_items_usagehelp = S("To use arrows as ammunition for a bow, just put them anywhere in your inventory, they will be used up automatically. To use arrows as ammunition for a dispenser, place them in the dispenser's inventory. To retrieve an arrow that sticks in a block, simply walk close to it."),
+	inventory_image = "mcl_bows_rocket.png",
+	groups = { ammo=1, ammo_crossbow=1, ammo_bow_regular=1 },
+	_on_dispense = function(itemstack, dispenserpos, droppos, dropnode, dropdir)
+		-- Shoot arrow
+		local shootpos = vector.add(dispenserpos, vector.multiply(dropdir, 0.51))
+		local yaw = math.atan2(dropdir.z, dropdir.x) + YAW_OFFSET
+		mcl_bows.shoot_arrow(itemstack:get_name(), shootpos, dropdir, yaw, nil, 19, 3)
+	end,
+})
+
+
+
+local ARROW_ENTITY={
+	physical = true,
+	pointable = false,
+	visual = "mesh",
+	mesh = "mcl_bows_rocket.obj",
+	visual_size = {x=2.5, y=2.5},
+	textures = {"mcl_bows_rocket.png"},
+	collisionbox = {-0.19, -0.125, -0.19, 0.19, 0.125, 0.19},
+	collide_with_objects = false,
+	_fire_damage_resistant = true,
+
+	_lastpos={},
+	_startpos=nil,
+	_damage=1,	-- Damage on impact
+	_is_critical=false, -- Whether this arrow would deal critical damage
+	_stuck=false,   -- Whether arrow is stuck
+	_fuse=nil,-- Amount of time (in seconds) the arrow has been stuck so far
+	_fuserechecktimer=nil,-- An additional timer for periodically re-checking the stuck status of an arrow
+	_stuckin=nil,	--Position of node in which arow is stuck.
+	_shooter=nil,	-- ObjectRef of player or mob who shot it
+	_is_arrow = true,
+
+	_viscosity=0,   -- Viscosity of node the arrow is currently in
+	_deflection_cooloff=0, -- Cooloff timer after an arrow deflection, to prevent many deflections in quick succession
+}
+
+-- Destroy arrow entity self at pos and drops it as an item
+local function spawn_item(self, pos)
+	if not minetest.is_creative_enabled("") then
+		local item = minetest.add_item(pos, "mcl_bows:rocket")
+		item:set_velocity({x=0, y=0, z=0})
+		item:set_yaw(self.object:get_yaw())
+	end
+	mcl_burning.extinguish(self.object)
+	self.object:remove()
+end
+
+local function damage_particles(pos, is_critical)
+	if is_critical then
+		minetest.add_particlespawner({
+			amount = 15,
+			time = 0.1,
+			minpos = {x=pos.x-0.5, y=pos.y-0.5, z=pos.z-0.5},
+			maxpos = {x=pos.x+0.5, y=pos.y+0.5, z=pos.z+0.5},
+			minvel = {x=-0.1, y=-0.1, z=-0.1},
+			maxvel = {x=0.1, y=0.1, z=0.1},
+			minacc = {x=0, y=0, z=0},
+			maxacc = {x=0, y=0, z=0},
+			minexptime = 1,
+			maxexptime = 2,
+			minsize = 1.5,
+			maxsize = 1.5,
+			collisiondetection = false,
+			vertical = false,
+			texture = "mcl_particles_crit.png^[colorize:#bc7a57:127",
+		})
+	end
+end
+
+function ARROW_ENTITY.on_step(self, dtime)
+	mcl_burning.tick(self.object, dtime, self)
+
+	self._time_in_air = self._time_in_air + .001
+
+
+	local pos = self.object:get_pos()
+	local dpos = table.copy(pos) -- digital pos
+	dpos = vector.round(dpos)
+	local node = minetest.get_node(dpos)
+
+	if not self._fuse then
+		self._fuse = 0
+	end
+	if not self._fuserechecktimer then
+		self._fuserechecktimer = 0
+	end
+
+	self._fuse = self._fuse + dtime
+	self._fuserechecktimer = self._fuserechecktimer + dtime
+
+	if self._fuse > ARROW_TIMEOUT then
+		self._stuck = true
+	end
+	if self._stuck then
+		if self._fuse > ARROW_TIMEOUT then
+			local eploded_particle = particle_explosion(self)
+			damage_explosion(self, eploded_particle * 17)
+			mcl_burning.extinguish(self.object)
+			self.object:remove()
+			return
+		end
+		-- Drop arrow as item when it is no longer stuck
+		-- FIXME: Arrows are a bit slow to react and continue to float in mid air for a few seconds.
+		if self._fuserechecktimer > STUCK_RECHECK_TIME then
+			local stuckin_def
+			if self._stuckin then
+				stuckin_def = minetest.registered_nodes[minetest.get_node(self._stuckin).name]
+			end
+			-- TODO: In MC, arrow just falls down without turning into an item
+			if stuckin_def and stuckin_def.walkable == false then
+				spawn_item(self, pos)
+				return
+			end
+			self._fuserechecktimer = 0
+		end
+		-- Pickup arrow if player is nearby (not in Creative Mode)
+		local objects = minetest.get_objects_inside_radius(pos, 1)
+		for _,obj in ipairs(objects) do
+			if obj:is_player() then
+				if self._collectable and not minetest.is_creative_enabled(obj:get_player_name()) then
+					if obj:get_inventory():room_for_item("main", "mcl_bows:rocket") then
+						obj:get_inventory():add_item("main", "mcl_bows:rocket")
+						minetest.sound_play("item_drop_pickup", {
+							pos = pos,
+							max_hear_distance = 16,
+							gain = 1.0,
+						}, true)
+					end
+				end
+				mcl_burning.extinguish(self.object)
+				self.object:remove()
+				return
+			end
+		end
+
+	-- Check for object "collision". Done every tick (hopefully this is not too stressing)
+	else
+
+		if self._in_player == false then
+			minetest.add_particlespawner({
+				amount = 1,
+				time = .0001,
+				minpos = pos,
+				maxpos = pos,
+				minvel = vector.new(-0.1,-0.1,-0.1),
+				maxvel = vector.new(0.1,0.1,0.1),
+				minexptime = 0.5,
+				maxexptime = 0.5,
+				minsize = 2,
+				maxsize = 2,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mcl_bows_rocket_particle.png",
+				glow = 1,
+			})
+		end
+		-- We just check for any hurtable objects nearby.
+		-- The radius of 3 is fairly liberal, but anything lower than than will cause
+		-- arrow to hilariously go through mobs often.
+		-- TODO: Implement an ACTUAL collision detection (engine support needed).
+		local objs = minetest.get_objects_inside_radius(pos, 1.5)
+		local closest_object
+		local closest_distance
+
+		if self._deflection_cooloff > 0 then
+			self._deflection_cooloff = self._deflection_cooloff - dtime
+		end
+
+		-- Iterate through all objects and remember the closest attackable object
+		for k, obj in pairs(objs) do
+			local ok = false
+			-- Arrows can only damage players and mobs
+			if obj:is_player() then
+				ok = true
+			elseif obj:get_luaentity() then
+				if (obj:get_luaentity()._cmi_is_mob or obj:get_luaentity()._hittable_by_projectile) then
+					ok = true
+				end
+			end
+
+			if ok then
+				local dist = vector.distance(pos, obj:get_pos())
+				if not closest_object or not closest_distance then
+					closest_object = obj
+					closest_distance = dist
+				elseif dist < closest_distance then
+					closest_object = obj
+					closest_distance = dist
+				end
+			end
+		end
+
+		-- If an attackable object was found, we will damage the closest one only
+
+		if closest_object then
+			local obj = closest_object
+			local is_player = obj:is_player()
+			local lua = obj:get_luaentity()
+			if obj == self._shooter and self._time_in_air > 1.02 or obj ~= self._shooter and (is_player or (lua and (lua._cmi_is_mob or lua._hittable_by_projectile))) then
+				if obj:get_hp() > 0 then
+					-- Check if there is no solid node between arrow and object
+					local ray = minetest.raycast(self.object:get_pos(), obj:get_pos(), true)
+					for pointed_thing in ray do
+						if pointed_thing.type == "object" and pointed_thing.ref == closest_object then
+							-- Target reached! We can proceed now.
+							break
+						elseif pointed_thing.type == "node" then
+							local nn = minetest.get_node(minetest.get_pointed_thing_position(pointed_thing)).name
+							local def = minetest.registered_nodes[nn]
+							if (not def) or def.walkable then
+								-- There's a node in the way. Delete arrow without damage
+								mcl_burning.extinguish(self.object)
+								self.object:remove()
+								return
+							end
+						end
+					end
+
+					-- Punch target object but avoid hurting enderman.
+					if not lua or lua.name ~= "mobs_mc:enderman" then
+						if self._in_player == false then
+							damage_particles(self.object:get_pos(), self._is_critical)
+						end
+						if mcl_burning.is_burning(self.object) then
+							mcl_burning.set_on_fire(obj, 5)
+						end
+						if self._in_player == false then
+							obj:punch(self.object, 1.0, {
+								full_punch_interval=1.0,
+								damage_groups={fleshy=self._damage},
+							}, self.object:get_velocity())
+							if obj:is_player() then
+								local eploded_particle = particle_explosion(self)
+								damage_explosion(self, eploded_particle * 17)
+								mcl_burning.extinguish(self.object)
+								self.object:remove()
+							end
+						end
+					end
+
+
+					if is_player then
+						if self._shooter and self._shooter:is_player() and self._in_player == false then
+							-- “Ding” sound for hitting another player
+							minetest.sound_play({name="mcl_bows_hit_player", gain=0.1}, {to_player=self._shooter:get_player_name()}, true)
+						end
+					end
+
+					if lua then
+						local entity_name = lua.name
+						-- Achievement for hitting skeleton, wither skeleton or stray (TODO) with an arrow at least 50 meters away
+						-- NOTE: Range has been reduced because mobs unload much earlier than that ... >_>
+						-- TODO: This achievement should be given for the kill, not just a hit
+						if self._shooter and self._shooter:is_player() and vector.distance(pos, self._startpos) >= 20 then
+							if mod_awards and (entity_name == "mobs_mc:skeleton" or entity_name == "mobs_mc:stray" or entity_name == "mobs_mc:witherskeleton") then
+								awards.unlock(self._shooter:get_player_name(), "mcl:snipeSkeleton")
+							end
+						end
+					end
+					if self._in_player == false then
+						minetest.sound_play({name="mcl_bows_hit_other", gain=0.3}, {pos=self.object:get_pos(), max_hear_distance=16}, true)
+					end
+				end
+				if not obj:is_player() then
+					mcl_burning.extinguish(self.object)
+					if self._piercing == 0 then
+						local eploded_particle = particle_explosion(self)
+						damage_explosion(self, eploded_particle * 17)
+						self.object:remove()
+					end
+				end
+				return
+			end
+		end
+	end
+
+	-- Check for node collision
+	if self._lastpos.x~=nil and not self._stuck then
+		local def = minetest.registered_nodes[node.name]
+		local vel = self.object:get_velocity()
+		-- Arrow has stopped in one axis, so it probably hit something.
+		-- This detection is a bit clunky, but sadly, MT does not offer a direct collision detection for us. :-(
+		if (math.abs(vel.x) < 0.0001) or (math.abs(vel.z) < 0.0001) or (math.abs(vel.y) < 0.00001) then
+			-- Check for the node to which the arrow is pointing
+			local dir
+			if math.abs(vel.y) < 0.00001 then
+				if self._lastpos.y < pos.y then
+					dir = {x=0, y=1, z=0}
+				else
+					dir = {x=0, y=-1, z=0}
+				end
+			else
+				dir = minetest.facedir_to_dir(minetest.dir_to_facedir(minetest.yaw_to_dir(self.object:get_yaw()-YAW_OFFSET)))
+			end
+			self._stuckin = vector.add(dpos, dir)
+			local snode = minetest.get_node(self._stuckin)
+			local sdef = minetest.registered_nodes[snode.name]
+
+			-- If node is non-walkable, unknown or ignore, don't make arrow stuck.
+			-- This causes a deflection in the engine.
+			if not sdef or sdef.walkable == false or snode.name == "ignore" then
+				self._stuckin = nil
+				if self._deflection_cooloff <= 0 then
+					-- Lose 1/3 of velocity on deflection
+					local newvel = vector.multiply(vel, 0.6667)
+
+					self.object:set_velocity(newvel)
+					-- Reset deflection cooloff timer to prevent many deflections happening in quick succession
+					self._deflection_cooloff = 1.0
+				end
+			else
+
+				-- Node was walkable, make arrow stuck
+				self._stuck = true
+				self._fuserechecktimer = 0
+
+				self.object:set_velocity({x=0, y=0, z=0})
+				self.object:set_acceleration({x=0, y=0, z=0})
+
+				minetest.sound_play({name="mcl_bows_hit_other", gain=0.3}, {pos=self.object:get_pos(), max_hear_distance=16}, true)
+
+				if mcl_burning.is_burning(self.object) and snode.name == "mcl_tnt:tnt" then
+					tnt.ignite(self._stuckin)
+				end
+
+				-- Push the button! Push, push, push the button!
+				if mod_button and minetest.get_item_group(node.name, "button") > 0 and minetest.get_item_group(node.name, "button_push_by_arrow") == 1 then
+					local bdir = minetest.wallmounted_to_dir(node.param2)
+					-- Check the button orientation
+					if vector.equals(vector.add(dpos, bdir), self._stuckin) then
+						mesecon.push_button(dpos, node)
+					end
+				end
+			end
+		elseif (def and def.liquidtype ~= "none") then
+			-- Slow down arrow in liquids
+			local v = def.liquid_viscosity
+			if not v then
+				v = 0
+			end
+			--local old_v = self._viscosity
+			self._viscosity = v
+			local vpenalty = math.max(0.1, 0.98 - 0.1 * v)
+			if math.abs(vel.x) > 0.001 then
+				vel.x = vel.x * vpenalty
+			end
+			if math.abs(vel.z) > 0.001 then
+				vel.z = vel.z * vpenalty
+			end
+			self.object:set_velocity(vel)
+		end
+	end
+
+	-- Update yaw
+	if not self._stuck then
+		local vel = self.object:get_velocity()
+		local yaw = minetest.dir_to_yaw(vel)+YAW_OFFSET
+		local pitch = dir_to_pitch(vel)
+		self.object:set_rotation({ x = 0, y = yaw, z = pitch })
+	end
+
+	-- Update internal variable
+	self._lastpos={x=pos.x, y=pos.y, z=pos.z}
+end
+
+-- Force recheck of stuck arrows when punched.
+-- Otherwise, punching has no effect.
+function ARROW_ENTITY.on_punch(self)
+	if self._stuck then
+		self._fuserechecktimer = STUCK_RECHECK_TIME
+	end
+end
+
+function ARROW_ENTITY.get_staticdata(self)
+	local out = {
+		lastpos = self._lastpos,
+		startpos = self._startpos,
+		damage = self._damage,
+		is_critical = self._is_critical,
+		stuck = self._stuck,
+		stuckin = self._stuckin,
+	}
+	if self._stuck then
+		-- If _fuse is missing for some reason, assume the maximum
+		if not self._fuse then
+			self._fuse = ARROW_TIMEOUT
+		end
+		out.stuckstarttime = minetest.get_gametime() - self._fuse
+	end
+	if self._shooter and self._shooter:is_player() then
+		out.shootername = self._shooter:get_player_name()
+	end
+	return minetest.serialize(out)
+end
+
+function ARROW_ENTITY.on_activate(self, staticdata, dtime_s)
+	self._time_in_air = 1.0
+	self._in_player = false
+	local data = minetest.deserialize(staticdata)
+	if data then
+		self._stuck = data.stuck
+		if data.stuck then
+			if data.stuckstarttime then
+				-- First, check if the stuck arrow is aleady past its life timer.
+				-- If yes, delete it.
+				self._fuse = minetest.get_gametime() - data.stuckstarttime
+				if self._fuse > ARROW_TIMEOUT then
+					mcl_burning.extinguish(self.object)
+					self.object:remove()
+					return
+				end
+			end
+
+			self._fuse = 2
+			-- Perform a stuck recheck on the next step.
+			self._fuserechecktimer = STUCK_RECHECK_TIME
+
+			self._stuckin = data.stuckin
+		end
+
+		-- Get the remaining arrow state
+		self._lastpos = data.lastpos
+		self._startpos = data.startpos
+		self._damage = data.damage
+		self._is_critical = data.is_critical
+		if data.shootername then
+			local shooter = minetest.get_player_by_name(data.shootername)
+			if shooter and shooter:is_player() then
+				self._shooter = shooter
+			end
+		end
+	end
+	self.object:set_armor_groups({ immortal = 1 })
+end
+
+minetest.register_entity("mcl_bows:rocket_entity", ARROW_ENTITY)
+
+if minetest.get_modpath("mcl_core") and minetest.get_modpath("mcl_mobitems") then
+	minetest.register_craft({
+		output = "mcl_bows:rocket 1",
+		recipe = {
+			{"mcl_core:paper"},
+			{"mcl_fireworks:rocket_2"},
+			{"mcl_bows:arrow"},
+		}
+	})
+end
+
+if minetest.get_modpath("doc_identifier") then
+	doc.sub.identifier.register_object("mcl_bows:rocket_entity", "craftitems", "mcl_bows:rocket")
+end
diff --git a/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_0.ogg b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_0.ogg
new file mode 100644
index 0000000000..f4f81b3074
Binary files /dev/null and b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_0.ogg differ
diff --git a/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_1.ogg b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_1.ogg
new file mode 100644
index 0000000000..c8c06b4fac
Binary files /dev/null and b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_1.ogg differ
diff --git a/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_2.ogg b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_2.ogg
new file mode 100644
index 0000000000..4ddd20c422
Binary files /dev/null and b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_drawback_2.ogg differ
diff --git a/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_load.ogg b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_load.ogg
new file mode 100644
index 0000000000..02d2fd1afc
Binary files /dev/null and b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_load.ogg differ
diff --git a/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_shoot.ogg b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_shoot.ogg
new file mode 100644
index 0000000000..a7d7b69d12
Binary files /dev/null and b/mods/ITEMS/mcl_bows/sounds/mcl_bows_crossbow_shoot.ogg differ
diff --git a/mods/ITEMS/mcl_bows/sounds/mcl_bows_firework.ogg b/mods/ITEMS/mcl_bows/sounds/mcl_bows_firework.ogg
new file mode 100644
index 0000000000..ea9a4c4be5
Binary files /dev/null and b/mods/ITEMS/mcl_bows/sounds/mcl_bows_firework.ogg differ
diff --git a/mods/ITEMS/mcl_bows/sounds/mcl_bows_firework_soft.ogg b/mods/ITEMS/mcl_bows/sounds/mcl_bows_firework_soft.ogg
new file mode 100644
index 0000000000..8b2e7bc5bd
Binary files /dev/null and b/mods/ITEMS/mcl_bows/sounds/mcl_bows_firework_soft.ogg differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow.png
new file mode 100644
index 0000000000..b688dab947
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_0.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_0.png
new file mode 100644
index 0000000000..41daad6d84
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_0.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_1.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_1.png
new file mode 100644
index 0000000000..3769f2967b
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_1.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_2.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_2.png
new file mode 100644
index 0000000000..b1bb50feb2
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_2.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_3.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_3.png
new file mode 100644
index 0000000000..8a8f1b03fc
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_crossbow_3.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_blue.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_blue.png
new file mode 100644
index 0000000000..608dbe0d0f
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_blue.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_green.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_green.png
new file mode 100644
index 0000000000..acd74d6d1c
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_green.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_red.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_red.png
new file mode 100644
index 0000000000..4d7355c57a
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_red.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_white.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_white.png
new file mode 100644
index 0000000000..1860ee53c5
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_white.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_yellow.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_yellow.png
new file mode 100644
index 0000000000..c2b745def7
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_firework_yellow.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_rocket.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_rocket.png
new file mode 100644
index 0000000000..800185ce08
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_rocket.png differ
diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_rocket_particle.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_rocket_particle.png
new file mode 100644
index 0000000000..12a894c721
Binary files /dev/null and b/mods/ITEMS/mcl_bows/textures/mcl_bows_rocket_particle.png differ
diff --git a/mods/ITEMS/mcl_brewing/mod.conf b/mods/ITEMS/mcl_brewing/mod.conf
index 2c27c979e7..0f6217f098 100644
--- a/mods/ITEMS/mcl_brewing/mod.conf
+++ b/mods/ITEMS/mcl_brewing/mod.conf
@@ -1,4 +1,4 @@
 name = mcl_brewing
 author = bzoss
 depends = mcl_init, mcl_formspec, mcl_sounds, mcl_potions, mcl_mobitems
-optional_depends = mcl_core, doc, screwdriver
+optional_depends = mcl_core, doc, screwdriver, mesecons_mvps
diff --git a/mods/ITEMS/mcl_buckets/API.md b/mods/ITEMS/mcl_buckets/API.md
index 53f7d36989..94ec48de54 100644
--- a/mods/ITEMS/mcl_buckets/API.md
+++ b/mods/ITEMS/mcl_buckets/API.md
@@ -9,13 +9,46 @@ Accept folowing params:
 	* string: name of the node to place
 	* function(pos): will returns name of the node to place with pos being the placement position
 * source_take: table of liquid source node names to take
-* itemname: itemstring of the new bucket item (or nil if liquid is not takeable)
+* bucketname: itemstring of the new bucket item
 * inventory_image: texture of the new bucket item (ignored if itemname == nil)
 * name: user-visible bucket description
 * longdesc: long explanatory description (for help)
 * usagehelp: short usage explanation (for help)
 * tt_help: very short tooltip help
-* extra_check(pos, placer): (optional) function(pos) which can returns false to avoid placing the liquid. Placer is object/player who is placing the liquid, can be nil.
+* extra_check(pos, placer): (optional) function(pos)
 * groups: optional list of item groups
 
-This function can be called from any mod (which depends on this one)
\ No newline at end of file
+
+**Usage exemple:**
+```lua
+mcl_buckets.register_liquid({
+	bucketname = "dummy:bucket_dummy",
+	--source_place = "dummy:dummy_source",
+	source_place = function(pos)
+		if condition then
+			return "dummy:dummy_source"
+		else
+			return "dummy:dummy_source_nether"
+		end
+	end,
+	source_take = {"dummy:dummy_source"},
+	inventory_image = "bucket_dummy.png",
+	name = S("Dummy liquid Bucket"),
+	longdesc = S("This bucket is filled with a dummy liquid."),
+	usagehelp = S("Place it to empty the bucket and create a dummy liquid source."),
+	tt_help = S("Places a dummy liquid source"),
+	extra_check = function(pos, placer)
+		--pos = pos where the liquid should be placed
+		--placer people who tried to place the bucket (can be nil)
+
+		--no liquid node will be placed
+		--the bucket will not be emptied
+		--return false, false
+
+		--liquid node will be placed
+		--the bucket will be emptied
+		return true, true
+	end,
+	groups = { dummy_group = 123 },
+})
+```
\ No newline at end of file
diff --git a/mods/ITEMS/mcl_buckets/README.txt b/mods/ITEMS/mcl_buckets/README.md
similarity index 67%
rename from mods/ITEMS/mcl_buckets/README.txt
rename to mods/ITEMS/mcl_buckets/README.md
index 06862d5894..b783cc1337 100644
--- a/mods/ITEMS/mcl_buckets/README.txt
+++ b/mods/ITEMS/mcl_buckets/README.md
@@ -1,9 +1,12 @@
-Bucket mod.
-Originally taken from Minetest Game, adapted for MineClone 2.
+# MineClone2 Bucket (`mcl_bucket`)
+Originally taken from Minetest Game, adapted for MineClone2.
+
+This mod add buckets to the game, including an API to register your own (see `API.md`).
+
+## License
 
-License of source code:
------------------------
 Copyright (C) 2011-2012 Kahrl <kahrl@gmx.net>
+
 Copyright (C) 2011-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/mods/ITEMS/mcl_buckets/init.lua b/mods/ITEMS/mcl_buckets/init.lua
index 90ccec636e..931214b95c 100644
--- a/mods/ITEMS/mcl_buckets/init.lua
+++ b/mods/ITEMS/mcl_buckets/init.lua
@@ -3,6 +3,7 @@ local modname = minetest.get_current_modname()
 local S = minetest.get_translator(modname)
 local modpath = minetest.get_modpath(modname)
 
+-- Compatibility with old bucket mod
 minetest.register_alias("bucket:bucket_empty", "mcl_buckets:bucket_empty")
 minetest.register_alias("bucket:bucket_water", "mcl_buckets:bucket_water")
 minetest.register_alias("bucket:bucket_lava", "mcl_buckets:bucket_lava")
@@ -11,13 +12,24 @@ local mod_doc = minetest.get_modpath("doc")
 local mod_mcl_core = minetest.get_modpath("mcl_core")
 --local mod_mclx_core = minetest.get_modpath("mclx_core")
 
+-- Localize some functions for faster access
+local vector = vector
+local math = math
+local string = string
+
+local raycast = minetest.raycast
+local get_node = minetest.get_node
+local add_node = minetest.add_node
+local add_item = minetest.add_item
+
+
 if mod_mcl_core then
 	minetest.register_craft({
 		output = "mcl_buckets:bucket_empty 1",
 		recipe = {
 			{"mcl_core:iron_ingot", "", "mcl_core:iron_ingot"},
 			{"", "mcl_core:iron_ingot", ""},
-		}
+		},
 	})
 end
 
@@ -25,147 +37,218 @@ mcl_buckets = {}
 mcl_buckets.liquids = {}
 
 -- Sound helper functions for placing and taking liquids
-local sound_place = function(itemname, pos)
+local function sound_place(itemname, pos)
 	local def = minetest.registered_nodes[itemname]
 	if def and def.sounds and def.sounds.place then
 		minetest.sound_play(def.sounds.place, {gain=1.0, pos = pos, pitch = 1 + math.random(-10, 10)*0.005}, true)
 	end
 end
 
-local sound_take = function(itemname, pos)
+local function sound_take(itemname, pos)
 	local def = minetest.registered_nodes[itemname]
 	if def and def.sounds and def.sounds.dug then
 		minetest.sound_play(def.sounds.dug, {gain=1.0, pos = pos, pitch = 1 + math.random(-10, 10)*0.005}, true)
 	end
 end
 
-local place_liquid = function(pos, itemstring)
+local function place_liquid(pos, itemstring)
 	local fullness = minetest.registered_nodes[itemstring].liquid_range
 	sound_place(itemstring, pos)
 	minetest.add_node(pos, {name=itemstring, param2=fullness})
 end
 
+local function give_bucket(new_bucket, itemstack, user)
+	local inv = user:get_inventory()
+	if minetest.is_creative_enabled(user:get_player_name()) then
+		--TODO: is a full bucket added if inv doesn't contain one?
+		return itemstack
+	else
+		if itemstack:get_count() == 1 then
+			return new_bucket
+		else
+			if inv:room_for_item("main", new_bucket) then
+				inv:add_item("main", new_bucket)
+			else
+				add_item(user:get_pos(), new_bucket)
+			end
+			itemstack:take_item()
+			return itemstack
+		end
+	end
+end
+
+local pointable_sources = {}
+
+local function bucket_raycast(user)
+	--local pos = user:get_pos()
+	local pos = user:get_pos()
+	--local pos = vector.add(user:get_pos(), user:get_bone_position("Head_Control"))
+	pos.y = pos.y + user:get_properties().eye_height
+	local look_dir = user:get_look_dir()
+	look_dir = vector.multiply(look_dir, 5)
+	local pos2 = vector.add(pos, look_dir)
+
+	local ray = raycast(pos, pos2, false, true)
+	if ray then
+		for pointed_thing in ray do
+			if pointed_thing and pointable_sources[get_node(pointed_thing.above).name] then
+				--minetest.chat_send_all("found!")
+				return {under=pointed_thing.under,above=pointed_thing.above}
+			end
+		end
+	end
+	return nil
+end
+
+local function get_node_place(source_place, place_pos)
+	local node_place
+	if type(source_place) == "function" then
+		node_place = source_place(place_pos)
+	else
+		node_place = source_place
+	end
+	return node_place
+end
+
+local function get_extra_check(check, pos, user)
+	local result
+	local take_bucket
+	if check then
+		result, take_bucket = check(pos, user)
+		if result == nil then result = true end
+		if take_bucket == nil then take_bucket = true end
+	else
+		result = true
+		take_bucket = true
+	end
+	return result, take_bucket
+end
+
+local function get_bucket_drop(itemstack, user, take_bucket)
+	-- Handle bucket item and inventory stuff
+	if take_bucket and not minetest.is_creative_enabled(user:get_player_name()) then
+		-- Add empty bucket and put it into inventory, if possible.
+		-- Drop empty bucket otherwise.
+		local new_bucket = ItemStack("mcl_buckets:bucket_empty")
+		if itemstack:get_count() == 1 then
+			return new_bucket
+		else
+			local inv = user:get_inventory()
+			if inv:room_for_item("main", new_bucket) then
+				inv:add_item("main", new_bucket)
+			else
+				add_item(user:get_pos(), new_bucket)
+			end
+			itemstack:take_item()
+			return itemstack
+		end
+	else
+		return itemstack
+	end
+end
+
 function mcl_buckets.register_liquid(def)
-	for i=1, #def.source_take do
-		mcl_buckets.liquids[def.source_take[i]] = {
+	for _,source in ipairs(def.source_take) do
+		mcl_buckets.liquids[source] = {
 			source_place = def.source_place,
-			source_take = def.source_take[i],
+			source_take = source,
 			on_take = def.on_take,
-			itemname = def.itemname,
+			bucketname = def.bucketname,
 		}
+		pointable_sources[source] = true
 		if type(def.source_place) == "string" then
-			mcl_buckets.liquids[def.source_place] = mcl_buckets.liquids[def.source_take[i]]
+			mcl_buckets.liquids[def.source_place] = mcl_buckets.liquids[source]
 		end
 	end
 
-	if def.itemname then
-		minetest.register_craftitem(def.itemname, {
-			description = def.name,
-			_doc_items_longdesc = def.longdesc,
-			_doc_items_usagehelp = def.usagehelp,
-			_tt_help = def.tt_help,
-			inventory_image = def.inventory_image,
-			stack_max = 1,
-			groups = def.groups,
-			on_place = function(itemstack, user, pointed_thing)
-				-- Must be pointing to node
-				if pointed_thing.type ~= "node" then
-					return
-				end
+	if def.bucketname == nil or def.bucketname == "" then
+		error(string.format("[mcl_bucket] Invalid itemname then registering [%s]!", def.name))
+	end
 
-				local node = minetest.get_node(pointed_thing.under)
-				local place_pos = pointed_thing.under
-				local nn = node.name
-				local nodedef = minetest.registered_nodes[nn]
-				-- Call on_rightclick if the pointed node defines it
-				if user and not user:get_player_control().sneak then
-					if nodedef and nodedef.on_rightclick then
-						return nodedef.on_rightclick(place_pos, node, user, itemstack) or itemstack
-					end
-				end
+	minetest.register_craftitem(def.bucketname, {
+		description = def.name,
+		_doc_items_longdesc = def.longdesc,
+		_doc_items_usagehelp = def.usagehelp,
+		_tt_help = def.tt_help,
+		inventory_image = def.inventory_image,
+		stack_max = 1,
+		groups = def.groups,
+		on_place = function(itemstack, user, pointed_thing)
+			-- Must be pointing to node
+			if pointed_thing.type ~= "node" then
+				return
+			end
+			-- Call on_rightclick if the pointed node defines it
+			local new_stack = mcl_util.call_on_rightclick(itemstack, user, pointed_thing)
+			if new_stack then
+				return new_stack
+			end
 
-				local node_place
-				if type(def.source_place) == "function" then
-					node_place = def.source_place(place_pos)
-				else
-					node_place = def.source_place
-				end
-				-- Check if pointing to a buildable node
-				--local item = itemstack:get_name()
+			local undernode = get_node(pointed_thing.under)
+			local abovenode = get_node(pointed_thing.above)
+			local buildable1 = minetest.registered_nodes[undernode.name] and minetest.registered_nodes[undernode.name].buildable_to
+			local buildable2 = minetest.registered_nodes[abovenode.name] and minetest.registered_nodes[abovenode.name].buildable_to
+			if not buildable1 and not buildable2 then return itemstack end --if both nodes aren't buildable_to, skip
 
-				if def.extra_check and def.extra_check(place_pos, user) == true and nodedef and nodedef.buildable_to then
-					-- buildable; replace the node
+			if buildable1 then
+				local result, take_bucket = get_extra_check(def.extra_check, pointed_thing.under, user)
+				if result then
+					local node_place = get_node_place(def.source_place, pointed_thing.under)
 					local pns = user:get_player_name()
-					if minetest.is_protected(place_pos, pns) then
-						minetest.record_protection_violation(place_pos, pns)
+
+					-- Check protection
+					if minetest.is_protected(pointed_thing.under, pns) then
+						minetest.record_protection_violation(pointed_thing.under, pns)
 						return itemstack
 					end
-					place_liquid(place_pos, node_place)
+
+					-- Place liquid
+					place_liquid(pointed_thing.under, node_place)
+
+					-- Update doc mod
 					if mod_doc and doc.entry_exists("nodes", node_place) then
 						doc.mark_entry_as_revealed(user:get_player_name(), "nodes", node_place)
 					end
-				else
-					-- not buildable to; place the liquid above
-					-- check if the node above can be replaced
-					local abovenode = minetest.get_node(pointed_thing.above)
-					if minetest.registered_nodes[abovenode.name] and minetest.registered_nodes[abovenode.name].buildable_to then
-						local pn = user:get_player_name()
-						if minetest.is_protected(pointed_thing.above, pn) then
-							minetest.record_protection_violation(pointed_thing.above, pn)
-							return itemstack
-						end
-						place_liquid(pointed_thing.above, node_place)
-						if mod_doc and doc.entry_exists("nodes", node_place) then
-							doc.mark_entry_as_revealed(user:get_player_name(), "nodes", node_place)
-						end
-					else
-						-- do not remove the bucket with the liquid
-						return
-					end
 				end
+				return get_bucket_drop(itemstack, user, take_bucket)
+			elseif buildable2 then
+				local result, take_bucket = get_extra_check(def.extra_check, pointed_thing.above, user)
+				if result then
+					local node_place = get_node_place(def.source_place, pointed_thing.above)
+					local pns = user:get_player_name()
 
-				-- Handle bucket item and inventory stuff
-				if not minetest.is_creative_enabled(user:get_player_name()) then
-					-- Add empty bucket and put it into inventory, if possible.
-					-- Drop empty bucket otherwise.
-					local new_bucket = ItemStack("mcl_buckets:bucket_empty")
-					if itemstack:get_count() == 1 then
-						return new_bucket
-					else
-						local inv = user:get_inventory()
-						if inv:room_for_item("main", new_bucket) then
-							inv:add_item("main", new_bucket)
-						else
-							minetest.add_item(user:get_pos(), new_bucket)
-						end
-						itemstack:take_item()
+					-- Check protection
+					if minetest.is_protected(pointed_thing.above, pns) then
+						minetest.record_protection_violation(pointed_thing.above, pns)
 						return itemstack
 					end
-				else
-					return
-				end
-			end,
-			_on_dispense = function(stack, pos, droppos, dropnode, dropdir)
-				--local iname = stack:get_name()
-				local buildable = minetest.registered_nodes[dropnode.name].buildable_to or dropnode.name == "mcl_portals:portal"
 
-				--if def.extra_check and def.extra_check(droppos, nil) == false then
-					-- Fail placement of liquid
-				if def.extra_check and def.extra_check(droppos, nil) == true and buildable then
-					-- buildable; replace the node
-					local node_place
-					if type(def.source_place) == "function" then
-						node_place = def.source_place(droppos)
-					else
-						node_place = def.source_place
+					-- Place liquid
+					place_liquid(pointed_thing.above, node_place)
+
+					-- Update doc mod
+					if mod_doc and doc.entry_exists("nodes", node_place) then
+						doc.mark_entry_as_revealed(user:get_player_name(), "nodes", node_place)
 					end
-					place_liquid(droppos, node_place)
-					stack:set_name("mcl_buckets:bucket_empty")
 				end
-				return stack
-			end,
-		})
-	end
+				return get_bucket_drop(itemstack, user, take_bucket)
+			else
+				return itemstack
+			end
+		end,
+		_on_dispense = function(stack, pos, droppos, dropnode, dropdir)
+			local buildable = minetest.registered_nodes[dropnode.name].buildable_to or dropnode.name == "mcl_portals:portal"
+			if not buildable then return stack end
+			local result, take_bucket = get_extra_check(def.extra_check, droppos, nil)
+			if result then -- Fail placement of liquid if result is false
+				place_liquid(droppos, get_node_place(def.source_place, droppos))
+			end
+			if take_bucket then
+				stack:set_name("mcl_buckets:bucket_empty")
+			end
+			return stack
+		end,
+	})
 end
 
 minetest.register_craftitem("mcl_buckets:bucket_empty", {
@@ -173,8 +256,7 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
 	_doc_items_longdesc = S("A bucket can be used to collect and release liquids."),
 	_doc_items_usagehelp = S("Punch a liquid source to collect it. You can then use the filled bucket to place the liquid somewhere else."),
 	_tt_help = S("Collects liquids"),
-
-	liquids_pointable = true,
+	--liquids_pointable = true,
 	inventory_image = "bucket.png",
 	stack_max = 16,
 	on_place = function(itemstack, user, pointed_thing)
@@ -184,74 +266,70 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
 		end
 
 		-- Call on_rightclick if the pointed node defines it
+		local new_stack = mcl_util.call_on_rightclick(itemstack, user, pointed_thing)
+		if new_stack then
+			return new_stack
+		end
+
 		local node = minetest.get_node(pointed_thing.under)
 		local nn = node.name
-		if user and not user:get_player_control().sneak then
-			if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
-				return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
-			end
-		end
 
-		-- Can't steal liquids
-		if minetest.is_protected(pointed_thing.above, user:get_player_name()) then
-			minetest.record_protection_violation(pointed_thing.under, user:get_player_name())
-			return itemstack
-		end
-
-		-- Check if pointing to a liquid source
-		local liquiddef = mcl_buckets.liquids[nn]
 		local new_bucket
-		if liquiddef and liquiddef.itemname and (nn == liquiddef.source_take) then
-
-			-- Fill bucket, but not in Creative Mode
-			if not minetest.is_creative_enabled(user:get_player_name()) then
-				new_bucket = ItemStack({name = liquiddef.itemname})
-				if liquiddef.on_take then
-					liquiddef.on_take(user)
-				end
+		local liquid_node = bucket_raycast(user)
+		if liquid_node then
+			if minetest.is_protected(liquid_node.above, user:get_player_name()) then
+				minetest.record_protection_violation(liquid_node.above, user:get_player_name())
 			end
+			local liquid_name = get_node(liquid_node.above).name
+			if liquid_name then
+				local liquid_def = mcl_buckets.liquids[liquid_name]
+				if liquid_def then
+					--minetest.chat_send_all("test")
+					-- Fill bucket, but not in Creative Mode
+					-- FIXME: remove this line
+					--if not minetest.is_creative_enabled(user:get_player_name()) then
+					if not false then
+						new_bucket = ItemStack({name = liquid_def.bucketname})
+						if liquid_def.on_take then
+							liquid_def.on_take(user)
+						end
+					end
+					add_node(liquid_node.above, {name="air"})
+					sound_take(nn, liquid_node.above)
 
-			minetest.add_node(pointed_thing.under, {name="air"})
-			sound_take(nn, pointed_thing.under)
-
-			if mod_doc and doc.entry_exists("nodes", nn) then
-				doc.mark_entry_as_revealed(user:get_player_name(), "nodes", nn)
-			end
-
-		elseif nn == "mcl_cauldrons:cauldron_3" then
-			-- Take water out of full cauldron
-			minetest.set_node(pointed_thing.under, {name="mcl_cauldrons:cauldron"})
-			if not minetest.is_creative_enabled(user:get_player_name()) then
-				new_bucket = ItemStack("mcl_buckets:bucket_water")
-			end
-			sound_take("mcl_core:water_source", pointed_thing.under)
-		elseif nn == "mcl_cauldrons:cauldron_3r" then
-			-- Take river water out of full cauldron
-			minetest.set_node(pointed_thing.under, {name="mcl_cauldrons:cauldron"})
-			if not minetest.is_creative_enabled(user:get_player_name()) then
-				new_bucket = ItemStack("mcl_buckets:bucket_river_water")
-			end
-			sound_take("mclx_core:river_water_source", pointed_thing.under)
-		end
-
-		-- Add liquid bucket and put it into inventory, if possible.
-		-- Drop new bucket otherwise.
-		if new_bucket then
-			if itemstack:get_count() == 1 then
-				return new_bucket
-			else
-				local inv = user:get_inventory()
-				if inv:room_for_item("main", new_bucket) then
-					inv:add_item("main", new_bucket)
+					if mod_doc and doc.entry_exists("nodes", liquid_name) then
+						doc.mark_entry_as_revealed(user:get_player_name(), "nodes", liquid_name)
+					end
+					if new_bucket then
+						return give_bucket(new_bucket, itemstack, user)
+					end
 				else
-					minetest.add_item(user:get_pos(), new_bucket)
+					minetest.log("error", string.format("[mcl_buckets] Node [%s] has invalid group [_mcl_bucket_pointable]!", liquid_name))
 				end
-				if not minetest.is_creative_enabled(user:get_player_name()) then
-					itemstack:take_item()
-				end
-				return itemstack
 			end
-		end
+			return itemstack
+		else
+			-- FIXME: replace this ugly code by cauldrons API
+			if nn == "mcl_cauldrons:cauldron_3" then
+				-- Take water out of full cauldron
+				minetest.set_node(pointed_thing.under, {name="mcl_cauldrons:cauldron"})
+				if not minetest.is_creative_enabled(user:get_player_name()) then
+					new_bucket = ItemStack("mcl_buckets:bucket_water")
+				end
+				sound_take("mcl_core:water_source", pointed_thing.under)
+			elseif nn == "mcl_cauldrons:cauldron_3r" then
+				-- Take river water out of full cauldron
+				minetest.set_node(pointed_thing.under, {name="mcl_cauldrons:cauldron"})
+				if not minetest.is_creative_enabled(user:get_player_name()) then
+					new_bucket = ItemStack("mcl_buckets:bucket_river_water")
+				end
+				sound_take("mclx_core:river_water_source", pointed_thing.under)
+			end
+			if new_bucket then
+				return give_bucket(new_bucket, itemstack, user)
+			end
+        end
+        return itemstack
 	end,
 	_on_dispense = function(stack, pos, droppos, dropnode, dropdir)
 		-- Fill empty bucket with liquid or drop bucket if no liquid
@@ -259,9 +337,9 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
 
 		local liquiddef = mcl_buckets.liquids[dropnode.name]
 		local new_bucket
-		if liquiddef and liquiddef.itemname and (dropnode.name  == liquiddef.source_take) then
+		if liquiddef and liquiddef.bucketname and (dropnode.name  == liquiddef.source_take) then
 			-- Fill bucket
-			new_bucket = ItemStack({name = liquiddef.itemname})
+			new_bucket = ItemStack({name = liquiddef.bucketname})
 			sound_take(dropnode.name, droppos)
 			collect_liquid = true
 		end
diff --git a/mods/ITEMS/mcl_buckets/mod.conf b/mods/ITEMS/mcl_buckets/mod.conf
index 5a78e70ada..0d7b764b87 100644
--- a/mods/ITEMS/mcl_buckets/mod.conf
+++ b/mods/ITEMS/mcl_buckets/mod.conf
@@ -1,6 +1,6 @@
 name = mcl_buckets
 author = Kahrl
 description =
-depends = mcl_worlds
+depends = mcl_worlds, mcl_util
 optional_depends = mcl_core, mclx_core, doc
  
diff --git a/mods/ITEMS/mcl_buckets/register.lua b/mods/ITEMS/mcl_buckets/register.lua
index 863aa074c2..1a7c8fe141 100644
--- a/mods/ITEMS/mcl_buckets/register.lua
+++ b/mods/ITEMS/mcl_buckets/register.lua
@@ -3,7 +3,7 @@ local mod_mcl_core = minetest.get_modpath("mcl_core")
 local mod_mclx_core = minetest.get_modpath("mclx_core")
 local has_awards = minetest.get_modpath("awards")
 
-local sound_place = function(itemname, pos)
+local function sound_place(itemname, pos)
 	local def = minetest.registered_nodes[itemname]
 	if def and def.sounds and def.sounds.place then
 		minetest.sound_play(def.sounds.place, {gain=1.0, pos = pos, pitch = 1 + math.random(-10, 10)*0.005}, true)
@@ -34,7 +34,7 @@ if mod_mcl_core then
                 awards.unlock(user:get_player_name(), "mcl:hotStuff")
             end
         end,
-		itemname = "mcl_buckets:bucket_lava",
+		bucketname = "mcl_buckets:bucket_lava",
 		inventory_image = "bucket_lava.png",
 		name = S("Lava Bucket"),
 		longdesc = S("A bucket can be used to collect and release liquids. This one is filled with hot lava, safely contained inside. Use with caution."),
@@ -46,22 +46,13 @@ if mod_mcl_core then
 	mcl_buckets.register_liquid({
 		source_place = "mcl_core:water_source",
 		source_take = {"mcl_core:water_source"},
-		itemname = "mcl_buckets:bucket_water",
+		bucketname = "mcl_buckets:bucket_water",
 		inventory_image = "bucket_water.png",
 		name = S("Water Bucket"),
 		longdesc = S("A bucket can be used to collect and release liquids. This one is filled with water."),
 		usagehelp = S("Place it to empty the bucket and create a water source."),
 		tt_help = S("Places a water source"),
 		extra_check = function(pos, placer)
-			-- Check protection
-			local placer_name = ""
-			if placer then
-				placer_name = placer:get_player_name()
-			end
-			if placer and minetest.is_protected(pos, placer_name) then
-				minetest.record_protection_violation(pos, placer_name)
-				return false
-			end
 			local nn = minetest.get_node(pos).name
 			-- Pour water into cauldron
 			if minetest.get_item_group(nn, "cauldron") ~= 0 then
@@ -70,13 +61,13 @@ if mod_mcl_core then
 					minetest.set_node(pos, {name="mcl_cauldrons:cauldron_3"})
 				end
 				sound_place("mcl_core:water_source", pos)
-				return false
+				return false, true
 			-- Evaporate water if used in Nether (except on cauldron)
 			else
 				local dim = mcl_worlds.pos_to_dimension(pos)
 				if dim == "nether" then
 					minetest.sound_play("fire_extinguish_flame", {pos = pos, gain = 0.25, max_hear_distance = 16}, true)
-					return false
+					return false, true
 				end
 			end
 		end,
@@ -89,22 +80,13 @@ if mod_mclx_core then
 	mcl_buckets.register_liquid({
 		source_place = "mclx_core:river_water_source",
 		source_take = {"mclx_core:river_water_source"},
-		itemname = "mcl_buckets:bucket_river_water",
+		bucketname = "mcl_buckets:bucket_river_water",
 		inventory_image = "bucket_river_water.png",
 		name = S("River Water Bucket"),
 		longdesc = S("A bucket can be used to collect and release liquids. This one is filled with river water."),
 		usagehelp = S("Place it to empty the bucket and create a river water source."),
 		tt_help = S("Places a river water source"),
 		extra_check = function(pos, placer)
-			-- Check protection
-			local placer_name = ""
-			if placer then
-				placer_name = placer:get_player_name()
-			end
-			if placer and minetest.is_protected(pos, placer_name) then
-				minetest.record_protection_violation(pos, placer_name)
-				return false
-			end
 			local nn = minetest.get_node(pos).name
 			-- Pour into cauldron
 			if minetest.get_item_group(nn, "cauldron") ~= 0 then
@@ -113,13 +95,13 @@ if mod_mclx_core then
 					minetest.set_node(pos, {name="mcl_cauldrons:cauldron_3r"})
 				end
 				sound_place("mcl_core:water_source", pos)
-				return false
+				return false, true
 			else
 				-- Evaporate water if used in Nether (except on cauldron)
 				local dim = mcl_worlds.pos_to_dimension(pos)
 				if dim == "nether" then
 					minetest.sound_play("fire_extinguish_flame", {pos = pos, gain = 0.25, max_hear_distance = 16}, true)
-					return false
+					return false, true
 				end
 			end
 		end,
diff --git a/mods/ITEMS/mcl_chests/init.lua b/mods/ITEMS/mcl_chests/init.lua
index cd66c3fc40..69f6a601da 100644
--- a/mods/ITEMS/mcl_chests/init.lua
+++ b/mods/ITEMS/mcl_chests/init.lua
@@ -1133,7 +1133,7 @@ for color, desc in pairs(boxtypes) do
 	if mod_doc then
 		if is_canonical then
 			longdesc = S("A shulker box is a portable container which provides 27 inventory slots for any item except shulker boxes. Shulker boxes keep their inventory when broken, so shulker boxes as well as their contents can be taken as a single item. Shulker boxes come in many different colors.")
-			usagehelp = S("To access the inventory of a shulker box, place and right-click it. To take a shulker box and its contents with you, just break and collect it, the items will not fall out.")
+			usagehelp = S("To access the inventory of a shulker box, place and right-click it. To take a shulker box and its contents with you, just break and collect it, the items will not fall out. Place the shulker box again to be able to retrieve its contents.")
 			entry_name = S("Shulker Box")
 		else
 			create_entry = false
diff --git a/mods/ITEMS/mcl_chests/locale/template.txt b/mods/ITEMS/mcl_chests/locale/template.txt
index 1d947184b1..d680c24c9d 100644
--- a/mods/ITEMS/mcl_chests/locale/template.txt
+++ b/mods/ITEMS/mcl_chests/locale/template.txt
@@ -24,7 +24,7 @@ Red Shulker Box=
 Grey Shulker Box=
 Black Shulker Box=
 A shulker box is a portable container which provides 27 inventory slots for any item except shulker boxes. Shulker boxes keep their inventory when broken, so shulker boxes as well as their contents can be taken as a single item. Shulker boxes come in many different colors.=
-To access the inventory of a shulker box, place and right-click it. To take a shulker box and its contents with you, just break and collect it, the items will not fall out.=
+To access the inventory of a shulker box, place and right-click it. To take a shulker box and its contents with you, just break and collect it, the items will not fall out. Place the shulker box again to be able to retrieve its contents.=
 Shulker Box=
 Large Chest=
 Inventory=
diff --git a/mods/ITEMS/mcl_core/craftitems.lua b/mods/ITEMS/mcl_core/craftitems.lua
index 03f30b7b97..85a078766f 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 in villager trades as currency."),
 	inventory_image = "mcl_core_emerald.png",
 	stack_max = 64,
 	groups = { craftitem=1 },
diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua
index 6e1a977d93..2ef73af729 100644
--- a/mods/ITEMS/mcl_core/functions.lua
+++ b/mods/ITEMS/mcl_core/functions.lua
@@ -184,6 +184,7 @@ minetest.register_abm({
 	end,
 })
 
+-- Cactus mechanisms
 minetest.register_abm({
 	label = "Cactus growth",
 	nodenames = {"mcl_core:cactus"},
@@ -195,18 +196,31 @@ minetest.register_abm({
 	end,
 })
 
--- Make cactus destroy items
 minetest.register_abm({
-	label = "Cactus destroy items",
+	label = "Cactus mechanisms",
 	nodenames = {"mcl_core:cactus"},
 	interval = 1,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
-		for _,object in pairs(minetest.get_objects_inside_radius(pos, 0.9)) do
-			if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
+		for _, object in pairs(minetest.get_objects_inside_radius(pos, 0.9)) do
+			local entity = object:get_luaentity()
+			if entity and entity.name == "__builtin:item" then
 				object:remove()
 			end
 		end
+		local posses = { { 1, 0 }, { -1, 0 }, { 0, 1 }, { 0, -1 } }
+		for _, p in pairs(posses) do
+			if minetest.registered_nodes[minetest.get_node(vector.new(pos.x + p[1], pos.y, pos.z + p[2])).name].walkable then
+				local posy = pos.y
+				while minetest.get_node(vector.new(pos.x, posy, pos.z)).name == "mcl_core:cactus" do
+					local pos = vector.new(pos.x, posy, pos.z)
+					minetest.remove_node(pos)
+					minetest.add_item(vector.offset(pos, math.random(-0.5, 0.5), 0, math.random(-0.5, 0.5)), "mcl_core:cactus")
+					posy = posy + 1
+				end
+				break
+			end
+		end
 	end,
 })
 
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
index 0a1cbad37b..b064cebbef 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 1e1029c0f4..1937babd3f 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 725025e487..64aadd6db6 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 832a47830b..68dfbd3d0f 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 f93db7c2c9..2d5b5462c3 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=Текущая лава
diff --git a/mods/ITEMS/mcl_core/locale/template.txt b/mods/ITEMS/mcl_core/locale/template.txt
index 2cb74f5d1e..19d156711d 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 in villager trades as currency.=
 Flint=
 Flint is a raw material.=
 Flowing Lava=
diff --git a/mods/ITEMS/mcl_enchanting/enchantments.lua b/mods/ITEMS/mcl_enchanting/enchantments.lua
index ecc9fe1135..17b6b6ac69 100644
--- a/mods/ITEMS/mcl_enchanting/enchantments.lua
+++ b/mods/ITEMS/mcl_enchanting/enchantments.lua
@@ -379,8 +379,8 @@ mcl_enchanting.enchantments.mending = {
 	inv_tool_tab = true,
 }
 
--- requires missing MineClone2 feature
---[[mcl_enchanting.enchantments.multishot = {
+
+mcl_enchanting.enchantments.multishot = {
 	name = S("Multishot"),
 	max_level = 1,
 	primary = {crossbow = true},
@@ -396,10 +396,10 @@ mcl_enchanting.enchantments.mending = {
 	power_range_table = {{20, 50}},
 	inv_combat_tab = true,
 	inv_tool_tab = false,
-}]]--
+}
 
 -- requires missing MineClone2 feature
---[[mcl_enchanting.enchantments.piercing = {
+mcl_enchanting.enchantments.piercing = {
 	name = S("Piercing"),
 	max_level = 4,
 	primary = {crossbow = true},
@@ -415,7 +415,7 @@ mcl_enchanting.enchantments.mending = {
 	power_range_table = {{1, 50}, {11, 50}, {21, 50}, {31, 50}},
 	inv_combat_tab = true,
 	inv_tool_tab = false,
-}]]--
+}
 
 -- implemented in mcl_bows
 mcl_enchanting.enchantments.power = {
@@ -456,7 +456,7 @@ mcl_enchanting.enchantments.punch = {
 }
 
 -- requires missing MineClone2 feature
---[[mcl_enchanting.enchantments.quick_charge = {
+mcl_enchanting.enchantments.quick_charge = {
 	name = S("Quick Charge"),
 	max_level = 3,
 	primary = {crossbow = true},
@@ -472,7 +472,7 @@ mcl_enchanting.enchantments.punch = {
 	power_range_table = {{12, 50}, {32, 50}, {52, 50}},
 	inv_combat_tab = true,
 	inv_tool_tab = false,
-}]]--
+}
 
 -- unimplemented
 --[[mcl_enchanting.enchantments.respiration = {
diff --git a/mods/ITEMS/mcl_enchanting/engine.lua b/mods/ITEMS/mcl_enchanting/engine.lua
index d2a7499478..6050aeed2a 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
diff --git a/mods/ITEMS/mcl_end/chorus_plant.lua b/mods/ITEMS/mcl_end/chorus_plant.lua
index 24307b5ed6..4dc54db186 100644
--- a/mods/ITEMS/mcl_end/chorus_plant.lua
+++ b/mods/ITEMS/mcl_end/chorus_plant.lua
@@ -453,7 +453,7 @@ function mcl_end.grow_chorus_plant_step(pos, node, pr)
 end
 
 --- ABM ---
-local seed = minetest.get_mapgen_params().seed
+local seed = minetest.get_mapgen_setting("seed")
 local pr = PseudoRandom(seed)
 minetest.register_abm({
 	label = "Chorus plant growth",
diff --git a/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.es.tr b/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.es.tr
new file mode 100644
index 0000000000..e66eb06a59
--- /dev/null
+++ b/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.es.tr
@@ -0,0 +1,3 @@
+# textdomain: mcl_fireworks
+Firework Rocket=
+Flight Duration:=
\ No newline at end of file
diff --git a/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.fr.tr b/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.fr.tr
new file mode 100644
index 0000000000..b02faa4285
--- /dev/null
+++ b/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.fr.tr
@@ -0,0 +1,3 @@
+# textdomain: mcl_fireworks
+Firework Rocket=Fusée
+Flight Duration:=Durée de vol :
\ No newline at end of file
diff --git a/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.ru.tr b/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.ru.tr
new file mode 100644
index 0000000000..e66eb06a59
--- /dev/null
+++ b/mods/ITEMS/mcl_fireworks/locale/mcl_fireworks.ru.tr
@@ -0,0 +1,3 @@
+# textdomain: mcl_fireworks
+Firework Rocket=
+Flight Duration:=
\ No newline at end of file
diff --git a/mods/ITEMS/mcl_maps/locale/mcl_maps.fr.tr b/mods/ITEMS/mcl_maps/locale/mcl_maps.fr.tr
index 9ef7cd5c50..1808e839d3 100644
--- a/mods/ITEMS/mcl_maps/locale/mcl_maps.fr.tr
+++ b/mods/ITEMS/mcl_maps/locale/mcl_maps.fr.tr
@@ -1,5 +1,8 @@
 # textdomain: mcl_maps
 Empty Map=Carte Vierge
 Empty maps are not useful as maps, but they can be stacked and turned to maps which can be used.=Les cartes vierges ne sont pas utiles en tant que cartes, mais elles peuvent être empilées et transformées en cartes utilisables.
-Rightclick to start using the map (which can't be stacked anymore).=Clic droit pour commencer à utiliser la carte (qui ne peut plus être empilée).
+Rightclick to create a filled map (which can't be stacked anymore).=Clic droit pour créer une carte remplie (qui ne peut plus être empilée).
 Map=Carte
+Shows a map image.=Affiche une carte.
+When created, the map saves the nearby area as an image that can be viewed any time by holding the map.=Lors de sa création, la carte sauvegarde le terrain proche sous forme d'image qui peut être consultée n'importe quand en tenant la carte dans la main.
+Hold the map in your hand. This will display a map on your screen.=Tenez la carte dans votre main. Cela affichera la carte à l'écran.
diff --git a/mods/ITEMS/mcl_mobspawners/init.lua b/mods/ITEMS/mcl_mobspawners/init.lua
index 6c5d7f6e43..b756d4a6d2 100644
--- a/mods/ITEMS/mcl_mobspawners/init.lua
+++ b/mods/ITEMS/mcl_mobspawners/init.lua
@@ -230,7 +230,7 @@ local function spawn_mobs(pos, elapsed)
 
 	-- spawn up to 4 mobs in random air blocks
 	if air then
-		local max = 4
+		local max = 200
 		if spawn_count_overrides[mob] then
 			max = spawn_count_overrides[mob]
 		end
@@ -387,4 +387,3 @@ minetest.register_lbm({
 		respawn_doll(pos)
 	end,
 })
-
diff --git a/mods/ITEMS/mcl_portals/mod.conf b/mods/ITEMS/mcl_portals/mod.conf
index d99344a76a..610b590c60 100644
--- a/mods/ITEMS/mcl_portals/mod.conf
+++ b/mods/ITEMS/mcl_portals/mod.conf
@@ -1,4 +1,4 @@
 name = mcl_portals
 description = Adds buildable portals to the Nether and End dimensions.
-depends = mcl_nether, mcl_end, mcl_particles, mcl_spawn
+depends = mcl_nether, mcl_end, mcl_particles, mcl_spawn, mcl_credits
 optional_depends = awards, doc
diff --git a/mods/ITEMS/mcl_portals/portal_end.lua b/mods/ITEMS/mcl_portals/portal_end.lua
index d591537e1b..e4982c39b7 100644
--- a/mods/ITEMS/mcl_portals/portal_end.lua
+++ b/mods/ITEMS/mcl_portals/portal_end.lua
@@ -4,6 +4,8 @@ local table = table
 local vector = vector
 local math = math
 
+local has_doc = minetest.get_modpath("doc")
+
 -- Parameters
 --local SPAWN_MIN = mcl_vars.mg_end_min+70
 --local SPAWN_MAX = mcl_vars.mg_end_min+98
@@ -339,7 +341,7 @@ minetest.register_node("mcl_portals:end_portal_frame_eye", {
 	_mcl_hardness = -1,
 })
 
-if minetest.get_modpath("doc") then
+if has_doc then
 	doc.add_entry_alias("nodes", "mcl_portals:end_portal_frame", "nodes", "mcl_portals:end_portal_frame_eye")
 end
 
@@ -366,7 +368,7 @@ minetest.override_item("mcl_end:ender_eye", {
 			end
 			minetest.set_node(pointed_thing.under, { name = "mcl_portals:end_portal_frame_eye", param2 = node.param2 })
 
-			if minetest.get_modpath("doc") then
+			if has_doc then
 				doc.mark_entry_as_revealed(user:get_player_name(), "nodes", "mcl_portals:end_portal_frame")
 			end
 			minetest.sound_play(
@@ -381,7 +383,7 @@ minetest.override_item("mcl_end:ender_eye", {
 				-- Epic 'portal open' sound effect that can be heard everywhere
 				minetest.sound_play("mcl_portals_open_end_portal", {gain=0.8}, true)
 				end_portal_area(ppos)
-				if minetest.get_modpath("doc") then
+				if has_doc then
 					doc.mark_entry_as_revealed(user:get_player_name(), "nodes", "mcl_portals:portal_end")
 				end
 			end
@@ -389,7 +391,3 @@ minetest.override_item("mcl_end:ender_eye", {
 		return itemstack
 	end,
 })
-minetest.override_item("mcl_core:bedrock", {
-	after_destruct = destroy_portal,
-})
-
diff --git a/mods/ITEMS/mcl_potions/functions.lua b/mods/ITEMS/mcl_potions/functions.lua
index 09b95115ad..c3b034b664 100644
--- a/mods/ITEMS/mcl_potions/functions.lua
+++ b/mods/ITEMS/mcl_potions/functions.lua
@@ -35,13 +35,13 @@ local function potions_init_icons(player)
 	local name = player:get_player_name()
 	icon_ids[name] = {}
 	for e=1, EFFECT_TYPES do
-		local x = -7 + -38 * e
+		local x = -52 * e - 2
 		local id = player:hud_add({
 			hud_elem_type = "image",
 			text = "blank.png",
 			position = { x = 1, y = 0 },
-			offset = { x = x, y = 272 },
-			scale = { x = 2, y = 2 },
+			offset = { x = x, y = 3 },
+			scale = { x = 3, y = 3 },
 			alignment = { x = 1, y = 1 },
 			z_index = 100,
 		})
diff --git a/mods/ITEMS/mcl_potions/tipped_arrow.lua b/mods/ITEMS/mcl_potions/tipped_arrow.lua
index ab55cb72ad..1717533a8f 100644
--- a/mods/ITEMS/mcl_potions/tipped_arrow.lua
+++ b/mods/ITEMS/mcl_potions/tipped_arrow.lua
@@ -463,4 +463,4 @@ function mcl_potions.register_arrow(name, desc, color, def)
 	if minetest.get_modpath("doc_identifier") then
 		doc.sub.identifier.register_object("mcl_bows:arrow_entity", "craftitems", "mcl_bows:arrow")
 	end
-end
\ No newline at end of file
+end
diff --git a/mods/MISC/mcl_privs/init.lua b/mods/MISC/mcl_privs/init.lua
index 63694ab11a..f06ff35820 100644
--- a/mods/MISC/mcl_privs/init.lua
+++ b/mods/MISC/mcl_privs/init.lua
@@ -3,3 +3,27 @@ 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 = 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
+	end
+	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
+	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
diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua
index 420cd6c2ec..b7607946d4 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!
diff --git a/mods/PLAYER/mcl_hunger/hunger.lua b/mods/PLAYER/mcl_hunger/hunger.lua
index 5dec8b1b04..d9a6fd5fe6 100644
--- a/mods/PLAYER/mcl_hunger/hunger.lua
+++ b/mods/PLAYER/mcl_hunger/hunger.lua
@@ -152,26 +152,18 @@ function mcl_hunger.item_eat(hunger_change, replace_with_item, poisontime, poiso
 				-- If false, force item to not spawn any food partiles when eaten
 				if def._food_particles ~= false and texture and texture ~= "" then
 					local v = user:get_velocity() or user:get_player_velocity()
-					local minvel = vector.add(v, {x=-1, y=1, z=-1})
-					local maxvel = vector.add(v, {x=1, y=2, z=1})
-
-					minetest.add_particlespawner({
-						amount = math.min(math.max(8, hunger_change*2), 25),
-						time = 0.1,
-						minpos = {x=pos.x, y=pos.y, z=pos.z},
-						maxpos = {x=pos.x, y=pos.y, z=pos.z},
-						minvel = minvel,
-						maxvel = maxvel,
-						minacc = {x=0, y=-5, z=0},
-						maxacc = {x=0, y=-9, z=0},
-						minexptime = 1,
-						maxexptime = 1,
-						minsize = 1,
-						maxsize = 2,
-						collisiondetection = true,
-						vertical = false,
-						texture = texture,
-					})
+					for i = 0, math.min(math.max(8, hunger_change*2), 25) do
+						minetest.add_particle({
+							pos = { x = pos.x, y = pos.y, z = pos.z },
+							velocity = vector.add(v, { x = math.random(-1, 1), y = math.random(1, 2), z = math.random(-1, 1) }),
+							acceleration = { x = 0, y = math.random(-9, -5), z = 0 },
+							expirationtime = 1,
+							size = math.random(1, 2),
+							collisiondetection = true,
+							vertical = false,
+							texture = "[combine:3x3:" .. -i .. "," .. -i .. "=" .. texture,
+						})
+					end
 				end
 				minetest.sound_play("mcl_hunger_bite", {
 					max_hear_distance = 12,
diff --git a/mods/PLAYER/mcl_player/init.lua b/mods/PLAYER/mcl_player/init.lua
index a3c7697410..2a4c25c349 100644
--- a/mods/PLAYER/mcl_player/init.lua
+++ b/mods/PLAYER/mcl_player/init.lua
@@ -9,7 +9,7 @@ local animation_blend = 0
 local function get_mouse_button(player)
 	local controls = player:get_player_control()
 	local get_wielded_item_name = player:get_wielded_item():get_name()
-	if controls.RMB and not string.find(get_wielded_item_name, "mcl_bows:bow") or controls.LMB then
+	if controls.RMB and not string.find(get_wielded_item_name, "mcl_bows:bow") and not string.find(get_wielded_item_name, "mcl_bows:crossbow") or controls.LMB then
 		return true
 	else
 		return false
@@ -212,9 +212,9 @@ minetest.register_globalstep(function(dtime)
 					player_set_animation(player, "swim_walk_mine", animation_speed_mod)
 				elseif not controls.sneak and head_in_water and is_sprinting == true then
 					player_set_animation(player, "swim_walk", animation_speed_mod)
-				elseif string.find(player:get_wielded_item():get_name(), "mcl_bows:bow") and controls.RMB and controls.sneak then
+				elseif string.find(player:get_wielded_item():get_name(), "mcl_bows:bow") and controls.RMB and controls.sneak or string.find(player:get_wielded_item():get_name(), "mcl_bows:crossbow_") and controls.sneak then
 					player_set_animation(player, "bow_sneak", animation_speed_mod)
-				elseif string.find(player:get_wielded_item():get_name(), "mcl_bows:bow") and controls.RMB then
+				elseif string.find(player:get_wielded_item():get_name(), "mcl_bows:bow") and controls.RMB or string.find(player:get_wielded_item():get_name(), "mcl_bows:crossbow_") then
 					player_set_animation(player, "bow_walk", animation_speed_mod)
 				elseif is_sprinting == true and get_mouse_button(player) == true and not controls.sneak and not head_in_water then
 					player_set_animation(player, "run_walk_mine", animation_speed_mod)
diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua
index 1f881d2b6d..f86d5e26a8 100644
--- a/mods/PLAYER/mcl_playerplus/init.lua
+++ b/mods/PLAYER/mcl_playerplus/init.lua
@@ -127,6 +127,7 @@ minetest.register_globalstep(function(dtime)
 	for _,player in pairs(get_connected_players()) do
 
 		--[[
+
 						 _                 _   _
 			  __ _ _ __ (_)_ __ ___   __ _| |_(_) ___  _ __  ___
 			 / _` | '_ \| | '_ ` _ \ / _` | __| |/ _ \| '_ \/ __|
@@ -220,6 +221,10 @@ minetest.register_globalstep(function(dtime)
 			player:set_bone_position("Wield_Item", vector.new(0,3.9,1.3), vector.new(90,0,0))
 		elseif string.find(wielded:get_name(), "mcl_bows:bow") then
 			player:set_bone_position("Wield_Item", vector.new(.5,4.5,-1.6), vector.new(90,0,20))
+		elseif string.find(wielded:get_name(), "mcl_bows:crossbow_loaded") then
+			player:set_bone_position("Wield_Item", vector.new(-1.5,5.7,1.8), vector.new(64,90,0))
+		elseif string.find(wielded:get_name(), "mcl_bows:crossbow") then
+			player:set_bone_position("Wield_Item", vector.new(-1.5,5.7,1.8), vector.new(90,90,0))
 		else
 			player:set_bone_position("Wield_Item", vector.new(-1.5,4.9,1.8), vector.new(135,0,90))
 		end
@@ -231,6 +236,14 @@ minetest.register_globalstep(function(dtime)
 		if string.find(wielded:get_name(), "mcl_bows:bow") and control.RMB then
 			player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(pitch+90,-30,pitch * -1 * .35))
 			player:set_bone_position("Arm_Left_Pitch_Control", vector.new(3.5,5.785,0), vector.new(pitch+90,43,pitch * .35))
+		-- controls right and left arms pitch when holing a loaded crossbow
+		elseif string.find(wielded:get_name(), "mcl_bows:crossbow_loaded") then
+			player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(pitch+90,-30,pitch * -1 * .35))
+			player:set_bone_position("Arm_Left_Pitch_Control", vector.new(3.5,5.785,0), vector.new(pitch+90,43,pitch * .35))
+		-- controls right and left arms pitch when loading a crossbow
+	elseif string.find(wielded:get_name(), "mcl_bows:crossbow_") then
+			player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(45,-20,25))
+			player:set_bone_position("Arm_Left_Pitch_Control", vector.new(3,5.785,0), vector.new(55,20,-45))
 		-- when punching
 		elseif control.LMB and not parent then
 			player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(pitch,0,0))
diff --git a/mods/PLAYER/mcl_playerplus/mod.conf b/mods/PLAYER/mcl_playerplus/mod.conf
index 6989957d77..b77c9e2e5e 100644
--- a/mods/PLAYER/mcl_playerplus/mod.conf
+++ b/mods/PLAYER/mcl_playerplus/mod.conf
@@ -1,5 +1,5 @@
 name = mcl_playerplus
 author = TenPlus1
 description = Adds some simple player-related gameplay effects: Hurt by touching a cactus, suffocation and more.
-depends = mcl_init, mcl_core, mcl_particles, mcl_hunger, playerphysics, mcl_playerinfo, mcl_weather, mcl_spawn, mcl_enchanting, mcl_damage
+depends = mcl_init, mcl_core, mcl_particles, mcl_hunger, playerphysics, mcl_playerinfo, mcl_weather, mcl_spawn, mcl_enchanting, mcl_damage, mcl_sprint
 
diff --git a/mods/PLAYER/mcl_sprint/init.lua b/mods/PLAYER/mcl_sprint/init.lua
index 73a518c425..4c0d609c96 100644
--- a/mods/PLAYER/mcl_sprint/init.lua
+++ b/mods/PLAYER/mcl_sprint/init.lua
@@ -69,18 +69,19 @@ local function setSprinting(playerName, sprinting) --Sets the state of a player
 	local controls = player:get_player_control()
 	if players[playerName] then
 		players[playerName].sprinting = sprinting
+		local fov_old = players[playerName].fov
+		local fov_new = fov_old
+		local fade_time = .15
 		if sprinting == true
 		or controls.RMB
 		and string.find(player:get_wielded_item():get_name(), "mcl_bows:bow")
 		and player:get_wielded_item():get_name() ~= "mcl_bows:bow" then
 			if sprinting == true then
-				players[playerName].fov = math.min(players[playerName].fov + 0.05, 1.2)
-				players[playerName].fade_time = .15
+				fov_new = math.min(players[playerName].fov + 0.05, 1.2)
 			else
-				players[playerName].fov = .7
+				fov_new = .7
 				players[playerName].fade_time = .3
 			end
-			player:set_fov(players[playerName].fov, true, players[playerName].fade_time)
 			if sprinting == true then
 				playerphysics.add_physics_factor(player, "speed", "mcl_sprint:sprint", mcl_sprint.SPEED)
 			end
@@ -88,12 +89,15 @@ local function setSprinting(playerName, sprinting) --Sets the state of a player
 		and player:get_wielded_item():get_name() ~= "mcl_bows:bow_0"
 		and player:get_wielded_item():get_name() ~= "mcl_bows:bow_1"
 		and player:get_wielded_item():get_name() ~= "mcl_bows:bow_2" then
-			players[playerName].fov = math.max(players[playerName].fov - 0.05, 1.0)
-			player:set_fov(players[playerName].fov, true, 0.15)
+			fov_new = math.max(players[playerName].fov - 0.05, 1.0)
 			if sprinting == false then
 				playerphysics.remove_physics_factor(player, "speed", "mcl_sprint:sprint")
 			end
 		end
+		if fov_new ~= fov_old then
+			players[playerName].fov = fov_new
+			player:set_fov(fov_new, true, fade_time)
+		end
 		return true
 	end
 	return false
diff --git a/settingtypes.txt b/settingtypes.txt
index ea1c1a50a3..542711675a 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -33,9 +33,12 @@ mcl_tnt_griefing (TNT destroys blocks) bool true
 # This setting is only read at startup.
 enable_bed_respawn (Respawn at bed) bool true
 
-# 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
+# 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
+
 # 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
@@ -153,3 +156,7 @@ fix_doubleplants (Mcimport double plant fixes) bool true
 
 # Allow players to create Minecraft-like maps.
 enable_real_maps (Enable Real Maps) bool true
+
+[Debugging]
+# If enabled, this will show the itemstring of an item in the description.
+mcl_item_id_debug (Item ID Debug) bool false
\ No newline at end of file