Add optimized theme.ogg

delete unoptimized theme.ogg
2023-09-06 01:54:01 +00:00 · 2023-09-06 01:52:59 +00:00
469 changed files with 1422 additions and 6596 deletions
--- a/CREDITS.md
+++ b/CREDITS.md
@ -8,32 +8,30 @@

 ## Maintainers
 * AncientMariner
-* Herowl
+* Nicu

 ## Previous Maintainers
 * Fleckenstein
 * cora
-* Nicu

 ## Developers
 * AFCMS
 * epCode
 * chmodsayshello
+* PrairieWind
 * MrRar
 * FossFanatic 
 * SmokeyDope
-* Faerraven / Michieal
-* Codiac

 ## Past Developers
 * jordan4ibanez
 * iliekprogrammar
 * kabou
 * kay27
+* Faerraven / Michieal
 * MysticTempest
 * NO11
 * SumianVoice
-* PrairieWind

 ## Contributors
 * RandomLegoBrick
@ -114,21 +112,6 @@
 * Niterux
 * appgurueu
 * seventeenthShulker
-* DinoNuggies4665
-* basxto
-* Morik666
-* Eliy21
-* mdk
-* Alessandra Lozoya
-* VanicGame
-* ThePython10110
-* Araca
-* Montandalar
-* mim
-* Dark
-* Bakawun
-* JoseDouglas26
-* Zasco

 ## Music
 * Jordach for the jukebox music compilation from Big Freaking Dig
@ -172,7 +155,6 @@
 * cora
 * Faerraven / Michieal
 * PrairieWind
-* ChrisPHP

 ## 3D Models
 * 22i
@ -180,7 +162,6 @@
 * epCode
 * Faerraven / Michieal
 * SumianVoice
-* thunder1035

 ## Textures
 * XSSheep
@ -197,11 +178,8 @@
 * Faerraven / Michieal
 * Nicu
 * Exhale
-* Aeonix_Aeon
 * Wbjitscool
 * SmokeyDope
-* thunder1035
-* Herowl

 ## Translations
 * Wuzzy
@ -221,10 +199,6 @@
 * Temak
 * megustanlosfrijoles
 * kbundg
-* Isaac Dennis
-* ADLON
-* Sab Pyrope
-* JoseDouglas26

 ## Funders
 * 40W
@ -234,4 +208,4 @@
 ## Special thanks
 * The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible
 * The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
-* Notch and Jeb for being the major forces behind Minecraft
+* Notch and Jeb for being the major forces behind Minecraft
--- a/GROUPS.md
+++ b/GROUPS.md
@ -170,8 +170,16 @@ These groups are used mostly for informational purposes
 * `ammo_bow=1`: Item is used as ammo for bows
 * `non_combat_armor=1`: Item can be equipped as armor, but is not made for combat (e.g. zombie head, pumpkin)
 * `container`: Node is a container which physically stores items within and has at least 1 inventory
-   * `container=1`: Container type, which does not allow hoppers to transfer items
-   * `container=2`: Items can be placed and taken freely. Can have inventory with list name `"main"` or define `_mcl_hoppers_on_try_pull`, `_mcl_hoppers_on_try_push`, `_mcl_hoppers_on_after_pull`, `_mcl_hoppers_on_after_push` to play along hoppers nicely.
+   * `container=2`: Has one inventory with list name `"main"`. Items can be placed and taken freely
+   * `container=3`: Same as `container=2`, but shulker boxes can not be inserted
+   * `container=4`: Furnace-like, has lists `"src"`, `"fuel"` and `"dst"`.
+                    It is expected that this also reacts on `on_timer`;
+                    the node timer must be started from other mods when they add into `"src"` or `"fuel"`
+   * `container=5`: Left part of a 2-part horizontal connected container. Both parts have a `"main"` inventory
+                    list. Both inventories are considered to belong together. This is used for large chests.
+   * `container=6`: Same as above, but for the right part.
+   * `container=7`: Has inventory list "`main`", no movement allowed
+   * `container=1`: Other/unspecified container type
 * `spawn_egg=1`: Spawn egg

 * `pressure_plate=1`: Pressure plate (off)
--- a/LEGAL.md
+++ b/LEGAL.md
@ -42,10 +42,6 @@ The glazed terracotta textures have been created by [MysticTempest](https://gith
 Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
 License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)

-Armor trim models were created by Aeonix_Aeon
-Source: <https://www.curseforge.com/minecraft/texture-packs/ozocraft-remix>
-License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/)
-
 The main menu images are released under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)

 All other files, unless mentioned otherwise, fall under:
--- a/README.md
+++ b/README.md
@ -27,7 +27,7 @@ Or you can play in “creative mode” in which you can build almost anything in
 ## How to play (quick start)
 ### Getting started
 * **Punch a tree** trunk until it breaks and collect wood
