diff --git a/GROUPS.md b/GROUPS.md
index 8c0c3563e..8286b29bc 100644
--- a/GROUPS.md
+++ b/GROUPS.md
@@ -149,7 +149,7 @@ These groups are used mostly for informational purposes
 * `trapdoor=2`: Open trapdoor
 * `glass=1`: Glass (full cubes only)
 * `rail=1`: Rail
-* `music_record`: Music Disc (rating is track ID)
+* `music_record`: Item is Music Disc
 * `tnt=1`: Block is TNT
 * `boat=1`: Boat
 * `minecart=1`: Minecart
diff --git a/mods/CORE/mcl_init/init.lua b/mods/CORE/mcl_init/init.lua
index 066e555df..fec9c7ba9 100644
--- a/mods/CORE/mcl_init/init.lua
+++ b/mods/CORE/mcl_init/init.lua
@@ -32,9 +32,9 @@ local singlenode = mg_name == "singlenode"
 
 -- Calculate mapgen_edge_min/mapgen_edge_max
 mcl_vars.chunksize = math.max(1, tonumber(minetest.get_mapgen_setting("chunksize")) or 5)
-mcl_vars.MAP_BLOCKSIZE = math.max(1, core.MAP_BLOCKSIZE or 16)
+mcl_vars.MAP_BLOCKSIZE = math.max(1, minetest.MAP_BLOCKSIZE or 16)
 mcl_vars.mapgen_limit = math.max(1, tonumber(minetest.get_mapgen_setting("mapgen_limit")) or 31000)
-mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, core.MAX_MAP_GENERATION_LIMIT or 31000)
+mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, minetest.MAX_MAP_GENERATION_LIMIT or 31000)
 local central_chunk_offset = -math.floor(mcl_vars.chunksize / 2)
 mcl_vars.central_chunk_offset_in_nodes = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
 mcl_vars.chunk_size_in_nodes = mcl_vars.chunksize * mcl_vars.MAP_BLOCKSIZE
diff --git a/mods/ENTITIES/mcl_falling_nodes/init.lua b/mods/ENTITIES/mcl_falling_nodes/init.lua
index 01681a159..d527603de 100644
--- a/mods/ENTITIES/mcl_falling_nodes/init.lua
+++ b/mods/ENTITIES/mcl_falling_nodes/init.lua
@@ -19,7 +19,10 @@ local function deal_falling_damage(self, dtime)
 	end
 	self._hit = self._hit or {}
 	for _, obj in ipairs(minetest.get_objects_inside_radius(pos, 1)) do
-		if mcl_util.get_hp(obj) > 0 and not self._hit[obj] then
+		local entity = obj:get_luaentity()
+		if entity and entity.name == "__builtin:item" then
+			obj:remove()
+		elseif mcl_util.get_hp(obj) > 0 and not self._hit[obj] then
 			self._hit[obj] = true
 			local way = self._startpos.y - pos.y
 			local damage = (way - 1) * 2
diff --git a/mods/ENTITIES/mcl_mobs/api/api.lua b/mods/ENTITIES/mcl_mobs/api/api.lua
index d1840f671..639eb517d 100644
--- a/mods/ENTITIES/mcl_mobs/api/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api/api.lua
@@ -129,6 +129,7 @@ end
 local api_path = minetest.get_modpath(minetest.get_current_modname()).."/api/mob_functions/"
 
 --ignite all parts of the api
+dofile(api_path .. "flow_lib.lua")
 dofile(api_path .. "ai.lua")
 dofile(api_path .. "animation.lua")
 dofile(api_path .. "collision.lua")
diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua
index d16d24929..88ce3274b 100644
--- a/mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua
+++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua
@@ -9,6 +9,8 @@ local minetest_get_item_group               = minetest.get_item_group
 local minetest_get_node                     = minetest.get_node
 local minetest_line_of_sight                = minetest.line_of_sight
 local minetest_get_node_light               = minetest.get_node_light
+local minetest_registered_nodes	            = minetest.registered_nodes
+local flow                                  = mobs.get_flowing_dir
 
 local DOUBLE_PI = math.pi * 2
 local THIRTY_SECONDTH_PI = DOUBLE_PI * 0.03125
@@ -521,8 +523,8 @@ ______ _
 |  _| | | | | |
 | |   | | |_| |
 \_|   |_|\__, |
-		  __/ |
-		 |___/
+	  __/ |
+	 |___/
 ]]--
 
 -- state switching logic (stand, walk, run, attacks)
@@ -675,12 +677,12 @@ end
 --[[
    ___
   |_  |
-	| |_   _ _ __ ___  _ __
-	| | | | | '_ ` _ \| '_ \
+    | |_   _ _ __ ___  _ __
+    | | | | | '_ ` _ \| '_ \
 /\__/ / |_| | | | | | | |_) |
 \____/ \__,_|_| |_| |_| .__/
-					  | |
-					  |_|
+		      | |
+		      |_|
 ]]--
 
 