-* Place the **wood into the 2×2 grid** (your “crafting grid” in your inventory menu) and craft 4 wood planks
+* Place the **wood into the 2×2 grid** (your “crafting grid” in your inventory menu and craft 4 wood planks
 * Place the 4 wood planks in a 2×2 shape in the crafting grid to **make a crafting table**
 * **Rightclick the crafting table** for a 3×3 crafting grid to craft more complex things
 * Use the **crafting guide** (book icon) to learn all the possible crafting recipes
@ -37,15 +37,15 @@ Or you can play in “creative mode” in which you can build almost anything in

 ### Farming
 * Find seeds
-* Craft a hoe
-* Rightclick dirt or a similar block with a hoe to create farmland
+* Craft hoe
+* Rightclick dirt or similar block with hoe to create farmland
 * Place seeds on farmland and watch them grow
-* Collect plants when fully grown
+* Collect plant when fully grown
 * If near water, farmland becomes wet and speeds up growth

 ### Furnace
-* Craft a furnace
-* The furnace allows you to obtain more items
+* Craft furnace
+* Furnace allows you to obtain more items
 * Upper slot must contain a smeltable item (example: iron ore)
 * Lower slot must contain a fuel item (example: coal)
 * See tooltips in crafting guide to learn about fuels and smeltable items
@ -162,7 +162,7 @@ Bonus features (not found in Minecraft):
 * Built-in crafting guide which shows you crafting and smelting recipes
 * In-game help system containing extensive help about gameplay basics, blocks, items and more
 * Temporary crafting recipes. They only exist to make some otherwise unaccessible items available when you're not in creative mode. These recipes will be removed as development goes on an more features become available
-* Saplings in chests in [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
+* Saplings in chests in mapgen v6
 * Fully moddable (thanks to Minetest's powerful Lua API)
 * New blocks and items:
    * Lookup tool, shows you the help for whatever it touches
--- a/README_locale/README.fr.md
+++ b/README_locale/README.fr.md
@ -137,7 +137,7 @@ Fonctionnalités bonus (absentes de Minecraft) :
 * Guide d'artisanat intégré au jeu qui montre les recettes d'artisanat et de cuisson
 * Système d'aide intégré au jeu contenant des informations à propos des techniques de base, blocs, objets et plus
 * Recettes d'artisanat temporaires. Elles existent uniquement pour rendre des objets accessibles qui ne le seraient pas autrement sauf en mode créatif. Elles seront retirées au cours de l'avancement du développement et de l'ajout de nouvelles fonctionnalités.
-* Pousses dans les coffres en [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
+* Pousses dans les coffres en mapgen v6
 * Entièrement moddable (grâce la puissante API Lua de Minetest)
 * Nouveaux blocs et objets :
    * Outil de recherche, montre l'aide de ce qu'il touche
--- a/README_locale/README.ru.md
+++ b/README_locale/README.ru.md
@ -154,12 +154,12 @@ Mineclone2, то ветка master обычно относительно ста
 * Некоторые вагонетки (с сундуком и с воронкой уже работают)
 * Пара нетривиальных блоков и предметов

-Бонусные возможности (нет в Minecraft-е):
+Бонусные воронкой (нет в Minecraft-е):

 * Встроенный гайд для крафта покажет вам рецепты крафта и переплавки
 * Внутриигровая справка содержит всестороннюю информацию об основах игры, блоках, предметах и прочее
 * Временные рецепты крафта. Они существуют, чтобы получить доступ к ранее недоступным предметам вне творческого режима. Они будут удалены как только разработка позволит им стать доступными
-* Саженцы в сундуках в [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
+* Саженцы в сундуках мапгена v6
 * Полностью модифицируема (благодаря мощному Lua API в Minetest)
 * Новые блоки и предметы:
    * Инструмент просмотра покажет справку о том чего коснется
@ -177,7 +177,7 @@ Mineclone2, то ветка master обычно относительно ста
 * Недостающие блоки, предметы, мобы
 * Некоторые предметы с другими названиями, чтобы лучше их различать
 * Другая музыка для проигрывателей
-* Другие текстуры (Pixel Perfection)
+* Другие текступы (Pixel Perfection)
 * Другие звуки (разные источники)
 * Другой движок (Minetest)
 * Другие пасхалки
--- a/game.conf
+++ b/game.conf
@ -1,4 +1,4 @@
 title = MineClone 2
 description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
 disallowed_mapgens = v6
-version=0.87.0-SNAPSHOT
+version=0.85.0-SNAPSHOT
--- a/menu/theme.ogg
+++ b/menu/theme.ogg
--- a/mods/CORE/controls/init.lua
+++ b/mods/CORE/controls/init.lua
@ -31,7 +31,6 @@ local known_controls = {
 	aux1 = true,
 	down = true,
 	up = true,
-	zoom = true,
 }

 minetest.register_on_joinplayer(function(player)
--- a/mods/CORE/mcl_explosions/locale/mcl_explosions.pt_BR.tr
+++ b/mods/CORE/mcl_explosions/locale/mcl_explosions.pt_BR.tr
@ -1,2 +0,0 @@
-# textdomain:mcl_explosions
-@1 was caught in an explosion.=@1 foi pego(a) em uma explosão.
--- a/mods/CORE/mcl_oxidation/README.md
+++ b/mods/CORE/mcl_oxidation/README.md
@ -11,4 +11,4 @@ For example, Copper Blocks have the definition arguement of `_mcl_waxed_variant

 For waxed nodes, scraping is easy. Start by putting `waxed = 1` into the list of groups of the waxed node.
 Next put `_mcl_stripped_variant = item string of the unwaxed variant of the node` into the defintion table.
-Waxed Copper Blocks can be scrapped into normal Copper Blocks because of the definition `_mcl_stripped_variant = "mcl_copper:block"`.
+Wxaed Copper Blocks can be scrapped into normal Copper Blocks because of the definition `_mcl_stripped_variant = "mcl_copper:block"`.
--- a/mods/CORE/mcl_util/init.lua
+++ b/mods/CORE/mcl_util/init.lua
@ -22,30 +22,6 @@ function table.update_nil(t, ...)
 	return t
 end

---Works the same as `pairs`, but order returned by keys
---
---Taken from https://www.lua.org/pil/19.3.html
---@generic T: table, K, V, C
---@param t T
---@param f? fun(a: C, b: C):boolean
---@return fun():K, V
-function table.pairs_by_keys(t, f)
-	local a = {}
-	for n in pairs(t) do table.insert(a, n) end
-	table.sort(a, f)
-
-	local i = 0        -- iterator variable
-	local function iter() -- iterator function
-		i = i + 1
-		if a[i] == nil then
-			return nil
-		else
-			return a[i], t[a[i]]
-		end
-	end
-	return iter
-end
-
 local LOGGING_ON = minetest.settings:get_bool("mcl_logging_default", false)
 local LOG_MODULE = "[MCL2]"
 function mcl_util.mcl_log(message, module, bypass_default_logger)
@ -98,18 +74,6 @@ function mcl_util.check_dtime_timer(self, dtime, timer_name, threshold)
 	return false
 end

-- While we should always favour the new minetest vector functions such as vector.new or vector.offset which validate on
-- creation. There may be cases where state gets corrupted and we may have to check the vector is valid if created the
-- old way. This allows us to do this as a tactical solution until old style vectors are completely removed.
-function mcl_util.validate_vector (vect)
-	if vect then
-		if tonumber(vect.x) and tonumber(vect.y) and tonumber(vect.z) then
-			return true
-		end
-	end
-	return false
-end
-
 -- Minetest 5.3.0 or less can only measure the light level. This came in at 5.4
 -- This function has been known to fail in multiple places so the error handling is added increase safety and improve
 -- debugging. See:
@ -160,7 +124,7 @@ function mcl_util.rotate_axis_and_place(itemstack, placer, pointed_thing, infini
 		return
 	end
 	local undef = minetest.registered_nodes[unode.name]
-	if undef and undef.on_rightclick and not invert_wall then
+	if undef and undef.on_rightclick then
 		undef.on_rightclick(pointed_thing.under, unode, placer,
 			itemstack, pointed_thing)
 		return
@ -198,11 +162,25 @@ function mcl_util.rotate_axis_and_place(itemstack, placer, pointed_thing, infini

 	local p2
 	if is_y then
-		p2 = 0
+		if invert_wall then
+			if fdir == 3 or fdir == 1 then
+				p2 = 12
+			else
+				p2 = 6
+			end
+		end
 	elseif is_x then
-		p2 = 12
+		if invert_wall then
+			p2 = 0
+		else
+			p2 = 12
+		end
 	elseif is_z then
-		p2 = 6
+		if invert_wall then
+			p2 = 0
+		else
+			p2 = 6
+		end
 	end
 	minetest.set_node(pos, {name = wield_name, param2 = p2})

@ -251,25 +229,34 @@ function mcl_util.get_double_container_neighbor_pos(pos, param2, side)
 	end
 end

--- Selects item stack to transfer from
---@param src_inventory InvRef Source innentory to pull from
---@param src_list string Name of source inventory list to pull from
---@param dst_inventory InvRef Destination inventory to push to
---@param dst_list string Name of destination inventory list to push to
---@param condition? fun(stack: ItemStack) Condition which items are allowed to be transfered.
---@return integer Item stack number to be transfered
-function mcl_util.select_stack(src_inventory, src_list, dst_inventory, dst_list, condition)
-	local src_size = src_inventory:get_size(src_list)
+-- Iterates through all items in the given inventory and
+-- returns the slot of the first item which matches a condition.
+-- Returns nil if no item was found.
+--- source_inventory: Inventory to take the item from
+--- source_list: List name of the source inventory from which to take the item
+--- destination_inventory: Put item into this inventory
+--- destination_list: List name of the destination inventory to which to put the item into
+--- condition: Function which takes an itemstack and returns true if it matches the desired item condition.
+---            If set to nil, the slot of the first item stack will be taken unconditionally.
+-- dst_inventory and dst_list can also be nil if condition is nil.
+function mcl_util.get_eligible_transfer_item_slot(src_inventory, src_list, dst_inventory, dst_list, condition)
+	local size = src_inventory:get_size(src_list)
 	local stack
-	for i = 1, src_size do
+	for i = 1, size do
 		stack = src_inventory:get_stack(src_list, i)
-		if not stack:is_empty() and dst_inventory:room_for_item(dst_list, stack) and ((condition == nil or condition(stack))) then
+		if not stack:is_empty() and (condition == nil or condition(stack, src_inventory, src_list, dst_inventory, dst_list)) then
 			return i
 		end
 	end
 	return nil
 end

+-- Returns true if itemstack is a shulker box
+local function is_not_shulker_box(itemstack)
+	local g = minetest.get_item_group(itemstack:get_name(), "shulker_box")
+	return g == 0 or g == nil
+end
+
 -- Moves a single item from one inventory to another.
 --- source_inventory: Inventory to take the item from
 --- source_list: List name of the source inventory from which to take the item
@ -280,6 +267,13 @@ end
 -- Returns true on success and false on failure
 -- Possible failures: No item in source slot, destination inventory full
 function mcl_util.move_item(source_inventory, source_list, source_stack_id, destination_inventory, destination_list)
+	if source_stack_id == -1 then
+		source_stack_id = mcl_util.get_first_occupied_inventory_slot(source_inventory, source_list)
+		if source_stack_id == nil then
+			return false
+		end
+	end
+
 	if not source_inventory:is_empty(source_list) then
 		local stack = source_inventory:get_stack(source_list, source_stack_id)
 		if not stack:is_empty() then
@ -297,75 +291,150 @@ function mcl_util.move_item(source_inventory, source_list, source_stack_id, dest
 	return false
 end

--- Try pushing item from hopper inventory to destination inventory
---@param pos Vector
---@param dst_pos Vector
-function mcl_util.hopper_push(pos, dst_pos)
-	local hop_inv = minetest.get_meta(pos):get_inventory()
-	local hop_list = 'main'
+-- Moves a single item from one container node into another. Performs a variety of high-level
+-- checks to prevent invalid transfers such as shulker boxes into shulker boxes
+--- source_pos: Position ({x,y,z}) of the node to take the item from
+--- destination_pos: Position ({x,y,z}) of the node to put the item into
+--- source_list (optional): List name of the source inventory from which to take the item. Default is normally "main"; "dst" for furnace
+--- source_stack_id (optional): The inventory position ID of the source inventory to take the item from (-1 for slot of the first valid item; -1 is default)
+--- destination_list (optional): List name of the destination inventory. Default is normally "main"; "src" for furnace
+-- Returns true on success and false on failure.
+function mcl_util.move_item_container(source_pos, destination_pos, source_list, source_stack_id, destination_list)
+	local dpos = table.copy(destination_pos)
+	local spos = table.copy(source_pos)
+	local snode = minetest.get_node(spos)
+	local dnode = minetest.get_node(dpos)

-	-- Get node pos' for item transfer
-	local dst = minetest.get_node(dst_pos)
-	if not minetest.registered_nodes[dst.name] then return end
-	local dst_type = minetest.get_item_group(dst.name, "container")
-	if dst_type ~= 2 then return end
-	local dst_def = minetest.registered_nodes[dst.name]
+	local dctype = minetest.get_item_group(dnode.name, "container")
+	local sctype = minetest.get_item_group(snode.name, "container")

-	local dst_list = 'main'
-	local dst_inv, stack_id
-
-	if dst_def._mcl_hoppers_on_try_push then
-		dst_inv, dst_list, stack_id = dst_def._mcl_hoppers_on_try_push(dst_pos, pos, hop_inv, hop_list)
-	else
-		local dst_meta = minetest.get_meta(dst_pos)
-		dst_inv = dst_meta:get_inventory()
-		stack_id = mcl_util.select_stack(hop_inv, hop_list, dst_inv, dst_list)
+	-- Container type 7 does not allow any movement
+	if sctype == 7 then
+		return false
 	end

-	if stack_id ~= nil then
-		local ok = mcl_util.move_item(hop_inv, hop_list, stack_id, dst_inv, dst_list)
-		if dst_def._mcl_hoppers_on_after_push then
-			dst_def._mcl_hoppers_on_after_push(dst_pos)
+	-- Normalize double container by forcing to always use the left segment first
+	local function normalize_double_container(pos, node, ctype)
+		if ctype == 6 then
+			pos = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "right")
+			if not pos then
+				return false
+			end
+			node = minetest.get_node(pos)
+			ctype = minetest.get_item_group(node.name, "container")
+			-- The left segment seems incorrect? We better bail out!
+			if ctype ~= 5 then
+				return false
+			end
 		end
-		if ok then
-			return true
+		return pos, node, ctype
+	end
+
+	spos, snode, sctype = normalize_double_container(spos, snode, sctype)
+	dpos, dnode, dctype = normalize_double_container(dpos, dnode, dctype)
+	if not spos or not dpos then return false end
+
+	local smeta = minetest.get_meta(spos)
+	local dmeta = minetest.get_meta(dpos)
+
+	local sinv = smeta:get_inventory()
+	local dinv = dmeta:get_inventory()
+
+	-- Default source lists
+	if not source_list then
+		-- Main inventory for most container types
+		if sctype == 2 or sctype == 3 or sctype == 5 or sctype == 6 or sctype == 7 then
+			source_list = "main"
+			-- Furnace: output
+		elseif sctype == 4 then
+			source_list = "dst"
+			-- Unknown source container type. Bail out
+		else
+			return false
 		end
 	end

+	-- Automatically select stack slot ID if set to automatic
+	if not source_stack_id then
+		source_stack_id = -1
+	end
+	if source_stack_id == -1 then
+		local cond = nil
+		-- Prevent shulker box inception
+		if dctype == 3 then
+			cond = is_not_shulker_box
+		end
+		source_stack_id = mcl_util.get_eligible_transfer_item_slot(sinv, source_list, dinv, dpos, cond)
+		if not source_stack_id then
+			-- Try again if source is a double container
+			if sctype == 5 then
+				spos = mcl_util.get_double_container_neighbor_pos(spos, snode.param2, "left")
+				smeta = minetest.get_meta(spos)
+				sinv = smeta:get_inventory()
+
+				source_stack_id = mcl_util.get_eligible_transfer_item_slot(sinv, source_list, dinv, dpos, cond)
+				if not source_stack_id then
+					return false
+				end
+			else
+				return false
+			end
+		end
+	end
+
+	-- Abort transfer if shulker box wants to go into shulker box
+	if dctype == 3 then
+		local stack = sinv:get_stack(source_list, source_stack_id)
+		if stack and minetest.get_item_group(stack:get_name(), "shulker_box") == 1 then
+			return false
+		end
+	end
+	-- Container type 7 does not allow any placement
+	if dctype == 7 then
+		return false
+	end
+
+	-- If it's a container, put it into the container
+	if dctype ~= 0 then
+		-- Automatically select a destination list if omitted
+		if not destination_list then
+			-- Main inventory for most container types
+			if dctype == 2 or dctype == 3 or dctype == 5 or dctype == 6 or dctype == 7 then
+				destination_list = "main"
+				-- Furnace source slot
+			elseif dctype == 4 then
+				destination_list = "src"
+			end
+		end
+		if destination_list then
+			-- Move item
+			local ok = mcl_util.move_item(sinv, source_list, source_stack_id, dinv, destination_list)
+
+			-- Try transfer to neighbor node if transfer failed and double container
+			if not ok and dctype == 5 then
+				dpos = mcl_util.get_double_container_neighbor_pos(dpos, dnode.param2, "left")
+				dmeta = minetest.get_meta(dpos)
+				dinv = dmeta:get_inventory()
+
+				ok = mcl_util.move_item(sinv, source_list, source_stack_id, dinv, destination_list)
+			end
+
+			-- Update furnace
+			if ok and dctype == 4 then
+				-- Start furnace's timer function, it will sort out whether furnace can burn or not.
+				minetest.get_node_timer(dpos):start(1.0)
+			end
+
+			return ok
+		end
+	end
 	return false
 end

-- Try pulling from source inventory to hopper inventory
---@param pos Vector
---@param src_pos Vector
-function mcl_util.hopper_pull(pos, src_pos)
-	local hop_inv = minetest.get_meta(pos):get_inventory()
-	local hop_list = 'main'
-
-	-- Get node pos' for item transfer
-	local src = minetest.get_node(src_pos)
-	if not minetest.registered_nodes[src.name] then return end
-	local src_type = minetest.get_item_group(src.name, "container")
-	if src_type ~= 2 then return end
-	local src_def = minetest.registered_nodes[src.name]
-
-	local src_list = 'main'
-	local src_inv, stack_id
-
-	if src_def._mcl_hoppers_on_try_pull then
-		src_inv, src_list, stack_id = src_def._mcl_hoppers_on_try_pull(src_pos, pos, hop_inv, hop_list)
-	else
-		local src_meta = minetest.get_meta(src_pos)
-		src_inv = src_meta:get_inventory()
-		stack_id = mcl_util.select_stack(src_inv, src_list, hop_inv, hop_list)
-	end
-
-	if stack_id ~= nil then
-		local ok = mcl_util.move_item(src_inv, src_list, stack_id, hop_inv, hop_list)
-		if src_def._mcl_hoppers_on_after_pull then
-			src_def._mcl_hoppers_on_after_pull(src_pos)
-		end
-	end
+-- Returns the ID of the first non-empty slot in the given inventory list
+-- or nil, if inventory is empty.
+function mcl_util.get_first_occupied_inventory_slot(inventory, listname)
+	return mcl_util.get_eligible_transfer_item_slot(inventory, listname)
 end

 local function drop_item_stack(pos, stack)
@ -543,7 +612,7 @@ function mcl_util.deal_damage(target, damage, mcl_reason)
 			end
 			return
 		end
-	elseif not target:is_player() then return end
+	end

 	local is_immortal = target:get_armor_groups().immortal or 0
 	if is_immortal>0 then
@ -1032,62 +1101,3 @@ function mcl_util.get_colorwallmounted_rotation(pos)
 		end
 	end
 end
-
---Move items from one inventory list to another, drop items that do not fit in provided pos and direction.
---@param src_inv mt.InvRef
---@param src_listname string
---@param out_inv mt.InvRef
---@param out_listname string
---@param pos mt.Vector Position to throw items at
---@param dir? mt.Vector Direction to throw items in
---@param insta_collect? boolean Enable instant collection, let players collect dropped items instantly. Default `false`
-function mcl_util.move_list(src_inv, src_listname, out_inv, out_listname, pos, dir, insta_collect)
-	local src_list = src_inv:get_list(src_listname)
-
-	if not src_list then return end
-	for i, stack in ipairs(src_list) do
-		if out_inv:room_for_item(out_listname, stack) then
-			out_inv:add_item(out_listname, stack)
-		else
-			local p = vector.copy(pos)
-			p.x = p.x + (math.random(1, 3) * 0.2)
-			p.z = p.z + (math.random(1, 3) * 0.2)
-
-			local obj = minetest.add_item(p, stack)
-			if obj then
-				if dir then
-					local v = vector.copy(dir)
-					v.x = v.x * 4
-					v.y = v.y * 4 + 2
-					v.z = v.z * 4
-					obj:set_velocity(v)
-					mcl_util.mcl_log("item velocity calculated "..vector.to_string(v), "[mcl_util]")
-				end
-				if not insta_collect then
-					obj:get_luaentity()._insta_collect = false
-				end
-			end
-		end
-
-		stack:clear()
-		src_inv:set_stack(src_listname, i, stack)
-	end
-end
-
---Move items from a player's inventory list to its main inventory list, drop items that do not fit in front of him.
---@param player mt.PlayerObjectRef
---@param src_listname string
-function mcl_util.move_player_list(player, src_listname)
-	mcl_util.move_list(player:get_inventory(), src_listname, player:get_inventory(), "main",
-		vector.offset(player:get_pos(), 0, 1.2, 0),
-		player:get_look_dir(), false)
-end
-
-function mcl_util.is_it_christmas()
-	local date = os.date("*t")
-	if date.month == 12 and date.day >= 24 or date.month == 1 and date.day <= 7 then
-		return true
-	else
-		return false
-	end
-end
--- a/mods/ENTITIES/mcl_boats/init.lua
+++ b/mods/ENTITIES/mcl_boats/init.lua
@ -62,13 +62,8 @@ end
 local function set_double_attach(boat)
 	boat._driver:set_attach(boat.object, "",
 		{x = 0, y = 0.42, z = 0.8}, {x = 0, y = 0, z = 0})
-	if boat._passenger:is_player() then
-		boat._passenger:set_attach(boat.object, "",
-			{x = 0, y = 0.42, z = -6.2}, {x = 0, y = 0, z = 0})
-	else
-		boat._passenger:set_attach(boat.object, "",
-			{x = 0, y = 0.42, z = -4.5}, {x = 0, y = 270, z = 0})
-	end
+	boat._passenger:set_attach(boat.object, "",
+		{x = 0, y = 0.42, z = -2.2}, {x = 0, y = 0, z = 0})
 end
 local function set_choat_attach(boat)
 	boat._driver:set_attach(boat.object, "",
@ -160,7 +155,7 @@ local boat = {
 minetest.register_on_respawnplayer(detach_object)

 function boat.on_rightclick(self, clicker)
-	if self._passenger or not clicker or clicker:get_attach() or (self.name == "mcl_boats:chest_boat" and self._driver) then
+	if self._passenger or not clicker or clicker:get_attach() then
 		return
 	end
 	attach_object(self, clicker)
--- a/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr
+++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr
@ -12,7 +12,6 @@ Water vehicle=Véhicule aquatique
 Sneak to dismount=Se baisser pour descendre
 Obsidian Boat=Bateau en obsidienne
 Mangrove Boat=Bateau en palétuvier
-Cherry Boat=Bateau en cerisier
 Oak Chest Boat=Bateau en chêne avec coffre
 Spruce Chest Boat=Bateau en sapin avec coffre
 Birch Chest Boat=Bateau en bouleau avec coffre
@ -20,4 +19,3 @@ Jungle Chest Boat=Bateau en acajou avec coffre
 Acacia Chest Boat=Bateau en acacia avec coffre
 Dark Oak Chest Boat=Bateau en chêne noir avec coffre
 Mangrove Chest Boat=Bateau en palétuvier avec coffre
-Cherry Chest Boat=Bateau en cerisier avec coffre
--- a/mods/ENTITIES/mcl_boats/locale/mcl_boats.pt_BR.tr
+++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.pt_BR.tr
@ -1,23 +0,0 @@
-# textdomain: mcl_boats
-Acacia Boat=Barco de Acácia
-Birch Boat=Barco de Bétula
-Boat=Barco
-Boats are used to travel on the surface of water.=Barcos são usados para viajar na superfície da água
-Dark Oak Boat=Barco de Carvalho Escuro
-Jungle Boat=Barco de Selva
-Oak Boat=Barco de Carvalho
-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.=Clique com o botão direito em uma fonte de água para posicionar o barco. Clique com o botão direito no barco para entrar nele. Use [Esquerda] e [Direita] para fazer curva, [Frente] para acelerar e [Trás] para frear e ir para trás. Use [Agachar] para deixar o barco, soque-o para fazê-lo dropar como um item.
-Spruce Boat=Barco de Pinheiro
-Water vehicle=Veículo aquático
-Sneak to dismount=Agache para desmontar
-Obsidian Boat=Barco de Obsidiana
-Mangrove Boat=Barco de Mangue
-Cherry Boat=Barco de Cerejeira
-Oak Chest Boat=Barco de Carvalho com Baú
-Spruce Chest Boat=Barco de Pinheiro com Baú
-Birch Chest Boat=Barco de Bétula com Baú
-Jungle Chest Boat=Barco de Selva com Baú
-Acacia Chest Boat=Barco de Acácia com Baú
-Dark Oak Chest Boat=Barco de Carvalho Escuro com Baú
-Mangrove Chest Boat=Barco de Mangue com Baú
-Cherry Chest Boat=Barco de Cerejeira com Baú
--- a/mods/ENTITIES/mcl_dripping/README.md
+++ b/mods/ENTITIES/mcl_dripping/README.md
@ -1,36 +1,36 @@
-# mcl_dripping
-
-Dripping Mod by kddekadenz, modified for MineClone 2 by Wuzzy, NO11 and AFCM
-
-## Manual
-
- drops are generated rarely under solid nodes
- they will stay some time at the generated block and than they fall down
- when they collide with the ground, a sound is played and they are destroyed
-
-Water and Lava have builtin drops registered.
-
-## License
-
-code & sounds: CC0
-
-## API
-
-```lua
-mcl_dripping.register_drop({
-	-- The group the liquid's nodes belong to
-	liquid   = "water",
-	-- The texture used (particles will take a random 2x2 area of it)
-	texture  = "mcl_core_water_source_animation.png",
-	-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
-	light    = 1,
-	-- The nodes (or node group) the particles will spawn under
-	nodes    = { "group:opaque", "group:leaves" },
-	-- The sound that will be played then the particle detaches from the roof, see SimpleSoundSpec in lua_api.txt
-	sound    = "drippingwater_drip",
-	-- The interval for the ABM to run
-	interval = 60,
-	-- The chance of the ABM
-	chance   = 10,
-})
-```
+# mcl_dripping
+
+Dripping Mod by kddekadenz, modified for MineClone 2 by Wuzzy, NO11 and AFCM
+
+## Manual
+
+- drops are generated rarely under solid nodes
+- they will stay some time at the generated block and than they fall down
+- when they collide with the ground, a sound is played and they are destroyed
+
+Water and Lava have builtin drops registered.
+
+## License
+
+code & sounds: CC0
+
+## API
+
+```lua
+mcl_dripping.register_drop({
+	-- The group the liquid's nodes belong to
+	liquid   = "water",
+	-- The texture used (particles will take a random 2x2 area of it)
+	texture  = "default_water_source_animated.png",
+	-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
+	light    = 1,
+	-- The nodes (or node group) the particles will spawn under
+	nodes    = { "group:opaque", "group:leaves" },
+	-- The sound that will be played then the particle detaches from the roof, see SimpleSoundSpec in lua_api.txt
+	sound    = "drippingwater_drip",
+	-- The interval for the ABM to run
+	interval = 60,
+	-- The chance of the ABM
+	chance   = 10,
+})
+```
--- a/mods/ENTITIES/mcl_dripping/init.lua
+++ b/mods/ENTITIES/mcl_dripping/init.lua
@ -82,7 +82,7 @@ end

 mcl_dripping.register_drop({
 	liquid   = "water",
-	texture  = "mcl_core_water_source_animation.png",
+	texture  = "default_water_source_animated.png",
 	light    = 1,
 	nodes    = { "group:opaque", "group:leaves" },
 	sound    = "drippingwater_drip",
@ -92,7 +92,7 @@ mcl_dripping.register_drop({

 mcl_dripping.register_drop({
 	liquid   = "lava",
-	texture  = "mcl_core_lava_source_animation.png",
+	texture  = "default_lava_source_animated.png",
 	light    = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
 	nodes    = { "group:opaque" },
 	sound    = "drippingwater_lavadrip",
--- a/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.pt_BR.tr
+++ b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.pt_BR.tr
@ -1,3 +0,0 @@
-# textdomain: mcl_falling_nodes
-@1 was smashed by a falling anvil.=@1 foi esmagado(a) por uma bigorna em queda.
-@1 was smashed by a falling block.=@1 foi esmagado(a) por um bloco em queda.
--- a/mods/ENTITIES/mcl_item_entity/init.lua
+++ b/mods/ENTITIES/mcl_item_entity/init.lua
@ -362,121 +362,6 @@ function minetest.handle_node_drops(pos, drops, digger)
 	end
 end

-- the following code is pulled from Minetest builtin without changes except for the call order being changed,
-- until a comment saying explicitly it's the end of such code
-- TODO if this gets a fix in the engine, remove the block of code
-local function user_name(user)
-	return user and user:get_player_name() or ""
-end
-- Returns a logging function. For empty names, does not log.
-local function make_log(name)
-	return name ~= "" and minetest.log or function() end
-end
-function minetest.node_dig(pos, node, digger)
-	local diggername = user_name(digger)
-	local log = make_log(diggername)
-	local def = minetest.registered_nodes[node.name]
-	-- Copy pos because the callback could modify it
-	if def and (not def.diggable or
-			(def.can_dig and not def.can_dig(vector.copy(pos), digger))) then
-		log("info", diggername .. " tried to dig "
-			.. node.name .. " which is not diggable "
-			.. minetest.pos_to_string(pos))
-		return false
-	end
-
-	if minetest.is_protected(pos, diggername) then
-		log("action", diggername
-				.. " tried to dig " .. node.name
-				.. " at protected position "
-				.. minetest.pos_to_string(pos))
-		minetest.record_protection_violation(pos, diggername)
-		return false
-	end
-
-	log('action', diggername .. " digs "
-		.. node.name .. " at " .. minetest.pos_to_string(pos))
-
-	local wielded = digger and digger:get_wielded_item()
-	local drops = minetest.get_node_drops(node, wielded and wielded:get_name())
-
-	-- Check to see if metadata should be preserved.
-	if def and def.preserve_metadata then
-		local oldmeta = minetest.get_meta(pos):to_table().fields
-		-- Copy pos and node because the callback can modify them.
-		local pos_copy = vector.copy(pos)
-		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
-		local drop_stacks = {}
-		for k, v in pairs(drops) do
-			drop_stacks[k] = ItemStack(v)
-		end
-		drops = drop_stacks
-		def.preserve_metadata(pos_copy, node_copy, oldmeta, drops)
-	end
-
-	-- Handle drops
-	minetest.handle_node_drops(pos, drops, digger)
-
-	if wielded then
-		local wdef = wielded:get_definition()
-		local tp = wielded:get_tool_capabilities()
-		local dp = minetest.get_dig_params(def and def.groups, tp, wielded:get_wear())
-		if wdef and wdef.after_use then
-			wielded = wdef.after_use(wielded, digger, node, dp) or wielded
-		else
-			-- Wear out tool
-			if not minetest.is_creative_enabled(diggername) then
-				wielded:add_wear(dp.wear)
-				if wielded:get_count() == 0 and wdef.sound and wdef.sound.breaks then
-					minetest.sound_play(wdef.sound.breaks, {
-						pos = pos,
-						gain = 0.5
-					}, true)
-				end
-			end
-		end
-		digger:set_wielded_item(wielded)
-	end
-
-	local oldmetadata = nil
-	if def and def.after_dig_node then
-		oldmetadata = minetest.get_meta(pos):to_table()
-	end
-
-	-- Remove node and update
-	minetest.remove_node(pos)
-
-	-- Play sound if it was done by a player
-	if diggername ~= "" and def and def.sounds and def.sounds.dug then
-		minetest.sound_play(def.sounds.dug, {
-			pos = pos,
-			exclude_player = diggername,
-		}, true)
-	end
-
-	-- Run callback
-	if def and def.after_dig_node then
-		-- Copy pos and node because callback can modify them
-		local pos_copy = vector.copy(pos)
-		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
-		def.after_dig_node(pos_copy, node_copy, oldmetadata, digger)
-	end
-
-	-- Run script hook
-	for _, callback in ipairs(minetest.registered_on_dignodes) do
-		local origin = minetest.callback_origins[callback]
-		minetest.set_last_run_mod(origin.mod)
-
-		-- Copy pos and node because callback can modify them
-		local pos_copy = vector.copy(pos)
-		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
-		callback(pos_copy, node_copy, digger)
-	end
-
-	return true
-end
-- end of code pulled from Minetest
-
 -- Drop single items by default
 function minetest.item_drop(itemstack, dropper, pos)
 	if dropper and dropper:is_player() then
--- a/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.pt_BR.tr
+++ b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.pt_BR.tr
@ -1,36 +0,0 @@
-# textdomain: mcl_minecarts
-Minecart=Carrinho
-Minecarts can be used for a quick transportion on rails.=Carrinhos podem ser usados para transporte rápido em trilhos.
-Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Carrinhos viajam somente em trilhos e sempre seguem os traçados. Em uma junção em T sem linha reta à frente, eles viram à esquerda. A velocidade é afetada pelo tipo do trilho.
-You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Você pode posicionar o carrinho em trilhos. Clique com o botão direito para entrar nele. Soque-o para fazê-lo mover.
-To obtain the minecart, punch it while holding down the sneak key.=Para obter o carrinho, soque-o enquanto segura pressionada a tecla de agachar.
-A minecart with TNT is an explosive vehicle that travels on rail.=Um carrinho com TNT é um veículo explosivo que viaja nos trilhos.
-Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Posicione-o nos trilhos. Soque-o para movê-lo. A TNT é acesa com um isqueiro ou quando o carrinho está sobre um trilho ativador energizado.
-To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Para obter o carrinho e a TNT, soque-os enquanto segura pressionada a tecla de agachar. Você não consegue fazer isso se a TNT foi acesa.
-A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Um carrinho com fornalha é um veículo que viaja nos trilhos. Se move por conta própria com combustível.
-Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Posicione-o nos trilhos. Se você o der um pouco de carvão, a fornalha vai começar a queimar por um longo tempo e o carrinho será capaz de se mover por conta própria. Soque-o para fazê-lo mover.
-To obtain the minecart and furnace, punch them while holding down the sneak key.=Para obter o carrinho e a fornalha, soque-os enquanto segura pressionada a tecla de agachar.
-Minecart with Chest=Carrinho com Baú
-Minecart with Furnace=Carrinho com Fornalha
-Minecart with Command Block=Carrinho com Bloco de Comandos
-Minecart with Hopper=Carrinho com Funil
-Minecart with TNT=Carrinho com TNT
-Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Posicione-os no chão para construir suas linhas férreas, os trilhos vão conectar-se automaticamente uns nos outros e vão se transformar em curvas, junções em T, cruzamentos e rampas quando necessário.
-Rail=Trilho
-Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Trilhos podem ser usados para construir traçados de transporte para carrinhos. Trilhos normais freiam carrinhos gradativamente devido ao atrito.
-Powered Rail=Trilho Energizador
-Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Trilhos podem ser usados para construir traçados de transporte para carrinhos. Trilhos energizados são capazes de acelerar e frear carrinhos.
-Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Sem carga de redstone, o trilho vai frear os carrinhos. Para fazer o trilho acelerar os carrinhos, energize-o com uma carga de redstone.
-Activator Rail=Trilho Ativador
-Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Trilhos podem ser usados para construir traçados de transporte para carrinhos. Trilhos ativadores são usados para ativar carrinhos especiais.
-To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Para fazer esse trilho ativar os carrinhos, energize-o com uma carga de redstone e envie um carrinho sobre esse pedaço de trilho.
-Detector Rail=Trilho Detector
-Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Trilhos podem ser usados para construir traçados de transporte para carrinhos. Um trilho detector é capaz de detectar um carrinho sobre ele e energizar mecanismos de redstone.
-To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Para detectar um carrinho e providenciar carga de redstone, conecte-o em trilhas de redstone ou mecanismos de redstone e envie qualquer carrinho sobre esse trilho.
-Track for minecarts=Traçado para carrinhos
-Speed up when powered, slow down when not powered=Acelera quando energizado, desacelera quando não energizado
-Activates minecarts when powered=Ativa carrinhos quando energizado
-Emits redstone power when a minecart is detected=Emite carga de redstone quando um carrinho é detectado
-Vehicle for fast travel on rails=Veículo para viajar rápido em trilhos
-Can be ignited by tools or powered activator rail=Pode ser aceso por ferramentas ou trilho ativador energizado
-Sneak to dismount=Agache para desmontar
--- a/mods/ENTITIES/mcl_mobs/breeding.lua
+++ b/mods/ENTITIES/mcl_mobs/breeding.lua
@ -32,9 +32,6 @@ function mob_class:feed_tame(clicker, feed_count, breed, tame, notake)
 	if not self.follow then
 		return false
 	end
-	if clicker:get_wielded_item():get_definition()._mcl_not_consumable then
-		return false
-	end
 	-- can eat/tame with item in hand
 	if self.nofollow or self:follow_holding(clicker) then
 		local consume_food = false
--- a/mods/ENTITIES/mcl_mobs/combat.lua
+++ b/mods/ENTITIES/mcl_mobs/combat.lua
@ -21,8 +21,6 @@ local function atan(x)
 	end
 end

-mcl_mobs.effect_functions = {}
-

 -- check if daytime and also if mob is docile during daylight hours
 function mob_class:day_docile()
@ -384,8 +382,7 @@ function mob_class:monster_attack()
 		-- find specific mob to attack, failing that attack player/npc/animal
 		if specific_attack(self.specific_attack, name)
 				and (type == "player" or ( type == "npc" and self.attack_npcs )
-				or (type == "animal" and self.attack_animals == true)
-				or (self.extra_hostile and not self.attack_exception(player))) then
+				or (type == "animal" and self.attack_animals == true)) then
 			p = player:get_pos()
 			sp = s

@ -516,28 +513,6 @@ end

 -- deal damage and effects when mob punched
 function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
-	local is_player = hitter:is_player()
-	local mob_pos = self.object:get_pos()
-	local player_pos = hitter:get_pos()
-
-	if is_player then
-		-- is mob out of reach?
-		if vector.distance(mob_pos, player_pos) > 3 then
-			return
-		end
-		-- is mob protected?
-		if self.protected and minetest.is_protected(mob_pos, hitter:get_player_name()) then
-			return
-		end
-	end
-
-	local time_now = minetest.get_us_time()
-	local time_diff = time_now - self.invul_timestamp
-
-	-- check for invulnerability time in microseconds (0.5 second)
-	if time_diff <= 500000 and time_diff >= 0 then
-		return
-	end

 	-- custom punch function
 	if self.do_punch then
@ -554,15 +529,20 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 		return
 	end

-	local time_now = minetest.get_us_time()
+	local is_player = hitter:is_player()

 	if is_player then
+		-- is mob protected?
+		if self.protected and minetest.is_protected(self.object:get_pos(), hitter:get_player_name()) then
+			return
+		end
+
 		if minetest.is_creative_enabled(hitter:get_player_name()) then
 			self.health = 0
 		end

 		-- set/update 'drop xp' timestamp if hitted by player
-		self.xp_timestamp = time_now
+		self.xp_timestamp = minetest.get_us_time()
 	end


@ -674,9 +654,6 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 			-- do damage
 			self.health = self.health - damage

-			-- give invulnerability
-			self.invul_timestamp = time_now
-
 			-- skip future functions if dead, except alerting others
 			if self:check_for_death( "hit", {type = "punch", puncher = hitter}) then
 				die = true
@ -692,10 +669,10 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 			if not v then return end
 			local r = 1.4 - math.min(punch_interval, 1.4)
 			local kb = r * (math.abs(v.x)+math.abs(v.z))
-			local up = 2.625
+			local up = 2

 			if die==true then
-				kb=kb*1.25
+				kb=kb*2
 			end

 			-- if already in air then dont go up anymore when hit
@ -709,7 +686,7 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 			if tool_capabilities.damage_groups["knockback"] then
 				kb = tool_capabilities.damage_groups["knockback"]
 			else
-				kb = kb * 1.25
+				kb = kb * 1.5
 			end


@ -719,19 +696,9 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 			end
 			if hitter and is_player then
 				local wielditem = hitter:get_wielded_item()
-				kb = kb + 9 * mcl_enchanting.get_enchantment(wielditem, "knockback")
-				-- add player velocity to mob knockback
-				local hv = hitter:get_velocity()
-				local dir_dot = (hv.x * dir.x) + (hv.z * dir.z)
-				local player_mag = math.sqrt((hv.x * hv.x) + (hv.z * hv.z))
-				local mob_mag = math.sqrt((v.x * v.x) + (v.z * v.z))
-				if dir_dot > 0 and mob_mag <= player_mag * 0.625 then
-					kb = kb + ((math.abs(hv.x) + math.abs(hv.z)) * r)
-				end
-			elseif luaentity and luaentity._knockback and die == false then
+				kb = kb + 3 * mcl_enchanting.get_enchantment(wielditem, "knockback")
+			elseif luaentity and luaentity._knockback then
 				kb = kb + luaentity._knockback
-			elseif luaentity and luaentity._knockback and die == true then
-				kb = kb + luaentity._knockback * 0.25
 			end
 			self._kb_turn = true
 			self._turn_to=self.object:get_yaw()-1.57
@ -1136,11 +1103,6 @@ function mob_class:do_states_attack (dtime)
 							full_punch_interval = 1.0,
 							damage_groups = {fleshy = self.damage}
 						}, nil)
-						if self.dealt_effect then
-							mcl_mobs.effect_functions[self.dealt_effect.name](
-								self.attack, self.dealt_effect.factor, self.dealt_effect.dur
-							)
-						end
 					end
 				else
 					self.custom_attack(self, p)
@ -1231,9 +1193,6 @@ function mob_class:do_states_attack (dtime)
 					-- important for mcl_shields
 					ent._shooter = self.object
 					ent._saved_shooter_pos = self.object:get_pos()
-					if ent.homing then
-						ent._target = self.attack
-					end
 				end

 				local amount = (vec.x * vec.x + vec.y * vec.y + vec.z * vec.z) ^ 0.5
@ -1250,13 +1209,7 @@ function mob_class:do_states_attack (dtime)
 				end
 			end
 		end
+	else

-	elseif self.attack_type == "custom" and self.attack_state then
-		self.attack_state(self, dtime)
 	end
-
-	if self.on_attack then
-		self.on_attack(self, dtime)
-	end
-
 end
--- a/mods/ENTITIES/mcl_mobs/effects.lua
+++ b/mods/ENTITIES/mcl_mobs/effects.lua
@ -1,7 +1,5 @@
 local math, tonumber, vector, minetest, mcl_mobs = math, tonumber, vector, minetest, mcl_mobs
 local mob_class = mcl_mobs.mob_class
-local validate_vector = mcl_util.validate_vector
-
 local active_particlespawners = {}
 local disable_blood = minetest.settings:get_bool("mobs_disable_blood")
 local DEFAULT_FALL_SPEED = -9.81*1.5
@ -11,6 +9,16 @@ local PATHFINDING = "gowp"
 local player_transfer_distance = tonumber(minetest.settings:get("player_transfer_distance")) or 128
 if player_transfer_distance == 0 then player_transfer_distance = math.huge end

+
+local function validate_vector (vect)
+	if vect then
+		if tonumber(vect.x) and tonumber(vect.y) and tonumber(vect.z) then
+			return true
+		end
+	end
+	return false
+end
+
 -- custom particle effects
 function mcl_mobs.effect(pos, amount, texture, min_size, max_size, radius, gravity, glow, go_down)

@ -410,7 +418,7 @@ function mob_class:check_head_swivel(dtime)
 		--final_rotation = vector.new(0,0,0)
 	end

-	mcl_util.set_bone_position(self.object,self.head_swivel, vector.new(0,self.bone_eye_height,self.horizontal_head_height), final_rotation)
+	mcl_util.set_bone_position(self.object,self.head_swivel, vector.new(0,self.bone_eye_height,self.horrizonatal_head_height), final_rotation)
 end


--- a/mods/ENTITIES/mcl_mobs/init.lua
+++ b/mods/ENTITIES/mcl_mobs/init.lua
@ -147,7 +147,7 @@ function mcl_mobs.register_mob(name, def)
 		head_eye_height = def.head_eye_height or def.bone_eye_height or 0, -- how hight aproximatly the mobs head is fromm the ground to tell the mob how high to look up at the player
 		curiosity = def.curiosity or 1, -- how often mob will look at player on idle
 		head_yaw = def.head_yaw or "y", -- axis to rotate head on
-		horizontal_head_height = def.horizontal_head_height or 0,
+		horrizonatal_head_height = def.horrizonatal_head_height or 0,
 		wears_armor = def.wears_armor, -- a number value used to index texture slot for armor
 		stepheight = def.stepheight or 0.6,
 		name = name,
@ -171,7 +171,6 @@ function mcl_mobs.register_mob(name, def)
 		xp_min = def.xp_min or 0,
 		xp_max = def.xp_max or 0,
 		xp_timestamp = 0,
-		invul_timestamp = 0,
 		breath_max = def.breath_max or 15,
 		breathes_in_water = def.breathes_in_water or false,
 		physical = true,
@ -288,7 +287,6 @@ function mcl_mobs.register_mob(name, def)
 		spawn_in_group_min = def.spawn_in_group_min,
 		noyaw = def.noyaw or false,
 		particlespawners = def.particlespawners,
-		spawn_check = def.spawn_check,
 		-- End of MCL2 extensions
 		on_spawn = def.on_spawn,
 		on_blast = def.on_blast or function(self,damage)
@ -299,7 +297,6 @@ function mcl_mobs.register_mob(name, def)
 			return false, true, {}
 		end,
 		do_punch = def.do_punch,
-		deal_damage = def.deal_damage,
 		on_breed = def.on_breed,
 		on_grown = def.on_grown,
 		on_pick_up = def.on_pick_up,
@ -314,16 +311,8 @@ function mcl_mobs.register_mob(name, def)

 			return self:mob_activate(staticdata, def, dtime)
 		end,
-		attack_state = def.attack_state, -- custom attack state
-		on_attack = def.on_attack, -- called after attack, useful with otherwise predefined attack states (not custom)
 		harmed_by_heal = def.harmed_by_heal,
-		is_boss = def.is_boss,
-		dealt_effect = def.dealt_effect,
-		on_lightning_strike = def.on_lightning_strike,
-		extra_hostile = def.extra_hostile,
-		attack_exception = def.attack_exception or function(p) return false end,
-
-		_spawner = def._spawner,
+		on_lightning_strike = def.on_lightning_strike
 	}
 	minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))

@ -334,13 +323,6 @@ function mcl_mobs.register_mob(name, def)
 end -- END mcl_mobs.register_mob function


-function mcl_mobs.get_arrow_damage_func(damage, typ)
-	local typ = mcl_damage.types[typ] and typ or "arrow"
-	return function(projectile, object)
-		return mcl_util.deal_damage(object, damage, {type = typ})
-	end
-end
-
 -- register arrow for shoot attack
 function mcl_mobs.register_arrow(name, def)

@ -357,15 +339,13 @@ function mcl_mobs.register_arrow(name, def)
 		hit_node = def.hit_node,
 		hit_mob = def.hit_mob,
 		hit_object = def.hit_object,
-		homing = def.homing,
 		drop = def.drop or false, -- drops arrow as registered item when true
 		collisionbox = {0, 0, 0, 0, 0, 0}, -- remove box around arrows
 		timer = 0,
 		switch = 0,
-		_lifetime = def._lifetime or 150,
 		owner_id = def.owner_id,
 		rotate = def.rotate,
-		on_punch = def.on_punch or function(self)
+		on_punch = function(self)
 			local vel = self.object:get_velocity()
 			self.object:set_velocity({x=vel.x * -1, y=vel.y * -1, z=vel.z * -1})
 		end,
@ -382,7 +362,7 @@ function mcl_mobs.register_arrow(name, def)
 			local pos = self.object:get_pos()

 			if self.switch == 0
-			or self.timer > self._lifetime
+			or self.timer > 150
 			or not within_limits(pos, 0) then
 				mcl_burning.extinguish(self.object)
 				self.object:remove();
@ -430,17 +410,6 @@ function mcl_mobs.register_arrow(name, def)
 				end
 			end

-			if self.homing and self._target then
-				local p = self._target:get_pos()
-				if p then
-					if minetest.line_of_sight(self.object:get_pos(), p) then
-						self.object:set_velocity(vector.direction(self.object:get_pos(), p) * self.velocity)
-					end
-				else
-					self._target = nil
-				end
-			end
-
 			if self.hit_player or self.hit_mob or self.hit_object then

 				for _,player in pairs(minetest.get_objects_inside_radius(pos, 1.5)) do
--- a/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.pt_BR.tr
+++ b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.pt_BR.tr
@ -1,13 +0,0 @@
-# textdomain: mcl_mobs
-Peaceful mode active! No monsters will spawn.=Modo pacífico ativado! Nenhum monstro será gerado.
-This allows you to place a single mob.=Isso permite você posicionar um único mob.
-Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=Posicione-o onde você deseja que o mob apareça. Animais serão gerados domesticados, a menos que você segure pressionada a tecla de agachar enquanto posiciona. Se você posicionar em um gerador de mobs, você muda o mob que será gerado.
-You need the “maphack” privilege to change the mob spawner.=Você precisa do privilégio "maphack" para mudar o gerador de mobs.
-Name Tag=Etiqueta
-A name tag is an item to name a mob.=Uma etiqueta é um item para nomear um mob.
-Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=Antes de você usar a etiqueta, você precisa determinar um nome em uma bigorna. Assim você pode usar a etiqueta para nomear um mob. Isso consumirá a etiqueta.
-Only peaceful mobs allowed!=Apenas mobs pacíficos permitidos!
-Give names to mobs=Dá nome aos mobs
-Set name at anvil=Determine um nome em uma bigorna
-Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player.=Remove mobs especifícos exceto os mobs nomeados ou domesticados. Como segundo parâmetro, use nametagged/tamed para selecionar apenas mobs nomeados/domesticados, ou um alcançe para especificar uma distância máxima em relação ao jogador.
-Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=Uso padrão. Eliminando mobs hostis. Para mais opções por favor digite: /help clearmobs
--- a/mods/ENTITIES/mcl_mobs/physics.lua
+++ b/mods/ENTITIES/mcl_mobs/physics.lua
@ -1,6 +1,5 @@
 local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
 local mob_class = mcl_mobs.mob_class
-local validate_vector = mcl_util.validate_vector

 local ENTITY_CRAMMING_MAX = 24
 local CRAMMING_DAMAGE = 3
@ -356,7 +355,7 @@ function mob_class:set_yaw(yaw, delay, dtime)

 	if math.abs(target_shortest_path_nums) > 10 then
 		self.object:set_yaw(self.object:get_yaw()+(target_shortest_path*(3.6*ddtime)))
-		if validate_vector(self.acc) then
+		if self.acc then
 			self.acc=vector.rotate_around_axis(self.acc,vector.new(0,1,0), target_shortest_path*(3.6*ddtime))
 		end
 	end
@ -682,9 +681,6 @@ function mob_class:do_env_damage()
 	-- don't fall when on ignore, just stand still
 	if self.standing_in == "ignore" then
 		self.object:set_velocity({x = 0, y = 0, z = 0})
-	-- wither rose effect
-	elseif self.standing_in == "mcl_flowers:wither_rose" then
-		mcl_potions.withering_func(self.object, 1, 2)
 	end

 	local nodef = minetest.registered_nodes[self.standing_in]
--- a/mods/ENTITIES/mcl_mobs/spawning.lua
+++ b/mods/ENTITIES/mcl_mobs/spawning.lua
@ -2,13 +2,6 @@
 local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
 local mob_class = mcl_mobs.mob_class

-local modern_lighting = minetest.settings:get_bool("mcl_mobs_modern_lighting", true)
-local nether_threshold = tonumber(minetest.settings:get("mcl_mobs_nether_threshold")) or 11
-local end_threshold = tonumber(minetest.settings:get("mcl_mobs_end_threshold")) or 0
-local overworld_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_threshold")) or 0
-local overworld_sky_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_sky_threshold")) or 7
-local overworld_passive_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_passive_threshold")) or 7
-
 local get_node                     = minetest.get_node
 local get_item_group               = minetest.get_item_group
 local get_node_light               = minetest.get_node_light
@ -716,6 +709,9 @@ local function spawn_check(pos, spawn_def)
 			and spawn_def.dimension == dimension
 			and biome_check(spawn_def.biomes, gotten_biome) then

+		--mcl_log("Level 1 spawn check passed")
+		--minetest.log("Mob: " .. mob_def.name)
+
 		if  (is_ground or spawn_def.type_of_spawning ~= "ground")
 				and (spawn_def.type_of_spawning ~= "ground" or not is_leaf)
 				and (not is_farm_animal(spawn_def.name) or is_grass)
@ -725,41 +721,20 @@ local function spawn_check(pos, spawn_def)
 				and (spawn_def.check_position and spawn_def.check_position(pos) or spawn_def.check_position == nil)
 				and ( not spawn_protected or not minetest.is_protected(pos, "") ) then

+			--mcl_log("Level 2 spawn check passed")
+
 			local gotten_light = get_node_light(pos)
-
-			if modern_lighting then
-				local my_node = get_node(pos)
-				local sky_light = minetest.get_natural_light(pos)
-				local art_light = minetest.get_artificial_light(my_node.param1)
-
-				if mob_def.spawn_check then
-					return mob_def.spawn_check(pos, gotten_light, art_light, sky_light)
-				elseif mob_type == "monster" then
-					if dimension == "nether" then
-						if art_light <= nether_threshold then
-							return true
-						end
-					elseif dimension == "end" then
-						if art_light <= end_threshold then
-							return true
-						end
-					elseif dimension == "overworld" then
-						if art_light <= overworld_threshold and sky_light <= overworld_sky_threshold then
-							return true
-						end
-					end
-				else
-					-- passive threshold is apparently the same in all dimensions ...
-					if gotten_light > overworld_passive_threshold then
-						return true
-					end
-				end
+			if gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light then
+				--mcl_log("Level 3 spawn check passed")
+				return true
 			else
-				if gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light then
-					return true
-				end
+				--mcl_log("Spawn check level 3 failed")
 			end
+		else
+			--mcl_log("Spawn check level 2 failed")
 		end
+	else
+		--mcl_log("Spawn check level 1 failed")
 	end
 	return false
 end
--- a/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.pt_BR.tr
+++ b/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.pt_BR.tr
@ -1,2 +0,0 @@
-# textdomain:mcl_paintings
-Painting=Pintura
--- a/mods/ENTITIES/mcl_wither_spawning/init.lua
+++ b/mods/ENTITIES/mcl_wither_spawning/init.lua
@ -2,9 +2,6 @@ local dim = {"x", "z"}

 local modpath = minetest.get_modpath(minetest.get_current_modname())

-local anti_troll = minetest.settings:get_bool("wither_anti_troll_measures", false)
-local peaceful = minetest.settings:get_bool("only_peaceful_mobs", false)
-
 local function load_schem(filename)
 	local file = io.open(modpath .. "/schems/" .. filename, "r")
 	local data = minetest.deserialize(file:read())
@ -12,14 +9,6 @@ local function load_schem(filename)
 	return data
 end

-local wboss_overworld = 0
-local wboss_nether = 0
-local wboss_end = 0
-
-local LIM_OVERWORLD = tonumber(minetest.settings:get("wither_cap_overworld")) or 3
-local LIM_NETHER = tonumber(minetest.settings:get("wither_cap_nether")) or 10
-local LIM_END = tonumber(minetest.settings:get("wither_cap_end")) or 5
-
 local wither_spawn_schems = {}

 for _, d in pairs(dim) do
@ -27,13 +16,8 @@ for _, d in pairs(dim) do
 end

 local function check_schem(pos, schem)
-	local cn_name
 	for _, n in pairs(schem) do
-		cn_name = minetest.get_node(vector.add(pos, n)).name
-		if string.find(cn_name, "mcl_heads:wither_skeleton") then
-			cn_name = "mcl_heads:wither_skeleton"
-		end
-		if cn_name ~= n.name then
+		if minetest.get_node(vector.add(pos, n)).name ~= n.name then
 			return false
 		end
 	end
@ -46,32 +30,14 @@ local function remove_schem(pos, schem)
 	end
 end

-local function check_limit(pos)
-	local dim = mcl_worlds.pos_to_dimension(pos)
-	if dim == "overworld" and wboss_overworld >= LIM_OVERWORLD then return false
-	elseif dim == "end" and wboss_end >= LIM_END then return false
-	elseif wboss_nether >= LIM_NETHER then return false
-	else return true end
-end
-
-local function wither_spawn(pos, player)
-	if peaceful then return end
+local function wither_spawn(pos)
 	for _, d in pairs(dim) do
 		for i = 0, 2 do
 			local p = vector.add(pos, {x = 0, y = -2, z = 0, [d] = -i})
 			local schem = wither_spawn_schems[d]
-			if check_schem(p, schem) and (not anti_troll or check_limit(pos)) then
+			if check_schem(p, schem) then
 				remove_schem(p, schem)
-				local wither = minetest.add_entity(vector.add(p, {x = 0, y = 1, z = 0, [d] = 1}), "mobs_mc:wither")
-				if not wither then return end
-				local wither_ent = wither:get_luaentity()
-				wither_ent._spawner = player:get_player_name()
-				local dim = mcl_worlds.pos_to_dimension(pos)
-				if dim == "overworld" then
-					wboss_overworld = wboss_overworld + 1
-				elseif dim == "end" then
-					wboss_end = wboss_end + 1
-				else wboss_nether = wboss_nether + 1 end
+				minetest.add_entity(vector.add(p, {x = 0, y = 1, z = 0, [d] = 1}), "mobs_mc:wither")
 				local objects = minetest.get_objects_inside_radius(pos, 20)
 				for _, players in ipairs(objects) do
 					if players:is_player() then
@ -88,19 +54,7 @@ local old_on_place = wither_head.on_place
 function wither_head.on_place(itemstack, placer, pointed)
 	local n = minetest.get_node(vector.offset(pointed.above,0,-1,0))
 	if n and n.name  == "mcl_nether:soul_sand" then
-		minetest.after(0, wither_spawn, pointed.above, placer)
+		minetest.after(0, wither_spawn, pointed.above)
 	end
 	return old_on_place(itemstack, placer, pointed)
 end
-
-if anti_troll then
-	-- pull wither counts per dimension
-	minetest.register_globalstep(function(dtime)
-		wboss_overworld = mobs_mc.wither_count_overworld
-		wboss_nether = mobs_mc.wither_count_nether
-		wboss_end = mobs_mc.wither_count_end
-		mobs_mc.wither_count_overworld = 0
-		mobs_mc.wither_count_nether = 0
-		mobs_mc.wither_count_end = 0
-	end)
-end
--- a/mods/ENTITIES/mobs_mc/LICENSE-media.md
+++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md
@ -305,9 +305,6 @@ Origin of those models:
    * `mobs_mc_rabbit_random.*.ogg` (CC0)
        * Changes were made.
        * Source: <https://freesound.org/people/Alshred/>
-* [epCode]
-    * `extra_mobs_hoglin*.ogg` (LGPL 3.0)
-        * Source: <https://git.minetest.land/epCode/extra_mobs/src/branch/master/sounds>

 Note: Many of these sounds have been more or less modified to fit the game.

--- a/mods/ENTITIES/mobs_mc/axolotl.lua
+++ b/mods/ENTITIES/mobs_mc/axolotl.lua
@ -13,7 +13,7 @@ local axolotl = {
 	head_swivel = "head.control",
 	bone_eye_height = -1,
 	head_eye_height = -0.5,
-	horizontal_head_height = 0,
+	horrizonatal_head_height = 0,
 	curiosity = 10,
 	head_yaw="z",

@ -78,6 +78,7 @@ local axolotl = {
 	attack_animals = true,
 	specific_attack = {
 		"extra_mobs_cod",
+		"mobs_mc:sheep",
 		"extra_mobs_glow_squid",
 		"extra_mobs_salmon",
 		"extra_mobs_tropical_fish",
--- a/mods/ENTITIES/mobs_mc/bat.lua
+++ b/mods/ENTITIES/mobs_mc/bat.lua
@ -2,18 +2,6 @@

 local S = minetest.get_translator("mobs_mc")

-local function spawn_check(pos, environmental_light, artificial_light, sky_light)
-	local date = os.date("*t")
-	local maxlight
-	if (date.month == 10 and date.day >= 20) or (date.month == 11 and date.day <= 3) then
-		maxlight = 6
-	else
-		maxlight = 3
-	end
-
-	return artificial_light <= maxlight
-end
-
 mcl_mobs.register_mob("mobs_mc:bat", {
 	description = S("Bat"),
 	type = "animal",
@ -62,7 +50,6 @@ mcl_mobs.register_mob("mobs_mc:bat", {
 	jump = false,
 	fly = true,
 	makes_footstep_sound = false,
-	spawn_check = spawn_check,
 })


--- a/mods/ENTITIES/mobs_mc/blaze.lua
+++ b/mods/ENTITIES/mobs_mc/blaze.lua
@ -11,9 +11,6 @@ local mod_target = minetest.get_modpath("mcl_target")
 --################### BLAZE
 --###################

-local function spawn_check(pos, environmental_light, artificial_light, sky_light)
-	return artificial_light <= 11
-end

 mcl_mobs.register_mob("mobs_mc:blaze", {
 	description = S("Blaze"),
@ -140,7 +137,6 @@ mcl_mobs.register_mob("mobs_mc:blaze", {
 			},
 		})
 	end,
-	spawn_check = spawn_check,
 })

 mcl_mobs:spawn_specific(
--- a/mods/ENTITIES/mobs_mc/chicken.lua
+++ b/mods/ENTITIES/mobs_mc/chicken.lua
@ -23,7 +23,7 @@ mcl_mobs.register_mob("mobs_mc:chicken", {
 	head_swivel = "head.control",
 	bone_eye_height = 4,
 	head_eye_height = 1.5,
-	horizontal_head_height = -.3,
+	horrizonatal_head_height = -.3,
 	curiosity = 10,
 	head_yaw="z",
 	visual_size = {x=1,y=1},
--- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
+++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
@ -24,7 +24,7 @@ local cow_def = {
 	head_swivel = "head.control",
 	bone_eye_height = 10,
 	head_eye_height = 1.1,
-	horizontal_head_height=-1.8,
+	horrizonatal_head_height=-1.8,
 	curiosity = 2,
 	head_yaw="z",
 	makes_footstep_sound = true,
--- a/mods/ENTITIES/mobs_mc/creeper.lua
+++ b/mods/ENTITIES/mobs_mc/creeper.lua
@ -50,7 +50,7 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
 	explosion_strength = 3,
 	explosion_radius = 3.5,
 	explosion_damage_radius = 3.5,
-	explosiontimer_reset_radius = 3,
+	explosiontimer_reset_radius = 6,
 	reach = 3,
 	explosion_timer = 1.5,
 	allow_fuse_reset = true,
@ -172,7 +172,7 @@ mcl_mobs.register_mob("mobs_mc:creeper_charged", {
 	explosion_strength = 6,
 	explosion_radius = 8,
 	explosion_damage_radius = 8,
-	explosiontimer_reset_radius = 3,
+	explosiontimer_reset_radius = 6,
 	reach = 3,
 	explosion_timer = 1.5,
 	allow_fuse_reset = true,
--- a/mods/ENTITIES/mobs_mc/ender_dragon.lua
+++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua
@ -127,7 +127,7 @@ mcl_mobs.register_mob("mobs_mc:enderdragon", {
 				minetest.set_node(vector.add(self._portal_pos, vector.new(0, 5, 0)), {name = "mcl_end:dragon_egg"})
 			end
 		end
-
+		
 		-- Free The End Advancement
 		for _,players in pairs(minetest.get_objects_inside_radius(pos,64)) do
 			if players:is_player() then
@ -136,7 +136,6 @@ mcl_mobs.register_mob("mobs_mc:enderdragon", {
 		end
 	end,
 	fire_resistant = true,
-	is_boss = true,
 })


--- a/mods/ENTITIES/mobs_mc/hoglin+zoglin.lua
+++ b/mods/ENTITIES/mobs_mc/hoglin+zoglin.lua
@ -31,9 +31,8 @@ local hoglin = {
 	} },
 	visual_size = {x=3, y=3},
 	sounds = {
-		random = "extra_mobs_hoglin.1",
+		random = "extra_mobs_hoglin",
 		damage = "extra_mobs_hoglin_hurt",
-		death = "extra_mobs_hoglin_hurt",
 		distance = 16,
 	},
 	jump = true,
@ -93,12 +92,6 @@ local zoglin = table.copy(hoglin)
 zoglin.description = S("Zoglin")
 zoglin.fire_resistant = 1
 zoglin.textures = {"extra_mobs_zoglin.png"}
-sounds = {
-		random = "extra_mobs_hoglin.2",
-		damage = "extra_mobs_hoglin_hurt",
-		death = "extra_mobs_hoglin_hurt",
-		distance = 16,
-        }
 zoglin.do_custom = function()
 	return
 end
--- a/mods/ENTITIES/mobs_mc/horse.lua
+++ b/mods/ENTITIES/mobs_mc/horse.lua
@ -44,6 +44,18 @@ local function get_drops(self)
 		max = 2,
 		looting = "common",
 		})
+	if self._saddle then
+		table.insert(self.drops,{name = "mcl_mobitems:saddle",
+		chance = 1,
+		min = 1,
+		max = 1,})
+	end
+	if self._chest then
+		table.insert(self.drops,{name = "mcl_chests:chest",
+		chance = 1,
+		min = 1,
+		max = 1,})
+	end
 end

 -- Helper functions to determine equipment rules
@ -233,18 +245,10 @@ local horse = {

 	on_die = function(self, pos)

-		-- drop saddle when horse is killed
+		-- drop saddle when horse is killed while riding
 		if self._saddle then
 			minetest.add_item(pos, "mcl_mobitems:saddle")
 		end
-		-- drop chest when mule/donkey is killed
-		if self._chest then
-			minetest.add_item(pos, "mcl_chests:chest")
-		end
-		-- drop armor when horse is killed
-		if self._wearing_armor then
-			minetest.add_item(pos, self._horse_armor)
-		end
 		-- also detach from horse properly
 		if self.driver then
 			mcl_mobs.detach(self.driver, {x = 1, y = 0, z = 1})
@ -397,7 +401,6 @@ local horse = {
 				-- Put on armor and take armor from player's inventory
 				local armor = minetest.get_item_group(iname, "horse_armor")
 				self._horse_armor = iname
-				self._wearing_armor = true
 				local w = clicker:get_wielded_item()
 				if not minetest.is_creative_enabled(clicker:get_player_name()) then
 					w:take_item()
--- a/mods/ENTITIES/mobs_mc/iron_golem.lua
+++ b/mods/ENTITIES/mobs_mc/iron_golem.lua
@ -4,14 +4,12 @@
 --License for code WTFPL and otherwise stated in readmes

 local S = minetest.get_translator("mobs_mc")
-local allow_nav_hacks = minetest.settings:get_bool("mcl_mob_allow_nav_hacks ",false)

 --###################
 --################### IRON GOLEM
 --###################

-local walk_dist = 40
-local tele_dist = 80
+local etime = 0

 mcl_mobs.register_mob("mobs_mc:iron_golem", {
 	description = S("Iron Golem"),
@ -87,23 +85,11 @@ mcl_mobs.register_mob("mobs_mc:iron_golem", {
 		punch_start = 40,  punch_end = 50,
 	},
 	jump = true,
-	do_custom = function(self, dtime)
-		self.home_timer = (self.home_timer or 0) + dtime
-
-		if self.home_timer > 10 then
-			self.home_timer = 0
-			if self._home and self.state ~= "attack" then
-				local dist = vector.distance(self._home,self.object:get_pos())
-				if allow_nav_hacks and dist >= tele_dist then
-					self.object:set_pos(self._home)
-					self.state = "stand"
-					self.order = "follow"
-				elseif dist >= walk_dist then
-					self:gopath(self._home, function(self)
-						self.state = "stand"
-						self.order = "follow"
-					end)
-				end
+	on_step = function(self,dtime)
+		etime = etime + dtime
+		if etime > 10 then
+			if self._home and vector.distance(self._home,self.object:get_pos()) > 50 then
+				self:gopath(self._home)
 			end
 		end
 	end,
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@ -62,7 +62,7 @@ mcl_mobs.register_mob("mobs_mc:llama", {
 	head_swivel = "head.control",
 	bone_eye_height = 11,
 	head_eye_height = 3,
-	horizontal_head_height=0,
+	horrizonatal_head_height=0,
 	curiosity = 60,
 	head_yaw = "z",

--- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr
+++ b/mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr
@ -21,7 +21,6 @@ Mule=Mule
 Iron Golem=Golem de fer
 Llama=Lama
 Ocelot=Ocelot
-Cat=Chat
 Parrot=Perroquet
 Pig=Cochon
 Polar Bear=Ours blanc
@ -49,15 +48,8 @@ Witch=Sorcière
 Wither=Wither
 Wolf=Loup
 Husk=Zombie Momifié
-Baby Husk=Bébé Zombie Momifié
 Zombie=Zombie
-Baby Zombie=Bébé Zombie
-Piglin=Piglin
-Baby Piglin=Bébé Piglin
-Zombie Piglin=Piglin Zombie
-Baby Zombie Piglin=Bébé Piglin Zombie
-Sword Piglin=Piglin avec une épée
-Piglin Brute=Piglin Barbare
+Zombie Piglin=Zombie Cochon
 Farmer=Fermier
 Fisherman=Pêcheur
 Fletcher=Archer
@ -77,7 +69,5 @@ Dolphin=Dauphin
 Pillager=Pilleur
 Tropical fish=Poisson tropical
 Hoglin=Hoglin
-Baby hoglin=Bébé Hoglin
-Zoglin=Zoglin
 Strider=Arpenteur
-Glow Squid=Poulpe Brillant
+Glow Squid=Poulpe Brillant
--- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.pt_BR.tr
+++ b/mods/ENTITIES/mobs_mc/locale/mobs_mc.pt_BR.tr
@ -1,83 +0,0 @@
-# textdomain: mobs_mc
-Agent=Agente
-Axolotl=Axolote
-Bat=Morcego
-Blaze=Blaze
-Chicken=Galinha
-Cow=Vaca
-Mooshroom=Coguvaca
-Creeper=Creeper
-Ender Dragon=Dragão do Fim
-Enderman=Enderman
-Endermite=Endermite
-Ghast=Ghast
-Elder Guardian=Guardião Ancião
-Guardian=Guardião
-Horse=Cavalo
-Skeleton Horse=Cavalo Esqueleto
-Zombie Horse=Cavalo Zumbi
-Donkey=Burro
-Mule=Mula
-Iron Golem=Golem de Ferro
-Llama=Lhama
-Ocelot=Jaguatirica
-Cat=Gato
-Parrot=Papagaio
-Pig=Porco
-Polar Bear=Urso Polar
-Rabbit=Coelho
-Killer Bunny=Coelho Assassino
-Sheep=Ovelha
-Shulker=Shulker
-Silverfish=Traça
-Skeleton=Esqueleto
-Stray=Esqueleto Errante
-Wither Skeleton=Esqueleto Wither
-Magma Cube=Cubo de Magma
-Slime=Slime
-Snow Golem=Golem de Neve
-Spider=Aranha
-Cave Spider=Aranha de Caverna
-Squid=Lula
-Vex=Vex
-Evoker=Invocador
-Illusioner=Ilusionista
-Villager=Aldeão
-Vindicator=Vingador
-Zombie Villager=Aldeão Zumbi
-Witch=Bruxa
-Wither=Wither
-Wolf=Lobo
-Husk=Zumbi-Múmia
-Baby Husk=Zumbi-Múmia Bebê
-Zombie=Zumbi
-Baby Zombie=Zumbi Bebê
-Piglin=Piglin
-Baby Piglin=Piglin Bebê
-Zombie Piglin=Piglin Zumbi
-Baby Zombie Piglin=Piglin Zumbi Bebê
-Sword Piglin=Piglin Espadachim
-Piglin Brute=Piglin Barbáro
-Farmer=Fazendeiro
-Fisherman=Pescador
-Fletcher=Flecheiro
-Shepherd=Pastor
-Librarian=Bibliotecário
-Cartographer=Cartógrafo
-Armorer=Armoreiro
-Leatherworker=Coureiro
-Butcher=Açougueiro
-Weapon Smith=Armeiro
-Tool Smith=Ferramenteiro
-Cleric=Clérigo
-Nitwit=Palerma
-Cod=Bacalhau
-Salmon=Salmão
-Dolphin=Golfinho
-Pillager=Saqueador
-Tropical fish=Peixe Tropical
-Hoglin=Hoglin
-Baby hoglin=Hoglin Bebê
-Zoglin=Zoglin
-Strider=Lavagante
-Glow Squid=Lula Brilhante
--- a/mods/ENTITIES/mobs_mc/mod.conf
+++ b/mods/ENTITIES/mobs_mc/mod.conf
@ -2,4 +2,4 @@ name = mobs_mc
 author = maikerumine
 description = Adds Minecraft-like monsters and animals.
 depends = mcl_init, mcl_particles, mcl_mobs, mcl_wip, mcl_core, mcl_util
-optional_depends = default, mcl_tnt, mcl_bows, mcl_throwing, mcl_fishing, bones, mesecons_materials, doc_items, mcl_worlds
+optional_depends = default, mcl_tnt, mcl_bows, mcl_throwing, mcl_fishing, bones, mesecons_materials, doc_items
--- a/mods/ENTITIES/mobs_mc/ocelot.lua
+++ b/mods/ENTITIES/mobs_mc/ocelot.lua
@ -39,7 +39,7 @@ local ocelot = {
 	head_swivel = "head.control",
 	bone_eye_height = 6.2,
 	head_eye_height = 0.4,
-	horizontal_head_height=-0,
+	horrizonatal_head_height=-0,
 	head_yaw="z",
 	curiosity = 4,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3},
--- a/mods/ENTITIES/mobs_mc/parrot.lua
+++ b/mods/ENTITIES/mobs_mc/parrot.lua
@ -137,7 +137,7 @@ mcl_mobs.register_mob("mobs_mc:parrot", {
 	xp_max = 3,
 	head_swivel = "head.control",
 	bone_eye_height = 1.1,
-	horizontal_head_height=0,
+	horrizonatal_head_height=0,
 	curiosity = 10,
 	collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.89, 0.25},
 	visual = "mesh",
--- a/mods/ENTITIES/mobs_mc/pig.lua
+++ b/mods/ENTITIES/mobs_mc/pig.lua
@ -22,7 +22,7 @@ mcl_mobs.register_mob("mobs_mc:pig", {
 	head_swivel = "head.control",
 	bone_eye_height = 7.5,
 	head_eye_height = 0.8,
-	horizontal_head_height=-1,
+	horrizonatal_head_height=-1,
 	curiosity = 3,
 	head_yaw="z",
 	makes_footstep_sound = true,
--- a/mods/ENTITIES/mobs_mc/piglin.lua
+++ b/mods/ENTITIES/mobs_mc/piglin.lua
@ -61,10 +61,8 @@ local piglin = {
 	} },
 	visual_size = {x=1, y=1},
 	sounds = {
-		random = "mobs_mc_zombiepig_random",
-		war_cry = "mobs_mc_zombiepig_war_cry",                  death = "mobs_mc_zombiepig_death",
-		damage = "mobs_mc_zombiepig_hurt.2",
-		death = "mobs_mc_zombiepig_death.2",
+		random = "extra_mobs_piglin",
+		damage = "extra_mobs_piglin_hurt",
 		distance = 16,
 	},
 	jump = true,
@ -221,10 +219,6 @@ mcl_mobs.register_mob("mobs_mc:sword_piglin", sword_piglin)
 -- Zombified Piglin --


-local function spawn_check(pos, environmental_light, artificial_light, sky_light)
-	return artificial_light <= 11
-end
-
 local zombified_piglin = {
 	description = S("Zombie Piglin"),
 	-- type="animal", passive=false: This combination is needed for a neutral mob which becomes hostile, if attacked
@ -262,7 +256,6 @@ local zombified_piglin = {
 	},
 	jump = true,
 	makes_footstep_sound = true,
-	spawn_check = spawn_check,
 	walk_velocity = .8,
 	run_velocity = 2.6,
 	pathfinding = 1,
--- a/mods/ENTITIES/mobs_mc/polar_bear.lua
+++ b/mods/ENTITIES/mobs_mc/polar_bear.lua
@ -27,7 +27,7 @@ mcl_mobs.register_mob("mobs_mc:polar_bear", {
 	head_swivel = "head.control",
 	bone_eye_height = 2.6,
 	head_eye_height = 1,
-	horizontal_head_height = 0,
+	horrizonatal_head_height = 0,
 	curiosity = 20,
 	head_yaw="z",
 	visual_size = {x=3.0, y=3.0},
--- a/mods/ENTITIES/mobs_mc/rabbit.lua
+++ b/mods/ENTITIES/mobs_mc/rabbit.lua
@ -18,7 +18,7 @@ local rabbit = {
 	head_swivel = "head.control",
 	bone_eye_height = 2,
 	head_eye_height = 0.5,
-	horizontal_head_height = -.3,
+	horrizonatal_head_height = -.3,
 	curiosity = 20,
 	head_yaw="z",
 	visual = "mesh",
--- a/mods/ENTITIES/mobs_mc/sheep.lua
+++ b/mods/ENTITIES/mobs_mc/sheep.lua
@ -67,7 +67,7 @@ mcl_mobs.register_mob("mobs_mc:sheep", {
 	head_swivel = "head.control",
 	bone_eye_height = 3.3,
 	head_eye_height = 1.1,
-	horizontal_head_height=-.7,
+	horrizonatal_head_height=-.7,
 	curiosity = 6,
 	head_yaw="z",
 	visual = "mesh",
@ -111,7 +111,7 @@ mcl_mobs.register_mob("mobs_mc:sheep", {
 		run_start = 81, run_end = 121, run_speed = 60,
 		eat_start = 121, eat_start = 161, eat_loop = false,
 	},
-	follow = { "mcl_farming:wheat_item", "mcl_shepherd:shepherd_staff" },
+	follow = { "mcl_farming:wheat_item" },
 	view_range = 12,

 	-- Eat grass
--- a/mods/ENTITIES/mobs_mc/shulker.lua
+++ b/mods/ENTITIES/mobs_mc/shulker.lua
@ -35,7 +35,7 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
 	type = "monster",
 	spawn_class = "hostile",
 	attack_type = "shoot",
-	shoot_interval = 6,
+	shoot_interval = 0.5,
 	arrow = "mobs_mc:shulkerbullet",
 	shoot_offset = 0.5,
 	passive = false,
@ -43,7 +43,7 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
 	hp_max = 30,
 	xp_min = 5,
 	xp_max = 5,
-	armor = 20,
+	armor = 150,
 	collisionbox = {-0.5, -0.01, -0.5, 0.5, 0.99, 0.5},
 	visual = "mesh",
 	mesh = "mobs_mc_shulker.b3d",
@ -51,7 +51,7 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
 	-- TODO: sounds
 	-- TODO: Make shulker dye-able
 	visual_size = {x=3, y=3},
-	walk_chance = 10,
+	walk_chance = 0,
 	knock_back = false,
 	jump = false,
 	can_despawn = false,
@ -65,19 +65,15 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
 		looting_factor = 0.0625},
 	},
 	animation = {
-		stand_speed = 25, walk_speed = 25, run_speed = 50, punch_speed = 25,
+		stand_speed = 25, walk_speed = 0, run_speed = 50, punch_speed = 25,
 		speed_normal = 25,		speed_run = 50,
 		stand_start = 0,		stand_end = 25,
-		walk_start = 45,		walk_end = 65,
-		walk_loop = false,
-		run_start = 65,		run_end = 85,
-		run_loop = false,
+		walk_start = 25,		walk_end = 45,
+		run_start = 45,		run_end = 85,
        punch_start = 80,  punch_end = 100,
 	},
 	view_range = 16,
 	fear_height = 0,
-	walk_velocity = 0,
-	run_velocity = 0,
 	noyaw = true,
 	do_custom = function(self,dtime)
 		local pos = self.object:get_pos()
@ -85,13 +81,12 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
 			self.object:set_yaw(0)
 			mcl_mobs:yaw(self, 0, 0, dtime)
 		end
+		if self.state == "walk" or self.state == "stand" then
+			self.state = "stand"
+			self:set_animation("stand")
+		end
 		if self.state == "attack" then
-			self:set_animation("run")
-			self.armor = 0
-		elseif self.state  == "stand" then
-			self.armor = 20
-		elseif self.state == "walk" or self.state == "run" then
-			self.armor = 0
+			self:set_animation("punch")
 		end
 		self.path.way = false
 		self.look_at_players = false
@ -154,9 +149,6 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
 			end
 		end
 	end,
-	on_attack = function(self, dtime)
-		self.shoot_interval = math.random(1, 6)
-	end,
 })

 -- bullet arrow (weapon)
@ -164,12 +156,27 @@ mcl_mobs.register_arrow("mobs_mc:shulkerbullet", {
 	visual = "sprite",
 	visual_size = {x = 0.25, y = 0.25},
 	textures = {"mobs_mc_shulkerbullet.png"},
-	velocity = 5,
-	homing = true,
-	hit_player = mcl_mobs.get_arrow_damage_func(4),
-	hit_mob = mcl_mobs.get_arrow_damage_func(4),
+	velocity = 6,
+
+	hit_player = function(self, player)
+		player:punch(self.object, 1.0, {
+			full_punch_interval = 1.0,
+			damage_groups = {fleshy = 4},
+		}, nil)
+	end,
+
+	hit_mob = function(self, mob)
+		mob:punch(self.object, 1.0, {
+			full_punch_interval = 1.0,
+			damage_groups = {fleshy = 4},
+		}, nil)
+	end,
+
+	hit_node = function(self, pos, node)
+	end
 })

+
 mcl_mobs.register_egg("mobs_mc:shulker", S("Shulker"), "#946694", "#4d3852", 0)
 mcl_mobs:non_spawn_specific("mobs_mc:shulker","overworld",0,minetest.LIGHT_MAX+1)
 --[[
--- a/mods/ENTITIES/mobs_mc/silverfish.lua
+++ b/mods/ENTITIES/mobs_mc/silverfish.lua
@ -4,10 +4,6 @@

 local S = minetest.get_translator("mobs_mc")

-local function spawn_check(pos, environmental_light, artificial_light, sky_light)
-	return artificial_light <= 11
-end
-
 mcl_mobs.register_mob("mobs_mc:silverfish", {
 	description = S("Silverfish"),
 	type = "monster",
@ -57,7 +53,6 @@ mcl_mobs.register_mob("mobs_mc:silverfish", {
 	view_range = 16,
 	attack_type = "dogfight",
 	damage = 1,
-	spawn_check = spawn_check,
 })

 mcl_mobs.register_egg("mobs_mc:silverfish", S("Silverfish"), "#6d6d6d", "#313131", 0)
--- a/mods/ENTITIES/mobs_mc/skeleton_wither.lua
+++ b/mods/ENTITIES/mobs_mc/skeleton_wither.lua
@ -96,11 +96,6 @@ mcl_mobs.register_mob("mobs_mc:witherskeleton", {
 	fear_height = 4,
 	harmed_by_heal = true,
 	fire_resistant = true,
-	dealt_effect = {
-		name = "withering",
-		factor = 1,
-		dur = 10,
-	},
 })

 --spawn
--- a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
+++ b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
@ -161,18 +161,6 @@ local spawn_children_on_die = function(child_mob, spawn_distance, eject_speed)
 	end
 end

-local swamp_light_max = 7
-
-local function slime_spawn_check(pos, environmental_light, artificial_light, sky_light)
-	local maxlight = swamp_light_max
-
-	if is_slime_chunk(pos) then
-		maxlight = minetest.LIGHT_MAX + 1
-	end
-
-	return artificial_light <= maxlight
-end
-
 -- Slime
 local slime_big = {
 	description = S("Slime"),
@ -183,7 +171,7 @@ local slime_big = {
 	hp_max = 16,
 	xp_min = 4,
 	xp_max = 4,
-	collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02, rotate = true},
+	collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
 	visual_size = {x=12.5, y=12.5},
 	textures = {{"mobs_mc_slime.png", "mobs_mc_slime.png"}},
 	visual = "mesh",
@ -197,7 +185,7 @@ local slime_big = {
 		distance = 16,
 	},
 	damage = 4,
-	reach = 2.5,
+	reach = 3,
 	armor = 100,
 	drops = {},
 	-- TODO: Fix animations
@ -225,7 +213,6 @@ local slime_big = {
 	spawn_small_alternative = "mobs_mc:slime_small",
 	on_die = spawn_children_on_die("mobs_mc:slime_small", 1.0, 1.5),
 	use_texture_alpha = true,
-	spawn_check = slime_spawn_check,
 }
 mcl_mobs.register_mob("mobs_mc:slime_big", slime_big)

@ -235,10 +222,10 @@ slime_small.hp_min = 4
 slime_small.hp_max = 4
 slime_small.xp_min = 2
 slime_small.xp_max = 2
-slime_small.collisionbox = {-0.51, -0.01, -0.51, 0.51, 1.00, 0.51, rotate = true}
+slime_small.collisionbox = {-0.51, -0.01, -0.51, 0.51, 1.00, 0.51}
 slime_small.visual_size = {x=6.25, y=6.25}
 slime_small.damage = 3
-slime_small.reach = 2.25
+slime_small.reach = 2.75
 slime_small.walk_velocity = 1.8
 slime_small.run_velocity = 1.8
 slime_small.jump_height = 4.3
@ -252,10 +239,10 @@ slime_tiny.hp_min = 1
 slime_tiny.hp_max = 1
 slime_tiny.xp_min = 1
 slime_tiny.xp_max = 1
-slime_tiny.collisionbox = {-0.2505, -0.01, -0.2505, 0.2505, 0.50, 0.2505, rotate = true}
+slime_tiny.collisionbox = {-0.2505, -0.01, -0.2505, 0.2505, 0.50, 0.2505}
 slime_tiny.visual_size = {x=3.125, y=3.125}
-slime_tiny.damage = 1
-slime_tiny.reach = 2
+slime_tiny.damage = 0
+slime_tiny.reach = 2.5
 slime_tiny.drops = {
 	-- slimeball
 	{name = "mcl_mobitems:slimeball",
@ -310,6 +297,7 @@ local cave_min = mcl_vars.mg_overworld_min
 local cave_max = water_level - 23

 local swampy_biomes = {"Swampland", "MangroveSwamp"}
+local swamp_light_max = 7
 local swamp_min = water_level
 local swamp_max = water_level + 27

@ -403,7 +391,7 @@ local magma_cube_big = {
 	hp_max = 16,
 	xp_min = 4,
 	xp_max = 4,
-	collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02, rotate = true},
+	collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
 	visual_size = {x=12.5, y=12.5},
 	textures = {{ "mobs_mc_magmacube.png", "mobs_mc_magmacube.png" }},
 	visual = "mesh",
@ -418,7 +406,7 @@ local magma_cube_big = {
 	walk_velocity = 2.5,
 	run_velocity = 2.5,
 	damage = 6,
-	reach = 2.35,
+	reach = 3,
 	armor = 53,
 	drops = {
 		{name = "mcl_mobitems:magma_cream",
@ -463,10 +451,10 @@ magma_cube_small.hp_min = 4
 magma_cube_small.hp_max = 4
 magma_cube_small.xp_min = 2
 magma_cube_small.xp_max = 2
-magma_cube_small.collisionbox = {-0.51, -0.01, -0.51, 0.51, 1.00, 0.51, rotate = true}
+magma_cube_small.collisionbox = {-0.51, -0.01, -0.51, 0.51, 1.00, 0.51}
 magma_cube_small.visual_size = {x=6.25, y=6.25}
 magma_cube_small.damage = 3
-magma_cube_small.reach = 2.1
+magma_cube_small.reach = 2.75
 magma_cube_small.walk_velocity = .8
 magma_cube_small.run_velocity = 2.0
 magma_cube_small.jump_height = 6
@ -485,13 +473,13 @@ magma_cube_tiny.hp_min = 1
 magma_cube_tiny.hp_max = 1
 magma_cube_tiny.xp_min = 1
 magma_cube_tiny.xp_max = 1
-magma_cube_tiny.collisionbox = {-0.2505, -0.01, -0.2505, 0.2505, 0.50, 0.2505, rotate = true}
+magma_cube_tiny.collisionbox = {-0.2505, -0.01, -0.2505, 0.2505, 0.50, 0.2505}
 magma_cube_tiny.visual_size = {x=3.125, y=3.125}
 magma_cube_tiny.walk_velocity = 1.02
 magma_cube_tiny.run_velocity = 1.02
 magma_cube_tiny.jump_height = 4
 magma_cube_tiny.damage = 3
-magma_cube_tiny.reach = 2
+magma_cube_tiny.reach = 2.5
 magma_cube_tiny.armor = 50
 magma_cube_tiny.drops = {}
 magma_cube_tiny.spawn_small_alternative = nil
--- a/mods/ENTITIES/mobs_mc/sounds/extra_mobs_hoglin.1.ogg
+++ b/mods/ENTITIES/mobs_mc/sounds/extra_mobs_hoglin.1.ogg
--- a/mods/ENTITIES/mobs_mc/sounds/extra_mobs_hoglin.2.ogg
+++ b/mods/ENTITIES/mobs_mc/sounds/extra_mobs_hoglin.2.ogg
--- a/mods/ENTITIES/mobs_mc/sounds/extra_mobs_hoglin_hurt.ogg
+++ b/mods/ENTITIES/mobs_mc/sounds/extra_mobs_hoglin_hurt.ogg
--- a/mods/ENTITIES/mobs_mc/spider.lua
+++ b/mods/ENTITIES/mobs_mc/spider.lua
@ -114,7 +114,9 @@ mcl_mobs.register_mob("mobs_mc:spider", spider)
 local cave_spider = table.copy(spider)
 cave_spider.description = S("Cave Spider")
 cave_spider.textures = { {"mobs_mc_cave_spider.png^(mobs_mc_spider_eyes.png^[makealpha:0,0,0)"} }
-cave_spider.damage = 2
+-- TODO: Poison damage
+-- TODO: Revert damage to 2
+cave_spider.damage = 3 -- damage increased to undo non-existing poison
 cave_spider.hp_min = 1
 cave_spider.hp_max = 12
 cave_spider.collisionbox = {-0.35, -0.01, -0.35, 0.35, 0.46, 0.35}
@ -136,11 +138,6 @@ cave_spider.walk_velocity = 1.3
 cave_spider.run_velocity = 3.2
 cave_spider.sounds = table.copy(spider.sounds)
 cave_spider.sounds.base_pitch = 1.25
-cave_spider.dealt_effect = {
-	name = "poison",
-	factor = 2.5,
-	dur = 7,
-}
 mcl_mobs.register_mob("mobs_mc:cave_spider", cave_spider)


--- a/mods/ENTITIES/mobs_mc/vex.lua
+++ b/mods/ENTITIES/mobs_mc/vex.lua
@ -37,7 +37,6 @@ mcl_mobs.register_mob("mobs_mc:vex", {
 	walk_velocity = 3.2,
 	run_velocity = 5.9,
 	attack_type = "dogfight",
-	attack_frequency = 2,
 	sounds = {
 		-- TODO: random
 		death = "mobs_mc_vex_death",
@ -64,13 +63,10 @@ mcl_mobs.register_mob("mobs_mc:vex", {
 				self.object:set_properties({textures=self.base_texture})
 			end
 		else
-			if self.base_texture[2] == "mobs_mc_vex_charging.png" then
-				self.base_texture[2] = "mobs_mc_vex.png"
-			end
 			if self.base_texture[1] ~= "default_tool_steelsword.png" then
 				self.base_texture[1] = "default_tool_steelsword.png"
+				self.object:set_properties({textures=self.base_texture})
 			end
-			self.object:set_properties({textures=self.base_texture})
 		end

 		-- Take constant damage if the vex' life clock ran out
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@ -1941,7 +1941,6 @@ local trade_inventory = {
 			if not wanted2:is_empty() then
 				inv:remove_item("input", inv:get_stack("wanted", 2))
 			end
-			local name = player:get_player_name()
 			local trader = player_trading_with[name]
 			minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name(),object=trader.object}, true)
 		end
--- a/mods/ENTITIES/mobs_mc/villager_evoker.lua
+++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua
@ -42,7 +42,6 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
 	run_velocity = 1.4,
 	group_attack = true,
 	attack_type = "dogfight",
-	attack_frequency = 15,
 	-- Summon vexes
 	custom_attack = function(self, to_attack)
 		if not spawned_vexes[self] then spawned_vexes[self] = {} end
@ -65,6 +64,7 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
 			table.insert(spawned_vexes[self],ent)
 		end
 	end,
+	shoot_interval = 15,
 	passive = false,
 	drops = {
 		{name = "mcl_core:emerald",
@ -86,11 +86,6 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
 	},
 	view_range = 16,
 	fear_height = 4,
-
-	on_spawn = function(self)
-		self.timer = 15
-		return true
-	end,
 })

 -- spawn eggs
--- a/mods/ENTITIES/mobs_mc/witch.lua
+++ b/mods/ENTITIES/mobs_mc/witch.lua
@ -70,11 +70,6 @@ mcl_mobs.register_mob("mobs_mc:witch", {
 	},
 	view_range = 16,
 	fear_height = 4,
-	deal_damage = function(self, damage, mcl_reason)
-		local factor = 1
-		if mcl_reason.type == "magic" then factor = 0.15 end
-		self.health = self.health - factor*damage
-	end,
 })

 -- potion projectile (EXPERIMENTAL)
--- a/mods/ENTITIES/mobs_mc/wither.lua
+++ b/mods/ENTITIES/mobs_mc/wither.lua
@ -1,72 +1,14 @@
 --MCmobs v0.4
 --maikerumine
--updated by Herowl
 --made for MC like Survival game
 --License for code WTFPL and otherwise stated in readmes

 local S = minetest.get_translator("mobs_mc")
-local mobs_griefing = minetest.settings:get_bool("mobs_griefing", true)
-local follow_spawner = minetest.settings:get_bool("wither_follow_spawner", false)
-local w_strafes = minetest.settings:get_bool("wither_strafes", true)
-local anti_troll = minetest.settings:get_bool("wither_anti_troll_measures", false)
-
-local WITHER_INIT_BOOM = 7
-local WITHER_MELEE_COOLDOWN = 3
-
-local function atan(x)
-	if not x or x ~= x then
-		return 0
-	else
-		return math.atan(x)
-	end
-end

 --###################
 --################### WITHER
 --###################

-local function wither_unstuck(self)
-	local pos = self.object:get_pos()
-	if mobs_griefing then -- destroy blocks very nearby (basically, colliding with)
-		local col = self.collisionbox
-		local pos1 = vector.offset(pos, col[1], col[2], col[3])
-		local pos2 = vector.offset(pos, col[4], col[5], col[6])
-		for z = pos1.z, pos2.z do for y = pos1.y, pos2.y do for x = pos1.x, pos2.x do
-			local npos = vector.new(x,y,z)
-			local name = minetest.get_node(npos).name
-			if name ~= "air" then
-				local ndef = minetest.registered_nodes[name]
-				if ndef and ndef._mcl_hardness and ndef._mcl_hardness >= 0 then
-					local drops = minetest.get_node_drops(name, "")
-					if minetest.dig_node(npos) then
-						for _, item in ipairs(drops) do
-							if type(item) ~= "string" then
-								item = item:get_name() .. item:get_count()
-							end
-							minetest.add_item(npos, item)
-						end
-					end
-				end
-			end
-		end end end
-	end
-	mcl_mobs.mob_class.safe_boom(self, pos, 2)
-end
-
-local function get_dim_relative_y(pos)
-		if (pos.y >= mcl_vars.mg_realm_barrier_overworld_end_max) then
-			return pos.y
-		elseif (pos.y <= mcl_vars.mg_nether_max + 200) then
-			return (pos.y - mcl_vars.mg_nether_min - 20)
-		else
-			return (pos.y - mcl_vars.mg_end_min - 50)
-		end
-end
-
-mobs_mc.wither_count_overworld = 0
-mobs_mc.wither_count_nether = 0
-mobs_mc.wither_count_end = 0
-
 mcl_mobs.register_mob("mobs_mc:wither", {
 	description = S("Wither"),
 	type = "monster",
@ -84,11 +26,11 @@ mcl_mobs.register_mob("mobs_mc:wither", {
 		{"mobs_mc_wither.png"},
 	},
 	visual_size = {x=4, y=4},
-	view_range = 50,
+	makes_footstep_sound = true,
+	view_range = 16,
 	fear_height = 4,
 	walk_velocity = 2,
 	run_velocity = 4,
-	strafes = w_strafes,
 	sounds = {
 		shoot_attack = "mobs_mc_ender_dragon_shoot",
 		attack = "mobs_mc_ender_dragon_attack",
@ -99,8 +41,9 @@ mcl_mobs.register_mob("mobs_mc:wither", {
 	jump_height = 10,
 	fly = true,
 	makes_footstep_sound = false,
-	dogshoot_switch = 1, -- unused
-	dogshoot_count_max = 1, -- unused
+	dogshoot_switch = 1,
+	dogshoot_count_max = 1,
+	attack_animals = true,
 	can_despawn = false,
 	drops = {
 		{name = "mcl_mobitems:nether_star",
@ -110,13 +53,13 @@ mcl_mobs.register_mob("mobs_mc:wither", {
 	},
 	lava_damage = 0,
 	fire_damage = 0,
-	attack_type = "custom",
+	attack_type = "dogshoot",
 	explosion_strength = 8,
 	dogshoot_stop = true,
 	arrow = "mobs_mc:wither_skull",
 	reach = 5,
-	shoot_interval = 1,
-	shoot_offset = -0.5,
+	shoot_interval = 0.5,
+	shoot_offset = -1,
 	animation = {
 		walk_speed = 12, run_speed = 12, stand_speed = 12,
 		stand_start = 0,		stand_end = 20,
@ -124,377 +67,57 @@ mcl_mobs.register_mob("mobs_mc:wither", {
 		run_start = 0,		run_end = 20,
 	},
 	harmed_by_heal = true,
-	is_boss = true,
-	extra_hostile = true,
-	attack_exception = function(p)
-		local ent = p:get_luaentity()
-		if p:is_player() then return false end
-		if not ent or not ent.is_mob or ent.harmed_by_heal or string.find(ent.name, "ghast") then return true
-		else return false end
-	end,
-
-	do_custom = function(self, dtime)
-		if self._spawning then
-			-- "loading" bar while spawning
-			if not self._spw_max then self._spw_max = self._spawning end
-			self._spawning = self._spawning - dtime
-			local bardef = {
-				color = "dark_purple",
-				text = "Wither spawning",
-				percentage = math.floor((self._spw_max - self._spawning) / self._spw_max * 100),
-			}
-
-			local pos = self.object:get_pos()
-			for _, player in pairs(minetest.get_connected_players()) do
-				local d = vector.distance(pos, player:get_pos())
-				if d <= 80 then
-					mcl_bossbars.add_bar(player, bardef, true, d)
-				end
-			end
-
-			-- turn around and flash while spawning
-			self.object:set_yaw(self._spawning*10)
-			local factor = math.floor((math.sin(self._spawning*10)+1.5) * 85)
-			local str = minetest.colorspec_to_colorstring({r=factor, g=factor, b=factor})
-			self.object:set_texture_mod("^[brighten^[multiply:"..str)
-
-			-- when fully spawned, explode
-			if self._spawning <= 0 then
-				if mobs_griefing and not minetest.is_protected(pos, "") then
-					mcl_explosions.explode(pos, WITHER_INIT_BOOM, { drop_chance = 1.0 }, self.object)
-				else
-					mcl_mobs.mob_class.safe_boom(self, pos, WITHER_INIT_BOOM)
-				end
-				self.object:set_texture_mod("")
-				self._spawning = nil
-				self._spw_max = nil
-			else
-				return false
-			end
-		end
-
-		-- passive regeneration
-		self._custom_timer = self._custom_timer + dtime
-		if self._custom_timer > 1 then
-			self.health = math.min(self.health + 1, self.hp_max)
-			self._custom_timer = self._custom_timer - 1
-		end
-
-		-- anti-troll measures
-		if anti_troll then
-			if self._spawner then
-				local spawner = minetest.get_player_by_name(self._spawner)
-				if follow_spawner and spawner then
-					self._death_timer = 0
-					local pos = self.object:get_pos()
-					local spw = spawner:get_pos()
-					local dist = vector.distance(pos, spw)
-					if dist > 60 then -- teleport to the player who spawned the wither
-						local R = 10
-						pos.x = spw.x + math.random(-R, R)
-						pos.y = spw.y + math.random(-R, R)
-						pos.z = spw.z + math.random(-R, R)
-						self.object:set_pos(pos)
-					end
-				else -- despawn automatically after set time
-					-- HP changes impact timer: taking damage sets it back
-					self._death_timer = self._death_timer + self.health - self._health_old
-					if self.health == self._health_old then self._death_timer = self._death_timer + dtime end
-					if self._death_timer > 100 then
-						self.object:remove()
-						return false
-					end
-					self._health_old = self.health
-				end
-			end
-			-- count withers per dimension
-			local dim = mcl_worlds.pos_to_dimension(self.object:get_pos())
-			if dim == "overworld" then mobs_mc.wither_count_overworld = mobs_mc.wither_count_overworld + 1
-			elseif dim == "nether" then mobs_mc.wither_count_nether = mobs_mc.wither_count_nether + 1
-			elseif dim == "end" then mobs_mc.wither_count_end = mobs_mc.wither_count_end + 1 end
-		end
-
-		-- update things dependent on HP
-		local rand_factor
+	do_custom = function(self)
 		if self.health < (self.hp_max / 2) then
 			self.base_texture = "mobs_mc_wither_half_health.png"
 			self.fly = false
-			self._arrow_resistant = true
-			rand_factor = 3
-		else
-			self.base_texture = "mobs_mc_wither.png"
-			self.fly = true
-			self._arrow_resistant = false
-			rand_factor = 10
+			self.object:set_properties({textures={self.base_texture}})
+			self.armor = {undead = 80, fleshy = 80}
 		end
-		if not self.attack then
-			local y = get_dim_relative_y(self.object:get_pos())
-			if y > 0 then
-				self.fly = false
-			else
-				self.fly = true
-				local vel = self.object:get_velocity()
-				self.object:set_velocity(vector.new(vel.x, self.walk_velocity, vel.z))
-			end
-		end
-		self.object:set_properties({textures={self.base_texture}})
 		mcl_bossbars.update_boss(self.object, "Wither", "dark_purple")
-		if math.random(1, rand_factor) < 2 then
-			self.arrow = "mobs_mc:wither_skull_strong"
-		else
-			self.arrow = "mobs_mc:wither_skull"
-		end
 	end,
-
-	attack_state = function(self, dtime)
-		local s = self.object:get_pos()
-		local p = self.attack:get_pos() or s
-
-		p.y = p.y - .5
-		s.y = s.y + .5
-
-		local dist = vector.distance(p, s)
-		local vec = {
-			x = p.x - s.x,
-			y = p.y - s.y,
-			z = p.z - s.z
-		}
-
-		local yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate
-		if p.x > s.x then yaw = yaw +math.pi end
-		yaw = self:set_yaw( yaw, 0, dtime)
-
-		local stay_away_from_player = vector.zero()
-
-		--strafe back and fourth
-
-		--stay away from player so as to shoot them
-		if dist < self.avoid_distance and self.shooter_avoid_enemy then
-			self:set_animation( "shoot")
-			stay_away_from_player=vector.multiply(vector.direction(p, s), 0.33)
-		end
-
-		if self.fly then
-			local vel = self.object:get_velocity()
-			local diff = s.y - p.y
-			local FLY_FACTOR = self.walk_velocity
-			if diff < 10 then
-				self.object:set_velocity({x=vel.x, y= FLY_FACTOR, z=vel.z})
-			elseif diff > 15 then
-				self.object:set_velocity({x=vel.x, y=-FLY_FACTOR, z=vel.z})
-			end
-			for i=1, 15 do
-				if minetest.get_node(vector.offset(s, 0, -i, 0)).name ~= "air" then
-					self.object:set_velocity({x=vel.x, y= FLY_FACTOR,   z=vel.z})
-					break
-				elseif minetest.get_node(vector.offset(s, 0, i, 0)).name ~= "air" then
-					self.object:set_velocity({x=vel.x, y=-FLY_FACTOR/i, z=vel.z})
-					break
-				end
-			end
-		end
-
-		if self.strafes then
-			if not self.strafe_direction then
-				self.strafe_direction = 1.57
-			end
-			if math.random(40) == 1 then
-				self.strafe_direction = self.strafe_direction*-1
-			end
-
-			local dir = vector.rotate_around_axis(vector.direction(s, p), vector.new(0,1,0), self.strafe_direction)
-			local dir2 = vector.multiply(dir, 0.3 * self.walk_velocity)
-
-			if dir2 and stay_away_from_player then
-				self.acc = vector.add(dir2, stay_away_from_player)
-			end
-		else
-			self:set_velocity(0)
-		end
-
-		if dist > 30 then self.acc = vector.add(self.acc, vector.direction(s, p)*0.01) end
-
-		local side_cor = vector.new(0.7*math.cos(yaw), 0, 0.7*math.sin(yaw))
-		local m = self.object:get_pos() -- position of the middle head
-		local sr = self.object:get_pos() + side_cor -- position of side right head
-		local sl = self.object:get_pos() - side_cor -- position of side left head
-		-- height corrections
-		m.y = m.y + self.collisionbox[5]
-		sr.y = sr.y + self.collisionbox[5] - 0.3
-		sl.y = sl.y + self.collisionbox[5] - 0.3
-		local rand_pos = math.random(1,3)
-		if rand_pos == 1 then m = sr
-		elseif rand_pos == 2 then m = sl end
-
-		-- melee attack
-		if not self._melee_timer then
-			self._melee_timer = 0
-		end
-		if self._melee_timer < WITHER_MELEE_COOLDOWN then
-			self._melee_timer = self._melee_timer + dtime
-		else
-			self._melee_timer = 0
-			local pos = table.copy(s)
-			pos.y = pos.y + 2
-			local objs = minetest.get_objects_inside_radius(pos, self.reach)
-			local obj_pos, dist
-			local hit_some = false
-			for n = 1, #objs do
-				objs[n]:punch(objs[n], 1.0, {
-					full_punch_interval = 1.0,
-					damage_groups = {fleshy = 4},
-				}, pos)
-				local ent = objs[n]:get_luaentity()
-				if objs[n]:is_player() or (ent and ent ~= self and (not ent._shooter or ent._shooter ~= self)) then
-					mcl_util.deal_damage(objs[n], 8, {type = "magic"})
-					hit_some = true
-				end
-				mcl_mobs.effect_functions["withering"](objs[n], 0.5, 10)
-			end
-			if hit_some then
-				mcl_mobs.effect(pos, 32, "mcl_particles_soul_fire_flame.png", 5, 10, self.reach, 1, 0)
-			end
-		end
-
-		if dist < self.reach then
-			self.shoot_interval = 3
-		else
-			self.shoot_interval = 1
-		end
-
-		if self.shoot_interval
-				and self.timer > self.shoot_interval
-				and not minetest.raycast(vector.add(m, vector.new(0,self.shoot_offset,0)), vector.add(self.attack:get_pos(), vector.new(0,1.5,0)), false, false):next()
-				and math.random(1, 100) <= 60 then
-
-			self.timer = 0
-			self:set_animation( "shoot")
-
-			-- play shoot attack sound
-			self:mob_sound("shoot_attack")
-
-			-- Shoot arrow
-			if minetest.registered_entities[self.arrow] then
-
-				local arrow, ent
-				local v = 1
-				if not self.shoot_arrow then
-					self.firing = true
-					minetest.after(1, function()
-						self.firing = false
-					end)
-					arrow = minetest.add_entity(m, self.arrow)
-					ent = arrow:get_luaentity()
-					if ent.velocity then
-						v = ent.velocity
-					end
-					ent.switch = 1
-					ent.owner_id = tostring(self.object) -- add unique owner id to arrow
-
-					-- important for mcl_shields
-					ent._shooter = self.object
-					ent._saved_shooter_pos = self.object:get_pos()
-				end
-
-				local amount = (vec.x * vec.x + vec.y * vec.y + vec.z * vec.z) ^ 0.5
-				-- offset makes shoot aim accurate
-				vec.y = vec.y + self.shoot_offset
-				vec.x = vec.x * (v / amount)
-				vec.y = vec.y * (v / amount)
-				vec.z = vec.z * (v / amount)
-				if self.shoot_arrow then
-					vec = vector.normalize(vec)
-					self:shoot_arrow(m, vec)
-				else
-					arrow:set_velocity(vec)
-				end
-			end
-		end
-	end,
-
-	do_punch = function(self, hitter, tflp, tool_capabilities, dir)
-		if self._spawning or hitter == self.object then return false end
-		local ent = hitter:get_luaentity()
-		if ent and self._arrow_resistant and (string.find(ent.name, "arrow") or string.find(ent.name, "rocket")) then return false end
-		wither_unstuck(self)
-		return true
-	end,
-	deal_damage = function(self, damage, mcl_reason)
-		if self._spawning then return end
-		if self._arrow_resistant and mcl_reason.type == "magic" then return end
-		wither_unstuck(self)
-		self.health = self.health - damage
-	end,
-
 	on_spawn = function(self)
 		minetest.sound_play("mobs_mc_wither_spawn", {object=self.object, gain=1.0, max_hear_distance=64})
-		self._custom_timer = 0.0
-		self._death_timer = 0.0
-		self._health_old = self.hp_max
-		self._spawning = 10
-		return true
 	end,

 })

+local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
 local wither_rose_soil = { "group:grass_block", "mcl_core:dirt", "mcl_core:coarse_dirt", "mcl_nether:netherrack", "group:soul_block", "mcl_mud:mud", "mcl_moss:moss" }
-local function spawn_wither_rose(obj)
-	local n = minetest.find_node_near(obj:get_pos(),2,wither_rose_soil)
-	if n then
-		local p = vector.offset(n,0,1,0)
-		if minetest.get_node(p).name == "air" then
-			if not ( mobs_griefing and minetest.place_node(p,{name="mcl_flowers:wither_rose"}) ) then
-				minetest.add_item(p,"mcl_flowers:wither_rose")
-			end
-		end
-	end
-end

 mcl_mobs.register_arrow("mobs_mc:wither_skull", {
-	visual = "cube",
-	visual_size = {x = 0.3, y = 0.3},
-	textures = {
-		"mobs_mc_wither_projectile.png^[verticalframe:6:0", -- top
-		"mobs_mc_wither_projectile.png^[verticalframe:6:1", -- bottom
-		"mobs_mc_wither_projectile.png^[verticalframe:6:2", -- left
-		"mobs_mc_wither_projectile.png^[verticalframe:6:3", -- right
-		"mobs_mc_wither_projectile.png^[verticalframe:6:4", -- back
-		"mobs_mc_wither_projectile.png^[verticalframe:6:5", -- front
-	},
-	velocity = 7,
-	rotate = 90,
-	_lifetime = 350,
-	on_punch = function(self) end,
+	visual = "sprite",
+	visual_size = {x = 0.75, y = 0.75},
+	-- TODO: 3D projectile, replace tetxture
+	textures = {"mobs_mc_TEMP_wither_projectile.png"},
+	velocity = 6,

 	-- direct hit
 	hit_player = function(self, player)
-		local pos = vector.new(self.object:get_pos())
-		mcl_mobs.effect_functions["withering"](player, 0.5, 10)
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 0.5,
 			damage_groups = {fleshy = 8},
 		}, nil)
-		mcl_mobs.mob_class.boom(self, pos, 1)
-		if player:get_hp() <= 0 then
-			local shooter = self._shooter:get_luaentity()
-			if shooter then shooter.health = shooter.health + 5 end
-			spawn_wither_rose(player)
-		end
+		mcl_mobs.mob_class.boom(self,self.object:get_pos(), 1)
 	end,

 	hit_mob = function(self, mob)
-		local pos = vector.new(self.object:get_pos())
-		mcl_mobs.effect_functions["withering"](mob, 0.5, 10)
 		mob:punch(self.object, 1.0, {
 			full_punch_interval = 0.5,
 			damage_groups = {fleshy = 8},
 		}, nil)
-		mcl_mobs.mob_class.boom(self, pos, 1)
+		mcl_mobs.mob_class.boom(self,self.object:get_pos(), 1)
 		local l = mob:get_luaentity()
 		if l and l.health - 8 <= 0 then
-			local shooter = self._shooter:get_luaentity()
-			if shooter then shooter.health = shooter.health + 5 end
-			spawn_wither_rose(mob)
+			local n = minetest.find_node_near(mob:get_pos(),2,wither_rose_soil)
+			if n then
+				local p = vector.offset(n,0,1,0)
+				if minetest.get_node(p).name == "air" then
+					if not ( mobs_griefing and minetest.place_node(p,{name="mcl_flowers:wither_rose"}) ) then
+						minetest.add_item(p,"mcl_flowers:wither_rose")
+					end
+				end
+			end
 		end
 	end,

@ -503,75 +126,10 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull", {
 		mcl_mobs.mob_class.boom(self,pos, 1)
 	end
 })
-mcl_mobs.register_arrow("mobs_mc:wither_skull_strong", {
-	visual = "cube",
-	visual_size = {x = 0.35, y = 0.35},
-	textures = {
-		"mobs_mc_wither_projectile_strong.png^[verticalframe:6:0", -- top
-		"mobs_mc_wither_projectile_strong.png^[verticalframe:6:1", -- bottom
-		"mobs_mc_wither_projectile_strong.png^[verticalframe:6:2", -- left
-		"mobs_mc_wither_projectile_strong.png^[verticalframe:6:3", -- right
-		"mobs_mc_wither_projectile_strong.png^[verticalframe:6:4", -- back
-		"mobs_mc_wither_projectile_strong.png^[verticalframe:6:5", -- front
-	},
-	velocity = 4,
-	rotate = 90,
-	_lifetime = 500,
-	on_punch = function(self) end,
-
-	-- direct hit
-	hit_player = function(self, player)
-		local pos = vector.new(self.object:get_pos())
-		mcl_mobs.effect_functions["withering"](player, 0.5, 10)
-		player:punch(self.object, 1.0, {
-			full_punch_interval = 0.5,
-			damage_groups = {fleshy = 12},
-		}, nil)
-		if mobs_griefing and not minetest.is_protected(pos, "") then
-			mcl_explosions.explode(pos, 1, { drop_chance = 1.0, max_blast_resistance = 0, }, self.object)
-		else
-			mcl_mobs.mob_class.safe_boom(self, pos, 1) --need to call it this way bc self is the "arrow" object here
-		end
-		if player:get_hp() <= 0 then
-			local shooter = self._shooter:get_luaentity()
-			if shooter then shooter.health = shooter.health + 5 end
-			spawn_wither_rose(player)
-		end
-	end,
-
-	hit_mob = function(self, mob)
-		local pos = vector.new(self.object:get_pos())
-		mcl_mobs.effect_functions["withering"](mob, 0.5, 10)
-		mob:punch(self.object, 1.0, {
-			full_punch_interval = 0.5,
-			damage_groups = {fleshy = 12},
-		}, nil)
-		if mobs_griefing and not minetest.is_protected(pos, "") then
-			mcl_explosions.explode(pos, 1, { drop_chance = 1.0, max_blast_resistance = 0, }, self.object)
-		else
-			mcl_mobs.mob_class.safe_boom(self, pos, 1) --need to call it this way bc self is the "arrow" object here
-		end
-		local l = mob:get_luaentity()
-		if l and l.health - 8 <= 0 then
-			local shooter = self._shooter:get_luaentity()
-			if shooter then shooter.health = shooter.health + 5 end
-			spawn_wither_rose(mob)
-		end
-	end,
-
-	-- node hit, explode
-	hit_node = function(self, pos, node)
-		if mobs_griefing and not minetest.is_protected(pos, "") then
-			mcl_explosions.explode(pos, 1, { drop_chance = 1.0, max_blast_resistance = 0, }, self.object)
-		else
-			mcl_mobs.mob_class.safe_boom(self, pos, 1) --need to call it this way bc self is the "arrow" object here
-		end
-	end
-})
+-- TODO: Add blue wither skull

 --Spawn egg
 mcl_mobs.register_egg("mobs_mc:wither", S("Wither"), "#4f4f4f", "#4f4f4f", 0, true)

 mcl_wip.register_wip_item("mobs_mc:wither")
 mcl_mobs:non_spawn_specific("mobs_mc:wither","overworld",0,minetest.LIGHT_MAX+1)
-
--- a/mods/ENTITIES/mobs_mc/wolf.lua
+++ b/mods/ENTITIES/mobs_mc/wolf.lua
@ -29,7 +29,7 @@ local wolf = {
 	head_swivel = "head.control",
 	bone_eye_height = 3.5,
 	head_eye_height = 1.1,
-	horizontal_head_height=0,
+	horrizonatal_head_height=0,
 	curiosity = 3,
 	head_yaw="z",
 	sounds = {
--- a/mods/ENVIRONMENT/lightning/locale/lightning.es.tr
+++ b/mods/ENVIRONMENT/lightning/locale/lightning.es.tr
@ -1,3 +1,4 @@
 # textdomain: lightning
-Let lightning strike at the specified position or player.No parameter will strike yourself.=Deje que un rayo golpee en la posición especificada o jugador.Ningún parámetro le golpeará a usted mismo.
+@1 was struck by lightning.=@ 1 fue alcanzado por un rayo.
+Let lightning strike at the specified position or yourself=Deje que un rayo golpee en la posición especificada o sobre usted mismo.
 No position specified and unknown player=Ninguna posición especificada y jugador desconocido
--- a/mods/ENVIRONMENT/lightning/locale/lightning.pt_BR.tr
+++ b/mods/ENVIRONMENT/lightning/locale/lightning.pt_BR.tr
@ -1,3 +0,0 @@
-# textdomain: lightning
-Let lightning strike at the specified position or player. No parameter will strike yourself.=Deixa o relâmpago acertar a posição ou jogador especificado. Nenhum parâmetro irá acertar você mesmo.
-No position specified and unknown player=Nenhuma posição especificada e jogador desconhecido
--- a/mods/ENVIRONMENT/mcl_raids/locale/mcl_raids.fr.tr
+++ b/mods/ENVIRONMENT/mcl_raids/locale/mcl_raids.fr.tr
@ -1,2 +0,0 @@
-# textdomain: mcl_raids
-Ominous Banner=Bannière de mauvais augure
--- a/mods/ENVIRONMENT/mcl_raids/locale/mcl_raids.pt_BR.tr
+++ b/mods/ENVIRONMENT/mcl_raids/locale/mcl_raids.pt_BR.tr
@ -1,2 +0,0 @@
-# textdomain: mcl_raids
-Ominous Banner=Estandarte Ameaçador
--- a/mods/ENVIRONMENT/mcl_void_damage/locale/mcl_void_damage.pt_BR.tr
+++ b/mods/ENVIRONMENT/mcl_void_damage/locale/mcl_void_damage.pt_BR.tr
@ -1,3 +0,0 @@
-# textdomain: mcl_void_damage
-The void is off-limits to you!=O vazio está fora dos limites para você!
-@1 fell into the endless void.=@1 caiu em um vazio sem fim.
--- a/mods/ENVIRONMENT/mcl_weather/locale/mcl_weather.pt_BR.tr
+++ b/mods/ENVIRONMENT/mcl_weather/locale/mcl_weather.pt_BR.tr
@ -1,8 +0,0 @@
-# textdomain: mcl_weather
-Gives ability to control weather=Dá a habilidade de controlar o clima
-Changes the weather to the specified parameter.=Muda o clima para o parâmetro especificado.
-Error: No weather specified.=Erro: Nenhum clima especificado.
-Error: Invalid parameters.=Erro: Parâmetros inválidos.
-Error: Duration can't be less than 1 second.=Erro: Duração não pode ser menor que 1 segundo.
-Error: Invalid weather specified. Use “clear”, “rain”, “snow” or “thunder”.=Erro: Clima especificado é inválido. Use "clear", "rain", "snow" ou "thunder".
-Toggles between clear weather and weather with downfall (randomly rain, thunderstorm or snow)=Alterna entre clima limpo e clima com quedas (aleatoriamente chuva, tempestade ou neve)
--- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua
+++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
@ -120,13 +120,12 @@ mcl_weather.skycolor = {
 	override_day_night_ratio = function(player, ratio)
 		local meta = player:get_meta()
 		local has_night_vision = meta:get_int("night_vision") == 1
-		local is_visited_shepherd = meta:get_int("mcl_shepherd:special") == 1
 		local arg
 		-- Apply night vision only for dark sky
 		local is_dark = minetest.get_timeofday() > 0.8 or minetest.get_timeofday() < 0.2 or mcl_weather.state ~= "none"
 		local pos = player:get_pos()
 		local dim = mcl_worlds.pos_to_dimension(pos)
-		if (has_night_vision or is_visited_shepherd) and is_dark and dim ~= "nether" and dim ~= "end" then
+		if has_night_vision and is_dark and dim ~= "nether" and dim ~= "end" then
 			if ratio == nil then
 				arg = NIGHT_VISION_RATIO
 			else
--- a/mods/HELP/doc/doc_items/locale/doc_items.pt.tr
+++ b/mods/HELP/doc/doc_items/locale/doc_items.pt.tr
@ -53,8 +53,8 @@ Range: 4=Range: 4
 Rating @1=Classificação @1
 # @1 is minimal rating, @2 is maximum rating
 Rating @1-@2=Classificação @1-@2
-The fall damage on this block is increased by @1%.=O dano por queda nesse bloco é aumentado em @1%.
-The fall damage on this block is reduced by @1%.=O dano por queda nesse bloco é reduzido em @1%.
+The fall damage on this block is increased by @1%.=O dano por queda nesse bloco é aumentado em @ 1%.
+The fall damage on this block is reduced by @1%.=O dano por queda nesse bloco é reduzido em @ 1%.
 This block allows light to propagate with a small loss of brightness, and sunlight can even go through losslessly.=Esse bloco permite que a luz se propague com uma pequena perda de brilho, e a luz solar pode até passar sem perdas.
 This block allows light to propagate with a small loss of brightness.=Esse bloco permite que a luz se propague com uma pequena perda de brilho.
 This block allows sunlight to propagate without loss in brightness.=Esse bloco permite que a luz solar se propague sem perda de brilho.
@ -78,7 +78,7 @@ This block connects to this block: @1.=Esse bloco se conecta a esse bloco: @1.
 This block decreases your breath and causes a drowning damage of @1 hit point every 2 seconds.=Esse bloco diminui a sua respiração e causa um dano por afogamento de @1 ponto de vida a cada 2 segundos.
 This block decreases your breath and causes a drowning damage of @1 hit points every 2 seconds.=Esse bloco diminui a sua respiração e causa um dano por afogamento de @1 pontos de vida a cada 2 segundos.
 This block is a light source with a light level of @1.=Esse bloco é uma fonte de luz com um nível de luz de @1.
-This block glows faintly with a light level of @1.=Esse bloco tem um brilho fraco com um nível de luz de @1.
+This block glows faintly with a light level of @1.=Esse bloco tem um brilho fraco com um nível de luz de @ 1.
 This block is a building block for creating various buildings.=Esse bloco é um bloco de construção para criar vários edifícios.
 This block is a liquid with these properties:=Esse bloco é um líquido com as seguintes propriedades:
 This block is affected by gravity and can fall.=Esse bloco é afetado pela gravidade e pode cair.
@ -123,7 +123,7 @@ any level=qualquer nível
 level 0=nível 0
 level 0-@1=nivel 0-@1
 unknown=desconhecido
-Unknown item (@1)=Item desconhecido (@1)
+Unknown item (@1)=Item desconhecido
 • @1: @2=
 • @1: @2 HP=
 • @1: @2, @3=
--- a/mods/HELP/doc/doc_items/locale/doc_items.pt_BR.tr
+++ b/mods/HELP/doc/doc_items/locale/doc_items.pt_BR.tr
@ -10,12 +10,12 @@
 # Itemname (ca. 25%)
@1 (ca. @2%)=
 # List separator (e.g. “one, two, three”)
-, =,
+, =, 
 # Final list separator (e.g. “One, two and three”)
- and = e
+ and = e 
 1 second=1 segundo
 A transparent block, basically empty space. It is usually left behind after digging something.=Um bloco transparente, basicamente um vazio. Isso geralmente fica no lugar de um bloco removido.
-Air=Ar
+Air=Ár
 Blocks=Blocos
 Building another block at this block will place it inside and replace it.=Construir outro bloco nesse bloco vai subistitui-lo.
 Building this block is completely silent.=Construir esse bloco é completamente silencioso.
@ -129,12 +129,12 @@ Unknown item (@1)=Item desconhecido (@1)
 • @1: @2, @3=
 • Flowing range: @1=
 • No flowing=
-• Not renewable=• Não renovável
-• Renewable=• Renovável
-• Viscosity: @1=• Viscosidade: @1
+• Not renewable=
+• Renewable=
+• Viscosity: @1=
 Itemstring: "@1"=
-Durability: @1 uses=Durabilidade: @1 usos
-Durability: @1=Durabilidade: @1
+Durability: @1 uses=
+Durability: @1=
 Mining durability:=
 • @1, level @2: @3 uses=
 • @1, level @2: Unlimited=
--- a/mods/HELP/mcl_craftguide/init.lua
+++ b/mods/HELP/mcl_craftguide/init.lua
@ -774,7 +774,7 @@ local function search(data)
 	for i = 1, #data.items_raw do
 		local item = data.items_raw[i]
 		local def  = reg_items[item]
-		local desc = string.lower(M.get_translated_string(data.lang_code, def.description))
+		local desc = lower(def.description)
 		local search_in = item .. desc
 		local to_add

@ -838,7 +838,6 @@ local function init_data(name)
 		iX      = sfinv_only and 8 or DEFAULT_SIZE,
 		items   = init_items,
 		items_raw = init_items,
-		lang_code = M.get_player_information(name).lang_code or 'en',
 	}
 end

--- a/mods/HELP/mcl_craftguide/locale/mcl_craftguide.pt_BR.tr
+++ b/mods/HELP/mcl_craftguide/locale/mcl_craftguide.pt_BR.tr
@ -1,37 +0,0 @@
-# textdomain: craftguide
-Any shulker box=Qualquer caixa shulker
-Any wool=Qualquer lã
-Any wood planks=Quaisquer tábuas de madeira
-Any wood=Qualquer madeira
-Any sand=Qualquer areia
-Any normal sandstone=Qualquer arenito normal
-Any red sandstone=Qualquer arenito vermelho
-Any carpet=Qualquer carpete
-Any dye=Qualquer tintura
-Any water bucket=Qualquer balde de água
-Any flower=Qualquer flor
-Any mushroom=Qualquer cogumelo
-Any wooden slab=Qualquer laje de madeira
-Any wooden stairs=Quaisquer escadas de madeira
-Any coal=Qualquer carvão
-Any kind of quartz block=Qualquer tipo de bloco de quartzo
-Any kind of purpur block=Qualquer tipo de bloco de purpúra
-Any stone bricks=Quaisquer tijolos de pedra
-Any stick=Qualquer graveto
-Any item belonging to the @1 group=Qualquer item pertencente ao grupo @1
-Any item belonging to the groups: @1=Qualquer item pertencente aos grupos: @1
-Search=Pesquisar
-Reset=Resetar
-Previous page=Página anterior
-Next page=Página posterior
-Usage @1 of @2=Uso @1 de @2
-Recipe @1 of @2=Receita @1 de @2
-Burning time: @1=Tempo de queima: @1
-Cooking time: @1=Tempo de cozimento: @1
-Recipe is too big to be displayed (@1×@2)=Receita é muito grande para ser mostrada (@1x@2)
-Shapeless=Sem forma
-Cooking=Cozimento
-Increase window size=Aumentar tamanho da janela
-Decrease window size=Diminuir tamanho da janela
-No item to show=Nenhum item para mostrar
-Collect items to reveal more recipes=Colete itens para revelar mais receitas
--- a/mods/HELP/mcl_doc/locale/template.txt
+++ b/mods/HELP/mcl_doc/locale/template.txt
@ -2,7 +2,6 @@
 Water can flow into this block and cause it to drop as an item.=
 This block can be turned into dirt with a hoe.=
 This block can be turned into farmland with a hoe.=
-This block can be turned into grass path with a shovel.=
 This block acts as a soil for all saplings.=
 This block acts as a soil for some saplings.=
 Sugar canes will grow on this block.=
--- a/mods/HELP/mcl_doc_basics/locale/mcl_doc_basics.it.tr
+++ b/mods/HELP/mcl_doc_basics/locale/mcl_doc_basics.it.tr
@ -25,7 +25,7 @@ Minetest is a free software game engine for games based on voxel gameplay, inspi
 The player is thrown into a huge world made out of cubes or blocks. These cubes usually make the landscape they blocks can be removed and placed almost entirely freely. Using the collected items, new tools and other items can be crafted. Games in Minetest (also called “subgames”) can, however, be much more complex than this.=L'utente è gettat* in un enorme mondo fatto di cubi o blocchi. Questi cubi normalmente compongono il panorama e possono essere tolti o messi quasi completamente liberamente. Usando gli oggetti raccolti, si possono assemblare nuovi strumenti e altri oggetti. I giochi in Minetest (chiamati anche "subgame") possono, comunque, essere molto più complessi.
 A core feature of Minetest is the built-in modding capability. Mods modify existing gameplay. They can be as simple as adding a few decorational blocks or be very complex by e.g. introducing completely new gameplay concepts, generating a completely different kind of world, and many other things.=Una caratteristica centrale di Minetest è la capacità integrata di usare moduli. I moduli modificano l'esperienza di gioco esistente. Possono essere tanto semplici da aggiungere qualche blocco decorativo o essere molto complessi, per esempio introducendo concetti di gioco totalmente nuovi, generare un tipo di mondo completamente diverso, e molte altre cose.
 Minetest can be played alone or online together with multiple players. Online play will work out of the box with any mods, with no need for additional software as they are entirely provided by the server.=Minetest può essere giocato localmente o in rete assieme a più utenti. Il gioco in rete funzionerà immediatamente senza nessun modulo, senza bisogno di programmi aggiuntivi perché interamente forniti dal server.
-Minetest is usually bundled with a simple default game, named “Minetest Game” (shown in images 1 and 2). You probably already have it. Other games for Minetest can be downloaded from the official Minetest forums <https://forum.minetest.net/viewforum.php?f@=48>.=Minetest generalmente include un gioco predefinito semplice, chiamato "Minetest Game" (mostrato nelle immagini 1 e 2). Probabilmente lo avete già. Altri giochi per Minetest possono essere scaricati dai forum ufficiali di Minetest <https://forum.minetest.net/viewforum.php?f@=48>.
+Minetest is usually bundled with a simple default game, named “Minetest Game” (shown in images 1 and 2). You probably already have it. Other games for Minetest can be downloaded from the official Minetest forums <https://forum.minetest.net/viewforum.php?f=48>.=Minetest generalmente include un gioco predefinito semplice, chiamato "Minetest Game" (mostrato nelle immagini 1 e 2). Probabilmente lo avete già. Altri giochi per Minetest possono essere scaricati dai forum ufficiali di Minetest <https://forum.minetest.net/viewforum.php?f=48>.
 Sneaking=Strisciare
 Sneaking makes you walk slower and prevents you from falling off the edge of a block.=Strisciare vi fa camminare più lentamente e vi impedisce di cadere dal bordo di un blocco.
 To sneak, hold down the sneak key (default: [Shift]). When you release it, you stop sneaking. Careful: When you release the sneak key at a ledge, you might fall!=Per strisciare, tenete premuto il tasto per strisciare (predefinito [Maiusc]). Quando lo rilasciate, smettete di strisciare. Fate attenzione: quando rilasciate il tasto per strisciare vicino a un orlo, potreste cadere!
@ -396,7 +396,7 @@ Note that “transparency” here only means that the block is able to carry bri
 Coordinates=Coordinate
 The Minetest world is a large cube. And because of this, a position in the world can be easily expressed with Cartesian coordinates. That is, for each position in the world, there are 3 values X, Y and Z.=Il mondo di Minetest è un grande cubo. E per questo, una posizione nel mondo può essere facilmente espressa tramite coordinate Cartesiane. Cioè, per ogni posizione nel mondo, esistono tre valori: X, Y e Z.
 Like this: (5, 45, -12)=Come questi: (5, 45, -12)
-This refers to the position where X@=5, Y@=45 and Z@=-12. The 3 letters are called “axes”: Y is for the height. X and Z are for the horizontal position.=Ciò si riferisce alla posizione dove X@=5 (si legga “X vale 5”, NdT), Y@=45 e Z@=-12. Le tre lettere sono chiamate “assi”: Y si riferisce all'altezza. X e Z si riferiscono alla posizione orizzontale.
+This refers to the position where X=5, Y=45 and Z=-12. The 3 letters are called “axes”: Y is for the height. X and Z are for the horizontal position.=Ciò si riferisce alla posizione dove X=5 (si legga “X vale 5”, NdT), Y=45 e Z=-12. Le tre lettere sono chiamate “assi”: Y si riferisce all'altezza. X e Z si riferiscono alla posizione orizzontale.
 The values for X, Y and Z work like this:=I valori di X, Y e Z funzionano così:
 • If you go up, Y increases=• Se salite, Y aumenta
 • If you go down, Y decreases=• Se scendete, Y diminuisce
--- a/mods/HELP/mcl_tt/locale/mcl_tt.es.tr
+++ b/mods/HELP/mcl_tt/locale/mcl_tt.es.tr
@ -1,48 +0,0 @@
-# textdomain: mcl_tt
-Head armor=Armadura para la cabeza
-Torso armor=Armadura para el torso
-Legs armor=Armadura para las piernas
-Feet armor=Armadura para los pies
-Armor points: @1=Puntos de armadura: @1
-Armor durability: @1=Durabilidad de armadura: @1
-Protection: @1%=Protección: @1%
-Hunger points: +@1=Puntos de hambre: +@1
-Saturation points: +@1=Puntos de saturación: +@1
-Deals damage when falling=Causa daño al caer
-Grows on grass blocks or dirt=Crece sobre bloques de pasto o tierra
-Grows on grass blocks, podzol, dirt or coarse dirt=Crece sobre bloques de pasto, podsol, tierra o tierra estéril
-Flammable=Inflamable
-Zombie view range: -50%=Rango de visión zombie: -50%
-Skeleton view range: -50%=Rango de visión de esqueleto: -50%
-Creeper view range: -50%=Rango de visión de creeper: -50%
-Damage: @1=Daño: @1
-Damage (@1): @2=Daño (@1): @2
-Healing: @1=Curación: @1
-Healing (@1): @2=Curación (@1): @2
-Full punch interval: @1s=Intervalo de golpe completo: @1s
-Contact damage: @1 per second=Daño por contacto: @1 por segundo
-Contact healing: @1 per second=Curación por contacto: @1 por segundo
-Drowning damage: @1=Dañor por ahogamiento: @1
-Bouncy (@1%)=Rebota (@1%)
-Luminance: @1=Luminancia: @1
-Slippery=Resbaladizo
-Climbable=Escalable
-Climbable (only downwards)=Escalable (solo hacia abajo)
-No jumping=No saltar
-No swimming upwards=No nadar hacia arriba
-No rising=No levantar
-Fall damage: @1%=Daño por caída: @1% 
-Fall damage: +@1%=Daño por caída: @1%
-No fall damage=Sin daño por caída
-Mining speed: @1=Velocidad de minado: @1
-Very fast=Muy rápido
-Extremely fast=Extremadamente rápido
-Fast=Rápido
-Slow=Lento
-Very slow=Muy lento
-Painfully slow=Dolorosamente lento
-Mining durability: @1=Durabilidad de minería: @1
-Block breaking strength: @1=Fuerza para romper bloques: @1
-@1 uses=@1 usos
-Unlimited uses=Usos ilimitados
-Durability: @1=Durabilidad: @1
--- a/mods/HELP/mcl_tt/locale/mcl_tt.pt_BR.tr
+++ b/mods/HELP/mcl_tt/locale/mcl_tt.pt_BR.tr
@ -1,48 +0,0 @@
-# textdomain: mcl_tt
-Head armor=Armadura de cabeça
-Torso armor=Armadura de torso
-Legs armor=Armadura de pernas
-Feet armor=Armadura de pés
-Armor points: @1=Pontos de armadura: @1
-Armor durability: @1=Durabilidade da armadura: @1
-Protection: @1%=Proteção: @1%
-Hunger points: +@1=Pontos de fome: +@1
-Saturation points: +@1=Pontos de saturação: +@1
-Deals damage when falling=Dá dano enquanto cai
-Grows on grass blocks or dirt=Cresce em blocos de grama ou terra
-Grows on grass blocks, podzol, dirt or coarse dirt=Cresce em blocos de grama, podzol, terra ou terra infértil
-Flammable=Inflamável
-Zombie view range: -50%=Alcançe de visão do zumbi: -50%
-Skeleton view range: -50%=Alcançe de visão do esqueleto: -50%
-Creeper view range: -50%=Alcançe de visão do creeper: -50%
-Damage: @1= Dano: @1
-Damage (@1): @2=Dano (@1): @2
-Healing: @1=Cura: @1
-Healing (@1): @2=Cura (@1): @2
-Full punch interval: @1s=Intervalo completo de batida: @1s
-Contact damage: @1 per second=Dano por contaro: @1 por segundo
-Contact healing: @1 per second=Cura por contato: @1 por segundo
-Drowning damage: @1=Dano de afogamento: @1
-Bouncy (@1%)=Saltitante (@1%)
-Luminance: @1=Bliho: @1
-Slippery=Escorregadio
-Climbable=Escalável
-Climbable (only downwards)=Escalável (apenas em descida)
-No jumping=Sem pulo
-No swimming upwards=Sem natação em subida
-No rising=Sem levantamento
-Fall damage: @1%=Dano de queda: @1%
-Fall damage: +@1%=Dano de queda: +@1%
-No fall damage=Sem dano de queda
-Mining speed: @1=Velocidade de mineração: @1
-Very fast=Muito rápido
-Extremely fast=Extremamente rápido
-Fast=Rápido
-Slow=Lento
-Very slow=Muito lento
-Painfully slow=Dolorosamente lento
-Mining durability: @1=Durabilidade de mineração: @1
-Block breaking strength: @1=Força de quebra do bloco: @1
-@1 uses=@1 usos
-Unlimited uses=Usos ilimitados
-Durability: @1=Durabilidade: @1
--- a/mods/HUD/awards/api.lua
+++ b/mods/HUD/awards/api.lua
@ -217,9 +217,7 @@ function awards.unlock(name, award)

 	-- Get award
 	minetest.log("action", name.." has gotten award "..award)
-	if minetest.settings:get_bool("mcl_showAdvancementMessages", true) then
-		minetest.chat_send_all(S("@1 has made the advancement @2", name, minetest.colorize(mcl_colors.GREEN, "[" .. (awdef.title or award) .. "]")))
-	end
+	minetest.chat_send_all(S("@1 has made the advancement @2", name, minetest.colorize(mcl_colors.GREEN, "[" .. (awdef.title or award) .. "]")))
 	data.unlocked[award] = award
 	awards.save()

--- a/mods/HUD/awards/locale/awards.de.tr
+++ b/mods/HUD/awards/locale/awards.de.tr
@ -1,7 +1,7 @@
 # textdomain:awards
@1: @2=@1: @2
@1 (got)=@1 (erhalten)
-@1’s awards:=Auszeichnungen von @1:
+@1’s awards:=Auszeichnungen von @:
 (Secret Advancement)=(Geheime Auszeichnung)
 Achievement gotten!=Auszeichnung erhalten!
 Achievement gotten:=Auszeichnung erhalten:
@ -61,4 +61,4 @@ Achievement “@1” does not exist.=Auszeichnung »@1« existiert nicht.
 Write something in chat.=Schreiben Sie etwas in den Chat.
 Write @1 chat messages.=Schreiben Sie @1 Chatnachrichten.
@1/@2 chat messages=@1/@2 Chatnachrichten
-Awards are disabled, enable them first by using /awards enable!=Ihre Auszeichnungen sind aktuell deaktiviert, bitte aktivieren Sie diese zuerst indem Sie /awards enable ausführen bevor Sie diesen Befehl erneut verwenden!
+Awards are disabled, enable them first by using /awards enable!=Ihre Auszeichnungen sind aktuell deaktiviert, bitte aktivieren Sie diese zuerst indem Sie /awards enable ausführen bevor Sie diesen Befehl erneut verwenden!
--- a/mods/HUD/awards/locale/awards.fr.tr
+++ b/mods/HUD/awards/locale/awards.fr.tr
@ -62,9 +62,3 @@ Advancement “@1” does not exist.=Le progrès «@1» n'existe pas.
 Mine a block: @1=Miner un bloc : @1
 Mine blocks: @1×@2=Miner des blocs : @1×@2
 Awards are disabled, enable them first by using /awards enable!=Les récompenses sont désactivées, activez les d'abord en utilisant /awards enable !
-Goal Completed:=Objectif atteint :
-Goal Completed!=Objectif atteint !
-Goal Completed: @1=Objectif atteint : @1
-Challenge Completed:=Défi relevé :
-Challenge Completed!=Défi relevé !
-Challenge Completed: @1=Défi relevé : @1
--- a/mods/HUD/hudbars/locale/hudbars.pt_BR.tr
+++ b/mods/HUD/hudbars/locale/hudbars.pt_BR.tr
@ -1,6 +0,0 @@
-# textdomain: hudbars
-Health=Saúde
-Breath=Respiração
-
-# Default format string for progress bar-style HUD bars, e.g. “Health 5/20”
-@1: @2/@3=@1: @2/@3
--- a/mods/HUD/mcl_achievements/init.lua
+++ b/mods/HUD/mcl_achievements/init.lua
@ -431,27 +431,6 @@ awards.register_achievement("mcl:wax_off", {
 	group = "Husbandry",
 })

-- Triggered in mcl_smithing_table
-awards.register_achievement("mcl:trim", {
-	title = S("Crafting a New Look"),
-	description = S("Craft a trimmed armor at a Smithing Table"),
-	icon = "dune_armor_trim_smithing_template.png",
-	type = "Advancement",
-	group = "Adventure",
-})
-
-awards.register_achievement("mcl:lots_of_trimming", {
-	title = S("Smithing with Style"),
-	description = S("Apply these smithing templates at least once: Spire, Snout, Rib, Ward, Silence, Vex, Tide, Wayfinder"),
-	icon = "silence_armor_trim_smithing_template.png",
-	type = "Advancement",
-	group = "Adventure",
-	on_unlock = function(name, awdef)
-		-- delete json that is no longer needed
-		minetest.get_player_by_name(name):get_meta():set_string("mcl_smithing_table:achievement_trims", "")
-	end,
-})
-
 -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.)

 if non_pc_achievements then
--- a/mods/HUD/mcl_achievements/locale/mcl_achievements.de.tr
+++ b/mods/HUD/mcl_achievements/locale/mcl_achievements.de.tr
@ -51,7 +51,3 @@ Bring Home the Beacon=Den Nachbarn heimleuchten
 Use a beacon.=Benutzen Sie ein Leuchtfeuer.
 Beaconator=Leuchtturmwärter
 Use a fully powered beacon.=Benutzen Sie ein vollständiges Leuchtfeuer.
-Crafting a New Look=Ein neues Aussehen
-Craft a trimmed armor at a Smithing Table=Versieh ein Rüstungsteil an einem Schmiedetisch mit einem Rüstungsbesatz 
-Smithing with Style=Schmieden mit Stil
-Apply these smithing templates at least once: Spire, Snout, Rib, Ward, Silence, Vex, Tide, Wayfinder=Wende jede dieser Schmiedevorlagen mindestens einmal an: Turmspitze, Schnauze, Rippe, Warthof, Stille, Plagegeist, Gezeiten und Wegfinder
--- a/mods/HUD/mcl_achievements/locale/mcl_achievements.es.tr
+++ b/mods/HUD/mcl_achievements/locale/mcl_achievements.es.tr
@ -108,10 +108,7 @@ Put lava in a bucket.=Pon lava en un cubo.
 Hero of the Village=Héroe de la aldea
 Successfully defend a village from a raid=Defiende una aldea de una invasión
 Voluntary Exile=Exilio voluntario
-Kill a raid captain. Maybe consider staying away from the local villages for the time being...=Mata al capitán de una invasión. Sería mejor alejarte de las aldeas por un tiempo...
+Kill a raid captain. Maybe consider staying away from the local villages for the time being...=Mata al capitán de una invasión.
+Sería mejor alejarte de las aldeas por un tiempo...
 Tactical Fishing=Pesca táctica
 Catch a fish... without a fishing rod!=Atrapa a un pez... ¡sin una caña de pescar!
-Crafting a New Look=Forjando una nueva imagen
-Craft a trimmed armor at a Smithing Table=Decora una armadura en una mesa de herrería
-Smithing with Style=Forjando con estilo
-Apply these smithing templates at least once: Spire, Snout, Rib, Ward, Silence, Vex, Tide, Wayfinder=Aplica estos moldes de herrería al menos una vez: agujas, hocico, costillas, guardián, silencio, vex, mareas, buscacaminos
--- a/mods/HUD/mcl_achievements/locale/mcl_achievements.fr.tr
+++ b/mods/HUD/mcl_achievements/locale/mcl_achievements.fr.tr
@ -111,7 +111,3 @@ Voluntary Exile=Exil volontaire
 Kill a raid captain. Maybe consider staying away from the local villages for the time being...=Tuez un capitaine de pillards. Mieux vaut rester loin des villages pour l'instant...
 Tactical Fishing=Pêche tactique
 Catch a fish... without a fishing rod!=Attrapez un poisson... sans canne à pêche !
-Crafting a New Look=Motif de Jalousie
-Craft a trimmed armor at a Smithing Table=Fabriquez une pièce d'armure ornée sur la table de forge
-Smithing with Style=La classe de la cuirasse
-Apply these smithing templates at least once: Spire, Snout, Rib, Ward, Silence, Vex, Tide, Wayfinder=Appliquez ces modèles de forge au moins une fois : Tour, Groin, Côte, Abîme, Silence, Vex, Marée, Éclaireur
--- a/mods/HUD/mcl_achievements/locale/template.txt
+++ b/mods/HUD/mcl_achievements/locale/template.txt
@ -111,7 +111,3 @@ Voluntary Exile=
 Kill a raid captain. Maybe consider staying away from the local villages for the time being...=
 Tactical Fishing=
 Catch a fish... without a fishing rod!=
-Crafting a New Look=
-Craft a trimmed armor at a Smithing Table=
-Smithing with Style=
-Apply these smithing templates at least once: Spire, Snout, Rib, Ward, Silence, Vex, Tide, Wayfinder=
--- a/mods/HUD/mcl_credits/locale/mcl_credits.fr.tr
+++ b/mods/HUD/mcl_credits/locale/mcl_credits.fr.tr
@ -5,15 +5,10 @@ Contributors=Contributeurs
 Creator of MineClone=Créateur de MineClone
 Creator of MineClone2=Créateur de MineClone2
 Developers=Développeurs
-Past Developers=Anciens Développeurs
 Jump to speed up (additionally sprint)=Saut pour accélérer (peut être combiné avec sprint)
 Maintainers=Mainteneurs
-Previous Maintainers=Anciens Mainteneurs
 MineClone5=MineClone5
 Original Mod Authors=Auteurs des mods originaux
 Sneak to skip=Shift pour passer
 Textures=Textures
-Translations=Traductions
-Music=Musique
-Funders=Fondateurs
-Special thanks=Remerciements spéciaux
+Translations=Traductions
--- a/mods/HUD/mcl_credits/locale/mcl_credits.pt_BR.tr
+++ b/mods/HUD/mcl_credits/locale/mcl_credits.pt_BR.tr
@ -1,19 +0,0 @@
-# textdomain: mcl_credits
-3D Models=Modelos 3D
-A faithful Open Source clone of Minecraft=Um clone fiel Open Source do Minecraft
-Contributors=Colaboradores
-Creator of MineClone=Criador do MineClone
-Creator of MineClone2=Criador do MineClone2
-Developers=Desenvolvedores
-Past Developers=Desenvolvedores Passados
-Jump to speed up (additionally sprint)=Pule para acelerar (arrancada adicional)
-Maintainers=Mantedores
-Previous Maintainers=Mantedores Anteriores
-MineClone5=MineClone5
-Original Mod Authors=Autores Originais do Mod
-Sneak to skip=Agache para pular
-Textures=Texturas
-Translations=Traduções
-Music=Músicas
-Funders=Financiadores
-Special thanks=Agradecimentos especiais
--- a/mods/HUD/mcl_credits/people.lua
+++ b/mods/HUD/mcl_credits/people.lua
@ -10,32 +10,30 @@ return {
 	}},
 	{S("Maintainers"), 0xFF51D5, {
 		"AncientMariner",
-		"Herowl",
+		"Nicu",
 	}},
 	{S("Previous Maintainers"), 0xFFFFFF, {
 		"Fleckenstein",
 		"cora",
-		"Nicu",
 	}},
 	{S("Developers"), 0xF84355, {
 		"AFCMS",
 		"epCode",
 		"chmodsayshello",
+		"PrairieWind",
 		"MrRar",
 		"FossFanatic ",
 		"SmokeyDope",
-		"Faerraven / Michieal",
-		"Codiac",
 	}},
 	{S("Past Developers"), 0xF84355, {
 		"jordan4ibanez",
 		"iliekprogrammar",
 		"kabou",
 		"kay27",
+		"Faerraven / Michieal",
 		"MysticTempest",
 		"NO11",
 		"SumianVoice",
-		"PrairieWind",
 	}},
 	{S("Contributors"), 0x52FF00, {
 		"RandomLegoBrick",
@ -116,21 +114,6 @@ return {
 		"Niterux",
 		"appgurueu",
 		"seventeenthShulker",
-		"DinoNuggies4665",
-		"basxto",
-		"Morik666",
-		"Eliy21",
-		"mdk",
-		"Alessandra Lozoya",
-		"VanicGame",
-		"ThePython10110",
-		"Araca",
-		"Montandalar",
-		"mim",
-		"Dark",
-		"Bakawun",
-		"JoseDouglas26",
-		"Zasco",
 	}},
 	{S("Music"), 0xA60014, {
 		"Jordach for the jukebox music compilation from Big Freaking Dig",
@ -174,7 +157,6 @@ return {
 		"cora",
 		"Faerraven / Michieal",
 		"PrairieWind",
-		"ChrisPHP",
 	}},
 	{S("3D Models"), 0x0019FF, {
 		"22i",
@ -182,7 +164,6 @@ return {
 		"epCode",
 		"Faerraven / Michieal",
 		"SumianVoice",
-		"thunder1035",
 	}},
 	{S("Textures"), 0xFF9705, {
 		"XSSheep",
@ -199,11 +180,8 @@ return {
 		"Faerraven / Michieal",
 		"Nicu",
 		"Exhale",
-		"Aeonix_Aeon",
 		"Wbjitscool",
 		"SmokeyDope",
-		"thunder1035",
-		"Herowl",
 	}},
 	{S("Translations"), 0x00FF60, {
 		"Wuzzy",
@ -223,10 +201,6 @@ return {
 		"Temak",
 		"megustanlosfrijoles",
 		"kbundg",
-		"Isaac Dennis",
-		"ADLON",
-		"Sab Pyrope",
-		"JoseDouglas26",
 	}},
 	{S("Funders"), 0xF7FF00, {
 		"40W",
--- a/mods/HUD/mcl_death_messages/init.lua
+++ b/mods/HUD/mcl_death_messages/init.lua
@ -156,6 +156,7 @@ mcl_death_messages = {
 			plain = "@1 died a sweet death",
 			assist = "@1 was poked to death by a sweet berry bush whilst trying to escape @2",
 		},
+		-- Missing snowballs: The Minecraft wiki mentions them but the MC source code does not.
 	},
 }

--- a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.pt_BR.tr
+++ b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.pt_BR.tr
@ -1,55 +0,0 @@
-# textdomain: mcl_death_messages
-@1 went up in flames=@1 pegou fogo
-@1 walked into fire whilst fighting @2=@1 caminhou no fogo enquanto lutava contra @2
-@1 was struck by lightning=@1 foi atingido(a) por um raio
-@1 was struck by lightning whilst fighting @2=@1 foi atingido(a) por um raio enquanto lutava contra @2
-@1 burned to death=@1 queimou até a morte
-@1 was burnt to a crisp whilst fighting @2=@1 foi queimado até a crocância enquanto lutava contra @2
-@1 tried to swim in lava=@1 tentou nadar em lava
-@1 tried to swim in lava to escape @2=@1 tentou nadar em lava para escapar de @2
-@1 discovered the floor was lava=@1 descobriu que o chão era lava
-@1 walked into danger zone due to @2=@1 caminhou numa zona perigosa por conta de @2
-@1 suffocated in a wall=@1 sufocou em uma parede
-@1 suffocated in a wall whilst fighting @2=@1 sufocou em uma parede enquanto lutava contra @2
-@1 drowned=@1 se afogou
-@1 drowned whilst trying to escape @2=@1 se afogou enquanto tentava escapar de @2
-@1 starved to death=@1 morreu de fome
-@1 starved to death whilst fighting @2=@1 morreu de fome enquanto lutava contra @2
-@1 was pricked to death=@1 foi espetado até a morte
-@1 walked into a cactus whilst trying to escape @2=@1 caminhou até um cacto enquanto tentava escapar de @2
-@1 hit the ground too hard=@1 bateu muito forte no chão
-@1 hit the ground too hard whilst trying to escape @2=@1 bateu muito forte no chão enquanto tentava escapar de @2
-@1 experienced kinetic energy=@1 experienciou a energia cinética
-@1 experienced kinetic energy whilst trying to escape @2=@1 experienciou a energia cinética enquanto tentava escapar de @2
-@1 fell out of the world=@1 caiu do mundo
-@1 didn't want to live in the same world as @2=@1 não queria viver no mesmo mundo que @2
-@1 died=@1 morreu
-@1 died because of @2=@1 morreu por conta de @2
-@1 was killed by magic=@1 foi morto(a) por magia
-@1 was killed by magic whilst trying to escape @2=@1 foi morto(a) por magia enquanto tentava escapar de @2
-@1 was killed by @2 using magic=@1 foi morto(a) por @2 usando magia
-@1 was killed by @2 using @3=@1 foi morto(a) por @2 usando @3
-@1 was roasted in dragon breath=@1 foi assado(a) no bafo do dragão
-@1 was roasted in dragon breath by @2=@1 foi assado(a) no bafo do dragão por @2
-@1 withered away=@1 apodreceu
-@1 withered away whilst fighting @2=@1 apodreceu enquanto lutava contra @2
-@1 was shot by a skull from @2=@1 foi acertado(a) por um crânio vindo de @2
-@1 was squashed by a falling anvil=@1 foi esmagado(a) por uma bigorna em queda
-@1 was squashed by a falling anvil whilst fighting @2=@1 foi esmagado(a) por uma bigorna enquanto lutava contra @2
-@1 was squashed by a falling block=@1 foi esmagado(a) por um bloco em queda
-@1 was squashed by a falling block whilst fighting @2=@1 foi esmagado(a) por um bloco em queda enquanto lutava contra @2
-@1 was slain by @2=@1 foi assassinado por @2
-@1 was slain by @2 using @3=@1 foi assassinado por @2 usando @3
-@1 was shot by @2=@1 foi acertado(a) por @2
-@1 was shot by @2 using @3=@1 foi acertado(a) por @2 usando @3
-@1 was fireballed by @2=@1 foi atingido(a) por uma bola de fogo de @2
-@1 was fireballed by @2 using @3=@1 foi atingido(a) por uma bola de fogo de @2 usando @3
-@1 was killed trying to hurt @2=@1 foi morto(a) tentando machucar @2
-@1 tried to hurt @2 and died by @3=@1 tentou machucar @2 e morreu por conta de @3
-@1 blew up=@1 explodiu
-@1 was blown up by @2=@1 foi explodido por @2
-@1 was blown up by @2 using @3=@1 foi explodido por @2 usando @3
-@1 was squished too much=@1 foi esmagado(a) demais
-@1 was squashed by @2=@1 foi esmagado(a) por @2
-@1 went off with a bang=@1 saiu com um estrondo
-@1 went off with a bang due to a firework fired by @2 from @3=@1 saiu com um estrondo por conta de um fogo de artifício disparado por @2 vindo de @3
--- a/mods/HUD/mcl_experience/locale/mcl_experience.pt_BR.tr
+++ b/mods/HUD/mcl_experience/locale/mcl_experience.pt_BR.tr
@ -1,8 +0,0 @@
-# textdomain: mcl_experience
-[[<player>] <xp>]=[[<jogador>] <xp>]
-Gives a player some XP=Dá algum XP a um jogador
-Error: Too many parameters!=Erro: Muitos parâmetros
-Error: Incorrect value of XP=Erro: Valor incorreto de XP
-Error: Player not found=Erro: Jogador não encontrado
-Added @1 XP to @2, total: @3, experience level: @4=Adicionado @1 XP para @2, total: @3, nível de experiência: @4
-Bottle o' Enchanting=Frasco de Experiência
--- a/mods/HUD/mcl_experience/orb.lua
+++ b/mods/HUD/mcl_experience/orb.lua
@ -155,7 +155,7 @@ minetest.register_entity("mcl_experience:orb", {
 		collisionbox = {-0.2, -0.2, -0.2, 0.2, 0.2, 0.2},
 		visual = "sprite",
 		visual_size = {x = 0.4, y = 0.4},
-		textures = {"mcl_experience_orb.png"},
+		textures = {name="mcl_experience_orb.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}},
 		spritediv = {x = 1, y = 14},
 		initial_sprite_basepos = {x = 0, y = 0},
 		is_visible = true,
--- a/mods/HUD/mcl_hbarmor/locale/mcl_hbarmor.pt_BR.tr
+++ b/mods/HUD/mcl_hbarmor/locale/mcl_hbarmor.pt_BR.tr
@ -1,2 +0,0 @@
-# textdomain:hbarmor
-Armor=Armadura
--- a/mods/HUD/mcl_info/locale/mcl_info.fr.tr
+++ b/mods/HUD/mcl_info/locale/mcl_info.fr.tr
@ -1,4 +1,4 @@
 # textdomain: mcl_info
-Set debug bit mask: 0 @= disable, 1 @= biome name, 2 @= coordinates, 3 @= all=Régler le masque de bits pour débuguer : 0 @= pour désactiver, 1 @= nom du biome, 2 @= coordonnées, 3 @= tout
+Set debug bit mask: 0 @= disable, 1 @= biome name, 2 @= coordinates, 3 @= all=Régler le masque de bits pour débuguer : 0 @= pour désactiver, 1 @= nom du biome, 2 @= coordonnées, 3 @= tout=
 Error! Possible values are integer numbers from @1 to @2=Erreur ! Les valeurs possibles sont des nombres entiers de @1 à @2
 Debug bit mask set to @1=Masque de bits de débuguage réglé à @1
--- a/mods/HUD/mcl_info/locale/mcl_info.pt_BR.tr
+++ b/mods/HUD/mcl_info/locale/mcl_info.pt_BR.tr
@ -1,4 +0,0 @@
-# textdomain: mcl_info
-Set debug bit mask: 0 @= disable, 1 @= biome name, 2 @= coordinates, 3 @= all=Defina a máscara de bits de debug: 0 @= desabilitado, 1 @= nome do bioma, 2 @= coordenadas, 3 @= todos
-Error! Possible values are integer numbers from @1 to @2=Erro! Valores possíveis são números inteiros de @1 até @2
-Debug bit mask set to @1=Máscara de bits de debug definida como @1
--- a/mods/HUD/mcl_inventory/creative.lua
+++ b/mods/HUD/mcl_inventory/creative.lua
@ -741,14 +741,12 @@ if minetest.is_creative_enabled("") then
 			for _, item in ipairs(drops) do
 				minetest.add_item(pos, item)
 			end
-		else
-			-- If there is a player
-			local inv = digger:get_inventory()
-			if inv then
-				for _, item in ipairs(drops) do
-					if not inv:contains_item("main", item, true) then
-						inv:add_item("main", item)
-					end
+		end
+		local inv = digger:get_inventory()
+		if inv then
+			for _, item in ipairs(drops) do
+				if not inv:contains_item("main", item, true) then
+					inv:add_item("main", item)
 				end
 			end
 		end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
SmokeyDope	f990504e24	Add optimized theme.ogg	2023-09-06 01:54:01 +00:00
SmokeyDope	821405be98	delete unoptimized theme.ogg	2023-09-06 01:52:59 +00:00