@@ -787,8 +789,8 @@ ___  ___      _         _                 _
 | |\/| |/ _` | | '_ \  | |    / _ \ / _` | |/ __|
 | |  | | (_| | | | | | | |___| (_) | (_| | | (__
 \_|  |_/\__,_|_|_| |_| \_____/\___/ \__, |_|\___|
-									 __/ |
-									|___/
+				     __/ |
+				    |___/
 ]]--
 
 --the main loop
@@ -1011,6 +1013,19 @@ function mobs.mob_step(self, dtime)
 		end
 	end
 
+	--mobs flow from Crafter
+	local pos = self.object:get_pos()
+	if pos then
+		local flow_dir = flow(pos)
+		if flow_dir then
+			flow_dir = vector.multiply(flow_dir,10)
+			local vel = self.object:get_velocity()
+			local acceleration = vector.new(flow_dir.x-vel.x,flow_dir.y-vel.y,flow_dir.z-vel.z)
+			acceleration = vector.multiply(acceleration, 0.01)
+			self.object:add_velocity(acceleration)
+		end
+	end
+
 	--mob is stunned after being hit
 	if self.pause_timer > 0 then
 		self.pause_timer = self.pause_timer - dtime
diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/flow_lib.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/flow_lib.lua
new file mode 100644
index 000000000..aa64bfb4e
--- /dev/null
+++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/flow_lib.lua
@@ -0,0 +1,78 @@
+--this is from https://github.com/HybridDog/builtin_item/blob/e6dfd9dce86503b3cbd1474257eca5f6f6ca71c2/init.lua#L50
+local
+minetest,vector,math,pairs,minetest_get_node,vector_subtract,minetest_registered_nodes
+=
+minetest,vector,math,pairs,minetest.get_node,vector.subtract,minetest.registered_nodes
+
+local tab
+local n
+local function get_nodes(pos)
+	tab,n = {},1
+	for i = -1,1,2 do
+		for _,p in pairs({
+			{x=pos.x+i, y=pos.y, z=pos.z},
+			{x=pos.x, y=pos.y, z=pos.z+i}
+		}) do
+			tab[n] = {p, minetest_get_node(p)}
+			n = n+1
+		end
+	end
+	return tab
+end
+
+
+local data
+local param2
+local nd
+local par2
+local name
+local tmp
+local c_node
+function mobs.get_flowing_dir(pos)
+	c_node = minetest_get_node(pos).name
+	if c_node ~= "mcl_core:water_flowing" and c_node ~= "mcl_core:water" then
+		return nil
+	end
+	data = get_nodes(pos)
+	param2 = minetest_get_node(pos).param2
+	if param2 > 7 then
+		return nil
+	end
+	if c_node == "mcl_core:water" then
+		for _,i in pairs(data) do
+			nd = i[2]
+			name = nd.name
+			par2 = nd.param2
+			if name == "mcl_core:water_flowing" and par2 == 7 then
+				return(vector_subtract(i[1],pos))
+			end
+		end
+	end
+	for _,i in pairs(data) do
+		nd = i[2]
+		name = nd.name
+		par2 = nd.param2
+		if name == "mcl_core:water_flowing" and par2 < param2 then
+			return(vector_subtract(i[1],pos))
+		end
+	end
+	for _,i in pairs(data) do
+		nd = i[2]
+		name = nd.name
+		par2 = nd.param2
+		if name == "mcl_core:water_flowing" and par2 >= 11 then
+			return(vector_subtract(i[1],pos))
+		end
+	end
+	for _,i in pairs(data) do
+		nd = i[2]
+		name = nd.name
+		par2 = nd.param2
+		tmp = minetest_registered_nodes[name]
+		if tmp and not tmp.walkable and name ~= "mcl_core:water_flowing" and name ~= "mcl_core:water" then
+			return(vector_subtract(i[1],pos))
+		end
+	end
+
+	return nil
+end
diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/movement.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/movement.lua
index 893f8eede..d9698a0a7 100644
--- a/mods/ENTITIES/mcl_mobs/api/mob_functions/movement.lua
+++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/movement.lua
@@ -32,12 +32,15 @@ end
 mobs.float = function(self)
 
 	local acceleration = self.object:get_acceleration()
-	if acceleration and acceleration.y ~= 0 then
-		self.object:set_acceleration(vector.new(0,0,0))
-	else
+
+	if not acceleration then
 		return
 	end
 
+	if acceleration.y ~= 0 then
+		self.object:set_acceleration({x=0, y=0, z=0})
+	end
+
 	local current_velocity = self.object:get_velocity()
 
 	local goal_velocity = {
@@ -46,7 +49,7 @@ mobs.float = function(self)
 		z = 0,
 	}
 
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
+	local new_velocity_addition = vector.subtract(goal_velocity, current_velocity)
 
 	new_velocity_addition.x = 0
 	new_velocity_addition.z = 0
diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md
index dad31abb8..3bfe70a15 100644
--- a/mods/ENTITIES/mobs_mc/LICENSE-media.md
+++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md
@@ -190,9 +190,10 @@ Origin of those models:
 * [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0)
     * `mcl_totems_totem.ogg`
         * Source: <https://freesound.org/people/Spennnyyy/sounds/323502/>
-* [Baŝto](https://opengameart.org/users/ba%C5%9Dto)
+* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) (remixer) and [kantouth](https://freesound.org/people/kantouth/) (original author)
     * `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0)
         * Source: <https://opengameart.org/content/walking-skeleton>
+            * Based on:  <https://freesound.org/people/kantouth/sounds/115113/>
 * [spookymodem](https://freesound.org/people/spookymodem/)
     * `mobs_mc_skeleton_death.ogg` (CC0)
         * <https://freesound.org/people/spookymodem/sounds/202091/>
@@ -306,4 +307,4 @@ Origin of those models:
 
 Note: Many of these sounds have been more or less modified to fit the game.
 
-Sounds not mentioned hre are licensed under CC0.
+Sounds not mentioned here are licensed under CC0.
diff --git a/mods/ENTITIES/mobs_mc/iron_golem.lua b/mods/ENTITIES/mobs_mc/iron_golem.lua
index 946db312d..939412abb 100644
--- a/mods/ENTITIES/mobs_mc/iron_golem.lua
+++ b/mods/ENTITIES/mobs_mc/iron_golem.lua
@@ -158,11 +158,11 @@ mobs_mc.tools.check_iron_golem_summon = function(pos)
 		if ok then
 			-- Remove the nodes
 			minetest.remove_node(pos)
-			core.check_for_falling(pos)
+			minetest.check_for_falling(pos)
 			for i=1, 4 do
 				local cpos = vector.add(pos, checks[c][i])
 				minetest.remove_node(cpos)
-				core.check_for_falling(cpos)
+				minetest.check_for_falling(cpos)
 			end
 			-- Summon iron golem
 			local place
diff --git a/mods/ENTITIES/mobs_mc/snowman.lua b/mods/ENTITIES/mobs_mc/snowman.lua
index 9e2fae4d4..0726b8da0 100644
--- a/mods/ENTITIES/mobs_mc/snowman.lua
+++ b/mods/ENTITIES/mobs_mc/snowman.lua
@@ -179,9 +179,9 @@ mobs_mc.tools.check_snow_golem_summon = function(pos)
 			minetest.remove_node(pos)
 			minetest.remove_node(b1)
 			minetest.remove_node(b2)
-			core.check_for_falling(pos)
-			core.check_for_falling(b1)
-			core.check_for_falling(b2)
+			minetest.check_for_falling(pos)
+			minetest.check_for_falling(b1)
+			minetest.check_for_falling(b2)
 			local obj = minetest.add_entity(place, "mobs_mc:snowman")
 			if obj then
 				summon_particles(obj)
diff --git a/mods/HELP/mcl_craftguide/init.lua b/mods/HELP/mcl_craftguide/init.lua
index 378b420ff..3bc7b705a 100644
--- a/mods/HELP/mcl_craftguide/init.lua
+++ b/mods/HELP/mcl_craftguide/init.lua
@@ -155,7 +155,7 @@ end
 local custom_crafts, craft_types = {}, {}
 
 function mcl_craftguide.register_craft_type(name, def)
-	local func = "mcl_craftguide.register_craft_guide(): "
+	local func = "mcl_craftguide.register_craft_type(): "
 	assert(name, func .. "'name' field missing")
 	assert(def.description, func .. "'description' field missing")
 	assert(def.icon, func .. "'icon' field missing")
diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
index 8cbf74b84..ee7f29016 100644
--- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
@@ -19,9 +19,9 @@ local function setup_dispenser(pos)
 	"list[current_player;main;0,7.74;9,1;]"..
 	mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
 	"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dispenser"))).."]"..
-	"list[current_name;main;3,0.5;3,3;]"..
+	"list[context;main;3,0.5;3,3;]"..
 	mcl_formspec.get_itemslot_bg(3,0.5,3,3)..
-	"listring[current_name;main]"..
+	"listring[context;main]"..
 	"listring[current_player;main]"
 	local meta = minetest.get_meta(pos)
 	meta:set_string("formspec", form)
diff --git a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua
index 4bfdbab4b..b5bcc1d08 100644
--- a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua
@@ -20,9 +20,9 @@ local function setup_dropper(pos)
 	"list[current_player;main;0,7.74;9,1;]"..
 	mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
 	"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dropper"))).."]"..
-	"list[current_name;main;3,0.5;3,3;]"..
+	"list[context;main;3,0.5;3,3;]"..
 	mcl_formspec.get_itemslot_bg(3,0.5,3,3)..
-	"listring[current_name;main]"..
+	"listring[context;main]"..
 	"listring[current_player;main]"
 	local meta = minetest.get_meta(pos)
 	meta:set_string("formspec", form)
diff --git a/mods/ITEMS/REDSTONE/mcl_droppers/init_new.lua b/mods/ITEMS/REDSTONE/mcl_droppers/init_new.lua
index f140a9586..5409e6abc 100644
--- a/mods/ITEMS/REDSTONE/mcl_droppers/init_new.lua
+++ b/mods/ITEMS/REDSTONE/mcl_droppers/init_new.lua
@@ -19,8 +19,8 @@ local function setup_dropper(pos)
 	"list[current_player;main;0,4.5;9,3;9]"..
 	"list[current_player;main;0,7.74;9,1;]"..
 	"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dropper"))).."]"..
-	"list[current_name;main;3,0.5;3,3;]"..
-	"listring[current_name;main]"..
+	"list[context;main;3,0.5;3,3;]"..
+	"listring[context;main]"..
 	"listring[current_player;main]"
 	local meta = minetest.get_meta(pos)
 	meta:set_string("formspec", form)
diff --git a/mods/ITEMS/REDSTONE/mesecons_pistons/init.lua b/mods/ITEMS/REDSTONE/mesecons_pistons/init.lua
index 7d5f49048..93b8df96d 100644
--- a/mods/ITEMS/REDSTONE/mesecons_pistons/init.lua
+++ b/mods/ITEMS/REDSTONE/mesecons_pistons/init.lua
@@ -66,7 +66,7 @@ local function piston_remove_pusher(pos, oldnode)
 
 	if pushername == pistonspec.pusher then -- make sure there actually is a pusher
 		minetest.remove_node(pusherpos)
-		core.check_for_falling(pusherpos)
+		minetest.check_for_falling(pusherpos)
 		minetest.sound_play("piston_retract", {
 			pos = pos,
 			max_hear_distance = 31,
@@ -87,7 +87,7 @@ local function piston_remove_base(pos, oldnode)
 
 	if basename == pistonspec.onname then -- make sure there actually is a base node
 		minetest.remove_node(basepos)
-		core.check_for_falling(basepos)
+		minetest.check_for_falling(basepos)
 		minetest.sound_play("piston_retract", {
 			pos = pos,
 			max_hear_distance = 31,
diff --git a/mods/ITEMS/mcl_banners/init.lua b/mods/ITEMS/mcl_banners/init.lua
index 490e22643..a396caf7d 100644
--- a/mods/ITEMS/mcl_banners/init.lua
+++ b/mods/ITEMS/mcl_banners/init.lua
@@ -573,7 +573,7 @@ for colorid, colortab in pairs(mcl_banners.colors) do
 		end,
 	})
 
-	if mod_mcl_core and minetest.get_modpath("mcl_wool") then
+	if mod_mcl_core and minetest.get_modpath("mcl_wool") and pattern_name == "" then
 		minetest.register_craft({
 			output = itemstring,
 			recipe = {
diff --git a/mods/ITEMS/mcl_banners/patterncraft.lua b/mods/ITEMS/mcl_banners/patterncraft.lua
index bc2771fee..79778a665 100644
--- a/mods/ITEMS/mcl_banners/patterncraft.lua
+++ b/mods/ITEMS/mcl_banners/patterncraft.lua
@@ -8,9 +8,6 @@ local N = function(s) return s end
 -- Maximum number of layers which can be put on a banner by crafting.
 local max_layers_crafting = 12
 
--- Maximum number of layers when banner includes a gradient (workaround, see below).
-local max_layers_gradient = 3
-
 -- Max. number lines in the descriptions for the banner layers.
 -- This is done to avoid huge tooltips.
 local max_layer_lines = 6
@@ -398,16 +395,6 @@ local function banner_pattern_craft(itemstack, player, old_craft_grid, craft_inv
 	if #layers >= max_layers_crafting then
 		return ItemStack("")
 	end
-	-- Lower layer limit when banner includes any gradient.
-	-- Workaround to circumvent Minetest bug (https://github.com/minetest/minetest/issues/6210)
-	-- TODO: Remove this restriction when bug #6210 is fixed.
-	if #layers >= max_layers_gradient then
-		for l=1, #layers do
-			if layers[l].pattern == "gradient" or layers[l].pattern == "gradient_up" then
-				return ItemStack("")
-			end
-		end
-	end
 
 	local matching_pattern
 	local max_i = player:get_inventory():get_size("craft")
diff --git a/mods/ITEMS/mcl_brewing/init.lua b/mods/ITEMS/mcl_brewing/init.lua
index bd44b429b..38f81fa36 100644
--- a/mods/ITEMS/mcl_brewing/init.lua
+++ b/mods/ITEMS/mcl_brewing/init.lua
@@ -10,9 +10,9 @@ local function active_brewing_formspec(fuel_percent, brew_percent)
 	mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
 	"list[current_player;main;0,7.75;9,1;]"..
 	mcl_formspec.get_itemslot_bg(0,7.75,9,1)..
-	"list[current_name;fuel;0.5,1.75;1,1;]"..
+	"list[context;fuel;0.5,1.75;1,1;]"..
 	mcl_formspec.get_itemslot_bg(0.5,1.75,1,1).."image[0.5,1.75;1,1;mcl_brewing_fuel_bg.png]"..
-	"list[current_name;input;2.75,0.5;1,1;]"..
+	"list[context;input;2.75,0.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
 	"list[context;stand;4.5,2.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(4.5,2.5,1,1).."image[4.5,2.5;1,1;mcl_brewing_bottle_bg.png]"..
@@ -28,8 +28,8 @@ local function active_brewing_formspec(fuel_percent, brew_percent)
 	(brew_percent)..":mcl_brewing_bubbles_active.png]"..
 
 	"listring[current_player;main]"..
-	"listring[current_name;fuel]"..
-	"listring[current_name;input]"..
+	"listring[context;fuel]"..
+	"listring[context;input]"..
 	"listring[context;stand]"
 end
 
@@ -41,9 +41,9 @@ local brewing_formspec = "size[9,8.75]"..
 	mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
 	"list[current_player;main;0,7.75;9,1;]"..
 	mcl_formspec.get_itemslot_bg(0,7.75,9,1)..
-	"list[current_name;fuel;0.5,1.75;1,1;]"..
+	"list[context;fuel;0.5,1.75;1,1;]"..
 	mcl_formspec.get_itemslot_bg(0.5,1.75,1,1).."image[0.5,1.75;1,1;mcl_brewing_fuel_bg.png]"..
-	"list[current_name;input;2.75,0.5;1,1;]"..
+	"list[context;input;2.75,0.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
 	"list[context;stand;4.5,2.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(4.5,2.5,1,1).."image[4.5,2.5;1,1;mcl_brewing_bottle_bg.png]"..
@@ -56,8 +56,8 @@ local brewing_formspec = "size[9,8.75]"..
 	"image[2.76,1.4;1,2.15;mcl_brewing_bubbles.png]"..
 
 	"listring[current_player;main]"..
-	"listring[current_name;fuel]"..
-	"listring[current_name;input]"..
+	"listring[context;fuel]"..
+	"listring[context;input]"..
 	"listring[context;stand]"
 
 
diff --git a/mods/ITEMS/mcl_cake/init.lua b/mods/ITEMS/mcl_cake/init.lua
index 777b7ec58..104071064 100644
--- a/mods/ITEMS/mcl_cake/init.lua
+++ b/mods/ITEMS/mcl_cake/init.lua
@@ -104,7 +104,7 @@ local register_slice = function(level, nodebox, desc)
 			-- Check if we were allowed to eat
 			if newcake:get_name() ~= this or minetest.is_creative_enabled(clicker:get_player_name()) then
 				minetest.remove_node(pos)
-				core.check_for_falling(pos)
+				minetest.check_for_falling(pos)
 			end
 		end
 	end
diff --git a/mods/ITEMS/mcl_chests/init.lua b/mods/ITEMS/mcl_chests/init.lua
index de8b9bd09..cd66c3fc4 100644
--- a/mods/ITEMS/mcl_chests/init.lua
+++ b/mods/ITEMS/mcl_chests/init.lua
@@ -1108,14 +1108,14 @@ local function formspec_shulker_box(name)
 	end
 	return "size[9,8.75]"..
 	"label[0,0;"..minetest.formspec_escape(minetest.colorize("#313131", name)).."]"..
-	"list[current_name;main;0,0.5;9,3;]"..
+	"list[context;main;0,0.5;9,3;]"..
 	mcl_formspec.get_itemslot_bg(0,0.5,9,3)..
 	"label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]"..
 	"list[current_player;main;0,4.5;9,3;9]"..
 	mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
 	"list[current_player;main;0,7.74;9,1;]"..
 	mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
-	"listring[current_name;main]"..
+	"listring[context;main]"..
 	"listring[current_player;main]"
 end
 
diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua
index f0633914b..6e1a977d9 100644
--- a/mods/ITEMS/mcl_core/functions.lua
+++ b/mods/ITEMS/mcl_core/functions.lua
@@ -179,7 +179,7 @@ minetest.register_abm({
 		liquid_flow_action(pos, "lava", function(pos)
 			minetest.remove_node(pos)
 			minetest.sound_play("builtin_item_lava", {pos = pos, gain = 0.25, max_hear_distance = 16}, true)
-			core.check_for_falling(pos)
+			minetest.check_for_falling(pos)
 		end)
 	end,
 })
@@ -1242,7 +1242,7 @@ minetest.register_abm({
 		if not mcl_core.check_vines_supported(pos, node) then
 			minetest.remove_node(pos)
 			vinedecay_particles(pos, node)
-			core.check_for_falling(pos)
+			minetest.check_for_falling(pos)
 			return
 		end
 
@@ -1404,7 +1404,7 @@ minetest.register_abm({
 			-- Remove node
 			minetest.remove_node(p0)
 			leafdecay_particles(p0, n0)
-			core.check_for_falling(p0)
+			minetest.check_for_falling(p0)
 
 			-- Kill depending vines immediately to skip the vines decay delay
 			local surround = {
@@ -1421,7 +1421,7 @@ minetest.register_abm({
 				if maybe_vine.name == "mcl_core:vine" and (not mcl_core.check_vines_supported(spos, maybe_vine)) then
 					minetest.remove_node(spos)
 					vinedecay_particles(spos, maybe_vine)
-					core.check_for_falling(spos)
+					minetest.check_for_falling(spos)
 				end
 			end
 		end
@@ -1445,7 +1445,7 @@ minetest.register_abm({
 			minetest.remove_node(p0)
 			vinedecay_particles(p0, node)
 			-- Just in case a falling node happens to float above vines
-			core.check_for_falling(p0)
+			minetest.check_for_falling(p0)
 		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 3d90dd5ae..0a1cbad37 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr
@@ -221,17 +221,23 @@ Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly
 Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=Zuckerrohr kann nur auf Zuckerrohr platziert werden und auf Blöcken, auf denen Zuckerrohr wachsen würde.
 Sugar comes from sugar canes and is used to make sweet foods.=Zucker kommt von Zuckerrohr und wird benutzt, um süße Lebensmittel zu machen.
 The stripped trunk of an acacia tree.=Der entrindete Stamm einer Akazie.
-The stripped trunk of an birch tree.=Der entrindete Stamm einer Birke.
-The stripped trunk of an dark oak tree.=Der entrindete Stamm einer Schwarzeiche.
-The stripped trunk of an jungle tree.=Der entrindete Stamm eines Dschungelbaums.
+The stripped trunk of a birch tree.=Der entrindete Stamm einer Birke.
+The stripped trunk of a dark oak tree.=Der entrindete Stamm einer Schwarzeiche.
+The stripped trunk of a jungle tree.=Der entrindete Stamm eines Dschungelbaums.
 The stripped trunk of an oak tree.=Der entrindete Stamm einer Eiche.
-The stripped trunk of an spruce tree.=Der entrindete Stamm einer Fichte.
+The stripped trunk of a spruce tree.=Der entrindete Stamm einer Fichte.
 The trunk of a birch tree.=Der Baumstamm einer Birke.
 The trunk of a dark oak tree.=Der Baumstamm einer Schwarzeiche.
 The trunk of a jungle tree.=Der Baumstamm eines Dschungelbaums.
 The trunk of a spruce tree.=Der Baumstamm einer Fichte.
 The trunk of an acacia.=Der Baumstamm einer Akazie.
 The trunk of an oak tree.=Der Baumstamm einer Eiche.
+The stripped wood of an acacia tree.=Das entrindete Holz einer Akazie.
+The stripped wood of a birch tree.=Das entrindete Holz einer Birke.
+The stripped wood of a dark oak tree.=Das entrindete Holz einer Schwarzeiche.
+The stripped wood of a jungle tree.=Das entrindete Holz eines Dschungelbaums.
+The stripped wood of an oak tree.=Das entrindete Holz einer Eiche.
+The stripped wood of a spruce tree.=Das entrindete Holz einer Fichte.
 This block consists of a couple of loose stones and can't support itself.=Dieser Block besteht aus ein paar losen Steinchen und kann sich nicht selbst tragen.
 This is a decorative block surrounded by the bark of a tree trunk.=Dies ist ein dekorativer Block, der von der Rinde eines Baumstamms umgeben ist.
 This is a decorative block.=Dies ist ein dekorativer Block.
diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
index 86bc489cd..725025e48 100644
--- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
+++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr
@@ -109,7 +109,7 @@ Gold Ore=Minerai d'Or
 Gold nuggets are very small pieces of molten gold; the main purpose is to create gold ingots.=Les pépites d'or sont de très petites pièces d'or en fusion; le but principal est de créer des lingots d'or.
 Golden Apple=Pomme Dorée
 Golden apples are precious food items which can be eaten.=Les pommes dorrées sont des aliments précieux qui peuvent être consommés.
-Granite=Granite
+Granite=Granit
 Grass Block=Bloc d'Herbe
 Grass Path=Chemin d'Herbe
 Grass paths are a decorative variant of grass blocks. Their top has a different color and they are a bit lower than grass blocks, making them useful to build footpaths. Grass paths can be created with a shovel. A grass path turns into dirt when it is below a solid block.=Les chemins d'herbe sont une variante décorative des blocs d'herbe. Leur sommet a une couleur différente et ils sont un peu plus bas que les blocs d'herbe, ce qui les rend utiles pour construire des sentiers. Les chemins d'herbe peuvent être créés avec une pelle. Un chemin d'herbe se transforme en terre quand il est en dessous d'un bloc solide.
@@ -165,7 +165,7 @@ Podzol=Podzol
 Podzol is a type of dirt found in taiga forests. Only a few plants are able to survive on it.=Le podzol est un type de terre trouvé dans les forêts de la taïga. Seules quelques plantes peuvent y survivre.
 Polished Andesite=Andrésite Polie
 Polished Diorite=Diorite Polie
-Polished Granite=Granite Polie
+Polished Granite=Granit Poli
 Polished Stone=Roche Polie
 Polished andesite is a decorative building block made from andesite.=L'andésite polie est un bloc de construction décoratif en andésite.
 Polished diorite is a decorative building block made from diorite.=La diorite polie est un bloc de construction décoratif en diorite.
diff --git a/mods/ITEMS/mcl_core/locale/template.txt b/mods/ITEMS/mcl_core/locale/template.txt
index 31320c1c7..2cb74f5d1 100644
--- a/mods/ITEMS/mcl_core/locale/template.txt
+++ b/mods/ITEMS/mcl_core/locale/template.txt
@@ -221,17 +221,23 @@ Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly
 Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=
 Sugar comes from sugar canes and is used to make sweet foods.=
 The stripped trunk of an acacia tree.=
-The stripped trunk of an birch tree.=
-The stripped trunk of an dark oak tree.=
-The stripped trunk of an jungle tree.=
+The stripped trunk of a birch tree.=
+The stripped trunk of a dark oak tree.=
+The stripped trunk of a jungle tree.=
 The stripped trunk of an oak tree.=
-The stripped trunk of an spruce tree.=
+The stripped trunk of a spruce tree.=
 The trunk of a birch tree.=
 The trunk of a dark oak tree.=
 The trunk of a jungle tree.=
 The trunk of a spruce tree.=
 The trunk of an acacia.=
 The trunk of an oak tree.=
+The stripped wood of an acacia tree.=
+The stripped wood of a birch tree.=
+The stripped wood of a dark oak tree.=
+The stripped wood of a jungle tree.=
+The stripped wood of an oak tree.=
+The stripped wood of a spruce tree.=
 This block consists of a couple of loose stones and can't support itself.=
 This is a decorative block surrounded by the bark of a tree trunk.=
 This is a decorative block.=
diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua
index d4bfd7636..abc650bb0 100644
--- a/mods/ITEMS/mcl_core/nodes_base.lua
+++ b/mods/ITEMS/mcl_core/nodes_base.lua
@@ -1041,7 +1041,7 @@ for i=1,8 do
 		drop = "mcl_throwing:snowball "..(i+1),
 		_mcl_blast_resistance = 0.1,
 		_mcl_hardness = 0.1,
-		_mcl_silk_touch_drop = {"mcl_core:snow " .. (i+1)},
+		_mcl_silk_touch_drop = {"mcl_core:snow " .. i},
 	})
 end
 
diff --git a/mods/ITEMS/mcl_core/nodes_trees.lua b/mods/ITEMS/mcl_core/nodes_trees.lua
index c73829d6c..a5ef7aa97 100644
--- a/mods/ITEMS/mcl_core/nodes_trees.lua
+++ b/mods/ITEMS/mcl_core/nodes_trees.lua
@@ -9,7 +9,7 @@ if mod_screwdriver then
 end
 
 -- Register tree trunk (wood) and bark
-local function register_tree_trunk(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark, stripped_varient)
+local function register_tree_trunk(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark, stripped_variant)
 	minetest.register_node("mcl_core:"..subname, {
 		description = description_trunk,
 		_doc_items_longdesc = longdesc,
@@ -23,7 +23,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark,
 		on_rotate = on_rotate,
 		_mcl_blast_resistance = 2,
 		_mcl_hardness = 2,
-		_mcl_stripped_varient = stripped_varient,
+		_mcl_stripped_variant = stripped_variant,
 	})
 
 	minetest.register_node("mcl_core:"..subname.."_bark", {
@@ -39,7 +39,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark,
 		on_rotate = on_rotate,
 		_mcl_blast_resistance = 2,
 		_mcl_hardness = 2,
-		_mcl_stripped_varient = stripped_varient.."_bark",
+		_mcl_stripped_variant = stripped_variant.."_bark",
 	})
 
 	minetest.register_craft({
@@ -52,7 +52,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark,
 end
 
 -- Register stripped trunk and stripped wood
-local function register_stripped_trunk(subname, description_stripped_trunk, description_stripped_bark, longdesc, tile_stripped_inner, tile_stripped_bark)
+local function register_stripped_trunk(subname, description_stripped_trunk, description_stripped_bark, longdesc, longdesc_wood, tile_stripped_inner, tile_stripped_bark)
 	minetest.register_node("mcl_core:"..subname, {
 		description = description_stripped_trunk,
 		_doc_items_longdesc = longdesc,
@@ -61,7 +61,7 @@ local function register_stripped_trunk(subname, description_stripped_trunk, desc
 		paramtype2 = "facedir",
 		on_place = mcl_util.rotate_axis,
 		stack_max = 64,
-		groups = {handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+		groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
 		sounds = mcl_sounds.node_sound_wood_defaults(),
 		on_rotate = on_rotate,
 		_mcl_blast_resistance = 2,
@@ -70,12 +70,12 @@ local function register_stripped_trunk(subname, description_stripped_trunk, desc
 
 	minetest.register_node("mcl_core:"..subname.."_bark", {
 		description = description_stripped_bark,
-		_doc_items_longdesc = S("This is a decorative block."),
+		_doc_items_longdesc = longdesc_wood,
 		tiles = {tile_stripped_bark},
 		paramtype2 = "facedir",
 		on_place = mcl_util.rotate_axis,
 		stack_max = 64,
-		groups = {handy=1,axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
+		groups = {handy=1, axey=1, bark=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5},
 		sounds = mcl_sounds.node_sound_wood_defaults(),
 		is_ground_content = false,
 		on_rotate = on_rotate,
@@ -223,13 +223,12 @@ register_tree_trunk("sprucetree", S("Spruce Wood"), S("Spruce Bark"), S("The tru
 register_tree_trunk("birchtree", S("Birch Wood"), S("Birch Bark"), S("The trunk of a birch tree."), "mcl_core_log_birch_top.png", "mcl_core_log_birch.png", "mcl_core:stripped_birch")
 register_tree_trunk("jungletree", S("Jungle Wood"), S("Jungle Bark"), S("The trunk of a jungle tree."), "default_jungletree_top.png", "default_jungletree.png", "mcl_core:stripped_jungle")
 
-register_stripped_trunk("stripped_oak", S("Stripped Oak Log"), S("Stripped Oak Wood"), S("The stripped trunk of an oak tree."), "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png")
-register_stripped_trunk("stripped_acacia", S("Stripped Acacia Log"), S("Stripped Acacia Wood"), S("The stripped trunk of an acacia tree."), "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png")
-register_stripped_trunk("stripped_dark_oak", S("Stripped Dark Oak Log"), S("Stripped Dark Oak Wood"), S("The stripped trunk of an dark oak tree."), "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png")
-register_stripped_trunk("stripped_birch", S("Stripped Birch Log"), S("Stripped Birch Wood"), S("The stripped trunk of an birch tree."), "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png")
-register_stripped_trunk("stripped_spruce", S("Stripped Spruce Log"), S("Stripped Spruce Wood"), S("The stripped trunk of an spruce tree."), "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png")
-register_stripped_trunk("stripped_jungle", S("Stripped Jungle Log"), S("Stripped Jungle Wood"), S("The stripped trunk of an jungle tree."),"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png")
-
+register_stripped_trunk("stripped_oak", S("Stripped Oak Log"), S("Stripped Oak Wood"), S("The stripped trunk of an oak tree."), S("The stripped wood of an oak tree."), "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png")
+register_stripped_trunk("stripped_acacia", S("Stripped Acacia Log"), S("Stripped Acacia Wood"), S("The stripped trunk of an acacia tree."), S("The stripped wood of an acacia tree."), "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png")
+register_stripped_trunk("stripped_dark_oak", S("Stripped Dark Oak Log"), S("Stripped Dark Oak Wood"), S("The stripped trunk of a dark oak tree."), S("The stripped wood of a dark oak tree."), "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png")
+register_stripped_trunk("stripped_birch", S("Stripped Birch Log"), S("Stripped Birch Wood"), S("The stripped trunk of a birch tree."), S("The stripped wood of a birch tree."),  "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png")
+register_stripped_trunk("stripped_spruce", S("Stripped Spruce Log"), S("Stripped Spruce Wood"), S("The stripped trunk of a spruce tree."), S("The stripped wood of a spruce tree."), "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png")
+register_stripped_trunk("stripped_jungle", S("Stripped Jungle Log"), S("Stripped Jungle Wood"), S("The stripped trunk of a jungle tree."), S("The stripped wood of a jungle tree."),"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png")
 register_wooden_planks("wood", S("Oak Wood Planks"), {"default_wood.png"})
 register_wooden_planks("darkwood", S("Dark Oak Wood Planks"), {"mcl_core_planks_big_oak.png"})
 register_wooden_planks("junglewood", S("Jungle Wood Planks"), {"default_junglewood.png"})
diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua
index 11e5d08f4..b9b5d92ac 100644
--- a/mods/ITEMS/mcl_dye/init.lua
+++ b/mods/ITEMS/mcl_dye/init.lua
@@ -138,7 +138,7 @@ local function bone_meal_particle(pos)
 		maxvel = { x = 0, y = 0, z = 0},
 		minacc = { x = 0, y = 0, z = 0},
 		maxacc = { x = 0, y = 0, z = 0},
-		minexptime = 1, 
+		minexptime = 1,
 		maxexptime = 4,
 		minsize = 0.7,
 		maxsize = 2.4,
diff --git a/mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.fr.tr b/mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.fr.tr
index e1178e782..985499964 100644
--- a/mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.fr.tr
+++ b/mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.fr.tr
@@ -7,7 +7,7 @@ Blast Protection=Protection contre les explosions
 Reduces explosion damage and knockback.=Réduit les dégâts d'explosion et de recul.
 Channeling=Canalisation
 Channels a bolt of lightning toward a target. Works only during thunderstorms and if target is unobstructed with opaque blocks.=Canalise un éclair vers une cible. Fonctionne uniquement pendant les orages et si la cible n'est pas obstruée par des blocs opaques.
-Curse of Binding=Malédiction du lien éterne
+Curse of Binding=Malédiction du lien éternel
 Item cannot be removed from armor slots except due to death, breaking or in Creative Mode.=L'objet ne peut pas être retiré des emplacements d'armure sauf en cas de mort, de rupture ou en mode créatif.
 Curse of Vanishing=Malédiction de disparition
 Item destroyed on death.=Objet détruit à la mort.
diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua
index b183c1432..1d9ca012c 100644
--- a/mods/ITEMS/mcl_farming/pumpkin.lua
+++ b/mods/ITEMS/mcl_farming/pumpkin.lua
@@ -155,14 +155,16 @@ if minetest.get_modpath("mcl_armor") then
 	pumpkin_face_base_def.on_secondary_use = mcl_armor.equip_on_use
 	pumpkin_face_base_def._on_equip = add_pumpkin_hud
 	pumpkin_face_base_def._on_unequip = remove_pumpkin_hud
-	
+
 	minetest.register_on_joinplayer(function(player)
 		if player:get_inventory():get_stack("armor", 2):get_name() == "mcl_farming:pumpkin_face" then
 			add_pumpkin_hud(player)
 		end
 	end)
 	minetest.register_on_dieplayer(function(player)
-		remove_pumpkin_hud(player)
+		if not minetest.settings:get_bool("mcl_keepInventory") then
+			remove_pumpkin_hud(player)
+		end
 	end)
 	minetest.register_on_leaveplayer(function(player)
 		pumpkin_hud[player] = nil
diff --git a/mods/ITEMS/mcl_furnaces/init.lua b/mods/ITEMS/mcl_furnaces/init.lua
index e31406f6a..ca43b275a 100644
--- a/mods/ITEMS/mcl_furnaces/init.lua
+++ b/mods/ITEMS/mcl_furnaces/init.lua
@@ -15,11 +15,11 @@ local function active_formspec(fuel_percent, item_percent)
 	"list[current_player;main;0,7.74;9,1;]"..
 	mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
 	"label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]"..
-	"list[current_name;src;2.75,0.5;1,1;]"..
+	"list[context;src;2.75,0.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
-	"list[current_name;fuel;2.75,2.5;1,1;]"..
+	"list[context;fuel;2.75,2.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(2.75,2.5,1,1)..
-	"list[current_name;dst;5.75,1.5;1,1;]"..
+	"list[context;dst;5.75,1.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(5.75,1.5,1,1)..
 	"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
 	(100-fuel_percent)..":default_furnace_fire_fg.png]"..
@@ -29,11 +29,11 @@ local function active_formspec(fuel_percent, item_percent)
 	-- TODO: Add it back when the Minetest bug is fixed.
 	--"image_button[8,0;1,1;craftguide_book.png;craftguide;]"..
 	--"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]"..
-	"listring[current_name;dst]"..
+	"listring[context;dst]"..
 	"listring[current_player;main]"..
-	"listring[current_name;src]"..
+	"listring[context;src]"..
 	"listring[current_player;main]"..
-	"listring[current_name;fuel]"..
+	"listring[context;fuel]"..
 	"listring[current_player;main]"
 end
 
@@ -44,11 +44,11 @@ local inactive_formspec = "size[9,8.75]"..
 	"list[current_player;main;0,7.74;9,1;]"..
 	mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
 	"label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]"..
-	"list[current_name;src;2.75,0.5;1,1;]"..
+	"list[context;src;2.75,0.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
-	"list[current_name;fuel;2.75,2.5;1,1;]"..
+	"list[context;fuel;2.75,2.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(2.75,2.5,1,1)..
-	"list[current_name;dst;5.75,1.5;1,1;]"..
+	"list[context;dst;5.75,1.5;1,1;]"..
 	mcl_formspec.get_itemslot_bg(5.75,1.5,1,1)..
 	"image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
 	"image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[transformR270]"..
@@ -56,11 +56,11 @@ local inactive_formspec = "size[9,8.75]"..
 	-- TODO: Add it back when the Minetest bug is fixed.
 	--"image_button[8,0;1,1;craftguide_book.png;craftguide;]"..
 	--"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]"..
-	"listring[current_name;dst]"..
+	"listring[context;dst]"..
 	"listring[current_player;main]"..
-	"listring[current_name;src]"..
+	"listring[context;src]"..
 	"listring[current_player;main]"..
-	"listring[current_name;fuel]"..
+	"listring[context;fuel]"..
 	"listring[current_player;main]"
 
 local receive_fields = function(pos, formname, fields, sender)
diff --git a/mods/ITEMS/mcl_hoppers/init.lua b/mods/ITEMS/mcl_hoppers/init.lua
index ca6cb60e2..9defa26ca 100644
--- a/mods/ITEMS/mcl_hoppers/init.lua
+++ b/mods/ITEMS/mcl_hoppers/init.lua
@@ -5,14 +5,14 @@ local S = minetest.get_translator(minetest.get_current_modname())
 local mcl_hoppers_formspec =
 	"size[9,7]"..
 	"label[2,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Hopper"))).."]"..
-	"list[current_name;main;2,0.5;5,1;]"..
+	"list[context;main;2,0.5;5,1;]"..
 	mcl_formspec.get_itemslot_bg(2,0.5,5,1)..
 	"label[0,2;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]"..
 	"list[current_player;main;0,2.5;9,3;9]"..
 	mcl_formspec.get_itemslot_bg(0,2.5,9,3)..
 	"list[current_player;main;0,5.74;9,1;]"..
 	mcl_formspec.get_itemslot_bg(0,5.74,9,1)..
-	"listring[current_name;main]"..
+	"listring[context;main]"..
 	"listring[current_player;main]"
 
 -- Downwards hopper (base definition)
diff --git a/mods/ITEMS/mcl_jukebox/init.lua b/mods/ITEMS/mcl_jukebox/init.lua
index ebee6f7bb..6c51a6c94 100644
--- a/mods/ITEMS/mcl_jukebox/init.lua
+++ b/mods/ITEMS/mcl_jukebox/init.lua
@@ -94,7 +94,9 @@ minetest.register_craft({
 })
 
 local function play_record(pos, itemstack, player)
-	local name = itemstack:get_name()
+	local item_name = itemstack:get_name()
+	-- ensure the jukebox uses the new record names for old records
+	local name = minetest.registered_aliases[item_name] or item_name
 	if mcl_jukebox.registered_records[name] then
 		local cname = player:get_player_name()
 		if active_tracks[cname] then
diff --git a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr
index eee31278b..d31632345 100644
--- a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr
+++ b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr
@@ -27,7 +27,7 @@ Raw Porkchop=Porc Cru
 
 A raw porkchop is the flesh from a pig and can be eaten safely. Cooking it will greatly increase its nutritional value.=Un porc cru est la chair d'un porc et peut être mangée en toute sécurité. La cuisson augmentera considérablement sa valeur nutritive.
 
-Cooked Porkchop=Parc Cuit
+Cooked Porkchop=Porc Cuit
 Cooked porkchop is the cooked flesh of a pig and is used as food.=Le porc cuit est la chair cuite d'un porc et est utilisé comme aliment.
 Raw Rabbit=Lapin Cru
 
diff --git a/mods/ITEMS/mcl_portals/portal_end.lua b/mods/ITEMS/mcl_portals/portal_end.lua
index 085205cfd..d591537e1 100644
--- a/mods/ITEMS/mcl_portals/portal_end.lua
+++ b/mods/ITEMS/mcl_portals/portal_end.lua
@@ -307,7 +307,7 @@ minetest.register_node("mcl_portals:end_portal_frame_eye", {
 	description = S("End Portal Frame with Eye of Ender"),
 	_tt_help = S("Used to construct end portals"),
 	_doc_items_create_entry = false,
-	groups = { creative_breakable = 1, deco_block = 1, comparator_signal = 15, end_portal_frame = 2 },
+	groups = { creative_breakable = 1, deco_block = 1, comparator_signal = 15, end_portal_frame = 2, not_in_creative_inventory = 1 },
 	tiles = { "mcl_portals_endframe_top.png^[lowpart:75:mcl_portals_endframe_eye.png", "mcl_portals_endframe_bottom.png", "mcl_portals_endframe_eye.png^mcl_portals_endframe_side.png" },
 	use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
 	paramtype2 = "facedir",
diff --git a/mods/ITEMS/mcl_stairs/locale/mcl_stairs.fr.tr b/mods/ITEMS/mcl_stairs/locale/mcl_stairs.fr.tr
index 9c6684fc6..4892122f6 100644
--- a/mods/ITEMS/mcl_stairs/locale/mcl_stairs.fr.tr
+++ b/mods/ITEMS/mcl_stairs/locale/mcl_stairs.fr.tr
@@ -30,9 +30,9 @@ Double Polished Stone Slab=Double Dalle en Pierre Polie
 Andesite Stairs=Escalier en Andésite
 Andesite Slab=Dalle en Andésite
 Double Andesite Slab=Double Dalle en Andésite
-Granite Stairs=Escalier en Granite
-Granite Slab=Dalle en Granite
-Double Granite Slab=Double Dalle en Granite
+Granite Stairs=Escalier en Granit
+Granite Slab=Dalle en Granit
+Double Granite Slab=Double Dalle en Granit
 Diorite Stairs=Escalier en Diorite
 Diorite Slab=Dalle en Diorite
 Double Diorite Slab=Double Dalle en Diorite
diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua
index c05aeb2da..1d68a0973 100644
--- a/mods/ITEMS/mcl_tools/init.lua
+++ b/mods/ITEMS/mcl_tools/init.lua
@@ -368,10 +368,10 @@ local function make_stripped_trunk(itemstack, placer, pointed_thing)
         return itemstack
     end
 
-    if noddef._mcl_stripped_varient == nil then
+    if noddef._mcl_stripped_variant == nil then
 		return itemstack
 	else
-		minetest.swap_node(pointed_thing.under, {name=noddef._mcl_stripped_varient, param2=node.param2})
+		minetest.swap_node(pointed_thing.under, {name=noddef._mcl_stripped_variant, param2=node.param2})
 		if not minetest.is_creative_enabled(placer:get_player_name()) then
 			-- Add wear (as if digging a axey node)
 			local toolname = itemstack:get_name()
diff --git a/mods/ITEMS/mcl_walls/locale/mcl_walls.fr.tr b/mods/ITEMS/mcl_walls/locale/mcl_walls.fr.tr
index e4bbfd0dd..445c8f7b3 100644
--- a/mods/ITEMS/mcl_walls/locale/mcl_walls.fr.tr
+++ b/mods/ITEMS/mcl_walls/locale/mcl_walls.fr.tr
@@ -3,7 +3,7 @@ A piece of wall. It cannot be jumped over with a simple jump. When multiple of t
 Cobblestone Wall=Muret de Pierres
 Mossy Cobblestone Wall=Muret de Pierres Moussu
 Andesite Wall=Muret d'Andésite
-Granite Wall=Muret de Granite
+Granite Wall=Muret de Granit
 Diorite Wall=Muret de Diorite
 Brick Wall=Muret en Brique
 Sandstone Wall=Muret de Grès
diff --git a/mods/MAPGEN/mcl_structures/init.lua b/mods/MAPGEN/mcl_structures/init.lua
index 8efdd91b1..533c9cab0 100644
--- a/mods/MAPGEN/mcl_structures/init.lua
+++ b/mods/MAPGEN/mcl_structures/init.lua
@@ -187,8 +187,6 @@ function mcl_structures.generate_igloo(pos, rotation, pr)
 		if real_depth <= 6 then
 			return success
 		end
-		-- Place hidden trapdoor
-		minetest.set_node(tpos, {name="mcl_doors:trapdoor", param2=20+minetest.dir_to_facedir(dir)}) -- TODO: more reliable param2
 		-- Generate ladder to basement
 		for y=1, real_depth-1 do
 			set_brick({x=tpos.x-1,y=tpos.y-y,z=tpos.z  })
@@ -199,6 +197,10 @@ function mcl_structures.generate_igloo(pos, rotation, pr)
 		end
 		-- Place basement
 		mcl_structures.generate_igloo_basement(bpos, rotation, pr)
+		-- Place hidden trapdoor
+		minetest.after(5, function(tpos, dir)
+			minetest.set_node(tpos, {name="mcl_doors:trapdoor", param2=20+minetest.dir_to_facedir(dir)}) -- TODO: more reliable param2
+		end, tpos, dir)
 	end
 	return success
 end
diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua
index fc8dbcd51..1e1354ae0 100644
--- a/mods/PLAYER/mcl_playerplus/init.lua
+++ b/mods/PLAYER/mcl_playerplus/init.lua
@@ -189,22 +189,15 @@ minetest.register_globalstep(function(dtime)
 				if vector.length(player_velocity) < 40 then
 					local add_velocity = player.add_velocity or player.add_player_velocity
 					add_velocity(player, vector.multiply(player:get_look_dir(), 4))
-					minetest.add_particlespawner({
-						amount = 1,
-						time = 0.1,
-						minpos = fly_pos,
-						maxpos = fly_pos,
-						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.3,
-						maxexptime = 0.5,
-						minsize = 1,
-						maxsize = 2.5,
+					add_particle({
+						pos = fly_pos,
+						velocity = {x = 0, y = 0, z = 0},
+						acceleration = {x = 0, y = 0, z = 0},
+						expirationtime = math.random(0.3, 0.5),
+						size = math.random(1, 2),
 						collisiondetection = false,
 						vertical = false,
-						texture = "mcl_particles_crit.png^[colorize:#bc7a57:127",
+						texture = "mcl_particles_bonemeal.png^[colorize:#bc7a57:127",
 						glow = 5,
 					})
 				end