2132 changed files with 11798 additions and 33344 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -4,7 +4,7 @@ root = true
 end_of_line = lf
 [*.lua]
-charset = utf-8
+charset = utf8
 indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,3 @@
 *.blend3
 /.idea/
 *.xcf
 .Rproj.user
 prompt.txt
 __pycache__
--- a/.luacheckrc
+++ b/.luacheckrc
@ -1,5 +1,3 @@
 ---@diagnostic disable
 unused_args = false
 allow_defined_top = true
 max_line_length = false
--- a/.luarc.json
+++ b/.luarc.json
@ -1,22 +0,0 @@
 {
  "runtime.version": "LuaJIT",
  "diagnostics": { "disable": ["lowercase-global"] },
  "diagnostics.globals": [
    "minetest",
    "dump",
    "dump2",
    "Raycast",
    "Settings",
    "PseudoRandom",
    "PerlinNoise",
    "VoxelManip",
    "SecureRandom",
    "VoxelArea",
    "PerlinNoiseMap",
    "PcgRandom",
    "ItemStack",
    "AreaStore",
    "vector"
  ],
  "workspace.ignoreDir": [".luacheckrc"]
 }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -9,9 +9,10 @@ You can help with MineClone2's development in many different ways,
 whether you're a programmer or not.
 ## MineClone2's development target is to...
- Create a stable, peformant, moddable, free/libre game based on Minecraft
+- Crucially, create a stable, moddable, free/libre clone of Minecraft
-using the Minetest engine, usable in both singleplayer and multiplayer. 
+based on the Minetest engine with polished features, usable in both
- Currently, a lot of features are already implemented.
+singleplayer and multiplayer. Currently, a lot of Minecraft features
 are already implemented.
 Polishing existing features is always welcome.
 ## Links
@ -75,7 +76,7 @@ in singleplayer, post a screenshot of the message that Minetest showed
 when the crash happened (or copy the message into your issue). If you
 are a server admin, you can find error messages in the log file of the
 server.
-* Tell us which MineClone2 and Minetest versions you are using (from Minetest 5.7 type /ver, for previous versions, check the game.conf or README.md file).
+* Tell us which MineClone2 and Minetest versions you are using.
 * Tell us how to reproduce the problem: What you were doing to trigger
 the bug, e.g. before the crash happened or what causes the faulty
 behavior.
@ -119,11 +120,11 @@ It's also a good idea to join the Discord server
 (or alternatively IRC or Matrix).
 #### Textures
-For textures we prefer original art, but in the absence of that will accept 
+For textures we use the Pixel Perfection texture pack. For older Minecraft
-Pixel Perfection texture pack contributions. Be warned many of the newer 
+features that is mostly enough but a lot of the newer textures in it are
-textures in it are copies or slight modifications of the original MC textures 
+copies or slight modifications of the original MC textures so great caution
-so great caution needs to be taken when using any textures coming from 
+needs to be taken when using any textures coming from Minecraft texture
-Minecraft texture packs.
+packs.
 If you want to make such contributions, join our Discord server. Demands
 for textures will be communicated there.
@ -134,10 +135,7 @@ resource pack or minetest_game. Unfortunately, MineClone2 does not play
 a sound in every situation you would get one in Minecraft. Any help with
 sounds is greatly appreciated, however if you add new sounds you should
 probably work together with a programmer, to write the code to actually
-play these sounds in game. All sounds should be released under an open
+play these sounds in game.
 source license with clear information on the source, licencing and any
 changes made by the contributor. Use the README files in the mod to
 communicate this information.
 #### 3D Models
 Most of the 3D Models in MineClone2 come from
@ -147,9 +145,9 @@ Blender on demand. Many of the models have to be patched, some new
 animations have to be added etc.
 #### Crediting
-Asset contributions will be credited in their mods and their own respective 
+Asset contributions will be credited in their own respective sections in
-sections in CREDITS.md. If you have commited the results yourself, you will 
+CREDITS.md. If you have commited the results yourself, you will also be
-also be credited in the Contributors section.
+credited in the Contributors section.
 ### Contributing Translations
@ -184,12 +182,7 @@ information about the game's performance and let us know places to
 investigate optimization issues. This way we can make the game faster.
 #### Using Minetest's profiler
-We frequently will use profiling to optimise our code. We recommend use of
+Minetest has a built in profiler. Simply set `profiler.load = true` in
 the JIT profiler (RIP Jude) to fully understand performance impact:
 https://content.minetest.net/packages/jwmhjwmh/jitprofiler/
 Minetest also has a built in profiler. Simply set `profiler.load = true` in
 your configuration file and restart the server. After running the server
 for some time, just run `/profiler save` in chat - then you will find a
 file in the world directory containing the results. Open a new issue and
@ -220,14 +213,10 @@ they have made their donation Incognito).
 * Fork the repository (in case you have not already)
 * Do your change in a new branch
 * Create a pull request to get your changes merged into master
-* It is important that conflicts are resolved prior to merging the pull
+* Keep your pull request up to date by regularly merging upstream. It is
 imperative that conflicts are resolved prior to merging the pull
 request.
-* We update our branches via rebasing. Please avoid merging master into 
+* After the pull request got merged, you can delete the branch
 your branch unless it's the only way you can resolve a conflict. We can
 rebase branches from the GUI if the user has not merged master into the 
 branch.
 * After the pull request got merged, you can delete the branch if the 
 merger hasn't done this already.
 ### Discuss first
 If you feel like a problem needs to fixed or you want to make a new
@ -273,7 +262,9 @@ excessive git bureaucracy commits in master)
 * Submodules should only be used if a) upstream is highly reliable and
 b) it is 100% certain that no mcl2 specific changes to the code will  be
 needed (this has never been the case before, hence mcl2 is submodule free so far)
-* Commit messages should be descriptive
+* Commit messages should be descriptive and never contain mcl2 specific
 issueids - there are other projects who might use commits from mcl2 and
 it will confuse their issue trackers.
 * Try to group your submissions best as you can:
 * Try to keep your PRs small: In some cases things reasonably be can't
 split up but in general multiple small PRs are better than a big one.
@ -357,24 +348,18 @@ end
 ### Developer status
 Active and trusted contributors are often granted write access to the
-MineClone2 repository as a contributor. Those that have demonstrated the right
+MineClone2 repository.
 technical skills and behaviours may be granted developer access. These are the 
 most trusted contributors who will contribute to ensure coding standards and 
 processes are followed.
 #### Developer responsibilities
- If you have developer/contributor privileges you can just open a new branch
+- If you have developer privileges you can just open a new branch in the
-in the mcl2 repository (which is preferred). From that you create a pull request.
+mcl2 repository (which is preferred). From that you create a pull request.
 This way other people can review your changes and make sure they work
 before they get merged.
 - If you do not (yet) have developer privs you do your work on a branch
 on your private repository e.g. using the "fork" function on mesehub.
- Any developer is welcome to review, test and approve PRs. A maintainer may prefer
+- Any developer is welcome to review, test and merge PRs. A PR needs
-to merge the PR especially if it is in a similar area to what has been worked on
+at least one approval (by someone else than the author) but the maintainers
-and could result in merge conflicts for a larger older branch, or needs 
+are usually relatively quick to react to new submissions.
 art/licencing reviewing. A PR needs at least one approval (by someone else other
 than the author).
 - The maintainers are usually relatively quick to react to new submissions.
 ### Maintainer status
 Maintainers carry the main responsibility for the project.
--- a/CREDITS.md
+++ b/CREDITS.md
@ -6,44 +6,39 @@
 ## Creator of MineClone2
 * Wuzzy
 ## Maintainers
 * AncientMariner
-* Herowl
+* Nicu
 ## Previous Maintainers
 * Fleckenstein
 * jordan4ibanez
 * cora
 * Nicu
 ## Developers
 * bzoss
 * AFCMS
 * epCode
-* chmodsayshello
+* ryvnf
 * MrRar
 * FossFanatic 
 * SmokeyDope
 * Faerraven / Michieal
 * Codiac
 ## Past Developers
 * jordan4ibanez
 * iliekprogrammar
 * kabou
 * kay27
 * MysticTempest
 * Rootyjr
 * aligator
 * Code-Sploit
 * NO11
-* SumianVoice
+* kabou
 * rudzik8
 * chmodsayshello
 * PrairieWind
 * RandomLegoBrick
 * SumianVoice
 * MrRar
 * talamh
 * Faerraven / Michieal
 * FossFanatic
 ## Contributors
 * RandomLegoBrick
 * rudzik8
 * Code-Sploit
 * aligator
 * Rootyjr
 * ryvnf
 * bzoss
 * talamh
 * Laurent Rocher
 * HimbeerserverDE
 * TechDudie
@ -72,10 +67,6 @@
 * Marcin Serwin
 * erlehmann
 * E
 * n_to
 * debiankaios
 * Gustavo6046 / wallabra
 * CableGuy67
 * Benjamin Schötz
 * Doloment
 * Sydney Gems
@ -90,12 +81,15 @@
 * aldum
 * Dieter44
 * Pepebotella
 * MrRar
 * Lazerbeak12345
 * mrminer
 * Thunder1035
 * opfromthestart
 * snowyu
 * FaceDeer
 * Faerraven / Michieal
 * FossFanatic
 * Herbert West
 * GuyLiner
 * 3raven
@ -107,35 +101,27 @@
 * b3nderman
 * CyberMango
 * gldrk
 * SmokeyDope
 * atomdmac
 * emptyshore
 * FlamingRCCars
 * uqers
 * Niterux
 * appgurueu
 * seventeenthShulker
 * DinoNuggies4665
 * basxto
 * Morik666
 * Eliy21
 * mdk
 * Alessandra Lozoya
 * VanicGame
 * ThePython10110
 * Araca
 * Montandalar
 * mim
 * Dark
 * Bakawun
 * JoseDouglas26
 * Zasco
-## Music
+## MineClone5
-* Jordach for the jukebox music compilation from Big Freaking Dig
+* kay27
-* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
+* Debiankaios
-* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)
+* epCode
-* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)
+* NO11
-* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)
+* j45
 * chmodsayshello
 * 3raven
 * PrairieWind
 * Gustavo6046 / wallabra
 * CableGuy67
 * MrRar
 ## Mineclonia
 * erlehmann
 * Li0n
 * E
 * n_to
 ## Original Mod Authors
 * Wuzzy
@ -167,20 +153,14 @@
 * 4Evergreen4
 * jordan4ibanez
 * paramat
 * debian044 / debian44
 * chmodsayshello
 * cora
 * Faerraven / Michieal
 * PrairieWind
 * ChrisPHP
 ## 3D Models
 * 22i
 * tobyplowy
 * epCode
 * Faerraven / Michieal
 * SumianVoice
 * thunder1035
 ## Textures
 * XSSheep
@ -196,12 +176,6 @@
 * cora
 * Faerraven / Michieal
 * Nicu
 * Exhale
 * Aeonix_Aeon
 * Wbjitscool
 * SmokeyDope
 * thunder1035
 * Herowl
 ## Translations
 * Wuzzy
@ -217,14 +191,6 @@
 * 3raven
 * SakuraRiu
 * anarquimico
 * syl
 * Temak
 * megustanlosfrijoles
 * kbundg
 * Isaac Dennis
 * ADLON
 * Sab Pyrope
 * JoseDouglas26
 ## Funders
 * 40W
@ -232,6 +198,9 @@
 * Cora
 ## Special thanks
-* The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible
+* celeron55 for creating Minetest
 * Jordach for the jukebox music compilation from Big Freaking Dig
 * wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.
 * 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
 * Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
--- 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`: Has one inventory with list name `"main"`. Items can be placed and taken freely
-   * `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=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
@ -5,7 +5,7 @@ Copying is an act of love. Please copy and share! <3
 Here's the detailed legalese for those who need it:
 ## License of source code
-MineClone 2 (by Lizzy Fleckenstein, Wuzzy, davedevils and countless others)
+MineClone 2 (by kay27, EliasFleckenstein, Wuzzy, davedevils and countless others)
 is an imitation of Minecraft.
 MineClone 2 is free software: you can redistribute it and/or modify
@ -38,15 +38,11 @@ No non-free licenses are used anywhere.
 The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11,
 authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
 from scratch.
-The glazed terracotta textures have been created by [MysticTempest](https://github.com/MysticTempest).
+The glazed terracotta textures have been created by (MysticTempest)[https://github.com/MysticTempest].
 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
+The main menu images are release under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
 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:
 Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
--- a/MODELS.md
+++ b/MODELS.md
@ -1,75 +0,0 @@
 # Models in Minetest/Mineclone2
 Models are an important part of all entities & unique nodes in Mineclone2. They provide a 3 dimensional map of an object for which textures are then applied to. This document is for modders, it quickly highlights some important information for the software needed to open models in Mineclone2.
 ## Minetest Wiki
 For more detailed information on actually using blender to create and modify models for Minetest/Mineclone2, please visit the Minetest wiki's page on using Blender [Here](https://wiki.minetest.net/Using_Blender)
 ## Recommended software
 ### Blender
 Blender is a very popular and free modeling software supported on Windows, MacOS, and most Linux distributions. It is recommended to use Blender to create and modify 3D models within the minetest engine. 
 Download blender [Here](https://www.blender.org/download/)
 ### .b3d addon for blender
 Blitz 3D (.b3d) Is one of the main animated model formats used for entities in the minetest engine. It cannot be imported to blender without a plugin called "Import-Export:Bitz 3D format (.b3d)".
 The most up to date version of this Blender plugin can be downloaded [Here](https://github.com/GreenXenith/io_scene_b3d/releases/tag/f189786)
 ## Types of model formats
 ### Animated, skinned models
 * Blitz 3D files (.b3d)
 * Microsoft DirectX (.x) (binary & text, compression is not supported)
 ### Static meshes
 * Wavefront OBJ (.obj)
 Note: The sometimes accompanying .mtl files are not supported and can safely be deleted.
 Note: Do not use .b3d and .x files for static meshes at the moment, Minetest currently spawns animated mesh scene nodes for these, which may result in reduced performance.
 ### Supported texture formats
 * .png
 * .jpg
 * .bmp (depreciated, please use .png or .jpg)
 * .tga (depreciated, please use .png or .jpg)
 Note: Any formats not mentioned above but known to work in the past were removed in 5.5.0 and aren't supported anymore.
 ## Pros & Cons of .b3d vs .x
 ### B3D
 * [+] Binary format means a small size
 * [-] Difficult to postprocess after exporting
 * [-] Difficult to debug problems
 ### X (text version)
 * [+] Can be parsed easily with lua scripts
 * [+] Can be easily generated by scripts
 * [+] Easy to debug issues (you can just read it)
 * [+] Can be optimized by quantizing some data
 * [-] Blender exporter is kinda buggy and inefficient
 * [-] Probably still bigger than an equivalent .b3d
 Note: Avoid using the binary X format! It's actually just a tokenized version of the ASCII representation, and may actually be less efficient than a sufficiently optimized text .x file!
--- 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
+* Craft hoe
-* Rightclick dirt or a similar block with a hoe to create farmland
+* 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
+* Craft furnace
-* The furnace allows you to obtain more items
+* 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
@ -78,33 +78,35 @@ The MineClone2 repository is hosted at Mesehub. To contribute or report issues,
 * Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
 * Discord: <https://discord.gg/xE4z8EEpDC>
-* YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
+* YouTube <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
 * IRC: <https://web.libera.chat/#mineclone2>
 * Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
 * Reddit: <https://www.reddit.com/r/MineClone2/>
 * Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
 * ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
 * OpenCollective: <https://opencollective.com/mineclone2>
 * Mastodon: <https://fosstodon.org/@MineClone2>
 * Lemmy: <https://lemmy.world/c/mineclone2>
 * Matrix space: <https://app.element.io/#/room/#mcl2:matrix.org>
 * Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
 * Reddit: <https://www.reddit.com/r/MineClone2/>
 * IRC (barely used): <https://web.libera.chat/#mineclone2>
 ## Target
- Create a stable, moddable, free/libre game based on Minecraft
+- Crucially, create a stable, moddable, free/libre clone of Minecraft
-on the Minetest engine with polished features, usable in both
+based on the Minetest engine with polished features, usable in both
 singleplayer and multiplayer. Currently, a lot of **Minecraft Java
 Edition** features are already implemented and polishing existing
 features are prioritized over new feature requests.
- Implement features targetting
+- With lessened priority yet strictly, implement features targetting
 **Current Minecraft versions + OptiFine** (OptiFine only as far as supported
-by the Minetest Engine).
+by the Minetest Engine). This means features in parity with the listed
- Create a performant experience that will run relatively
+Minecraft experiences are prioritized over those that don't fulfill this
-well on really low spec computers.
+scope.
 - Optionally, create a performant experience that will run relatively
 well on really low spec computers. Unfortunately, due to Minecraft's
 mechanisms and Minetest engine's limitations along with a very small
 playerbase on low spec computers, optimizations are hard to investigate.
 ## Completion status
 This game is currently in **beta** stage.
 It is playable, but not yet feature-complete.
 Backwards-compability is not entirely guaranteed, updating your world might cause small bugs.
-If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable.
+If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable. The testing branch often features some experimental PRs and should be considered less stable.
 The following main features are available:
@ -162,7 +164,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
@ -1,45 +1,48 @@
 # MineClone2
-Un jeu non-officiel similaire à Minecraft pour Minetest. Forké depuis Mineclone par davedevils. Développé par de nombreuses personnes. Pas développé ni supporté par Mojang AB.
+Un jeu non-officiel similaire à Minecraft pour Minetest. Forké depuis Mineclone par davedevils. Développé par de nombreuses personnes. Ni développé ou supporté par Mojang AB.
 Version: 0.79 (en dévelopment)
 ### Gameplay 
 Vous atterissez dans un monde fait entièrement de cubes et généré aléatoirement. Vous pouvez explorer le monde, miner et construire presque n'importe quel bloc pour créer de nouvelles structures. Vous pouvez choisir de jouer en "mode survie" dans lequel vous devez combattre des monstres et la faim et progresser lentement dans différents aspects du jeu, comme l'extraction de minerai, l'agriculture, la construction de machines et ainsi de suite. Ou alors vous pouvez jouer en "mode créatif" où vous pouvez construire à peu près n'importe quoi instantanément.
 ### Résumé du Gameplay
 * Jeu de type bac-à-sable, sans objetifs
-* Survie : combattez des monstres hostiles et la faim
+* Survie : combattre des monstres hostiles et la faim
-* Creusez pour du minerai et d'autres trésors
+* Creuser pour du minerai et d'autres trésors
-* Magie : gagnez de l'expérience et enchantez les outils
+* Magie : gagner de l'expérience et enchanter les outils
-* Utilisez les blocs ramassés pour construire de magnifiques bâtiments, votre imagination est la seule limite
+* Utiliser les blocs ramassés pour construire de magnifiques bâtiments, votre imagination est la limite
-* Ramassez des fleurs (et d'autres sources de teinture) et colorez votre monde
+* Ramasser des fleurs (et d'autres sources de teinture) et colorez votre monde
 * Trouvez des graines et commencez à cultiver
 * Trouvez ou fabriquez des centaines d'objets
-* Construisez un réseau ferroviaire complexe et amusez-vous avec les wagonnets
+* Construisez un réseau ferroviaire complexe et amusez vous avec les wagonnets
 * En mode créatif vous pouvez construire presque n'importe quoi gratuitement et sans limite
 ## Comment jouer (démarrer rapidement)
 ### Commencer
 * **Frappez un arbre** jusqu'à ce qu'il casse et donne du bois
 * Placez le **bois dans la grille 2x2** (la "grille de fabrication" de votre menu d'inventaire) et fabriquez 4 planches de bois
-* Placer les 4 planches de bois dans la grille 2x2 et **fabriquez un établi**
+* Placer les 4 planches de bois dans la grille 2x2 et **fabriquez une table d'artisanat**
-* **Faites un clic droit sur l'établi** (icone livre) pour apprendre toutes les recettes possibles
+* **Cliquez droit la table d'artisanat** (icone livre) pour apprendre toutes les recettes possibles
 * **Fabriquez une pioche de bois** pour miner la pierre
-* Différents outils minent différentes sortes de blocs. Essayez-les !
+* Différents outils minent différentes sortes de blocs. Essayez les !
-* Continuez à jouer comme vous voulez. Amusez-vous !
+* Continuez à jouer comme vous voulez. Amusez vous !
 ### Agriculture
 * Trouvez des graines
 * Fabriquez une houe
-* Faites un clic droit sur la terre ou des blocs similaires avec la houe pour créer des terres agricoles
+* Cliquez droit la terre ou des blocs similaires avec la houe pour créer des terres agricoles
 * Placer des graines sur des terres agricoles et regardez les pousser
 * Récoltez les plantes une fois matûres
 * Les terres agricoles proche de l'eau deviennent humides et accélèrent la croissance
 ### Four
-* Fabriquez un four
+* Fabriquer un Four
 * Le four permet d'obtenir plus d'objets
-* L'emplacement du haut doit contenir un objet fondable (par ex : minerai de fer)
+* L'emplacement du haut doit contienir un objet fondable (par ex : minerai de fer)
-* L'emplacement du bas doit contenir un objet combustible (par ex : charbon)
+* L'emplacement du bas doit contienir un objet combustible (par ex : charbon)
 * Voir le guide d'artisanat pour en apprendre plus sur les objets fondables et combustibles
 ### Aide supplémentaire
@ -59,43 +62,43 @@ Il n'y a pas de support de MineClone2 dans les versions développement de Minete
 Pour installer MineClone2 (si ce n'est pas déjà fait), déplacez ce dossier dans le dossier “games” de Minetest. Consultez l'aide de Minetest pour en apprendre plus.
 ## Liens utiles 
-Le dépôt de MineClone2 est hébergé sur Mesehub. Pour contribuer ou signaler des problèmes, allez là-bas.
+Le dépôt de MineClone2 est hébergé sur Mesehub. Pour contribuer ou rapporter des problèmes, aller là-bas.
-* Mesehub : <https://git.minetest.land/MineClone2/MineClone2>
+* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
-* Discord : <https://discord.gg/xE4z8EEpDC>
+* Discord: <https://discord.gg/xE4z8EEpDC>
-* YouTube : <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
+* YouTube <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
-* IRC : <https://web.libera.chat/#mineclone2>
+* IRC: <https://web.libera.chat/#mineclone2>
-* Matrix : <https://app.element.io/#/room/#mc2:matrix.org>
+* Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
-* Reddit : <https://www.reddit.com/r/MineClone2/>
+* Reddit: <https://www.reddit.com/r/MineClone2/>
-* Forums Minetest : <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
+* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
-* ContentDB : <https://content.minetest.net/packages/wuzzy/mineclone2/>
+* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
-* OpenCollective : <https://opencollective.com/mineclone2>
+* OpenCollective: <https://opencollective.com/mineclone2>
 ## Objectif
-* Essentiellement, créer un clone de Minecraft stable, moddable, libre et gratuit basé sur le moteur de jeu Minetest avec des fonctionnalités abouties, utilisable à la fois en mode solo et multijoueur. Actuellement, beaucoup des fonctionnalités de **Minecraft Java Edition** sont déjà implémentées et leur amélioration est prioritaire sur les nouvelles demandes.
+* Créer un clone stable, moddable, libre et gratuit basé sur le moteur de jeu Minetest avec des fonctionalités abouties, utilisable à la fois en mode solo et multijoueur. Actuellement, beaucoup des fonctionalités de **Minecraft Java Edition** sont déjà implémentées et leur amélioration est prioritaire sur les nouvelles demandes.
-* Avec une priorité moindre, implémenter les fonctionnalités des versions **Minecraft + OptiFine** (OptiFine autant que supporté par le moteur Minetest). Cela signifie que les fonctionnalités présentes dans les versions listées sont priorisées.
+* Avec une priorité moindre, implémenter les fonctionalités des versions **Minecraft + OptiFine** (OtiFine autant que supporté par le moteur Minetest). Cela signifie que les fonctionalités présentes dans les versions listées sont priorisées.
-* Dans l'idéal, créer une expérience performante qui tourne bien sur des ordinateurs à basse performance. Malheureusement, en raison des mécanismes de Minecraft et des limitations du moteur Minetest ainsi que de la petite taille de la communauté de joueurs sur des ordinateurs à basses performances, les optimisations sont difficiles à explorer.
+* Dans l'idéal, créer une expérience performante qui tourne bien sur des ordinateurs à basse performance. Malheureusement, en raison des mécanismes de Minecraft et des limitations du moteur Minetest ainsi que de la petite taille de la communauté de joueurs sur des ordinateurs à basse performances, les optimisations sont difficiles à explorer.
 ## Statut de complétion
 Ce jeu est actuellement au stade **beta**.
-Il est jouable mais incomplet en fonctionnalités.
+Il est jouable mais incomplet en fonctionalités.
 La rétro-compatibilité n'est pas entièrement garantie, mettre votre monde à jour peut causer de petits bugs.
 Si vous voulez utiliser la version de développement de MineClone2 en production, la branche master est habituellement relativement stable. Les branches de test fusionnent souvent des pull requests expérimentales et doivent être considérées comme moins stable.
-Les principales fonctionnalités suivantes sont disponibles :
+Les principales fonctionalités suivantes sont disponibles :
 * Outils, armes
 * Armure
-* Système de fabrication : grille 2x2, établi (grille 3x3), four, incluant un guide de fabrication
+* Système de fabrication : grille 2x2, table d'artisanat (grille 3x3), four, incluant un guide de fabrication
-* Coffres, grands coffres, coffre ender, boites de Shulker
+* Coffres, grands coffres, coffre ender, boite de shulker
 * Fours, entonnoirs
 * Faim
 * La plupart des monstres et animaux
-* Tous les minerais de Minecraft
+* Tout les minerais de Minecraft
 * La plupart des blocs de l'overworld
 * Eau et lave
 * Météo
-* 28 biomes + 5 biomes du Nether
+* 28 biomes + 5 biomes du nether
 * Le Nether, monde souterrain brûlant dans une autre dimension
 * Circuits Redstone (partiel)
 * Effets de Statut (partiel)
@ -104,10 +107,10 @@ Les principales fonctionnalités suivantes sont disponibles :
 * Brassage, potions, flèches trempées (partiel)
 * Bâteaux
 * Feu
-* Blocs de construction : escaliers, dalles, portes, trappes, barrières, portillons, murets
+* Blocs de construction : escaliers, dalles, portes, trappes, barrière, portillon, muret
 * Horloge
 * Boussole
-* Éponge
+* Eponge
 * Bloc de slime 
 * Petites plantes et pousses
 * Teintures
@ -115,30 +118,26 @@ Les principales fonctionnalités suivantes sont disponibles :
 * Blocs de décoration : verre, verre teinté, vitres, barres de fer, terre cuites (et couleurs), têtes et plus
 * Cadres d'objets 
 * Juke-boxes
 * Lits
 * Menu d'inventaire
 * Inventaire créatif
 * Agriculture
 * Livres pour écrire
 * Commandes
 * Villages
 * L'End 
 * et plus !
-Les fonctionnalités suivantes sont incomplètes :
+Les fonctionalités suivantes sont incomplètes :
-* Certains monstres et animaux
+* certains monstres et animaux
-* Certains composants de Redstone
+* certains composants de Redstone
 * Wagonnets spéciaux
-* Quelques blocs et objets non-triviaux
+* quelques blocs et objets non-triviaux
-Fonctionnalités bonus (absentes de Minecraft) :
+Fonctionalité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.
+* 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 fonctionalité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)
+* 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
    * Plus de dalles et d'escaliers
@ -150,24 +149,22 @@ Fonctionnalités bonus (absentes de Minecraft) :
    * Avant-poste du Nether (Forteresse)
 Différences techniques avec Minecraft :
 * Limite en hauteur de 31000 blocs (bien plus grand que Minecraft)
 * Taille horizontale du monde 62000×62000 blocs (bien plus petit que Minecraft mais toujours très grand)
 * Toujours assez incomplet et buggé
-* Des blocs, objets, ennemis et fonctionnalités manquent
+* Des blocs, objets, ennemis et fonctionalités manquent
 * Quelques objets ont des noms légèrement différents pour être plus faciles à distinguer
 * Des musiques différentes pour le juke-boxe
 * Des textures différentes (Pixel Perfection)
 * Des sons différents (sources diverses)
 * Un moteur de jeu différent (Minetest)
 * Des bonus cachés différents
 ...et enfin MineClone2 est un logiciel libre !
 ## Autres fichiers readme
-* `LICENSE.txt` : Le texte de la licence GPLv3
+* `LICENSE.txt`: Le texte de la license GPLv3
-* `CONTRIBUTING.md` : Information pour ceux qui veulent contribuer
+* `CONTRIBUTING.md`: Information pour ceux qui veulent contribuer
-* `API.md` : Pour les modders Minetest qui veulent modder ce jeu
+* `API.md`: Pour les modders Minetest qui veulent modder ce jeu
-* `LEGAL.md` : Information légale
+* `LEGAL.md`: Information légale
-* `CREDITS.md` : Liste de toutes les personnes qui ont contribué
+* `CREDITS.md`: Liste des contributeurs
--- a/README_locale/README.ru.md
+++ b/README_locale/README.ru.md
@ -1,193 +0,0 @@
 # MineClone2
 Неофициальная игра в стиле Minecraft для Minetest. Форк MineClone от davedevils.
 Разработана многими людьми. Не разработана и не одобрена Mojang AB.
 ### Игровой процесс
 Вы начинаете в случайно сгенерированном мире созданном целиком из кубов. Вы можете
 исследовать мир, выкопать и поставить почти каждый блок в мире, чтобы создавать новые
 структуры. Вы можете играть в “режиме выживания” в котором вам придется бороться с
 монстрами и голодом за выживание и медленно проходить через различные аспекты игры,
 такие как копание, фермерство, постройка механизмов и так далее. Или вы можете играть
 в “творческом режиме” в котором вы сразу можете строить что угодно.
 #### Итоги геймплея
 * Геймплей в стиле песочницы, без целей
 * Выживайте: сражайтесь с враждебными монстрами и голодом
 * Добывайте руды и прочие ценные предметы
 * Магия: получайте опыт и зачаруйте ваше снаряжение
 * Создавайте из собранных блоков величественные постройки ограниченные только воображением
 * Собирайте цветы и другие красители, чтобы раскрасить ваш мир
 * Найдите семена и заведите ферму
 * Найдите или создайте один из сотен предметов
 * Проложите рельсы и повеселитесь с вагонетками
 * Постройте сложные механизмы со схемами из редстоуна
 * В творческом режиме вы можете свободно строить всё без лимитов
 ## Как играть (быстрый старт)
 ### Начнем
 * **Бейте по стволу дерева** пока оно не сломается и соберите древесину
 * Поставьте **древесину в сетку 2×2** (“сетка крафта” в вашем инвентаре) и скрафтите 4 доски
 * Разложите 4 доски в форме 2×2 в сетке крафта, чтобы **сделать верстак**
 * **Правым кликом по верстаку**, чтобы открыть сетку крафта 3×3 для более сложных предметов
 * Используйте **книгу рецептов** (иконка книги), чтобы узнать все возможные рецепты крафтов
 * **Скрафтите деревянную кирку**, чтобы вы могли копать камень
 * Разные инструменты добывают разные виды блоков. Опробуйте их все!
 * Продолжайте играть как пожелаете. Повеселитесь!
 ### Фермерство
 * Найдите семена
 * Скрафтите мотыгу
 * Правой кнопкой мотыгой по земле или похожему блоку, чтобы создать грядку
 * Посадите семена на грядку и ждите пока они вырастут
 * Соберите растение когда оно полностью созреет
 * Рядом с водой грядка становится влажной и растения растут быстрее
 ### Переплавка
 * Скрафтите печь
 * Печь позволит вам получить больше предметов
 * Верхний слот должен содержать переплавляемый предмет (например: железную руду)
 * Нижний слот должен содержать топливо (например: уголь)
 * Смотрите книгу рецептов, чтобы узнать о других переплавляемых предметах и топливе
 ### Дополнительная помощь
 Больше информации о геймплее, блоках, предметах и многое другое можно найти во
 внутриигровой справке. Вы можете перейти в неё через ваш инвентарь.
 ### Особые предметы
 Следующие предметы интересны для творческого режима и для строителей приключенческих
 карт. Их нельзя получить в игре или через творческий инвентарь.
 * Барьер: `mcl_core:barrier`
 Используйте чат-команду `/giveme`, чтобы получить их.
 Смотрите справку для дальнейшей информации.
 ## Установка
 Эта игра требует [Minetest](http://minetest.net) для запуска (версия 5.4.1 или
 выше). Вам нужно сперва установить Minetest. Только стабильные версии поддерживаются
 официально. Не поддерживается запуск MineClone2 на разрабатываемых версиях Minetest.
 Чтобы установить MineClone2 (если вы этого еще не сделали), переместите эту папку в
 “games” в папке данных Minetest. Смотрите справку Minetest, чтобы узнать больше.
 ## Полезные ссылки
 Репозиторий MineClone2 хранится на Mesehub. Зайдите туда, чтобы оставить запрос или
 поучаствовать в разработке.
 * Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
 * Discord: <https://discord.gg/xE4z8EEpDC>
 * YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
 * ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
 * OpenCollective: <https://opencollective.com/mineclone2>
 * Mastodon: <https://fosstodon.org/@MineClone2>
 * Lemmy: <https://lemmy.world/c/mineclone2>
 * Matrix space: <https://app.element.io/#/room/#mcl2:matrix.org>
 * Форум Minetest: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
 * Reddit: <https://www.reddit.com/r/MineClone2/>
 * IRC (едва используется): <https://web.libera.chat/#mineclone2>
 ## Цели
 - Создать стабильную, модифицируемую, бесплатную и свободную игру основанную на
 Minecraft на движке Minetest с проработанными возможностями для одиночной игры и
 для мультиплеера. На данный момент множество возможностей **Minecraft Java
 Edition** уже реализовано и доработка имеющегося контента в приоритете над
 добавлением нового.
 - Реализовать возможности на уровне **текущей версии Minecraft + OptiFine** (OptiFine
 настолько, насколько это поддерживается движком Minetest).
 - Добиться производительности для запуска на действительно слабых компьютерах.
 ## Готовность
 Игра сейчас на стадии **бета**.  Она играбельна, но еще не имеет всех возможностей.
 Обратная совместимость целиком не гарантируется, обновление вашего мира может повлечь
 за собой небольшие ошибки.  Если вы хотите использовать разрабатываемую версию
 Mineclone2, то ветка master обычно относительно стабильна.
 Следущие возможности уже доступны:
 * Инструменты, оружие, броня
 * Система крафта: сетка 2×2, верстак (сетка 3×3) и книга рецептов
 * Сундуки, большие сундуки, эндер-сундуки, ящики шалкера
 * Печи и воронки
 * Система голода
 * Большинство монстров и животных
 * Все руды из Minecraft
 * Большинство блоков из Верхнего мира
 * Вода и лава
 * Погода
 * 28 биомов + 5 биомов в Незере
 * Незер, пылающий подземный мир в другом измерении
 * Схемы из редстоуна (частично)
 * Вагонетки (частично)
 * Статусные эффекты (частично)
 * Опыт
 * Зачарование
 * Зельеварение, зелья, смоченные стрелы (частично)
 * Лодки
 * Огонь
 * Строительные блоки: ступени, плиты, двери, люки, заборы, калитки, стены
 * Часы
 * Компас
 * Губки
 * Блоки слизи
 * Растения и саженцы
 * Красители
 * Флаги
 * Декоративные блоки: стекло, окрашенное стекло, стеклянные панели, железные решетки, цветная керамика, головы и многое другое
 * Рамки для предметов
 * Прогрыватели
 * Кровати
 * Меню инвентаря
 * Творческий инвентарь
 * Фермерство
 * Книги с пером
 * Команды
 * Деревни
 * Измерение Края
 * И многое другое!
 Следующие возможности еще не завершены:
 * Некоторые монстры и животные
 * Предметы связанные с редстоуном
 * Некоторые вагонетки (с сундуком и с воронкой уже работают)
 * Пара нетривиальных блоков и предметов
 Бонусные возможности (нет в Minecraft-е):
 * Встроенный гайд для крафта покажет вам рецепты крафта и переплавки
 * Внутриигровая справка содержит всестороннюю информацию об основах игры, блоках, предметах и прочее
 * Временные рецепты крафта. Они существуют, чтобы получить доступ к ранее недоступным предметам вне творческого режима. Они будут удалены как только разработка позволит им стать доступными
 * Саженцы в сундуках в [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
 * Полностью модифицируема (благодаря мощному Lua API в Minetest)
 * Новые блоки и предметы:
    * Инструмент просмотра покажет справку о том чего коснется
    * Больше ступеней и плит
    * Калитки и заборы из адских кирпичей
 * Замены структур - малые верии структур из Minecraft пока большие структуры не будут сделаны:
    * Лесная хижина (Особняк)
    * Форт Незера (Крепости)
 Технические отличия от Minecraft:
 * Лимит высоты - 31000 блоков (намного больше чем в Minecraft)
 * Горизонтальный размер мира - 62000×62000 блоков (намного меньше чем в Minecraft, но всё еще очень большой)
 * Всё еще не завершен и содержит много багов
 * Недостающие блоки, предметы, мобы
 * Некоторые предметы с другими названиями, чтобы лучше их различать
 * Другая музыка для проигрывателей
 * Другие текстуры (Pixel Perfection)
 * Другие звуки (разные источники)
 * Другой движок (Minetest)
 * Другие пасхалки
 … и наконец, MineClone2 это свободное программное обеспечение!
 ## Другие readme файлы
 * `LICENSE.txt`: текст лицензии GPLv3
 * `CONTRIBUTING.md`: информация для тех кто хочет поучаствовать в разработке
 * `API.md`: для моддеров Minetest кто хочет изменить эту игру
 * `LEGAL.md`: юридическая информация
 * `CREDITS.md`: список участников проекта
--- a/RELEASE.md
+++ b/RELEASE.md
@ -1,11 +1,10 @@
 ### Standard Release
-# File to document release steps with a view to evolving into a script
+#File to document release steps with a view to evolving into a script
-# Update CREDITS.md
+#Update CREDITS.md
-# Update version in game.conf
+#Update version in game.conf
 ```
 lua tools/generate_ingame_credits.lua
 git add CREDITS.md
@ -14,16 +13,15 @@ git add game.conf
 #git add RELEASE.md
-git commit -m "Pre-release update credits and set version 0.83.0"
+git commit -m "Pre-release update credits and set version 0.82.0"
-git tag 0.83.0
+git tag 0.82.0
-git push origin 0.83.0
+git push origin 0.82.0
 ```
-# Update version in game.conf to the next version with -SNAPSHOT suffix
+#Update version in game.conf to -SNAPSHOT
-`git commit -m "Post-release set version 0.84.0-SNAPSHOT"`
+git commit -m "Post-release set version 0.82.0-SNAPSHOT"
 ### Hotfix Release
@ -34,17 +32,15 @@ To mitigate this, you just release the last release, and the relevant bug fix. F
 * Create release branch from the last release tag, push it:
 ```
 git checkout -b release/0.82.1 0.82.0
 git push origin release/0.82.1
 ```
 ##### Prepare feature branch and fix
 * Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately)
-`git checkout -b hotfix_bug_1_branch`
+git checkout -b hotfix_bug_1_branch
 * Fix crash/serious bug and commit
 * Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed)
@ -57,13 +53,11 @@ git push origin release/0.82.1
 * Tag it, push tag and branch:
 ```
 git tag 0.82.1
 git push origin 0.82.1
 git push origin release/0.82.1
 ```
 Note: If you have to do more than 1 hotfix release, can do it on the same release branch.
@ -77,13 +71,5 @@ Note: If you have to do more than 1 hotfix release, can do it on the same releas
 ##### Inform people
-* Upload video to YouTube
+* Add a comment to the forum post with the release number and what is involved, and maintainer will update main post.
-* Add a comment to the forum post with the release number and change log. Maintainer will update main post with code link.
+* Add a comment in Discord announcement
 * Add a Discord announcement post and @everyone with link to video, forum post and release notes.
 * Share the news on reddit + Lemmy. Good subs to share with:
  * r/linux_gaming 
  * r/opensourcegames
  * r/opensource
  * r/freesoftware
  * r/linuxmasterrace
  * r/MineClone2
--- a/TEXTURES.md
+++ b/TEXTURES.md
@ -1,57 +0,0 @@
 # Making Textures In Mineclone2
 Textures are a crucial asset for all items, nodes, and models in mineclone2. This document is for artist who would like to make and modify textures for mineclone2. While no means comprehensive, this document contains the basic important information for beginners to get started with texture curation and optimization.
 ## Minetest Wiki
 For more detailed information on creating and modifing texture packs for Minetest/Mineclone2, please visit the Minetest wiki's page on creating a texture pack. Click [here](https://wiki.minetest.net/Creating_texture_packs) to view the wiki page on creating texture packs.
 ## GIMP Tutorials Pixel Art Guide
 GIMP Tutorials has an excellent guide to making pixel art in GIMP. If you would like further clarification as well as screenshots for what we are about to cover, it is an excellent resource to turn to. Click [here](https://thegimptutorials.com/how-to-make-pixel-art/) to view the guide
 ## Recommended Software
 ### GIMP
 GIMP (GNU Image Manipulation Program) is a very popular and free image editing software supported on Windows, MacOS, and most Linux distributions. It is recommended to use GIMP to create and modify textures within the minetest engine. 
 Download GIMP [here](http://gimp.org/)
 # Getting Started
 ## Creating a new file
 the first thing to do is open GIMP and create a new file to work in by opening the File menu and choosing "New".
 Choose width of 16 and height of 16 for the image size. While higher resolution textures are possible, The default size is 16x16. It is recommended you use this size as well, as it is universally supported on all systems.
 ## Zoom In
 Next, you'll want to zoom in as the canvas is very small at the default zoom level. To do this either use CTRL + mousewheel, +/-, or navigate to the View menu > zoom > zoom in
 ## Configure Grid
 Now, we'll want to turn on the grid. Open the edit menu and enable the 'show grid' option.
 The default grid size is 10 pixels, we want to change it to a 1 pixel grid. Go to the Image menu and choose 'configure grid.
 In the Spacing section, change both the Horizontal and Vertical pixel settings to 1.00 then click ok and the grid will update.
 ## Pencil Tool & Color Picking
 The most useful brush type for pixel art is the Pencil tool. Its nested under the paintbrush tool in the toolbox, or you can use the keyboard shortcut 'N'.
 Once the pencil tool is selected, navigate to the sliders on the left side of the canvas and change brush size to 1 pixel.
 Now choose a color! You can do this by clicking on the two colored squares under the toolbox. The Color Picker tool is also a good option if you already have a reference image for color palette.
 ## How to export optimally
 Once you have finished up a texture and are ready to export it, navigate to the file menu > export as... and make sure the file name extention is .png
 After clicking 'Export', a menu will appear with a bunch of options checked. Make sure to uncheck all of these options!!! This will drastically reduce the file size from multiple kilobytes to a couple of hundred bytes. Finally click 'Export' one more time.
 ### Further optimization with OptiPNG
 For those running a GNU/linux distribution, you most likely have the 'optipng' command available to you. If it does not come with your system by default, the software homepage can be found [here](https://optipng.sourceforge.net/) where you can download and install from source.
 First, Open up the terminal in the directory where your exported texture is located (or navigate to the directory with the 'cd your/directory/path/to/textures'), then run this command
 ```
 optipng -o7 -zm1-9 -nc -clobber -strip all *.png
 ```
 This will further optimize all the textures in the directory.
 NOTE: If you would like to further edit a texture that has been optipng'd in GIMP, you must manually set the color palette back to RBG after opening. Navigate to Image menu > Mode > select RGB
--- a/description.txt
+++ b/description.txt
@ -1 +1 @@
-A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more.
+A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more. Faithful clone of Minecraft 1.12. This is a work in progress! Expect bugs!
--- 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.82.0-SNAPSHOT
--- a/mods/CORE/_mcl_autogroup/init.lua
+++ b/mods/CORE/_mcl_autogroup/init.lua
@ -215,10 +215,6 @@ function mcl_autogroup.can_harvest(nodename, toolname, player)
 		return true
 	end
 	if minetest.get_item_group(nodename, "dig_immediate_piston") >= 1 then
 		return true
 	end
 	-- Check if it can be dug by tool
 	local tdef = minetest.registered_tools[toolname]
 	if tdef and tdef._mcl_diggroups then
@ -304,10 +300,6 @@ end
 -- loading order.
 function mcl_autogroup.get_wear(toolname, diggroup)
 	local tdef = minetest.registered_tools[toolname]
 	if not tdef then
 		minetest.log("warning", "Adding wear for tool: " .. tostring(toolname) .. " failed with diggroup: " .. tostring(diggroup))
 		return nil
 	end
 	local uses = tdef._mcl_diggroups[diggroup].uses
 	return math.ceil(65535 / uses)
 end
@ -370,6 +362,12 @@ local function overwrite()
 			minetest.override_item(tname, {
 				tool_capabilities = toolcaps
 			})
 		else
 			-- This is needed to deal damage when punching mobs
 			-- with random items in hand in survival mode
 			minetest.override_item(tname, {
 				tool_capabilities = mcl_meshhand.survival_hand_tool_caps
 			})
 		end
 	end
 end
--- 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_damage/init.lua
+++ b/mods/CORE/mcl_damage/init.lua
@ -96,8 +96,8 @@ function mcl_damage.finish_reason(mcl_reason)
 end
 function mcl_damage.from_mt(mt_reason)
-	if mt_reason._mcl_cached_reason then
+	if mt_reason._mcl_chached_reason then
-		return mt_reason._mcl_cached_reason
+		return mt_reason._mcl_chached_reason
 	end
 	local mcl_reason
--- a/mods/CORE/mcl_explosions/init.lua
+++ b/mods/CORE/mcl_explosions/init.lua
@ -13,7 +13,6 @@ under the LGPLv2.1 license.
 mcl_explosions = {}
 local mod_fire = minetest.get_modpath("mcl_fire")
 local explosions_griefing = minetest.settings:get_bool("mcl_explosions_griefing", true)
 --local CONTENT_FIRE = minetest.get_content_id("mcl_fire:fire")
 local math = math
@ -192,7 +191,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
 	local grief_protected = info.grief_protected
 	-- Trace rays for environment destruction
-	if info.griefing and explosions_griefing then
+	if info.griefing then
 		for i = 1, #raydirs do
 			local rpos_x = pos.x
 			local rpos_y = pos.y
@ -352,23 +351,6 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
 				end
 			end
 		end
 		-- Punch End Crystals to make them explode
 		if ent and ent.name == "mcl_end:crystal" then
 			if direct then
 				local puncher = direct:get_luaentity()
 				if puncher and puncher.name == "mcl_end:crystal" then
 					ent.object:punch(direct, 1.0, { -- End Crystal nearby, trigger it.
 						full_punch_interval = 1.0,
 							damage_groups = {fleshy = 1},
 						}, nil, nil)
 				else
 					ent.object:remove() -- Direct Exists, but it is not an end crystal, remove crystal.
 				end
 			else
 				ent.object:remove() -- Node exploded the end crystal, remove it.
 			end
 		end
 	end
 	local airs, fires = {}, {}
--- a/mods/CORE/mcl_explosions/locale/mcl_explosions.fr.tr
+++ b/mods/CORE/mcl_explosions/locale/mcl_explosions.fr.tr
@ -1,2 +0,0 @@
 # textdomain:mcl_explosions
@1 was caught in an explosion.=@1 est mort dans une explosion
--- a/mods/CORE/mcl_explosions/locale/mcl_explosions.oc.tr
+++ b/mods/CORE/mcl_explosions/locale/mcl_explosions.oc.tr
@ -1,2 +0,0 @@
 # textdomain:mcl_explosions
@1 was caught in an explosion.=@1 z-es mòrt dins una explosion
--- 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_explosions/locale/mcl_explosions.ru.tr
+++ b/mods/CORE/mcl_explosions/locale/mcl_explosions.ru.tr
@ -1,2 +0,0 @@
 # textdomain:mcl_explosions
@1 was caught in an explosion.=@1 попал(а) под взрыв.
--- a/mods/CORE/mcl_explosions/locale/template.txt
+++ b/mods/CORE/mcl_explosions/locale/template.txt
@ -1,2 +0,0 @@
 # textdomain:mcl_explosions
@1 was caught in an explosion.=
--- a/mods/CORE/mcl_init/init.lua
+++ b/mods/CORE/mcl_init/init.lua
@ -36,8 +36,6 @@ mcl_vars.MAP_BLOCKSIZE = math.max(1, minetest.MAP_BLOCKSIZE or 16)
 mcl_vars.mapgen_limit = math.max(1, tonumber(minetest.get_mapgen_setting("mapgen_limit")) or 31000)
 mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, minetest.MAX_MAP_GENERATION_LIMIT or 31000)
 -- Central chunk is offset from 0,0,0 coordinates by 32 nodes (2 blocks)
 -- See more in https://git.minetest.land/MineClone2/MineClone2/wiki/World-structure%3A-positions%2C-boundaries%2C-blocks%2C-chunks%2C-dimensions%2C-barriers-and-the-void
 local central_chunk_offset = -math.floor(mcl_vars.chunksize / 2)
 mcl_vars.central_chunk_offset_in_nodes = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
--- a/mods/CORE/mcl_oxidation/README.md
+++ b/mods/CORE/mcl_oxidation/README.md
@ -1,14 +0,0 @@
 # Oxidization API for MineClone 2
 This mods adds the oxidization api, so that modders can easily use the same features that copper uses.
 ## API
 To take advantage of the actual oxidization, put `oxidizable = 1` into the list of groups for the oxidizable node.
 You would also need to put `_mcl_oxidized_variant = itemstring of node this node will oxidize into` into the node definition.
 For example, a copper block oxidizes into exposed copper, so the defintion would be `_mcl_oxidized_variant = "mcl_copper:block_exposed"`.
 To utilize the ability to wax the block for protection from oxidization, put `mcl_waxed_variant = item string of waxed variant of node` into the node definition table.
 For example, Copper Blocks have the definition arguement of `_mcl_waxed_variant = "mcl_copper:waxed_block"`.
 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"`.
--- a/mods/CORE/mcl_oxidation/init.lua
+++ b/mods/CORE/mcl_oxidation/init.lua
@ -1,12 +0,0 @@
 minetest.register_abm({
 	label = "Oxidatize Nodes",
 	nodenames = { "group:oxidizable" },
 	interval = 500,
 	chance = 3,
 	action = function(pos, node)
 		local def = minetest.registered_nodes[node.name]
 		if def and def._mcl_oxidized_variant then
 			minetest.set_node(pos, { name = def._mcl_oxidized_variant, param2 = node.param2 })
 		end
 	end,
 })
--- a/mods/CORE/mcl_oxidation/mod.conf
+++ b/mods/CORE/mcl_oxidation/mod.conf
@ -1,4 +0,0 @@
 name = mcl_oxidation
 title = Oxidation API for MineClone 2
 author = PrairieWind, N011, Michael
 description = API to allow oxidizing different nodes.
--- 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)
@ -58,76 +34,6 @@ function mcl_util.mcl_log(message, module, bypass_default_logger)
 	end
 end
 local player_timers = {}
 -- This is a dtime timer than can be used in on_step functions so it works every x seconds
 -- self - Object you want to store timer data on. E.g. mob or a minecart, or player_name
 -- dtime - The time since last run of on_step, should be passed in to function
 -- timer_name - This is the name of the timer and also the key to store the data. No spaces + lowercase.
 -- threshold - The time before it returns successful. 0.2 if you want to run it 5 times a second.
 function mcl_util.check_dtime_timer(self, dtime, timer_name, threshold)
 	if not self or not threshold or not dtime then return end
 	if not timer_name or timer_name == "" then return end
 	if type(self) == "string" then
 		local player_name = self
 		if not player_timers[player_name] then
 			player_timers[player_name] = {}
 		end
 		self = player_timers[player_name]
 	end
 	if not self._timers then
 		self._timers = {}
 	end
 	if not self._timers[timer_name] then
 		self._timers[timer_name] = 0
 	else
 		self._timers[timer_name] = self._timers[timer_name] + dtime
 		--minetest.log("dtime: " .. tostring(self._timers[timer_name]))
 	end
 	if self._timers[timer_name] > threshold then
 		--minetest.log("Over threshold")
 		self._timers[timer_name] = 0
 		return true
 		--else
 		--minetest.log("Not over threshold")
 	end
 	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:
 -- https://git.minetest.land/MineClone2/MineClone2/issues/1392
 function mcl_util.get_natural_light (pos, time)
 	local status, retVal = pcall(minetest.get_natural_light, pos, time)
 	if status then
 		return retVal
 	else
 		minetest.log("warning", "Failed to get natural light at pos: " .. dump(pos) .. ", time: " .. dump(time))
 		if (pos) then
 			local node = minetest.get_node(pos)
 			minetest.log("warning", "Node at pos: " .. dump(node.name))
 		end
 	end
 	return 0
 end
 function mcl_util.file_exists(name)
 	if type(name) ~= "string" then return end
 	local f = io.open(name)
@ -160,7 +66,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,12 +104,26 @@ function mcl_util.rotate_axis_and_place(itemstack, placer, pointed_thing, infini
 	local p2
 	if is_y then
-		p2 = 0
+		if invert_wall then
-	elseif is_x then
+			if fdir == 3 or fdir == 1 then
 				p2 = 12
-	elseif is_z then
+			else
 				p2 = 6
 			end
 		end
 	elseif is_x then
 		if invert_wall then
 			p2 = 0
 		else
 			p2 = 12
 		end
 	elseif is_z then
 		if invert_wall then
 			p2 = 0
 		else
 			p2 = 6
 		end
 	end
 	minetest.set_node(pos, {name = wield_name, param2 = p2})
 	if not infinitestacks then
@ -251,34 +171,34 @@ function mcl_util.get_double_container_neighbor_pos(pos, param2, side)
 	end
 end
--- Selects item stack to transfer from
+-- Iterates through all items in the given inventory and
---@param src_inventory InvRef Source innentory to pull from
+-- returns the slot of the first item which matches a condition.
---@param src_list string Name of source inventory list to pull from
+-- Returns nil if no item was found.
---@param dst_inventory InvRef Destination inventory to push to
+--- source_inventory: Inventory to take the item from
---@param dst_list string Name of destination inventory list to push to
+--- source_list: List name of the source inventory from which to take the item
---@param condition? fun(stack: ItemStack) Condition which items are allowed to be transfered.
+--- destination_inventory: Put item into this inventory
---@param count? integer Number of items to try to transfer at once
+--- destination_list: List name of the destination inventory to which to put the item into
---@return integer Item stack number to be transfered
+--- condition: Function which takes an itemstack and returns true if it matches the desired item condition.
-function mcl_util.select_stack(src_inventory, src_list, dst_inventory, dst_list, condition, count)
+---            If set to nil, the slot of the first item stack will be taken unconditionally.
-	local src_size = src_inventory:get_size(src_list)
+-- 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 (condition == nil or condition(stack, src_inventory, src_list, dst_inventory, dst_list)) then
 		-- Allow for partial stack movement
 		if count and stack:get_count() >= count then
 			local new_stack = ItemStack(stack)
 			new_stack:set_count(count)
 			stack = new_stack
 		end
 		if not stack:is_empty() and dst_inventory:room_for_item(dst_list, stack) and ((condition == nil or condition(stack))) 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
@ -289,13 +209,16 @@ 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)
-	-- Can't move items we don't have
+	if source_stack_id == -1 then
-	if source_inventory:is_empty(source_list) then return false end
+		source_stack_id = mcl_util.get_first_occupied_inventory_slot(source_inventory, source_list)
 		if source_stack_id == nil then
 			return false
 		end
 	end
-	-- Can't move from an empty stack
+	if not source_inventory:is_empty(source_list) then
 		local stack = source_inventory:get_stack(source_list, source_stack_id)
-	if stack:is_empty() then return false end
+		if not stack:is_empty() then
 			local new_stack = ItemStack(stack)
 			new_stack:set_count(1)
 			if not destination_inventory:room_for_item(destination_list, new_stack) then
@ -305,75 +228,155 @@ function mcl_util.move_item(source_inventory, source_list, source_stack_id, dest
 			source_inventory:set_stack(source_list, source_stack_id, stack)
 			destination_inventory:add_item(destination_list, new_stack)
 			return true
 		end
 	end
 	return false
 end
--- Try pushing item from hopper inventory to destination inventory
+-- Moves a single item from one container node into another. Performs a variety of high-level
---@param pos Vector
+-- checks to prevent invalid transfers such as shulker boxes into shulker boxes
---@param dst_pos Vector
+--- source_pos: Position ({x,y,z}) of the node to take the item from
-function mcl_util.hopper_push(pos, dst_pos)
+--- destination_pos: Position ({x,y,z}) of the node to put the item into
-	local hop_inv = minetest.get_meta(pos):get_inventory()
+--- source_list (optional): List name of the source inventory from which to take the item. Default is normally "main"; "dst" for furnace
-	local hop_list = 'main'
+--- 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 dctype = minetest.get_item_group(dnode.name, "container")
-	local dst = minetest.get_node(dst_pos)
+	local sctype = minetest.get_item_group(snode.name, "container")
 	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 dst_list = 'main'
+	-- Container type 7 does not allow any movement
-	local dst_inv, stack_id
+	if sctype == 7 then
-
+		return false
 	-- Find a inventory stack in the destination
 	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, nil, 1)
 	end
 	if not stack_id then return false end
-	-- Move the item
+	-- Normalize double container by forcing to always use the left segment first
-	local ok = mcl_util.move_item(hop_inv, hop_list, stack_id, dst_inv, dst_list)
+	local function normalize_double_container(pos, node, ctype)
-	if dst_def._mcl_hoppers_on_after_push then
+		if ctype == 6 then
-		dst_def._mcl_hoppers_on_after_push(dst_pos)
+			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
 		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
+-- Returns the ID of the first non-empty slot in the given inventory list
---@param pos Vector
+-- or nil, if inventory is empty.
---@param src_pos Vector
+function mcl_util.get_first_occupied_inventory_slot(inventory, listname)
-function mcl_util.hopper_pull(pos, src_pos)
+	return mcl_util.get_eligible_transfer_item_slot(inventory, listname)
 	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, nil, 1)
 	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
 end
 local function drop_item_stack(pos, stack)
@ -551,7 +554,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
@ -1030,72 +1033,3 @@ function mcl_util.get_palette_indexes_from_pos(pos)
 		return palette_indexes
 	end
 end
 function mcl_util.get_colorwallmounted_rotation(pos)
 	local colorwallmounted_node = minetest.get_node(pos)
 	for i = 0, 32, 1 do
 		local colorwallmounted_rotation = colorwallmounted_node.param2 - (i * 8)
 		if colorwallmounted_rotation < 6 then
 			return colorwallmounted_rotation
 		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/CORE/tga_encoder/LICENSE
+++ b/mods/CORE/tga_encoder/LICENSE
@ -1,674 +0,0 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/mods/CORE/tga_encoder/README.md
+++ b/mods/CORE/tga_encoder/README.md
@ -1,87 +1,4 @@
 # tga_encoder
 A TGA Encoder written in Lua without the use of external Libraries.
 Created by fleckenstein for MineClone2, then improved by erlehmann.
 May be used as a Minetest mod.
 See `examples.lua` for example code and usage hints.
 ## Use Cases for `tga_encoder`
 ### Encoding Textures for Editing
 TGA images of types 1/2/3 consist of header data followed by a pixel array.
 This makes it trivial to parse TGA files – and even edit pixels in-place.
 No checksums need to be updated on any kind of in-place texture editing.
 **Tip**: When storing an editable image in item meta, use zlib compression.
 ### Legacy Minetest Texture Encoding
 Minetest 5.4 did not include `minetest.encode_png()` (or any equvivalent).
 Since `tga_encoder` is written in pure Lua, it does not need engine support.
 **Tip:** Look at `examples.lua` and the Minetest mod `mcl_maps` for guidance.
 ### Advanced Texture Format Control
 The function `minetest.encode_png()` always encodes images as 32bpp RGBA.
 `tga_encoder` allows saving images as grayscale, 16bpp RGBA and 24bpp RGB.
 For generating maps from terrain, color-mapped formats can be more useful.
 ### Encoding Very Small Textures
 Images of size 8×8 or below are often smaller than an equivalent PNG file.
 Note that on many filesystems files use at least 4096 bytes (i.e. 64×64).
 Therefore, saving bytes on files up to a few 100 bytes is often useless.
 ### Encoding Reference Textures
 TGA is a simple format, which makes it easy to create reference textures.
 Using a hex editor, one can trivially see how all the pixels are stored.
 ## Supported Image Types
 For all types, images are encoded in a fast single pass (i.e. append-only).
 ### Color-Mapped Images (Type 1)
 These images contain a palette, followed by pixel data.
 * `A1R5G5B5` (8bpp RGB)
 * `B8G8R8` (8bpp RGB)
 * `B8G8R8A8` (8bpp RGBA)
 ### True-Color Images (Type 2)
 These images contain uncompressed RGB(A) pixel data.
 * `A1R5G5B5` (16bpp RGBA)
 * `B8G8R8` (24bpp RGB)
 * `B8G8R8A8` (32bpp RGBA)
 ### Grayscale Images (Type 3)
 * `Y8` (8bpp grayscale)
 ### Run-Length Encoded (RLE), True-Color Images (Type 10)
 These images contain compressed RGB(A) pixel data.
 * `A1R5G5B5` (16bpp RGBA)
 * `B8G8R8` (24bpp RGB)
 * `B8G8R8A8` (32bpp RGBA)
 ## TODO
 * Actually support `R8G8B8A8` input for `A1R5G5B5` output
 * Add both zoomable and explorable maps to `mcl_maps`.
--- a/mods/CORE/tga_encoder/colormap_generator.lua
+++ b/mods/CORE/tga_encoder/colormap_generator.lua
@ -1,32 +0,0 @@
 dofile("init.lua")
 -- This generates images necessary to colorize 16 Minetest nodes in 4096 colors.
 -- It serves as a demonstration of what you can achieve using colormapped nodes.
 -- It is be useful for grass or beam or glass nodes that need to blend smoothly.
 -- Sample depth rescaling is done according to the algorithm presented in:
 -- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
 local max_sample_in = math.pow(2, 4) - 1
 local max_sample_out = math.pow(2, 8) - 1
 for r = 0,15 do
 	local pixels = {}
 	for g = 0,15 do
 		if nil == pixels[g + 1] then
 			pixels[g + 1] = {}
 		end
 		for b = 0,15 do
 			local color = {
 				math.floor((r * max_sample_out / max_sample_in) + 0.5),
 				math.floor((g * max_sample_out / max_sample_in) + 0.5),
 				math.floor((b * max_sample_out / max_sample_in) + 0.5),
 			}
 			pixels[g + 1][b + 1] = color
 		end
 	end
 	local filename = "colormap_" .. tostring(r) .. ".tga"
 	tga_encoder.image(pixels):save(
 		filename,
 		{ color_format="A1R5G5B5" } -- waste less bits
 	)
 end
--- a/mods/CORE/tga_encoder/donut.lua
+++ b/mods/CORE/tga_encoder/donut.lua
@ -1,105 +0,0 @@
 #!/usr/bin/env lua5.1
 -- -*- coding: utf-8 -*-
 -- 3D “donut” shape rendering using floating-point math
 -- see <https://www.a1k0n.net/2011/07/20/donut-math.html>
 -- cargo-culted by erle 2023-09-18
 local theta_spacing = 0.01  -- 0.07
 local phi_spacing = 0.002  -- 0.02
 local R1 = 1
 local R2 = 2
 local K2 = 5
 local screen_height = 256
 local screen_width = 256
 local K1 = screen_width * K2 * 3 / ( 8 * ( R1 + R2 ) )
 local output = {}
 local zbuffer = {}
 local grey = { 120, 120, 120 }
 local gray = { 136, 136, 136 }
 for y = 1,screen_height,1 do
   output[y] = {}
   zbuffer[y] = {}
   for x = 1,screen_width,1 do
      local hori = math.floor( ( (y - 1) / 32 ) % 2 )
      local vert = math.floor( ( (x - 1) / 32 ) % 2 )
      output[y][x] = hori ~= vert and grey or gray
      zbuffer[y][x] = 0
   end
 end
 function render_frame(A, B)
   -- precompute sines and cosines of A and B
   local cosA = math.cos(A)
   local sinA = math.sin(A)
   local cosB = math.cos(B)
   local sinB = math.sin(B)
   -- theta goas around the cross-sectional circle of a torus
   local theta = 0
   while theta <= 2*math.pi do
      if ( theta < 2*math.pi * 1/8 ) or ( theta > 2*math.pi * 7/8 ) then
         theta = theta + (theta_spacing * 16)
      else
         theta = theta + theta_spacing
      end
      -- precompute sines and cosines of theta
      local costheta = math.cos(theta)
      local sintheta = math.sin(theta)
      -- phi goes around the center of revolution of a torus
      local phi = 0
      while phi <= 2*math.pi do
         if ( phi > 2*math.pi * 3/8 ) and ( phi < 2*math.pi * 5/8 ) then
            phi = phi + (phi_spacing * 128)
         else
            phi = phi + phi_spacing
         end
        -- precompute sines and cosines of phi
         local cosphi = math.cos(phi)
         local sinphi = math.sin(phi)
         -- 2D (x, y) coordinates of the circle, before revolving
         local circlex = R2 + R1*costheta
         local circley = R1*sintheta
         -- 3D (x, y, z) coordinates after rotation
         local x = circlex*(cosB*cosphi + sinA*sinB*sinphi) - circley*cosA*sinB
         local y = circlex*(sinB*cosphi - sinA*cosB*sinphi) + circley*cosA*cosB
         local z = K2 + cosA*circlex*sinphi + circley*sinA
         local ooz = 1/z
         -- x and y projection
         local xp = math.floor(screen_width/2 + K1*ooz*x)
         local yp = math.floor(screen_height/2 + K1*ooz*y)
         -- calculate luminance
         local L = cosphi*costheta*sinB - cosA*costheta*sinphi - sinA*sintheta + cosB*( cosA*sintheta - costheta*sinA*sinphi )
         -- if (L > 0) then
         if (true) then
            if (ooz > zbuffer[yp][xp]) then
                   zbuffer[yp][xp] = ooz
                   local luminance = math.max( math.ceil( L * 180 ), 0 )
                   -- luminance is now in the range 0 to 255
                   r = math.ceil( (luminance + xp) / 2 )
                   g = math.ceil( (luminance + yp) / 2 )
                   b = math.ceil( (luminance + xp + yp) / 3 )
                   output[yp][xp] = { r, g, b }
            end
         end
      end
   end
 end
 dofile('init.lua')
 render_frame(-0.7, 0.7)
 tga_encoder.image(output):save("donut.tga")
--- a/mods/CORE/tga_encoder/examples.lua
+++ b/mods/CORE/tga_encoder/examples.lua
@ -1,181 +0,0 @@
 dofile("init.lua")
 -- encode a bitmap
 local _ = { 0, 0, 0 }
 local R = { 255, 127, 127 }
 local pixels = {
 	{ _, _, _, _, _, _, _ },
 	{ _, _, _, R, _, _, _ },
 	{ _, _, R, R, R, _, _ },
 	{ _, R, R, R, R, R, _ },
 	{ _, R, R, R, R, R, _ },
 	{ _, _, R, _, R, _, _ },
 	{ _, _, _, _, _, _, _ },
 }
 tga_encoder.image(pixels):save("bitmap_small.tga")
 -- test that image can be encoded
 local bitmap_small_0 = tga_encoder.image(pixels)
 bitmap_small_0:encode()
 assert(191 == #bitmap_small_0.data)
 -- test that imbage can be encoded with parameters
 local bitmap_small_1 = tga_encoder.image(pixels)
 bitmap_small_1:encode(
 	{
 		colormap = {},
 		color_format = "B8G8R8",
 		compression = "RAW",
 	}
 )
 assert(191 == #bitmap_small_1.data)
 -- change a single pixel, then rescale the bitmap
 local pixels_orig = pixels
 pixels_orig[4][4] = { 255, 255, 255 }
 local pixels = {}
 for x = 1,56,1 do
 	local x_orig = math.ceil(x/8)
 	for z = 1,56,1 do
 		local z_orig = math.ceil(z/8)
 		local color = pixels_orig[z_orig][x_orig]
 		pixels[z] = pixels[z] or {}
 		pixels[z][x] = color
 	end
 end
 tga_encoder.image(pixels):save("bitmap_large.tga")
 -- note that the uncompressed grayscale TGA file written in this
 -- example is 80 bytes – but an optimized PNG file is 81 bytes …
 local pixels = {}
 for x = 1,6,1 do -- left to right
 	for z = 1,6,1 do -- bottom to top
 		local color = { math.min(x * z * 4 - 1, 255) }
 		pixels[z] = pixels[z] or {}
 		pixels[z][x] = color
 	end
 end
 tga_encoder.image(pixels):save("gradient_8bpp_raw.tga", {color_format="Y8", compression="RAW"})
 local pixels = {}
 for x = 1,16,1 do -- left to right
 	for z = 1,16,1 do -- bottom to top
 		local r = math.min(x * 32 - 1, 255)
 		local g = math.min(z * 32 - 1, 255)
 		local b = 0
 		-- blue rectangle in top right corner
 		if x > 8 and z > 8 then
 			r = 0
 			g = 0
 			b = math.min(z * 16 - 1, 255)
 		end
 		local color = { r, g, b }
 		pixels[z] = pixels[z] or {}
 		pixels[z][x] = color
 	end
 end
 local gradients = tga_encoder.image(pixels)
 gradients:save("gradients_8bpp_raw.tga", {color_format="Y8", compression="RAW"})
 gradients:save("gradients_16bpp_raw.tga", {color_format="A1R5G5B5", compression="RAW"})
 gradients:save("gradients_16bpp_rle.tga", {color_format="A1R5G5B5", compression="RLE"})
 gradients:save("gradients_24bpp_raw.tga", {color_format="B8G8R8", compression="RAW"})
 gradients:save("gradients_24bpp_rle.tga", {color_format="B8G8R8", compression="RLE"})
 for x = 1,16,1 do -- left to right
 	for z = 1,16,1 do -- bottom to top
 		local color = pixels[z][x]
 		color[#color+1] = ((x * x) + (z * z)) % 256
 		pixels[z][x] = color
 	end
 end
 gradients:save("gradients_32bpp_raw.tga", {color_format="B8G8R8A8", compression="RAW"})
 -- the RLE-compressed file is larger than just dumping pixels because
 -- the gradients in this picture can not be compressed well using RLE
 gradients:save("gradients_32bpp_rle.tga", {color_format="B8G8R8A8", compression="RLE"})
 local pixels = {}
 for x = 1,512,1 do -- left to right
 	for z = 1,512,1 do -- bottom to top
 		local oz = (z - 256) / 256 + 0.75
 		local ox = (x - 256) / 256
 		local px, pz, i = 0, 0, 0
 		while (px * px) + (pz * pz) <= 4 and i < 128 do
 			px = (px * px) - (pz * pz) + oz
 			pz = (2 * px  * pz) + ox
 			i =  i + 1
 		end
 		local color = {
 			math.max(0, math.min(255, math.floor(px * 64))),
 			math.max(0, math.min(255, math.floor(pz * 64))),
 			math.max(0, math.min(255, math.floor(i))),
 		}
 		pixels[z] = pixels[z] or {}
 		pixels[z][x] = color
 	end
 end
 tga_encoder.image(pixels):save("fractal_8bpp.tga", {color_format="Y8"})
 tga_encoder.image(pixels):save("fractal_16bpp.tga", {color_format="A1R5G5B5"})
 tga_encoder.image(pixels):save("fractal_24bpp.tga", {color_format="B8G8R8"})
 -- encode a colormapped bitmap
 local K = { 0 }
 local B = { 1 }
 local R = { 2 }
 local G = { 3 }
 local W = { 4 }
 local colormap = {
 	{   1,   2,   3 }, -- K
 	{   0,   0, 255 }, -- B
 	{ 255,   0,   0 }, -- R
 	{   0, 255,   0 }, -- G
 	{ 253, 254, 255 }, -- W
 }
 local pixels = {
 	{ W, K, W, K, W, K, W },
 	{ R, G, B, R, G, B, K },
 	{ K, W, K, W, K, W, K },
 	{ G, B, R, G, B, R, W },
 	{ W, W, W, K, K, K, W },
 	{ B, R, G, B, R, G, K },
 	{ B, R, G, B, R, G, W },
 }
 -- note that the uncompressed colormapped TGA file written in this
 -- example is 108 bytes – but an optimized PNG file is 121 bytes …
 tga_encoder.image(pixels):save("colormapped_B8G8R8.tga", {colormap=colormap})
 -- encoding as A1R5G5B5 saves 1 byte per palette entry → 103 bytes
 tga_encoder.image(pixels):save("colormapped_A1R5G5B5.tga", {colormap=colormap, color_format="A1R5G5B5"})
 -- encode a colormapped bitmap with transparency
 local _ = { 0 }
 local K = { 1 }
 local W = { 2 }
 local colormap = {
 	{   0,   0,   0,   0 },
 	{   0,   0,   0, 255 },
 	{ 255, 255, 255, 255 },
 }
 local pixels = {
 	{ _, K, K, K, K, K, _ },
 	{ _, K, W, W, W, K, _ },
 	{ K, K, W, W, W, K, K },
 	{ K, W, W, W, W, W, K },
 	{ _, K, W, W, W, K, _ },
 	{ _, _, K, W, K, _, _ },
 	{ _, _, _, K, _, _, _ },
 }
 tga_encoder.image(pixels):save("colormapped_B8G8R8A8.tga", {colormap=colormap})
 -- encoding a colormapped image with illegal colormap indexes should error out
 local colormap = {
 	{   0,   0,   0,   0 },
 	{   0,   0,   0, 255 },
 }
 local status, message = pcall(
 	function ()
 		tga_encoder.image(pixels):encode({colormap=colormap})
 	end
 )
 assert(
 	false == status and
 	"init.lua:36: colormap index 2 not in colormap of size 2" == message
 )
--- a/mods/CORE/tga_encoder/init.lua
+++ b/mods/CORE/tga_encoder/init.lua
@ -9,566 +9,60 @@ local image = setmetatable({}, {
 })
 function image:constructor(pixels)
 	self.data = ""
 	self.pixels = pixels
 	self.width = #pixels[1]
 	self.height = #pixels
 	self:encode()
 end
-local pixel_depth_by_color_format = {
+function image:encode_colormap_spec()
-	["Y8"] = 8,
+	self.data = self.data
-	["A1R5G5B5"] = 16,
+		.. string.char(0, 0) -- first entry index
-	["B8G8R8"] = 24,
+		.. string.char(0, 0) -- number of entries
-	["B8G8R8A8"] = 32,
+		.. string.char(0) -- bits per pixel
 }
 function image:encode_colormap_spec(properties)
 	local colormap = properties.colormap
 	local colormap_pixel_depth = 0
 	if 0 ~= #colormap then
 		colormap_pixel_depth = pixel_depth_by_color_format[
 			properties.color_format
 		]
 		-- ensure that each pixel references a legal colormap entry
 		for _, row in ipairs(self.pixels) do
 			for _, pixel in ipairs(row) do
 				local colormap_index = pixel[1]
 				if colormap_index >= #colormap then
 					error(
 						"colormap index " .. colormap_index ..
 						" not in colormap of size " .. #colormap
 					)
 				end
 			end
 		end
 	end
 	local colormap_spec =
 		string.char(0, 0) .. -- first entry index
 		string.char(#colormap % 256, math.floor(#colormap / 256)) .. -- number of entries
 		string.char(colormap_pixel_depth) -- bits per pixel
 	self.data = self.data .. colormap_spec
 end
-function image:encode_image_spec(properties)
+function image:encode_image_spec()
-	local color_format = properties.color_format
+	self.data = self.data
-	assert(
+		.. string.char(0, 0) -- X-origin
-		"Y8" == color_format or -- (8 bit grayscale = 1 byte = 8 bits)
+		.. string.char(0, 0) -- Y-origin
-		"A1R5G5B5" == color_format or -- (A1R5G5B5 = 2 bytes = 16 bits)
+		.. string.char(self.width  % 256, math.floor(self.width  / 256)) -- width
-		"B8G8R8" == color_format or -- (B8G8R8 = 3 bytes = 24 bits)
+		.. string.char(self.height % 256, math.floor(self.height / 256)) -- height
-		"B8G8R8A8" == color_format -- (B8G8R8A8 = 4 bytes = 32 bits)
+		.. string.char(24) -- pixel depth (RGB = 3 bytes = 24 bits)
-	)
+		.. string.char(0) -- image descriptor
 	local scanline_order = properties.scanline_order
 	assert (
 		"bottom-top" == scanline_order or
 		"top-bottom" == scanline_order
 	)
 	local pixel_depth
 	if 0 ~= #properties.colormap then
 		pixel_depth = self.pixel_depth
 	else
 		pixel_depth = pixel_depth_by_color_format[color_format]
 	end
 	assert( nil ~= pixel_depth)
 	-- the origin is the bottom left corner of the image (always)
 	local x_origin_lo = 0
 	local x_origin_hi = 0
 	local y_origin_lo = 0
 	local y_origin_hi = 0
 	local image_descriptor = 0 -- equal to bottom-top scanline order
 	local width_lo = self.width % 256
 	local width_hi = math.floor(self.width  / 256)
 	local height_lo = self.height % 256
 	local height_hi = math.floor(self.height / 256)
 	if "top-bottom" == scanline_order then
 		image_descriptor = 32
 		y_origin_lo = height_lo
 		y_origin_hi = height_hi
 	end
 	self.data = self.data .. string.char (
 		x_origin_lo, x_origin_hi,
 		y_origin_lo, y_origin_hi,
 		width_lo, width_hi,
 		height_lo, height_hi,
 		pixel_depth,
 		image_descriptor
 	)
 end
-function image:encode_colormap(properties)
+function image:encode_header()
 	local colormap = properties.colormap
 	if 0 == #colormap then
 		return
 	end
 	local color_format = properties.color_format
 	assert (
 		"A1R5G5B5" == color_format or
 		"B8G8R8" == color_format or
 		"B8G8R8A8" == color_format
 	)
 	local colors = {}
 	if "A1R5G5B5" == color_format then
 		-- Sample depth rescaling is done according to the algorithm presented in:
 		-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
 		local max_sample_in = math.pow(2, 8) - 1
 		local max_sample_out = math.pow(2, 5) - 1
 		for i = 1,#colormap,1 do
 			local color = colormap[i]
 			local colorword = 32768 +
 				((math.floor((color[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) +
 				((math.floor((color[2] * max_sample_out / max_sample_in) + 0.5)) * 32) +
 				((math.floor((color[3] * max_sample_out / max_sample_in) + 0.5)) * 1)
 			local color_bytes = string.char(
 				colorword % 256,
 				math.floor(colorword / 256)
 			)
 			colors[#colors + 1] = color_bytes
 		end
 	elseif "B8G8R8" == color_format then
 		for i = 1,#colormap,1 do
 			local color = colormap[i]
 			local color_bytes = string.char(
 				color[3], -- B
 				color[2], -- G
 				color[1]  -- R
 			)
 			colors[#colors + 1] = color_bytes
 		end
 	elseif "B8G8R8A8" == color_format then
 		for i = 1,#colormap,1 do
 			local color = colormap[i]
 			local color_bytes = string.char(
 				color[3], -- B
 				color[2], -- G
 				color[1], -- R
 				color[4]  -- A
 			)
 			colors[#colors + 1] = color_bytes
 		end
 	end
 	assert( 0 ~= #colors )
 	self.data = self.data .. table.concat(colors)
 end
 function image:encode_header(properties)
 	local color_format = properties.color_format
 	local colormap = properties.colormap
 	local compression = properties.compression
 	local colormap_type
 	local image_type
 	if "Y8" == color_format and "RAW" == compression then
 		colormap_type = 0
 		image_type = 3 -- grayscale
 	elseif (
 		"A1R5G5B5" == color_format or
 		"B8G8R8" == color_format or
 		"B8G8R8A8" == color_format
 	) then
 		if "RAW" == compression then
 			if 0 ~= #colormap then
 				colormap_type = 1
 				image_type = 1 -- colormapped RGB(A)
 			else
 				colormap_type = 0
 				image_type = 2 -- RAW RGB(A)
 			end
 		elseif "RLE" == compression then
 			colormap_type = 0
 			image_type = 10 -- RLE RGB
 		end
 	end
 	assert( nil ~= colormap_type )
 	assert( nil ~= image_type )
 	self.data = self.data
 		.. string.char(0) -- image id
-		.. string.char(colormap_type)
+		.. string.char(0) -- color map type
-		.. string.char(image_type)
+		.. string.char(10) -- image type (RLE RGB = 10)
-	self:encode_colormap_spec(properties) -- color map specification
+	self:encode_colormap_spec() -- color map specification
-	self:encode_image_spec(properties) -- image specification
+	self:encode_image_spec() -- image specification
 	self:encode_colormap(properties)
 end
-function image:encode_data(properties)
+function image:encode_data()
-	local color_format = properties.color_format
+	local current_pixel = ''
-	local colormap = properties.colormap
+	local previous_pixel = ''
 	local compression = properties.compression
 	local data_length_before = #self.data
 	if "Y8" == color_format and "RAW" == compression then
 		if 8 == self.pixel_depth then
 			self:encode_data_Y8_as_Y8_raw()
 		elseif 24 == self.pixel_depth then
 			self:encode_data_R8G8B8_as_Y8_raw()
 		end
 	elseif "A1R5G5B5" == color_format then
 		if 0 ~= #colormap then
 			if "RAW" == compression then
 				if 8 == self.pixel_depth then
 					self:encode_data_Y8_as_Y8_raw()
 				end
 			end
 		else
 			if "RAW" == compression then
 				self:encode_data_R8G8B8_as_A1R5G5B5_raw()
 			elseif "RLE" == compression then
 				self:encode_data_R8G8B8_as_A1R5G5B5_rle()
 			end
 		end
 	elseif "B8G8R8" == color_format then
 		if 0 ~= #colormap then
 			if "RAW" == compression then
 				if 8 == self.pixel_depth then
 					self:encode_data_Y8_as_Y8_raw()
 				end
 			end
 		else
 			if "RAW" == compression then
 				self:encode_data_R8G8B8_as_B8G8R8_raw()
 			elseif "RLE" == compression then
 			   self:encode_data_R8G8B8_as_B8G8R8_rle()
 			end
 		end
 	elseif "B8G8R8A8" == color_format then
 		if 0 ~= #colormap then
 			if "RAW" == compression then
 				if 8 == self.pixel_depth then
 					self:encode_data_Y8_as_Y8_raw()
 				end
 			end
 		else
 			if "RAW" == compression then
 				self:encode_data_R8G8B8A8_as_B8G8R8A8_raw()
 			elseif "RLE" == compression then
 				self:encode_data_R8G8B8A8_as_B8G8R8A8_rle()
 			end
 		end
 	end
 	local data_length_after = #self.data
 	assert(
 		data_length_after ~= data_length_before,
 		"No data encoded for color format: " .. color_format
 	)
 end
 function image:encode_data_Y8_as_Y8_raw()
 	assert(8 == self.pixel_depth)
 	local raw_pixels = {}
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
 			local raw_pixel = string.char(pixel[1])
 			raw_pixels[#raw_pixels + 1] = raw_pixel
 		end
 	end
 	self.data = self.data .. table.concat(raw_pixels)
 end
 function image:encode_data_R8G8B8_as_Y8_raw()
 	assert(24 == self.pixel_depth)
 	local raw_pixels = {}
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
 			-- the HSP RGB to brightness formula is
 			-- sqrt( 0.299 r² + .587 g² + .114 b² )
 			-- see <https://alienryderflex.com/hsp.html>
 			local gray = math.floor(
 				math.sqrt(
 					0.299 * pixel[1]^2 +
 					0.587 * pixel[2]^2 +
 					0.114 * pixel[3]^2
 				) + 0.5
 			)
 			local raw_pixel = string.char(gray)
 			raw_pixels[#raw_pixels + 1] = raw_pixel
 		end
 	end
 	self.data = self.data .. table.concat(raw_pixels)
 end
 function image:encode_data_R8G8B8_as_A1R5G5B5_raw()
 	assert(24 == self.pixel_depth)
 	local raw_pixels = {}
 	-- Sample depth rescaling is done according to the algorithm presented in:
 	-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
 	local max_sample_in = math.pow(2, 8) - 1
 	local max_sample_out = math.pow(2, 5) - 1
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
 			local colorword = 32768 +
 				((math.floor((pixel[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) +
 				((math.floor((pixel[2] * max_sample_out / max_sample_in) + 0.5)) * 32) +
 				((math.floor((pixel[3] * max_sample_out / max_sample_in) + 0.5)) * 1)
 			local raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
 			raw_pixels[#raw_pixels + 1] = raw_pixel
 		end
 	end
 	self.data = self.data .. table.concat(raw_pixels)
 end
 function image:encode_data_R8G8B8_as_A1R5G5B5_rle()
 	assert(24 == self.pixel_depth)
 	local colorword = nil
 	local previous_r = nil
 	local previous_g = nil
 	local previous_b = nil
 	local raw_pixel = ''
 	local raw_pixels = {}
 	local count = 1
 	local packets = {}
 	local raw_packet = ''
 	local rle_packet = ''
 	-- Sample depth rescaling is done according to the algorithm presented in:
 	-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
 	local max_sample_in = math.pow(2, 8) - 1
 	local max_sample_out = math.pow(2, 5) - 1
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
 			if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then
 				if nil ~= previous_r then
 					colorword = 32768 +
 						((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) +
 						((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) +
 						((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1)
 					if 1 == count then
 						-- remember pixel verbatim for raw encoding
 						raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
 						raw_pixels[#raw_pixels + 1] = raw_pixel
 						if 128 == #raw_pixels then
 							raw_packet = string.char(#raw_pixels - 1)
 							packets[#packets + 1] = raw_packet
 							for i=1, #raw_pixels do
 								packets[#packets +1] = raw_pixels[i]
 							end
 							raw_pixels = {}
 						end
 					else
 						-- encode raw pixels, if any
 						if #raw_pixels > 0 then
 							raw_packet = string.char(#raw_pixels - 1)
 							packets[#packets + 1] = raw_packet
 							for i=1, #raw_pixels do
 								packets[#packets +1] = raw_pixels[i]
 							end
 							raw_pixels = {}
 						end
 						-- RLE encoding
 						rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256))
 						packets[#packets +1] = rle_packet
 					end
 				end
 				count = 1
 				previous_r = pixel[1]
 				previous_g = pixel[2]
 				previous_b = pixel[3]
 			else
 				count = count + 1
 			end
 		end
 	end
 	colorword = 32768 +
 		((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) +
 		((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) +
 		((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1)
 	if 1 == count then
 		raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
 		raw_pixels[#raw_pixels + 1] = raw_pixel
 		raw_packet = string.char(#raw_pixels - 1)
 		packets[#packets + 1] = raw_packet
 		for i=1, #raw_pixels do
 			packets[#packets +1] = raw_pixels[i]
 		end
 		raw_pixels = {}
 	else
 		-- encode raw pixels, if any
 		if #raw_pixels > 0 then
 			raw_packet = string.char(#raw_pixels - 1)
 			packets[#packets + 1] = raw_packet
 			for i=1, #raw_pixels do
 				packets[#packets +1] = raw_pixels[i]
 			end
 			raw_pixels = {}
 		end
 		-- RLE encoding
 		rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256))
 		packets[#packets +1] = rle_packet
 	end
 	self.data = self.data .. table.concat(packets)
 end
 function image:encode_data_R8G8B8_as_B8G8R8_raw()
 	assert(24 == self.pixel_depth)
 	local raw_pixels = {}
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
 			local raw_pixel = string.char(pixel[3], pixel[2], pixel[1])
 			raw_pixels[#raw_pixels + 1] = raw_pixel
 		end
 	end
 	self.data = self.data .. table.concat(raw_pixels)
 end
 function image:encode_data_R8G8B8_as_B8G8R8_rle()
 	assert(24 == self.pixel_depth)
 	local previous_r = nil
 	local previous_g = nil
 	local previous_b = nil
 	local raw_pixel = ''
 	local raw_pixels = {}
 	local count = 1
 	local packets = {}
 	local raw_packet = ''
 	local rle_packet = ''
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
-			if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then
+			current_pixel = string.char(pixel[3], pixel[2], pixel[1])
-				if nil ~= previous_r then
+			if current_pixel ~= previous_pixel or count == 128 then
 					if 1 == count then
 						-- remember pixel verbatim for raw encoding
 						raw_pixel = string.char(previous_b, previous_g, previous_r)
 						raw_pixels[#raw_pixels + 1] = raw_pixel
 						if 128 == #raw_pixels then
 							raw_packet = string.char(#raw_pixels - 1)
 							packets[#packets + 1] = raw_packet
 							for i=1, #raw_pixels do
 								packets[#packets +1] = raw_pixels[i]
 							end
 							raw_pixels = {}
 						end
 					else
 						-- encode raw pixels, if any
 						if #raw_pixels > 0 then
 							raw_packet = string.char(#raw_pixels - 1)
 							packets[#packets + 1] = raw_packet
 							for i=1, #raw_pixels do
 								packets[#packets +1] = raw_pixels[i]
 							end
 							raw_pixels = {}
 						end
 						-- RLE encoding
 						rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r)
 				packets[#packets +1] = rle_packet
 					end
 				end
 				count = 1
-				previous_r = pixel[1]
+				previous_pixel = current_pixel
 				previous_g = pixel[2]
 				previous_b = pixel[3]
 			else
 				count = count + 1
 			end
 			rle_packet = string.char(128 + count - 1) .. current_pixel
 		end
 	end
 	if 1 == count then
 		raw_pixel = string.char(previous_b, previous_g, previous_r)
 		raw_pixels[#raw_pixels + 1] = raw_pixel
 		raw_packet = string.char(#raw_pixels - 1)
 		packets[#packets + 1] = raw_packet
 		for i=1, #raw_pixels do
 			packets[#packets +1] = raw_pixels[i]
 		end
 		raw_pixels = {}
 	else
 		-- encode raw pixels, if any
 		if #raw_pixels > 0 then
 			raw_packet = string.char(#raw_pixels - 1)
 			packets[#packets + 1] = raw_packet
 			for i=1, #raw_pixels do
 				packets[#packets +1] = raw_pixels[i]
 			end
 			raw_pixels = {}
 		end
 		-- RLE encoding
 		rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r)
 	packets[#packets +1] = rle_packet
 	end
 	self.data = self.data .. table.concat(packets)
 end
 function image:encode_data_R8G8B8A8_as_B8G8R8A8_raw()
 	assert(32 == self.pixel_depth)
 	local raw_pixels = {}
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
 			local raw_pixel = string.char(pixel[3], pixel[2], pixel[1], pixel[4])
 			raw_pixels[#raw_pixels + 1] = raw_pixel
 		end
 	end
 	self.data = self.data .. table.concat(raw_pixels)
 end
 function image:encode_data_R8G8B8A8_as_B8G8R8A8_rle()
 	assert(32 == self.pixel_depth)
 	local previous_r = nil
 	local previous_g = nil
 	local previous_b = nil
 	local previous_a = nil
 	local raw_pixel = ''
 	local raw_pixels = {}
 	local count = 1
 	local packets = {}
 	local raw_packet = ''
 	local rle_packet = ''
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
 			if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or pixel[4] ~= previous_a or count == 128 then
 				if nil ~= previous_r then
 					if 1 == count then
 						-- remember pixel verbatim for raw encoding
 						raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a)
 						raw_pixels[#raw_pixels + 1] = raw_pixel
 						if 128 == #raw_pixels then
 							raw_packet = string.char(#raw_pixels - 1)
 							packets[#packets + 1] = raw_packet
 							for i=1, #raw_pixels do
 								packets[#packets +1] = raw_pixels[i]
 							end
 							raw_pixels = {}
 						end
 					else
 						-- encode raw pixels, if any
 						if #raw_pixels > 0 then
 							raw_packet = string.char(#raw_pixels - 1)
 							packets[#packets + 1] = raw_packet
 							for i=1, #raw_pixels do
 								packets[#packets +1] = raw_pixels[i]
 							end
 							raw_pixels = {}
 						end
 						-- RLE encoding
 						rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a)
 						packets[#packets +1] = rle_packet
 					end
 				end
 				count = 1
 				previous_r = pixel[1]
 				previous_g = pixel[2]
 				previous_b = pixel[3]
 				previous_a = pixel[4]
 			else
 				count = count + 1
 			end
 		end
 	end
 	if 1 == count then
 		raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a)
 		raw_pixels[#raw_pixels + 1] = raw_pixel
 		raw_packet = string.char(#raw_pixels - 1)
 		packets[#packets + 1] = raw_packet
 		for i=1, #raw_pixels do
 			packets[#packets +1] = raw_pixels[i]
 		end
 		raw_pixels = {}
 	else
 		-- encode raw pixels, if any
 		if #raw_pixels > 0 then
 			raw_packet = string.char(#raw_pixels - 1)
 			packets[#packets + 1] = raw_packet
 			for i=1, #raw_pixels do
 				packets[#packets +1] = raw_pixels[i]
 			end
 			raw_pixels = {}
 		end
 		-- RLE encoding
 		rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a)
 		packets[#packets +1] = rle_packet
 	end
 	self.data = self.data .. table.concat(packets)
 end
@ -581,45 +75,15 @@ function image:encode_footer()
 		.. string.char(0)
 end
-function image:encode(properties)
+function image:encode()
-	local properties = properties or {}
+	self:encode_header() -- header
 	properties.colormap = properties.colormap or {}
 	properties.compression = properties.compression or "RAW"
        properties.scanline_order = properties.scanline_order or "bottom-top"
 	self.pixel_depth = #self.pixels[1][1] * 8
 	local color_format_defaults_by_pixel_depth = {
 		[8] = "Y8",
 		[24] = "B8G8R8",
 		[32] = "B8G8R8A8",
 	}
 	if nil == properties.color_format then
 		if 0 ~= #properties.colormap then
 			properties.color_format =
 				color_format_defaults_by_pixel_depth[
 				#properties.colormap[1] * 8
 				]
 		else
 			properties.color_format =
 				color_format_defaults_by_pixel_depth[
 					self.pixel_depth
 				]
 		end
 	end
 	assert( nil ~= properties.color_format )
 	self.data = ""
 	self:encode_header(properties) -- header
 	-- no color map and image id data
-	self:encode_data(properties) -- encode data
+	self:encode_data() -- encode data
 	-- no extension or developer area
 	self:encode_footer() -- footer
 end
-function image:save(filename, properties)
+function image:save(filename)
 	self:encode(properties)
 	local f = assert(io.open(filename, "wb"))
 	f:write(self.data)
 	f:close()
--- a/mods/CORE/tga_encoder/logo.lua
+++ b/mods/CORE/tga_encoder/logo.lua
@ -1,51 +0,0 @@
 dofile("init.lua")
 local colormap = {
 	{   0,   0,   0 }, -- black
 	{ 255, 255, 255 }, -- white
 	{ 255,   0,   0 }, -- red
 	{   0, 255,   0 }, -- green
 	{   0,   0, 255 }, -- blue
 }
 local _ = { 0 }
 local W = { 1 }
 local R = { 2 }
 local G = { 3 }
 local B = { 4 }
 local pixels_tiny = {
 	{ W, W, W, W, W, W, W, W, W, W, W, W, },
 	{ W, _, _, _, _, _, _, _, _, _, _, W, },
 	{ W, _, _, _, _, _, _, B, _, B, _, W, },
 	{ W, _, _, _, _, _, _, B, B, B, _, W, },
 	{ W, _, _, _, G, G, G, B, _, B, _, W, },
 	{ W, _, _, _, G, _, G, B, B, B, _, W, },
 	{ W, _, _, R, G, _, _, _, _, _, _, W, },
 	{ W, _, _, R, G, G, G, _, _, _, _, W, },
 	{ W, _, _, R, _, _, _, _, _, _, _, W, },
 	{ W, _, R, R, R, _, _, _, _, _, _, W, },
 	{ W, _, _, _, _, _, _, _, _, _, _, W, },
 	{ W, W, W, W, W, W, W, W, W, W, W, W, },
 }
 local pixels_huge = {}
 local size_tiny = #pixels_tiny
 local size_huge = 1200
 local scale = size_huge / size_tiny
 for x_huge = 1,size_huge,1 do
 	local x_tiny = math.ceil( x_huge / scale )
 	for z_huge = 1,size_huge,1 do
 		local z_tiny = math.ceil( z_huge / scale )
 		if nil == pixels_huge[z_huge] then
 		   pixels_huge[z_huge] = {}
 		end
 		pixels_huge[z_huge][x_huge] = pixels_tiny[z_tiny][x_tiny]
 	end
 end
 tga_encoder.image(pixels_tiny):save("logo_tiny.tga", {colormap=colormap})
 tga_encoder.image(pixels_huge):save("logo_huge.tga", {colormap=colormap})
--- a/mods/CORE/tga_encoder/mod.conf
+++ b/mods/CORE/tga_encoder/mod.conf
@ -1,2 +1,3 @@
 name = tga_encoder
 author = Fleckenstein
 description = A TGA Encoder written in Lua without the use of external Libraries.
--- a/mods/CORE/tga_encoder/tools/generate_test_textures.lua
+++ b/mods/CORE/tga_encoder/tools/generate_test_textures.lua
@ -1,180 +0,0 @@
 #!/usr/bin/env lua5.1
 dofile("../init.lua")
 local _ = { 0 }
 local R = { 1 }
 local G = { 2 }
 local B = { 3 }
 local pixels_colormapped_bt = {
 	{ _, _, _, _, _, B, _, B, },
 	{ _, _, _, _, _, B, B, B, },
 	{ _, _, G, G, G, B, _, B, },
 	{ _, _, G, _, G, B, B, B, },
 	{ _, R, G, _, _, _, _, _, },
 	{ _, R, G, G, G, _, _, _, },
 	{ _, R, _, _, _, _, _, _, },
 	{ R, R, R, _, _, _, _, _, },
 }
 local pixels_colormapped_tb = {
 	{ R, R, R, _, _, _, _, _, },
 	{ _, R, _, _, _, _, _, _, },
 	{ _, R, G, G, G, _, _, _, },
 	{ _, R, G, _, _, _, _, _, },
 	{ _, _, G, _, G, B, B, B, },
 	{ _, _, G, G, G, B, _, B, },
 	{ _, _, _, _, _, B, B, B, },
 	{ _, _, _, _, _, B, _, B, },
 }
 image_colormapped_bt = tga_encoder.image(pixels_colormapped_bt)
 image_colormapped_tb = tga_encoder.image(pixels_colormapped_tb)
 colormap_32bpp = {
 	{    0,   0,   0, 128 },
 	{ 255,    0,   0, 255 },
 	{    0, 255,   0, 255 },
 	{    0,   0, 255, 255 },
 }
 image_colormapped_bt:save(
 	"type1_32bpp_bt.tga",
 	{ colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "bottom-top" }
 )
 image_colormapped_tb:save(
 	"type1_32bpp_tb.tga",
 	{ colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "top-bottom" }
 )
 image_colormapped_bt:save(
 	"type1_16bpp_bt.tga",
 	{ colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "bottom-top" }
 )
 image_colormapped_tb:save(
 	"type1_16bpp_tb.tga",
 	{ colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "top-bottom" }
 )
 colormap_24bpp = {
 	{    0,   0,   0 },
 	{ 255,    0,   0 },
 	{    0, 255,   0 },
 	{    0,   0, 255 },
 }
 image_colormapped_bt:save(
 	"type1_24bpp_bt.tga",
 	{ colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "bottom-top" }
 )
 image_colormapped_tb:save(
 	"type1_24bpp_tb.tga",
 	{ colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "top-bottom" }
 )
 local _ = {    0,   0,   0, 128 }
 local R = { 255,    0,   0, 255 }
 local G = {    0, 255,   0, 255 }
 local B = {    0,   0, 255, 255 }
 local pixels_rgba_bt = {
 	{ _, _, _, _, _, B, _, B, },
 	{ _, _, _, _, _, B, B, B, },
 	{ _, _, G, G, G, B, _, B, },
 	{ _, _, G, _, G, B, B, B, },
 	{ _, R, G, _, _, _, _, _, },
 	{ _, R, G, G, G, _, _, _, },
 	{ _, R, _, _, _, _, _, _, },
 	{ R, R, R, _, _, _, _, _, },
 }
 local pixels_rgba_tb = {
 	{ R, R, R, _, _, _, _, _, },
 	{ _, R, _, _, _, _, _, _, },
 	{ _, R, G, G, G, _, _, _, },
 	{ _, R, G, _, _, _, _, _, },
 	{ _, _, G, _, G, B, B, B, },
 	{ _, _, G, G, G, B, _, B, },
 	{ _, _, _, _, _, B, B, B, },
 	{ _, _, _, _, _, B, _, B, },
 }
 image_rgba_bt = tga_encoder.image(pixels_rgba_bt)
 image_rgba_tb = tga_encoder.image(pixels_rgba_tb)
 image_rgba_bt:save(
 	"type2_32bpp_bt.tga",
 	{ color_format="B8G8R8A8", compression="RAW", scanline_order = "bottom-top" }
 )
 image_rgba_tb:save(
 	"type2_32bpp_tb.tga",
 	{ color_format="B8G8R8A8", compression="RAW", scanline_order = "top-bottom" }
 )
 image_rgba_bt:save(
 	"type10_32bpp_bt.tga",
 	{ color_format="B8G8R8A8", compression="RLE", scanline_order = "bottom-top" }
 )
 image_rgba_tb:save(
 	"type10_32bpp_tb.tga",
 	{ color_format="B8G8R8A8", compression="RLE", scanline_order = "top-bottom" }
 )
 local _ = {    0,   0,   0 }
 local R = { 255,    0,   0 }
 local G = {    0, 255,   0 }
 local B = {    0,   0, 255 }
 local pixels_rgb_bt = {
 	{ _, _, _, _, _, B, _, B, },
 	{ _, _, _, _, _, B, B, B, },
 	{ _, _, G, G, G, B, _, B, },
 	{ _, _, G, _, G, B, B, B, },
 	{ _, R, G, _, _, _, _, _, },
 	{ _, R, G, G, G, _, _, _, },
 	{ _, R, _, _, _, _, _, _, },
 	{ R, R, R, _, _, _, _, _, },
 }
 local pixels_rgb_tb = {
 	{ R, R, R, _, _, _, _, _, },
 	{ _, R, _, _, _, _, _, _, },
 	{ _, R, G, G, G, _, _, _, },
 	{ _, R, G, _, _, _, _, _, },
 	{ _, _, G, _, G, B, B, B, },
 	{ _, _, G, G, G, B, _, B, },
 	{ _, _, _, _, _, B, B, B, },
 	{ _, _, _, _, _, B, _, B, },
 }
 image_rgb_bt = tga_encoder.image(pixels_rgb_bt)
 image_rgb_tb = tga_encoder.image(pixels_rgb_tb)
 image_rgb_bt:save(
 	"type2_24bpp_bt.tga",
 	{ color_format="B8G8R8", compression="RAW", scanline_order = "bottom-top" }
 )
 image_rgb_tb:save(
 	"type2_24bpp_tb.tga",
 	{ color_format="B8G8R8", compression="RAW", scanline_order = "top-bottom" }
 )
 image_rgb_bt:save(
 	"type10_24bpp_bt.tga",
 	{ color_format="B8G8R8", compression="RLE", scanline_order = "bottom-top" }
 )
 image_rgb_tb:save(
 	"type10_24bpp_tb.tga",
 	{ color_format="B8G8R8", compression="RLE", scanline_order = "top-bottom" }
 )
 image_rgb_bt:save(
 	"type2_16bpp_bt.tga",
 	{ color_format="A1R5G5B5", compression="RAW", scanline_order = "bottom-top" }
 )
 image_rgb_tb:save(
 	"type2_16bpp_tb.tga",
 	{ color_format="A1R5G5B5", compression="RAW", scanline_order = "top-bottom" }
 )
 image_rgb_bt:save(
 	"type10_16bpp_bt.tga",
 	{ color_format="A1R5G5B5", compression="RLE", scanline_order = "bottom-top" }
 )
 image_rgb_tb:save(
 	"type10_16bpp_tb.tga",
 	{ color_format="A1R5G5B5", compression="RLE", scanline_order = "top-bottom" }
 )
--- 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})
+		{x = 0, y = 0.42, z = -2.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
 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)
@ -168,7 +163,7 @@ end
 function boat.on_activate(self, staticdata, dtime_s)
-	self.object:set_armor_groups({fleshy = 125})
+	self.object:set_armor_groups({fleshy = 100})
 	local data = minetest.deserialize(staticdata)
 	if type(data) == "table" then
 		self._v = data.v
@ -442,9 +437,9 @@ cboat.selectionbox = {-0.7, -0.15, -0.7, 0.7, 0.75, 0.7}
 minetest.register_entity("mcl_boats:chest_boat", cboat)
 mcl_entity_invs.register_inv("mcl_boats:chest_boat","Boat",27)
-local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "boat_cherry", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove", "chest_boat_cherry" }
+local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove" }
-local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Cherry Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat"), S("Cherry Chest Boat") }
+local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat") }
-local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood", "mcl_cherry_blossom:cherrywood" }
+local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood" }
 for b=1, #boat_ids do
 	local itemstring = "mcl_boats:"..boat_ids[b]
--- a/mods/ENTITIES/mcl_boats/locale/mcl_boats.dk.tr
+++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.dk.tr
@ -1,13 +0,0 @@
 # textdomain: mcl_boats
 Acacia Boat=Akaciebåd
 Birch Boat=Birkebåd
 Boat=Båd
 Boats are used to travel on the surface of water.=Både blier brugt til at rejse på vandoverflader.
 Dark Oak Boat=Mørk egetræsbåd
 Jungle Boat=Junglebåd
 Oak Boat=Egetræsbåd
 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.=Højre-klik på en vand for at placere båden. Højre-klik på båden for at gå ombord. Brug [Left] og [Right] til at styre. [Forwards] for at øge hastigheden, og [Backwards] for at sænke farten eller sejle bagud. Brug [Sneak] for at forlade båden, slå båden for at lave den om til en genstand.
 Spruce Boat=Granbåd
 Water vehicle=Vandfartøj
 Sneak to dismount=Snig for at stige ud
 Obsidian Boat=Obsidianbåd
--- a/mods/ENTITIES/mcl_boats/locale/mcl_boats.es.tr
+++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.es.tr
@ -8,6 +8,3 @@ Jungle Boat=Barca de la selva
 Oak Boat=Barca de roble
 Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Haga clic derecho en una fuente de agua para colocar el barco. Haga clic derecho en el barco para entrar. Utilice [Izquierda] y [Derecha] para dirigir, [Adelante] para acelerar y [Atrás] para reducir la velocidad o retroceder. Haga clic derecho en el barco nuevamente para dejarlo, golpee el barco para que se caiga como un artículo.
 Spruce Boat=Barca de abeto
 Water vehicle=Vehículo acuático
 Sneak to dismount=Agáchate para bajar
 Obsidian Boat=Barca de obsidiana
--- a/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr
+++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr
@ -1,23 +1,13 @@
 # textdomain: mcl_boats
-Acacia Boat=Bateau en acacia
+Acacia Boat=Bateau en Acacia
-Birch Boat=Bateau en bouleau
+Birch Boat=Bateau en Bouleau
 Boat=Bateau
 Boats are used to travel on the surface of water.=Les bateaux sont utilisés pour voyager à la surface de l'eau.
-Dark Oak Boat=Bateau en chêne noir
+Dark Oak Boat=Bateau en Chêne Noir
-Jungle Boat=Bateau en acajou
+Jungle Boat=Bateau en Acajou
-Oak Boat=Bateau en chêne
+Oak Boat=Bateau en Chêne
 Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Faites un clic droit sur une source d'eau pour placer le bateau. Faites un clic droit sur le bateau pour y entrer. Utilisez [Gauche] et [Droite] pour diriger, [Avant] pour accélérer et [Arrière] pour ralentir ou reculer. Utilisez [Sneak] pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet.
-Spruce Boat=Bateau en sapin
+Spruce Boat=Bateau en Sapin
 Water vehicle=Véhicule aquatique
 Sneak to dismount=Se baisser pour descendre
-Obsidian Boat=Bateau en obsidienne
+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
 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.oc.tr
+++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.oc.tr
@ -1,21 +0,0 @@
 # textdomain: mcl_boats
 Acacia Boat=Barca de Cacèir
 Birch Boat=Barca de Beç
 Boat=Barca
 Boats are used to travel on the surface of water.=Las barcas son utilizadas per voiatja per aigas.
 Dark Oak Boat=Barca de Ròure Nèir
 Jungle Boat=Barca d'Acajó
 Oak Boat=Barca de Ròure
 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.=Fasetz un clic dreit sobre una sorça d'aiga per plaça la barca. Fasetz un clic dreit sobre la barca per rintrar. Utilizatz [Gaucha] e [Dreita] per menar, [Davant] per accelerar e [Darrèir] per ralentir o racuolar. Utilizatz [Sneak] per z-o quitar, tustatz la barca per z-o faire tombar coma objècte.
 Spruce Boat=Barca de Sap
 Water vehicle=Veïcule per aiga
 Sneak to dismount=Se baissar per descendre
 Obsidian Boat=Barca d'Obsidiana
 Mangrove Boat=Barca de Paletuvèir
 Oak Chest Boat=Barca de Ròure embei una Mala
 Spruce Chest Boat=Barca de Sap embei una Mala
 Birch Chest Boat=Barca de Beç embei una Mala
 Jungle Chest Boat=Barca d'Acajó embei una Mala
 Acacia Chest Boat=Barca de Cacèir embei una Mala
 Dark Oak Chest Boat=Barca de Ròure Nèir embei una Mala
 Mangrove Chest Boat=Barca de Paletuvèir embei una Mala
--- 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_boats/locale/mcl_boats.ru.tr
+++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.ru.tr
@ -1,23 +1,11 @@
 # textdomain: mcl_boats
-Acacia Boat=Акациевая лодка
+Acacia Boat=Лодка из акации
 Birch Boat=Берёзовая лодка
 Boat=Лодка
-Boats are used to travel on the surface of water.=На лодке можно плыть по водной поверхности.
+Boats are used to travel on the surface of water.=С помощью лодки можно путешествовать по водной поверхности.
 Dark Oak Boat=Лодка из тёмного дуба
-Jungle Boat=Лодка из тропического дерева
+Jungle Boat=Лодка из дерева джунглей
 Oak Boat=Дубовая лодка
-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.=Правый клик на воде, чтобы установить лодку. Правый клик по лодке, чтобы сесть в нее. [Влево] и [Вправо] - рулить, [Вперед] - разгоняться, [Назад] - тормозить или плыть назад. Нажмите [Красться] для высадки, бейте по лодке, чтобы забрать её.
+Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Правый клик по воде спустит лодку на воду. Правый клик по лодке разместит вас в ней. [Влево] и [Вправо] - рулить, [Вперед] - разгоняться, [Назад] - тормозить или плыть назад. Правый клик по лодке, когда вы в ней, позволит выйти из неё. Удар по лодке превратит её обратно в предмет.
 Spruce Boat=Еловая лодка
 Water vehicle=Водный транспорт
 Sneak to dismount=Нажмите [Красться] для высадки
 Obsidian Boat=Обсидиановая лодка
 Mangrove Boat=Мангровая лодка
 Cherry Boat=Вишнёвая лодка
 Oak Chest Boat=Дубовая лодка с сундуком
 Spruce Chest Boat=Еловая лодка с сундуком
 Birch Chest Boat=Берёзовая лодка с сундуком
 Jungle Chest Boat=Лодка из тропического дерева с сундуком
 Acacia Chest Boat=Акациевая лодка с сундуком
 Dark Oak Chest Boat=Лодка из тёмного дуба с сундуком
 Mangrove Chest Boat=Мангровая лодка с сундуком
 Cherry Chest Boat=Вишнёвая лодка с сундуком
--- a/mods/ENTITIES/mcl_boats/locale/template.txt
+++ b/mods/ENTITIES/mcl_boats/locale/template.txt
@ -11,13 +11,3 @@ Spruce Boat=
 Water vehicle=
 Sneak to dismount=
 Obsidian Boat=
 Mangrove Boat=
 Cherry Boat=
 Oak Chest Boat=
 Spruce Chest Boat=
 Birch Chest Boat=
 Jungle Chest Boat=
 Acacia Chest Boat=
 Dark Oak Chest Boat=
 Mangrove Chest Boat=
 Cherry Chest Boat=
--- a/mods/ENTITIES/mcl_burning/api.lua
+++ b/mods/ENTITIES/mcl_burning/api.lua
@ -5,12 +5,7 @@ function mcl_burning.get_storage(obj)
 end
 function mcl_burning.is_burning(obj)
 	local storage = mcl_burning.get_storage(obj)
 	if storage then
 	return mcl_burning.get_storage(obj).burn_time
 	else
 		return false
 	end
 end
 function mcl_burning.is_affected_by_rain(obj)
@ -158,11 +153,6 @@ function mcl_burning.extinguish(obj)
 end
 function mcl_burning.tick(obj, dtime, storage)
 	if not storage then
 		minetest.log("warning", "No storage for burning tick. Should not happen: " .. dump(obj))
 		return
 	end
 	if storage.burn_time then
 		storage.burn_time = storage.burn_time - dtime
--- a/mods/ENTITIES/mcl_dripping/README.md
+++ b/mods/ENTITIES/mcl_dripping/README.md
@ -21,7 +21,7 @@ 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",
+	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
--- 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.dk.tr
+++ b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.dk.tr
@ -1,3 +0,0 @@
 # textdomain: mcl_falling_nodes
@1 was smashed by a falling anvil.=@1 blev smadret af en nedfaldende ambolt.
@1 was smashed by a falling block.=@1 blev smadret af en nedfaldende blok.
--- a/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.es.tr
+++ b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.es.tr
@ -1,3 +0,0 @@
 # textdomain: mcl_falling_nodes
@1 was smashed by a falling anvil.=@1 fue aplastado por un yunque.
@1 was smashed by a falling block.=@1 fue aplastado por un bloque.
--- a/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.fr.tr
+++ b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.fr.tr
@ -1,3 +0,0 @@
 # textdomain: mcl_falling_nodes
@1 was smashed by a falling anvil.=@1 a été écrasé par une enclume
@1 was smashed by a falling block.=@1 a été écrasé par un bloc
--- a/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.oc.tr
+++ b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.oc.tr
@ -1,3 +0,0 @@
 # textdomain: mcl_falling_nodes
@1 was smashed by a falling anvil.=@1 a estat espotit per un enclutge
@1 was smashed by a falling block.=@1 a estat espotit per un blòc
--- 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_falling_nodes/locale/mcl_falling_nodes.ru.tr
+++ b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.ru.tr
@ -1,3 +0,0 @@
 # textdomain: mcl_falling_nodes
@1 was smashed by a falling anvil.=@1 был(а) раздавлен(а) падающей наковальней.
@1 was smashed by a falling block.=@1 был(а) раздавлен(а) падающим блоком.
--- a/mods/ENTITIES/mcl_falling_nodes/locale/template.txt
+++ b/mods/ENTITIES/mcl_falling_nodes/locale/template.txt
@ -1,3 +0,0 @@
 # textdomain: mcl_falling_nodes
@1 was smashed by a falling anvil.=
@1 was smashed by a falling block.=
--- a/mods/ENTITIES/mcl_item_entity/init.lua
+++ b/mods/ENTITIES/mcl_item_entity/init.lua
@ -7,7 +7,12 @@ local pool = {}
 local tick = false
-
+local LOGGING_ON = minetest.settings:get_bool("mcl_logging_item_entities", false)
 local function mcl_log(message)
 	if LOGGING_ON then
 		mcl_util.mcl_log(message, "[Item Entities]", true)
 	end
 end
 minetest.register_on_joinplayer(function(player)
 	pool[player:get_player_name()] = 0
@ -113,55 +118,6 @@ local function disable_physics(object, luaentity, ignore_check, reset_movement)
 	end
 end
 local function try_object_pickup(player, inv, object, checkpos)
 	if not inv then return end
 	local le = object:get_luaentity()
 	-- Check magnet timer
 	if not (le._magnet_timer >= 0) then return end
 	if not (le._magnet_timer < item_drop_settings.magnet_time) then return end
 	-- Don't try to collect again
 	if le._removed then return end
 	-- Ignore if itemstring is not set yet
 	if le.itemstring == "" then return end
 	-- Add what we can to the inventory
 	local itemstack = ItemStack(le.itemstring)
 	local leftovers = inv:add_item("main", itemstack )
 	check_pickup_achievements(object, player)
 	if leftovers:is_empty() then
 		-- Destroy entity
 		-- This just prevents this section to be run again because object:remove() doesn't remove the item immediately.
 		le.target = checkpos
 		le._removed = true
 		-- Stop the object
 		object:set_velocity(vector.zero())
 		object:set_acceleration(vector.zero())
 		object:move_to(checkpos)
 		-- Update sound pool
 		local name = player:get_player_name()
 		pool[name] = ( pool[name] or 0 ) + 1
 		-- Make sure the object gets removed
 		minetest.after(0.25, function()
 			--safety check
 			if object and object:get_luaentity() then
 				object:remove()
 			end
 		end)
 	else
 		-- Update entity itemstring
 		le.itemstring = leftovers:to_string()
 	end
 end
 minetest.register_globalstep(function(_)
 	tick = not tick
@ -196,7 +152,40 @@ minetest.register_globalstep(function(_)
 					object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and object:get_luaentity()._magnet_timer
 					and (object:get_luaentity()._insta_collect or (object:get_luaentity().age > item_drop_settings.age)) then
-					try_object_pickup( player, inv, object, checkpos )
+					if object:get_luaentity()._magnet_timer >= 0 and
 						object:get_luaentity()._magnet_timer < item_drop_settings.magnet_time and inv and
 						inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
 						-- Collection
 						if not object:get_luaentity()._removed then
 							-- Ignore if itemstring is not set yet
 							if object:get_luaentity().itemstring ~= "" then
 								inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
 								check_pickup_achievements(object, player)
 								-- Destroy entity
 								-- This just prevents this section to be run again because object:remove() doesn't remove the item immediately.
 								object:get_luaentity().target = checkpos
 								object:get_luaentity()._removed = true
 								object:set_velocity(vector.zero())
 								object:set_acceleration(vector.zero())
 								object:move_to(checkpos)
 								pool[name] = pool[name] + 1
 								minetest.after(0.25, function()
 									--safety check
 									if object and object:get_luaentity() then
 										object:remove()
 									end
 								end)
 							end
 						end
 					end
 				elseif not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "mcl_experience:orb" then
 					local entity = object:get_luaentity()
 					entity.collector = player:get_player_name()
@ -378,121 +367,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
@ -534,176 +408,114 @@ local function cxcz(o, cw, one, zero)
 	return o
 end
-local function nodes_destroy_items (self, moveresult, def, nn)
+local function hopper_take_item(self, pos)
-	local lg = minetest.get_item_group(nn, "lava")
+	--mcl_log("self.itemstring: ".. self.itemstring)
-	local fg = minetest.get_item_group(nn, "fire")
+	--mcl_log("self.itemstring: ".. minetest.pos_to_string(pos))
 	local dg = minetest.get_item_group(nn, "destroys_items")
-	if (def and (lg ~= 0 or fg ~= 0 or dg == 1)) then
+	local objs = minetest.get_objects_inside_radius(pos, 2)
 		local item_string = self.itemstring
 		local item_name = ItemStack(item_string):get_name()
-		--Wait 2 seconds to allow mob drops to be cooked, & picked up instead of instantly destroyed.
+	if objs and self.itemstring then
-		if self.age > 2 and minetest.get_item_group(item_name, "fire_immune") == 0 then
+		--mcl_log("there is an itemstring. Number of objs: ".. #objs)
-			if dg ~= 2 then
+
-				minetest.sound_play("builtin_item_lava", { pos = self.object:get_pos(), gain = 0.5 })
+		for k, v in pairs(objs) do
 			local ent = v:get_luaentity()
 			-- Don't forget actual hoppers
 			if ent and ent.name == "mcl_minecarts:hopper_minecart" then
 				local taken_items = false
 				mcl_log("ent.name: " .. tostring(ent.name))
 				mcl_log("ent pos: " .. tostring(ent.object:get_pos()))
 				local inv = mcl_entity_invs.load_inv(ent, 5)
 				if not inv then
 					mcl_log("No inv")
 					return false
 				end
-			self._removed = true
+
 				local current_itemstack = ItemStack(self.itemstring)
 				mcl_log("inv. size: " .. ent._inv_size)
 				if inv:room_for_item("main", current_itemstack) then
 					mcl_log("Room")
 					inv:add_item("main", current_itemstack)
 					self.object:get_luaentity().itemstring = ""
 					self.object:remove()
-			return true
+					taken_items = true
 		end
 	end
 	-- Destroy item when it collides with a cactus
 	if moveresult and moveresult.collides then
 		for _, collision in pairs(moveresult.collisions) do
 			local pos = collision.node_pos
 			if collision.type == "node" and minetest.get_node(pos).name == "mcl_core:cactus" then
 				-- TODO We need to play a sound when it gets destroyed
 				self._removed = true
 				self.object:remove()
 				return true
 			end
 		end
 	end
 end
 local function push_out_item_stuck_in_solid(self, dtime, p, def, is_in_water)
 	if not is_in_water and def and def.walkable and def.groups and def.groups.opaque == 1 then
 		local shootdir
 		local cx = (p.x % 1) - 0.5
 		local cz = (p.z % 1) - 0.5
 		local order = {}
 		-- First prepare the order in which the 4 sides are to be checked.
 		-- 1st: closest
 		-- 2nd: other direction
 		-- 3rd and 4th: other axis
 		if math.abs(cx) < math.abs(cz) then
 			order = cxcz(order, cx, "x", "z")
 			order = cxcz(order, cz, "z", "x")
 				else
-			order = cxcz(order, cz, "z", "x")
+					mcl_log("no Room")
 			order = cxcz(order, cx, "x", "z")
 				end
-		-- Check which one of the 4 sides is free
+				if not taken_items then
-		for o = 1, #order do
+					local items_remaining = current_itemstack:get_count()
-			local nn = minetest.get_node(vector.add(p, order[o])).name
+
-			local def = minetest.registered_nodes[nn]
+					-- This will take part of a floating item stack if no slot can hold the full amount
-			if def and def.walkable == false and nn ~= "ignore" then
+					for i = 1, ent._inv_size, 1 do
-				shootdir = order[o]
+						local stack = inv:get_stack("main", i)
 						mcl_log("i: " .. tostring(i))
 						mcl_log("Items remaining: " .. items_remaining)
 						mcl_log("Name: " .. tostring(stack:get_name()))
 						if current_itemstack:get_name() == stack:get_name() then
 							mcl_log("We have a match. Name: " .. tostring(stack:get_name()))
 							local room_for = stack:get_stack_max() - stack:get_count()
 							mcl_log("Room for: " .. tostring(room_for))
 							if room_for == 0 then
 								-- Do nothing
 								mcl_log("No room")
 							elseif room_for < items_remaining then
 								mcl_log("We have more items remaining than space")
 								items_remaining = items_remaining - room_for
 								stack:set_count(stack:get_stack_max())
 								inv:set_stack("main", i, stack)
 								taken_items = true
 							else
 								local new_stack_size = stack:get_count() + items_remaining
 								stack:set_count(new_stack_size)
 								mcl_log("We have more than enough space. Now holds: " .. new_stack_size)
 								inv:set_stack("main", i, stack)
 								items_remaining = 0
 								self.object:get_luaentity().itemstring = ""
 								self.object:remove()
 								taken_items = true
 								break
 							end
 							mcl_log("Count: " .. tostring(stack:get_count()))
 							mcl_log("stack max: " .. tostring(stack:get_stack_max()))
 							--mcl_log("Is it empty: " .. stack:to_string())
 						end
 						if i == ent._inv_size and taken_items then
 							mcl_log("We are on last item and still have items left. Set final stack size: " .. items_remaining)
 							current_itemstack:set_count(items_remaining)
 							--mcl_log("Itemstack2: " .. current_itemstack:to_string())
 							self.itemstring = current_itemstack:to_string()
 						end
 		-- If none of the 4 sides is free, shoot upwards
 		if shootdir == nil then
 			shootdir = vector.new(0, 1, 0)
 			local nn = minetest.get_node(vector.add(p, shootdir)).name
 			if nn == "ignore" then
 				-- Do not push into ignore
 				return true
 					end
 				end
-		-- Set new item moving speed accordingly
+				--Add in, and delete
-		local newv = vector.multiply(shootdir, 3)
+				if taken_items then
-		self.object:set_acceleration(vector.zero())
+					mcl_log("Saving")
-		self.object:set_velocity(newv)
+					mcl_entity_invs.save_inv(ent)
-		disable_physics(self.object, self, false, false)
+					return taken_items
 		if shootdir.y == 0 then
 			self._force = newv
 			p.x = math.floor(p.x)
 			p.y = math.floor(p.y)
 			p.z = math.floor(p.z)
 			self._forcestart = p
 			self._forcetimer = 1
 		end
 		return true
 	end
 	-- This code is run after the entity got a push from above “push away” code.
 	-- It is responsible for making sure the entity is entirely outside the solid node
 	-- (with its full collision box), not just its center.
 	if self._forcetimer > 0 then
 		local cbox = self.object:get_properties().collisionbox
 		local ok = false
 		if self._force.x > 0 and (p.x > (self._forcestart.x + 0.5 + (cbox[4] - cbox[1]) / 2)) then ok = true
 		elseif self._force.x < 0 and (p.x < (self._forcestart.x + 0.5 - (cbox[4] - cbox[1]) / 2)) then ok = true
 		elseif self._force.z > 0 and (p.z > (self._forcestart.z + 0.5 + (cbox[6] - cbox[3]) / 2)) then ok = true
 		elseif self._force.z < 0 and (p.z < (self._forcestart.z + 0.5 - (cbox[6] - cbox[3]) / 2)) then ok = true end
 		-- Item was successfully forced out. No more pushing
 		if ok then
 			self._forcetimer = -1
 			self._force = nil
 			enable_physics(self.object, self)
 				else
-			self._forcetimer = self._forcetimer - dtime
+					mcl_log("No need to save")
 				end
 			end
 		end
 		return true
 	elseif self._force then
 		self._force = nil
 		enable_physics(self.object, self)
 		return true
 	end
 end
-local function move_items_in_water (self, p, def, node, is_floating, is_in_water)
+	return false
 	-- Move item around on flowing liquids; add 'source' check to allow items to continue flowing a bit in the source block of flowing water.
 	if def and not is_floating and (def.liquidtype == "flowing" or def.liquidtype == "source") then
 		self._flowing = true
 		--[[ Get flowing direction (function call from flowlib), if there's a liquid.
        NOTE: According to Qwertymine, flowlib.quickflow is only reliable for liquids with a flowing distance of 7.
        Luckily, this is exactly what we need if we only care about water, which has this flowing distance. ]]
 		local vec = flowlib.quick_flow(p, node)
 		-- Just to make sure we don't manipulate the speed for no reason
 		if vec.x ~= 0 or vec.y ~= 0 or vec.z ~= 0 then
 			-- Minecraft Wiki: Flowing speed is "about 1.39 meters per second"
 			local f = 1.2
 			-- Set new item moving speed into the direciton of the liquid
 			local newv = vector.multiply(vec, f)
 			-- Swap to acceleration instead of a static speed to better mimic MC mechanics.
 			self.object:set_acceleration(vector.new(newv.x, -0.22, newv.z))
 			self.physical_state = true
 			self._flowing = true
 			self.object:set_properties({
 				physical = true
 			})
 			return true
 		end
 		if is_in_water and def.liquidtype == "source" then
 			local cur_vec = self.object:get_velocity()
 			-- apply some acceleration in the opposite direction so it doesn't slide forever
 			local vec = {
 				x = 0 - cur_vec.x * 0.9,
 				y = 3 - cur_vec.y * 0.9,
 				z = 0 - cur_vec.z * 0.9
 			}
 			self.object:set_acceleration(vec)
 			-- slow down the item in water
 			local vel = self.object:get_velocity()
 			if vel.y < 0 then
 				vel.y = vel.y * 0.9
 			end
 			self.object:set_velocity(vel)
 			if self.physical_state ~= false or self._flowing ~= true then
 				self.physical_state = true
 				self._flowing = true
 				self.object:set_properties({
 					physical = true
 				})
 			end
 		end
 	elseif self._flowing == true and not is_in_water and not is_floating then
 		-- Disable flowing physics if not on/in flowing liquid
 		self._flowing = false
 		enable_physics(self.object, self, true)
 		return true
 	end
 end
 minetest.register_entity(":__builtin:item", {
@ -752,17 +564,13 @@ minetest.register_entity(":__builtin:item", {
 		if speed ~= nil then self.random_velocity = speed end
 		local vel = self.object:get_velocity()
 		-- There is perhaps a cleverer way of making this physical so it bounces off the wall like swords.
 		local max_vel = 6.5 -- Faster than this and it throws it into the wall / floor and turns black because of clipping.
 		if vel and vel.x == 0 and vel.z == 0 and self.random_velocity > 0 then
 			local v = self.random_velocity
-			local x = math.random(5, max_vel) / 10 * v
+			local x = math.random(5, 10) / 10 * v
 			if math.random(0, 10) < 5 then x = -x end
-			local z = math.random(5, max_vel) / 10 * v
+			local z = math.random(5, 10) / 10 * v
 			if math.random(0, 10) < 5 then z = -z end
-			local y = math.random(1, 2)
+			local y = math.random(2, 4)
 			self.object:set_velocity(vector.new(x, y, z))
 		end
 		self.random_velocity = 0
@ -939,19 +747,11 @@ minetest.register_entity(":__builtin:item", {
 		if total_count > max_count then
 			return false
 		end
 		-- Merge the remote stack into this one
 		local self_pos = self.object:get_pos()
 		local pos = object:get_pos()
-		--local y = pos.y + ((total_count - count) / max_count) * 0.15
+		-- local pos = object:get_pos()
-		local x_diff = (self_pos.x - pos.x) / 2
+		-- pos.y = pos.y + ((total_count - count) / max_count) * 0.15
-		local z_diff = (self_pos.z - pos.z) / 2
+		-- self.object:move_to(pos)
 		local new_pos = vector.offset(pos, x_diff, 0, z_diff)
 		new_pos.y = math.max(self_pos.y, pos.y) + 0.1
 		self.object:move_to(new_pos)
 		self.age = 0 -- Handle as new entity
 		own_stack:set_count(total_count)
@ -972,7 +772,6 @@ minetest.register_entity(":__builtin:item", {
 			self.object:set_acceleration(vector.zero())
 			return
 		end
 		self.age = self.age + dtime
 		if self._collector_timer then
 			self._collector_timer = self._collector_timer + dtime
@ -986,13 +785,19 @@ minetest.register_entity(":__builtin:item", {
 		-- otherwise there might have some data corruption.
 		if self.itemstring == "" then
 			minetest.log("warning",
-				"Item entity with empty itemstring found and being deleted at: " .. minetest.pos_to_string(self.object:get_pos()))
+				"Item entity with empty itemstring found at " .. minetest.pos_to_string(self.object:get_pos()) ..
 				"! Deleting it now.")
 			self._removed = true
 			self.object:remove()
 			return
 		end
 		local p = self.object:get_pos()
 		-- If hopper has taken item, it has gone, and no operations should be conducted on this item
 		if hopper_take_item(self, p) then
 			return
 		end
 		local node = minetest.get_node(p)
 		local in_unloaded = node.name == "ignore"
@ -1002,9 +807,6 @@ minetest.register_entity(":__builtin:item", {
 			return
 		end
 		if self.is_clock then
 			self.object:set_properties({
 				textures = { "mcl_clock:clock_" .. (mcl_worlds.clock_works(p) and mcl_clock.old_time or mcl_clock.random_frame) }
@ -1040,12 +842,167 @@ minetest.register_entity(":__builtin:item", {
 		-- Destroy item in lava, fire or special nodes
 		local def = minetest.registered_nodes[nn]
 		local lg = minetest.get_item_group(nn, "lava")
 		local fg = minetest.get_item_group(nn, "fire")
 		local dg = minetest.get_item_group(nn, "destroys_items")
 		if (def and (lg ~= 0 or fg ~= 0 or dg == 1)) then
 			--Wait 2 seconds to allow mob drops to be cooked, & picked up instead of instantly destroyed.
 			if self.age > 2 and minetest.get_item_group(self.itemstring, "fire_immune") == 0 then
 				if dg ~= 2 then
 					minetest.sound_play("builtin_item_lava", { pos = self.object:get_pos(), gain = 0.5 })
 				end
 				self._removed = true
 				self.object:remove()
 				return
 			end
 		end
-		if nodes_destroy_items(self, moveresult, def, nn) then return end
+		-- Destroy item when it collides with a cactus
 		if moveresult and moveresult.collides then
 			for _, collision in pairs(moveresult.collisions) do
 				local pos = collision.node_pos
 				if collision.type == "node" and minetest.get_node(pos).name == "mcl_core:cactus" then
 					self._removed = true
 					self.object:remove()
 					return
 				end
 			end
 		end
-		if push_out_item_stuck_in_solid(self, dtime, p, def, is_in_water) then return end
+		-- Push item out when stuck inside solid opaque node
 		if not is_in_water and def and def.walkable and def.groups and def.groups.opaque == 1 then
 			local shootdir
 			local cx = (p.x % 1) - 0.5
 			local cz = (p.z % 1) - 0.5
 			local order = {}
-		if move_items_in_water (self, p, def, node, is_floating, is_in_water) then return end
+			-- First prepare the order in which the 4 sides are to be checked.
 			-- 1st: closest
 			-- 2nd: other direction
 			-- 3rd and 4th: other axis
 			if math.abs(cx) < math.abs(cz) then
 				order = cxcz(order, cx, "x", "z")
 				order = cxcz(order, cz, "z", "x")
 			else
 				order = cxcz(order, cz, "z", "x")
 				order = cxcz(order, cx, "x", "z")
 			end
 			-- Check which one of the 4 sides is free
 			for o = 1, #order do
 				local nn = minetest.get_node(vector.add(p, order[o])).name
 				local def = minetest.registered_nodes[nn]
 				if def and def.walkable == false and nn ~= "ignore" then
 					shootdir = order[o]
 					break
 				end
 			end
 			-- If none of the 4 sides is free, shoot upwards
 			if shootdir == nil then
 				shootdir = vector.new(0, 1, 0)
 				local nn = minetest.get_node(vector.add(p, shootdir)).name
 				if nn == "ignore" then
 					-- Do not push into ignore
 					return
 				end
 			end
 			-- Set new item moving speed accordingly
 			local newv = vector.multiply(shootdir, 3)
 			self.object:set_acceleration(vector.zero())
 			self.object:set_velocity(newv)
 			disable_physics(self.object, self, false, false)
 			if shootdir.y == 0 then
 				self._force = newv
 				p.x = math.floor(p.x)
 				p.y = math.floor(p.y)
 				p.z = math.floor(p.z)
 				self._forcestart = p
 				self._forcetimer = 1
 			end
 			return
 		end
 		-- This code is run after the entity got a push from above “push away” code.
 		-- It is responsible for making sure the entity is entirely outside the solid node
 		-- (with its full collision box), not just its center.
 		if self._forcetimer > 0 then
 			local cbox = self.object:get_properties().collisionbox
 			local ok = false
 			if self._force.x > 0 and (p.x > (self._forcestart.x + 0.5 + (cbox[4] - cbox[1]) / 2)) then ok = true
 			elseif self._force.x < 0 and (p.x < (self._forcestart.x + 0.5 - (cbox[4] - cbox[1]) / 2)) then ok = true
 			elseif self._force.z > 0 and (p.z > (self._forcestart.z + 0.5 + (cbox[6] - cbox[3]) / 2)) then ok = true
 			elseif self._force.z < 0 and (p.z < (self._forcestart.z + 0.5 - (cbox[6] - cbox[3]) / 2)) then ok = true end
 			-- Item was successfully forced out. No more pushing
 			if ok then
 				self._forcetimer = -1
 				self._force = nil
 				enable_physics(self.object, self)
 			else
 				self._forcetimer = self._forcetimer - dtime
 			end
 			return
 		elseif self._force then
 			self._force = nil
 			enable_physics(self.object, self)
 			return
 		end
 		-- Move item around on flowing liquids; add 'source' check to allow items to continue flowing a bit in the source block of flowing water.
 		if def and not is_floating and (def.liquidtype == "flowing" or def.liquidtype == "source") then
 			self._flowing = true
 			--[[ Get flowing direction (function call from flowlib), if there's a liquid.
 			NOTE: According to Qwertymine, flowlib.quickflow is only reliable for liquids with a flowing distance of 7.
 			Luckily, this is exactly what we need if we only care about water, which has this flowing distance. ]]
 			local vec = flowlib.quick_flow(p, node)
 			-- Just to make sure we don't manipulate the speed for no reason
 			if vec.x ~= 0 or vec.y ~= 0 or vec.z ~= 0 then
 				-- Minecraft Wiki: Flowing speed is "about 1.39 meters per second"
 				local f = 1.2
 				-- Set new item moving speed into the direciton of the liquid
 				local newv = vector.multiply(vec, f)
 				-- Swap to acceleration instead of a static speed to better mimic MC mechanics.
 				self.object:set_acceleration(vector.new(newv.x, -0.22, newv.z))
 				self.physical_state = true
 				self._flowing = true
 				self.object:set_properties({
 					physical = true
 				})
 				return
 			end
 			if is_in_water and def.liquidtype == "source" then
 				local cur_vec = self.object:get_velocity()
 				-- apply some acceleration in the opposite direction so it doesn't slide forever
 				local vec = {
 					x = 0 - cur_vec.x * 0.9,
 					y = 3 - cur_vec.y * 0.9,
 					z = 0 - cur_vec.z * 0.9
 				}
 				self.object:set_acceleration(vec)
 				-- slow down the item in water
 				local vel = self.object:get_velocity()
 				if vel.y < 0 then
 					vel.y = vel.y * 0.9
 				end
 				self.object:set_velocity(vel)
 				if self.physical_state ~= false or self._flowing ~= true then
 					self.physical_state = true
 					self._flowing = true
 					self.object:set_properties({
 						physical = true
 					})
 				end
 			end
 		elseif self._flowing == true and not is_in_water and not is_floating then
 			-- Disable flowing physics if not on/in flowing liquid
 			self._flowing = false
 			enable_physics(self.object, self, true)
 			return
 		end
 		-- If node is not registered or node is walkably solid and resting on nodebox
 		local nn = minetest.get_node(vector.offset(p, 0, -0.5, 0)).name
@ -1054,13 +1011,14 @@ minetest.register_entity(":__builtin:item", {
 		local is_on_floor = def and (def.walkable
 			and not def.groups.slippery and v.y == 0)
-		if not minetest.registered_nodes[nn] or is_floating or is_on_floor then
+		if not minetest.registered_nodes[nn]
-
+			or is_floating or is_on_floor then
 			local own_stack = ItemStack(self.object:get_luaentity().itemstring)
 			-- Merge with close entities of the same item
 			for _, object in pairs(minetest.get_objects_inside_radius(p, 0.8)) do
 				local obj = object:get_luaentity()
-				if obj and obj.name == "__builtin:item" and obj.physical_state == false then
+				if obj and obj.name == "__builtin:item"
 					and obj.physical_state == false then
 					if self:try_merge_with(own_stack, object, obj) then
 						return
 					end
--- a/mods/ENTITIES/mcl_minecarts/functions.lua
+++ b/mods/ENTITIES/mcl_minecarts/functions.lua
@ -135,33 +135,3 @@ function mcl_minecarts:get_rail_direction(pos_, dir, ctrl, old_switch, railtype)
 	end
 	return {x=0, y=0, z=0}
 end
 local plane_adjacents = {
 	vector.new(-1,0,0),
 	vector.new(1,0,0),
 	vector.new(0,0,-1),
 	vector.new(0,0,1),
 }
 function mcl_minecarts:get_start_direction(pos)
 	local dir
 	local i = 0
 	while (not dir and i < #plane_adjacents) do
 		i = i+1
 		local node = minetest.get_node_or_nil(vector.add(pos, plane_adjacents[i]))
 		if node ~= nil
 		and minetest.get_item_group(node.name, "rail") == 0
 		and minetest.get_item_group(node.name, "solid") == 1
 		and minetest.get_item_group(node.name, "opaque") == 1
 		then
 			dir = mcl_minecarts:check_front_up_down(pos, vector.multiply(plane_adjacents[i], -1), true)
 		end
 	end
 	return dir
 end
 function mcl_minecarts:set_velocity(obj, dir, factor)
 	obj._velocity = vector.multiply(dir, factor or 3)
 	obj._old_pos = nil
 	obj._punched = true
 end
--- a/mods/ENTITIES/mcl_minecarts/init.lua
+++ b/mods/ENTITIES/mcl_minecarts/init.lua
@ -11,14 +11,6 @@ mcl_minecarts.check_float_time = 15
 dofile(mcl_minecarts.modpath.."/functions.lua")
 dofile(mcl_minecarts.modpath.."/rails.lua")
 local LOGGING_ON = minetest.settings:get_bool("mcl_logging_minecarts", false)
 local function mcl_log(message)
 	if LOGGING_ON then
 		mcl_util.mcl_log(message, "[Minecarts]", true)
 	end
 end
 local function detach_driver(self)
 	if not self._driver then
 		return
@ -59,126 +51,6 @@ end
 local activate_normal_minecart = detach_driver
 local function hopper_take_item(self, dtime)
 	local pos = self.object:get_pos()
 	if not pos then return end
 	if not self or self.name ~= "mcl_minecarts:hopper_minecart" then return end
 	if mcl_util.check_dtime_timer(self, dtime, "hoppermc_take", 0.15) then
 		--minetest.log("The check timer was triggered: " .. dump(pos) .. ", name:" .. self.name)
 	else
 		--minetest.log("The check timer was not triggered")
 		return
 	end
 	--mcl_log("self.itemstring: ".. self.itemstring)
 	local above_pos = vector.offset(pos, 0, 0.9, 0)
 	--mcl_log("self.itemstring: ".. minetest.pos_to_string(above_pos))
 	local objs = minetest.get_objects_inside_radius(above_pos, 1.25)
 	if objs then
 		mcl_log("there is an itemstring. Number of objs: ".. #objs)
 		for k, v in pairs(objs) do
 			local ent = v:get_luaentity()
 			if ent and not ent._removed and ent.itemstring and ent.itemstring ~= "" then
 				local taken_items = false
 				mcl_log("ent.name: " .. tostring(ent.name))
 				mcl_log("ent pos: " .. tostring(ent.object:get_pos()))
 				local inv = mcl_entity_invs.load_inv(self, 5)
 				if not inv then return false end
 				local current_itemstack = ItemStack(ent.itemstring)
 				mcl_log("inv. size: " .. self._inv_size)
 				if inv:room_for_item("main", current_itemstack) then
 					mcl_log("Room")
 					inv:add_item("main", current_itemstack)
 					ent.object:get_luaentity().itemstring = ""
 					ent.object:remove()
 					taken_items = true
 				else
 					mcl_log("no Room")
 				end
 				if not taken_items then
 					local items_remaining = current_itemstack:get_count()
 					-- This will take part of a floating item stack if no slot can hold the full amount
 					for i = 1, self._inv_size, 1 do
 						local stack = inv:get_stack("main", i)
 						mcl_log("i: " .. tostring(i))
 						mcl_log("Items remaining: " .. items_remaining)
 						mcl_log("Name: " .. tostring(stack:get_name()))
 						if current_itemstack:get_name() == stack:get_name() then
 							mcl_log("We have a match. Name: " .. tostring(stack:get_name()))
 							local room_for = stack:get_stack_max() - stack:get_count()
 							mcl_log("Room for: " .. tostring(room_for))
 							if room_for == 0 then
 								-- Do nothing
 								mcl_log("No room")
 							elseif room_for < items_remaining then
 								mcl_log("We have more items remaining than space")
 								items_remaining = items_remaining - room_for
 								stack:set_count(stack:get_stack_max())
 								inv:set_stack("main", i, stack)
 								taken_items = true
 							else
 								local new_stack_size = stack:get_count() + items_remaining
 								stack:set_count(new_stack_size)
 								mcl_log("We have more than enough space. Now holds: " .. new_stack_size)
 								inv:set_stack("main", i, stack)
 								items_remaining = 0
 								ent.object:get_luaentity().itemstring = ""
 								ent.object:remove()
 								taken_items = true
 								break
 							end
 							mcl_log("Count: " .. tostring(stack:get_count()))
 							mcl_log("stack max: " .. tostring(stack:get_stack_max()))
 							--mcl_log("Is it empty: " .. stack:to_string())
 						end
 						if i == self._inv_size and taken_items then
 							mcl_log("We are on last item and still have items left. Set final stack size: " .. items_remaining)
 							current_itemstack:set_count(items_remaining)
 							--mcl_log("Itemstack2: " .. current_itemstack:to_string())
 							ent.itemstring = current_itemstack:to_string()
 						end
 					end
 				end
 				--Add in, and delete
 				if taken_items then
 					mcl_log("Saving")
 					mcl_entity_invs.save_inv(ent)
 					return taken_items
 				else
 					mcl_log("No need to save")
 				end
 			end
 		end
 	end
 	return false
 end
 -- Table for item-to-entity mapping. Keys: itemstring, Values: Corresponding entity ID
 local entity_mapping = {}
@ -194,7 +66,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 		on_rightclick = on_rightclick,
 		_driver = nil, -- player who sits in and controls the minecart (only for minecart!)
 		_passenger = nil, -- for mobs
 		_punched = false, -- used to re-send _velocity and position
 		_velocity = {x=0, y=0, z=0}, -- only used on punch
 		_start_pos = nil, -- Used to calculate distance for “On A Rail” achievement
@ -215,7 +86,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 		local data = minetest.deserialize(staticdata)
 		if type(data) == "table" then
 			self._railtype = data._railtype
 			self._passenger = data._passenger
 		end
 		self.object:set_armor_groups({immortal=1})
@ -241,7 +111,9 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 			if vector.equals(cart_dir, {x=0, y=0, z=0}) then
 				return
 			end
-			mcl_minecarts:set_velocity(self, cart_dir)
+			self._velocity = vector.multiply(cart_dir, 3)
 			self._old_pos = nil
 			self._punched = true
 			return
 		end
@ -298,16 +170,14 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 		time_from_last_punch = math.min(time_from_last_punch, tool_capabilities.full_punch_interval)
 		local f = 3 * (time_from_last_punch / tool_capabilities.full_punch_interval)
-		mcl_minecarts:set_velocity(self, cart_dir, f)
+		self._velocity = vector.multiply(cart_dir, f)
 		self._old_pos = nil
 		self._punched = true
 	end
 	cart.on_activate_by_rail = on_activate_by_rail
 	local passenger_attach_position = vector.new(0, -1.75, 0)
 	function cart:on_step(dtime)
 		hopper_take_item(self, dtime)
 		local ctrl, player = nil, nil
 		if self._driver then
 			player = minetest.get_player_by_name(self._driver)
@ -342,29 +212,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 			end
 		end
 		-- Grab mob
 		if math.random(1,20) > 15 and not self._passenger then
 			if self.name == "mcl_minecarts:minecart" then
 				local mobsnear = minetest.get_objects_inside_radius(self.object:get_pos(), 1.3)
 				for n=1, #mobsnear do
 					local mob = mobsnear[n]
 					if mob then
 						local entity = mob:get_luaentity()
 						if entity and entity.is_mob then
 							self._passenger = entity
 							mob:set_attach(self.object, "", passenger_attach_position, vector.zero())
 							break
 						end
 					end
 				end
 			end
 		elseif self._passenger then
 			local passenger_pos = self._passenger.object:get_pos()
 			if not passenger_pos then
 				self._passenger = nil
 			end
 		end
 		-- Drop minecart if it isn't on a rail anymore
 		if self._last_float_check >= mcl_minecarts.check_float_time then
 			pos = self.object:get_pos()
@ -389,8 +236,19 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 					return
 				end
-				-- Do not drop minecart. It goes off the rails too frequently, and anyone using them for farms won't
+				-- Drop items and remove cart entity
-				-- notice and lose their iron and not bother. Not cool until fixed.
+				local pname = ""
 				if player then
 					pname = player:get_player_name()
 				end
 				if not minetest.is_creative_enabled(pname) then
 					for d=1, #drop do
 						minetest.add_item(self.object:get_pos(), drop[d])
 					end
 				end
 				self.object:remove()
 				return
 			end
 			self._last_float_check = 0
 		end
@ -466,7 +324,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 			return
 		end
-		local dir, last_switch, restart_pos = nil, nil, nil
+		local dir, last_switch = nil, nil
 		if not pos then
 			pos = self.object:get_pos()
 		end
@ -493,9 +351,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 				minetest.swap_node(rou_pos, newnode)
 				mesecon.receptor_on(rou_pos)
 			end
 			if node.name == "mcl_minecarts:golden_rail_on" then
 				restart_pos = rou_pos
 			end
 			if node_old.name == "mcl_minecarts:detector_rail_on" then
 				local newnode = {name="mcl_minecarts:detector_rail", param2 = node_old.param2}
 				minetest.swap_node(rou_old, newnode)
@ -646,14 +501,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 		if update.pos then
 			self.object:set_pos(pos)
 		end
 		-- stopped on "mcl_minecarts:golden_rail_on"
 		if vector.equals(vel, {x=0, y=0, z=0}) and restart_pos then
 			local dir = mcl_minecarts:get_start_direction(restart_pos)
 			if dir then
 				mcl_minecarts:set_velocity(self, dir)
 			end
 		end
 	end
 	function cart:get_staticdata()
@ -694,15 +541,7 @@ function mcl_minecarts.place_minecart(itemstack, pointed_thing, placer)
 	if le then
 		le._railtype = railtype
 	end
-	local cart_dir
+	local cart_dir = mcl_minecarts:get_rail_direction(railpos, {x=1, y=0, z=0}, nil, nil, railtype)
 	if node.name == "mcl_minecarts:golden_rail_on" then
 		cart_dir = mcl_minecarts:get_start_direction(railpos)
 	end
 	if cart_dir then
 		mcl_minecarts:set_velocity(le, cart_dir)
 	else
 		cart_dir = mcl_minecarts:get_rail_direction(railpos, {x=1, y=0, z=0}, nil, nil, railtype)
 	end
 	cart:set_yaw(minetest.dir_to_yaw(cart_dir))
 	local pname = ""
--- a/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.dk.tr
+++ b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.dk.tr
@ -1,36 +0,0 @@
 # textdomain: mcl_minecarts
 Minecart=Minevogn
 Minecarts can be used for a quick transportion on rails.=Minevogne kan bruges til hurtig transport på spor.
 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.=Minevogne kan kun køre på spor, og følger dem altid. Ved et T-kryds uden en vej ligeud drejer de altid til venstre. Farten påvirkes af sportypen.
 You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Du kan placere minevogne på spor. Højre-klik for at stige ombord.
 To obtain the minecart, punch it while holding down the sneak key.=For at at få minevognen i din oppakning. 
 A minecart with TNT is an explosive vehicle that travels on rail.=En minevogn med TNT as et eksplosivt fartøj som kører på spor.
 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.=Placér den på spor. Slå den for at flytte den. TNTet bliver antændt med flint og stål eller når minevognen er på et aktiveringsspor.
 To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=For at få minevognen med TNT i din oppakning skal du slå den mens du holder snigeknappen nede. Du kan ikke gøre dette hvis TNTen er antændt.
 A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=En minevogn med ovn er et fartøj som kører på spor. Den kan køre af sig selv med brændstof.
 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.=Placér den på spor. Hvis du putter kul i den vil ovnen brænde i lang tid, og minevognen vil køre af sig selv. Slå den for at sætte den i bevægelse.
 To obtain the minecart and furnace, punch them while holding down the sneak key.=For at få minevognen med ovn i din oppakning skal du slå den mens du holder snigeknappen nede.
 Minecart with Chest=Minevogn med kiste
 Minecart with Furnace=Minevogn med ovn
 Minecart with Command Block=Minevogn med kommandoblok
 Minecart with Hopper=Minevogn med tragt
 Minecart with TNT=Minevogn med 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.=Placér dem på jorden for at bygge din jerbane. Sporene kobler sig automatisk sammen med hinanden og laver sving, T-kryds, kryds og skråninger efter behov.
 Rail=Spor
 Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Spor kan bruges til at bygge jernbaner til minevogne. Normale spor sænker minevognene en smule på grund af friktionsmodstand.
 Powered Rail=Strømspor
 Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Spor kan bruges til at bygge jernbaner til minevogne. Strømspor kan accelerere eller bremse minevogne. 
 Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Uden redstonekraft vil sporet bremse minevognen. For at accelerere minevognen skal den bruge redstoneskraft.
 Activator Rail=Aktiveringsspor
 Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Spor kan bruges til at bygge jernbaner til minevogne. Aktiveringsspor bruges til at aktivere specielle minevogne.
 To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=For at få dette spor til at aktiere minevogne skal du give det redstonekraft og sende en minevogn over dette sporstykke.
 Detector Rail=Detektorspor
 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.=Spor kan bruges til at bygge jernbaner til minevogne. Et detektorspor kan opdage en minevogn som kører over det og give kraft til redstonemekanismer.
 To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=For at opdage en minevogn og give redstonekraft skal den forbindes til redstonestøv eller redstonemekanismer og send en hvilkensomhelst minevogn hen over sporet.
 Track for minecarts=Spor til minevogne.
 Speed up when powered, slow down when not powered=Accelerérer når der er strøm, sænk hastigheden når der ikke er strøm.
 Activates minecarts when powered=Aktieverer minevogne når der er strøm.
 Emits redstone power when a minecart is detected=Udsender redstonekraft når en minevogn bliver opdaget. 
 Vehicle for fast travel on rails=Fartøj til hurtig kørsel på spor.
 Can be ignited by tools or powered activator rail=Kan antændes med værktøj eller et aktivatorspor med strøm.
 Sneak to dismount=Snig for at stige af.
--- a/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.fr.tr
+++ b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.fr.tr
@ -10,15 +10,15 @@ To obtain the minecart and TNT, punch them while holding down the sneak key. You
 A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Une wagonnet avec un four est un véhicule qui se déplace sur rails. Il peut se propulser avec du carburant.
 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.=Placez-le sur des rails. Si vous lui donnez du charbon, le four commencera à brûler pendant longtemps et le wagonnet pourra se déplacer. Frappez-le pour le faire bouger.
 To obtain the minecart and furnace, punch them while holding down the sneak key.=Pour obtenir le wagonnet et le four, frappez-les tout en maintenant la touche furtive enfoncée.
-Minecart with Chest=Wagonnet avec coffre
+Minecart with Chest=Wagonnet avec Coffre
-Minecart with Furnace=Wagonnet avec four
+Minecart with Furnace=Wagonnet avec Four
-Minecart with Command Block=Wagonnet avec bloc de commande
+Minecart with Command Block=Wagonnet avec Bloc de Commande
-Minecart with Hopper=Wagonnet avec entonnoir
+Minecart with Hopper=Wagonnet avec Entonoir
 Minecart with TNT=Wagonnet avec 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.=Placez-les sur le sol pour construire votre chemin de fer, les rails se connecteront automatiquement les uns aux autres et se transformeront en courbes, en jonctions en T, en traversées et en pentes au besoin.
 Rail=Rail
 Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Les rails peuvent être utilisés pour construire des voies de transport pour les wagonnets. Les rails ralentissent légèrement les wagonnets en raison de la friction.
-Powered Rail=Rail alimenté
+Powered Rail=Rail allimenté
 Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Les rails peuvent être utilisés pour construire des voies de transport pour les wagonnets. Les rails motorisés sont capables d'accélérer et de freiner les wagonnets.
 Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Sans énergie de redstone, le rail freinera les wagonnets. Pour que ce rail accélère les minecarts, alimentez-le avec une source d'énergie redstone.
 Activator Rail=Rail d'activation
--- a/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.oc.tr
+++ b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.oc.tr
@ -1,36 +0,0 @@
 # textdomain: mcl_minecarts
 Minecart=Vagonet
 Minecarts can be used for a quick transportion on rails.=Los vagonet pòdon èsser utilizats per un transpòrt rapide per ralhs.
 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.=Los vagonets ròtlon mas per ralhs e seguisson totjorn la pista. A una joncion T embei ren davant, tòrnon a gaucha.
 You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Podètz plaçar le vagonet per ralhs. Fasetz un clic dreit dessobre per çai rentrar. Tustatz z-o per z-o faire bojar.
 To obtain the minecart, punch it while holding down the sneak key.=Per aver le vagonet, tustatz z-o embei la tocha sneak enfonçada.
 A minecart with TNT is an explosive vehicle that travels on rail.=Un vagonet embei TNT z-es un vagonet explosiu que voiatja per ralhs.
 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.=Plaçatz z-o per ralhs. Tustatz z-o per z-o desplaçar. La TNT z-es atubada embei un batifuòc o quand le vagonet z-es per un ralh d'activacion atubat.
 To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Per obtenèr le vagonet e la TNT, tustatz z-o embei la tocha sneak enfonçada. Podètz pas faire quo si la TNT z-es atubada.
 A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Un vagonet embei un fornil z-es un veïcule que voiatja per ralhs. Pòt se propulsar embei dau carburant.
 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.=Plaçatz z-o per ralhs. Si li balhatz dau charbon, le fornil vai començar de borlar lòngtemps e porà rotlar. Tustatz z-o per z-o faire bojar.
 To obtain the minecart and furnace, punch them while holding down the sneak key.=Per obtener le vagonet e le fornil, tustatz z-o embei la tocha sneak enfonçada.
 Minecart with Chest=Vagonet embei una Mala
 Minecart with Furnace=Vagonet embei un Fornil
 Minecart with Command Block=Vagonet embei un Blòc de Comandas
 Minecart with Hopper=Vagonet embei un Embure
 Minecart with TNT=Vagonet embei de la 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.=Plaçatz z-o per sòu per construrre vostre chamin de fèrre, los ralhs se conectaron entre ilhs e faron de las corbas, de las junccions en T, en traversadas et en pentas au besonh.
 Rail=Ralh
 Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Los ralhs pòdon èsser utilizats per construrre los chamins de transpòrt per los vagonets. Los ralhs normaus ralentissons gentament los vagonet per causa de friccion.
 Powered Rail=Ralh Atubat
 Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Los ralhs pòdon èsser utilizats per construrre los chamins de transpòrt per los vagonets. Los ralhs atubats son per faire accelerar o frenar los vagonets.
 Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Sens energia de pèirotge, le ralh vai frenar los vagonets. Per que le ralh accelera los vagonets, alimentatz z-o embei de l'energia de pèirotge.
 Activator Rail=Ralh d'Activacion
 Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Los ralhs pòdon èsser utilizats per construrre los chamins de transpòrt per los vagonets. Los ralhs d'activacion son utilizats per activar daus vagonets speciaus.
 To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Per activar le ralh, alimentatz z-o embei de l'energia de pèirotge e fasetz rotlar un vagonet per aqueste ralh.
 Detector Rail=Ralh de Deteccion
 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.=Los ralhs pòdon èsser utilizats per construirre los chamins de transpòrt per los vagonets. Los ralhs de deteccion pòdon detectar un vagonet per ilhs e atubar un mecanisme de pèirotge.
 To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Per detectar un vagonet e produrre de l'energia de pèirotge, conectatz le ralh a de la pèirotge e fasetz rotlar un vagonet per i-aul.
 Track for minecarts=Pista per vagonets
 Speed up when powered, slow down when not powered=Acceleratz quand z-es atubat, ralentissetz quand z-es pas atubat.
 Activates minecarts when powered=Activa los vagonets quand pas atubat.
 Emits redstone power when a minecart is detected=Emeta de l'energia de pèirotge quand un vagonet z-es detectat.
 Vehicle for fast travel on rails=Veicule per voiatjar vistament per ralhs.
 Can be ignited by tools or powered activator rail=Pòt èsser atubat embei daus otilhs o un ralh d'activacion
 Sneak to dismount=Se baissar per descendre
--- 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_minecarts/locale/mcl_minecarts.ru.tr
+++ b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.ru.tr
@ -1,36 +1,36 @@
 # textdomain: mcl_minecarts
 Minecart=Вагонетка
-Minecarts can be used for a quick transportion on rails.=Вагонетка может быть использована для быстрого перемещения по рельсам.
+Minecarts can be used for a quick transportion on rails.=Вагонетки нужны, чтобы быстро перемещаться по рельсам.
-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.=Вагонетки едут только по проложенным рельсам. На Т-образной развилке они поворачивают налево. Скорость зависит от типа рельсов.
+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.=Вагонетки едут строго по проложенному железнодорожному пути. На Т-образной развилке они поворачивают налево. Скорость зависит от типа рельсов.
-You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Вы можете поставить вагонетку на рельсы. Правым кликом сядьте в неё. Ударьте по ней, чтобы она поехала.
+You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Вы ставите вагонетку на рельсы. Правым кликом садитесь в неё. Стукаете, чтобы начать движение.
-To obtain the minecart, punch it while holding down the sneak key.=Чтобы забрать вагонетку, ударьте по ней, удерживая клавишу [Красться].
+To obtain the minecart, punch it while holding down the sneak key.=Чтобы взять вагонетку, стукните её, удерживая клавишу [Красться].
-A minecart with TNT is an explosive vehicle that travels on rail.=Вагонетка с ТНТ это взрывающийся железнодорожный транспорт.
+A minecart with TNT is an explosive vehicle that travels on rail.=Вагон тротила это подрывной железнодорожный транспорт.
-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.=Поместите вагонетку на рельсы. Ударьте по ней, чтобы она поехала. ТНТ активируется, если его поджечь огнивом или когда вагонетка проедет через подключенные активирующие рельсы.
+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.=Поместите его на рельсы. Стукните, чтобы он поехал. Тротил воспламеняется, если его поджечь огнивом, либо при попадании на подключенный рельсовый активатор.
-To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Чтобы забрать вагонетку с ТНТ, ударьте по ней, удерживая клавишу [Красться]. Если ТНТ подожжён, сделать это нельзя.
+To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Чтобы взять вагон тротила, стукните его, удерживая клавишу [Красться]. Если тротил воспламенён, сделать это нельзя.
-A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Вагонетка с печью это железнодорожный транспорт. Она может ехать сама за счёт топлива.
+A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Вагон с печью - это железнодорожный транспорт. Он может двигаться за счёт топлива.
-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.=Поставьте вагонетку на рельсы. Если добавить в неё угля, то печь будет гореть продолжительное время и вагонетка сможет поехать сама. Ударьте по ней, чтобы она поехала.
+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.=Поставьте его на рельсы. Если добавить немного угля, то печь зажжётся на продолжительное время и вагон сможет ехать. Стукните вагон для начала движения.
-To obtain the minecart and furnace, punch them while holding down the sneak key.=Чтобы забрать вагонетку с печью, ударьте по ней, удерживая клавишу [Красться].
+To obtain the minecart and furnace, punch them while holding down the sneak key.=Чтобы взять вагон с печью, стукните его, удерживая клавишу [Красться].
-Minecart with Chest=Вагонетка с сундуком
+Minecart with Chest=Вагон с сундуком
-Minecart with Furnace=Вагонетка с печью
+Minecart with Furnace=Вагон с печью
-Minecart with Command Block=Вагонетка с командным блоком
+Minecart with Command Block=Вагон с командным блоком
-Minecart with Hopper=Вагонетка с воронкой
+Minecart with Hopper=Вагон с бункером
-Minecart with TNT=Вагонетка с ТНТ
+Minecart with 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.=Поместите рельсы на землю, чтобы сделать железную дорогу, рельсы автоматически соединятся между собой и будут образовывать повороты, T-образные развилки, перекрёстки и склоны там, где это потребуется.
+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.=Поместите на землю, чтобы сделать железную дорогу, рельсы автоматически соединятся между собой и будут превращаться в плавный повороты, T-образные развилки, перекрёстки и уклоны там, где это потребуется.
 Rail=Рельсы
 Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Рельсы используются для строительства железной дороги. Обычные рельсы немного замедляют движение вагонеток из-за трения.
-Powered Rail=Энергорельсы
+Powered Rail=Подключаемые рельсы
-Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Энергорельсы используются для строительства железной дороги. Энергорельсы могут ускорять и тормозить вагонетки.
+Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Рельсы используются для строительства железной дороги. Подключённые рельсы могут разгонять и тормозить вагонетки.
-Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Неподключенные энергорельсы замедляют вагонетки. Чтобы энергорельсы ускоряли вагонетки, проведите к ним сигнал редстоуна.
+Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Без энергии редстоуна рельсы будут тормозить вагонетки.
-Activator Rail=Активирующие рельсы
+Activator Rail=Рельсовый активатор
-Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Активирующие рельсы используются для строительства железной дороги. Активирующие рельсы активируют некоторые особые вагонетки.
+Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Рельсы используются для строительства железной дороги. Рельсовый активатор активирует особые вагонетки.
-To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Чтобы эти рельсы активировали вагонетки, подключите активирующие рельсы к сигналу редстоуна и направьте вагонетку через них.
+To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Чтобы этот блок рельсов активировал вагонетку, подключите его к энергии редстоуна и направьте вагонетку через него.
-Detector Rail=Нажимные рельсы
+Detector Rail=Рельсовый детектор
-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.=Нажимные рельсы используются для строительства железной дороги. Нажимные рельсы реагируют на проезжающие по ним вагонетки и выдают сигнал для механизмов из редстоуна.
+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.=Рельсы используются для строительства железной дороги. Рельсовый детектор может обнаруживать вагонетку у себя наверху и подключать механизмы редстоуна.
-To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Подсоедините к нажимным рельсам редстоун или редстоуновые механизмы, чтобы активировать их когда по рельсам проезжает вагонетка.
+To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Чтобы обнаруживать вагонетку и подавать энергию редстоуна, подключите его к дорожке редстоуна или механизму редстоуна, после чего направьте любую вагонетку через него.
 Track for minecarts=Железная дорога
-Speed up when powered, slow down when not powered=Если подключены - ускоряют, если нет - тормозят
+Speed up when powered, slow down when not powered=Разгоняет, если подключён, тормозит, если не подключён
-Activates minecarts when powered=Активирует особые вагонетки, если подключены
+Activates minecarts when powered=Активирует особые вагонетки, если подключён
-Emits redstone power when a minecart is detected=Подает сигнал редстоуна при обнаружении вагонетки
+Emits redstone power when a minecart is detected=Испускает энергию редстоуна при обнаружении вагонетки
-Vehicle for fast travel on rails=Железнодорожный транспорт
+Vehicle for fast travel on rails=Быстрый железнодорожный транспорт
-Can be ignited by tools or powered activator rail=Можно поджечь инструментом или активирующими рельсами
+Can be ignited by tools or powered activator rail=Можно воспламенить с помощью инструмента или подключенного рельсового активатора
 Sneak to dismount=Нажмите [Красться] для высадки
--- a/mods/ENTITIES/mcl_minecarts/rails.lua
+++ b/mods/ENTITIES/mcl_minecarts/rails.lua
@ -112,22 +112,6 @@ register_rail("mcl_minecarts:golden_rail_on",
 				onstate = "mcl_minecarts:golden_rail_on",
 				rules = rail_rules_long,
 			},
 			effector = {
 				action_on = function(pos, node)
 					local dir = mcl_minecarts:get_start_direction(pos)
 					if not dir then return end
 					local objs = minetest.get_objects_inside_radius(pos, 1)
 					for _, o in pairs(objs) do
 						local l = o:get_luaentity()
 						local v = o:get_velocity()
 						if l and string.sub(l.name, 1, 14) == "mcl_minecarts:"
 						and v and vector.equals(v, vector.zero())
 						then
 							mcl_minecarts:set_velocity(l, dir)
 						end
 					end
 end,
 			},
 		},
 		drop = "mcl_minecarts:golden_rail",
 	},
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@ -5,18 +5,23 @@ local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
 local PATHFINDING = "gowp"
 local CRASH_WARN_FREQUENCY = 60
 local LIFETIMER_DISTANCE = 47
 -- Localize
 local S = minetest.get_translator("mcl_mobs")
-local DEVELOPMENT = minetest.settings:get_bool("mcl_development",false)
+local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_villager",false)
 local function mcl_log (message)
 	if LOGGING_ON then
 		mcl_util.mcl_log (message, "[Mobs]", true)
 	end
 end
 -- Invisibility mod check
 mcl_mobs.invis = {}
 local remove_far = true
-
+local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
 local spawn_protected = minetest.settings:get_bool("mobs_spawn_protected") ~= false
 local mobs_debug = minetest.settings:get_bool("mobs_debug", false) -- Shows helpful debug info above each mob
 local spawn_logging = minetest.settings:get_bool("mcl_logging_mobs_spawn",true)
@ -33,6 +38,15 @@ if minetest.settings:get_bool("only_peaceful_mobs", false) then
 	end)
 end
 local node_ok = function(pos, fallback)
 	fallback = fallback or mcl_mobs.fallback_node
 	local node = minetest.get_node_or_nil(pos)
 	if node and minetest.registered_nodes[node.name] then
 		return node
 	end
 	return minetest.registered_nodes[fallback]
 end
 function mob_class:update_tag() --update nametag and/or the debug box
 	local tag
 	if mobs_debug then
@ -61,27 +75,16 @@ function mob_class:update_tag() --update nametag and/or the debug box
 	})
 end
 function mob_class:jock_to(mob, reletive_pos, rot)
 	local pos = self.object:get_pos()
 	if not pos then return end
 	self.jockey = mob
 	local jock = minetest.add_entity(pos, mob)
 	if not jock then return end
 	jock:get_luaentity().docile_by_day = false
 	jock:get_luaentity().riden_by_jock = true
 	self.object:set_attach(jock, "", reletive_pos, rot)
 end
 function mob_class:get_staticdata()
 	for _,p in pairs(minetest.get_connected_players()) do
 		self:remove_particlespawners(p:get_player_name())
 	end
 	-- remove mob when out of range unless tamed
 	if remove_far
-	and self:despawn_allowed()
+	and self.can_despawn
 	and self.remove_ok
 	and ((not self.nametag) or (self.nametag == ""))
 	and self.lifetimer <= 20 then
 		if spawn_logging then
 			minetest.log("action", "[mcl_mobs] Mob "..tostring(self.name).." despawns at "..minetest.pos_to_string(vector.round(self.object:get_pos())) .. " - out of range")
@ -90,6 +93,7 @@ function mob_class:get_staticdata()
 		return "remove"-- nil
 	end
 	self.remove_ok = true
 	self.attack = nil
 	self.following = nil
 	self.state = "stand"
@ -111,21 +115,6 @@ function mob_class:get_staticdata()
 	return minetest.serialize(tmp)
 end
 local function valid_texture(self, def_textures)
 	if not self.base_texture then
 		return false
 	end
 	if self.texture_selected then
 		if #def_textures < self.texture_selected then
 			self.texture_selected = nil
 		else
 			return true
 		end
 	end
 	return false
 end
 function mob_class:mob_activate(staticdata, def, dtime)
 	if not self.object:get_pos() or staticdata == "remove" then
 		mcl_burning.extinguish(self.object)
@ -148,20 +137,16 @@ function mob_class:mob_activate(staticdata, def, dtime)
 	end
 	--If textures in definition change, reload textures
-	if not valid_texture(self, def.textures) then
+	if not self.base_texture or (def.textures and table.indexof(def.textures, self.base_texture) == -1) then
 		-- compatiblity with old simple mobs textures
 		if type(def.textures[1]) == "string" then
 			def.textures = {def.textures}
 		end
 		if not self.texture_selected then
 		local c = 1
 		if #def.textures > c then c = #def.textures end
 			self.texture_selected = math.random(c)
 		end
-		self.base_texture = def.textures[self.texture_selected]
+		self.base_texture = def.textures[math.random(c)]
 		self.base_mesh = def.mesh
 		self.base_size = self.visual_size
 		self.base_colbox = self.collisionbox
@ -283,13 +268,6 @@ function mob_class:mob_activate(staticdata, def, dtime)
 	self._current_animation = nil
 	self:set_animation( "stand")
 	if self.riden_by_jock then --- Keep this function before self.on_spawn() is run.
 		self.object:remove()
 		return
 	end
 	if self.on_spawn and not self.on_spawn_run then
 		if self.on_spawn(self) then
 			self.on_spawn_run = true
@ -306,9 +284,6 @@ function mob_class:mob_activate(staticdata, def, dtime)
 		self._run_armor_init = true
 	end
 	if def.after_activate then
 		def.after_activate(self, staticdata, def, dtime)
 	end
@ -316,33 +291,46 @@ end
 -- execute current state (stand, walk, run, attacks)
 -- returns true if mob has died
-function mob_class:do_states(dtime, player_in_active_range)
+function mob_class:do_states(dtime)
 	--if self.can_open_doors then check_doors(self) end
 	-- knockback timer. set in on_punch
 	if self.pause_timer > 0 then
 		self.pause_timer = self.pause_timer - dtime
 		return
 	end
 	self:env_danger_movement_checks(player_in_active_range)
 	if self.state == PATHFINDING then
 		self:check_gowp(dtime)
 	elseif self.state == "attack" then
 		if self:do_states_attack(dtime) then
 			return true
 		end
 	else
 		if mcl_util.check_dtime_timer(self, dtime, "onstep_dostates", 1) then
 	if self.state == "stand" then
-				self:do_states_stand(player_in_active_range)
+		self:do_states_stand()
 	elseif self.state == PATHFINDING then
 		self:check_gowp(dtime)
 	elseif self.state == "walk" then
 		self:do_states_walk()
 	elseif self.state == "runaway" then
 		-- runaway when punched
 		self:do_states_runaway()
 	elseif self.state == "attack" then
 		-- attack routines (explode, dogfight, shoot, dogshoot)
 		if self:do_states_attack(dtime) then
 			return true
 		end
 	end
 end
 local function update_timers (self, dtime)
 	-- knockback timer. set in on_punch
 	if self.pause_timer > 0 then
 		self.pause_timer = self.pause_timer - dtime
 		return true
 	end
 	-- attack timer. Not anymore, it seems. Used for also occassionally processing mob step too!
 	self.timer = self.timer + dtime
 	if self.state ~= "attack" and self.state ~= PATHFINDING then
 		if self.timer < 1 then
 			return true
 		end
 		self.timer = 0
 	end
 	-- never go over 100
 	if self.timer > 100 then
 		self.timer = 1
 	end
 end
@ -370,8 +358,6 @@ function mob_class:outside_limits()
 	end
 end
 local function on_step_work (self, dtime)
 	local pos = self.object:get_pos()
 	if not pos then return end
@ -387,62 +373,71 @@ local function on_step_work (self, dtime)
 	end
 	if self:falling(pos) then return end
-	if self:step_damage (dtime, pos) then return end
+	self:check_suspend()
 	if not self.fire_resistant then
 		mcl_burning.tick(self.object, dtime, self)
 		if not self.object:get_pos() then return end -- mcl_burning.tick may remove object immediately
 		if self:check_for_death("fire", {type = "fire"}) then
 			return true
 		end
 	end
 	if self:env_damage (dtime, pos) then return end
 	if self.state == "die" then return end
 	-- End: Death/damage processing
 	local player_in_active_range = self:player_in_active_range()
 	self:check_suspend(player_in_active_range)
 	self:check_water_flow()
 	self:env_danger_movement_checks (dtime)
-	if not self._jumping_cliff then
+	self:follow_flop() -- Mob following code.
 		self._can_jump_cliff = self:can_jump_cliff()
 	else
 		self._can_jump_cliff = false
 	end
 	self:flop()
 	self:check_smooth_rotation(dtime)
 	if player_in_active_range then
 	self:set_animation_speed() -- set animation speed relative to velocity
 	self:check_smooth_rotation(dtime)
 	self:check_head_swivel(dtime)
 		if mcl_util.check_dtime_timer(self, dtime, "onstep_engage", 0.2) then
 			self:check_follow()
 			self:check_runaway_from()
 			self:monster_attack()
 			self:npc_attack()
 		end
 		self:check_herd(dtime)
 	if self.jump_sound_cooloff > 0 then self.jump_sound_cooloff = self.jump_sound_cooloff - dtime end
 	self:do_jump()
 	end
 	if mcl_util.check_dtime_timer(self, dtime, "onstep_occassional", 1) then
 		if player_in_active_range then
 			self:check_item_pickup()
 			self:set_armor_texture()
 			self:step_opinion_sound(dtime)
 		end
 		self:check_breeding()
 	end
 	self:check_runaway_from()
 	self:monster_attack()
 	self:npc_attack()
 	self:check_aggro(dtime)
 	self:check_particlespawners(dtime)
 	if self.do_custom and self.do_custom(self, dtime) == false then return end
-	if self:do_states(dtime, player_in_active_range) then return end
+
 	-- In certain circumstances, we abandon processing of certain functionality
 	local skip_processing = false
 	if update_timers(self, dtime) then
 		skip_processing = true
 	end
 	if not skip_processing then
 		self:check_breeding()
 		self:check_item_pickup()
 		self:set_armor_texture()
 		self:check_particlespawners(dtime)
 		if self.opinion_sound_cooloff > 0 then
 			self.opinion_sound_cooloff = self.opinion_sound_cooloff - dtime
 		end
 		-- mob plays random sound at times. Should be 120. Zombie and mob farms are ridiculous
 		if math.random(1, 70) == 1 then
 			self:mob_sound("random", true)
 		end
 		if self:do_states(dtime) then return end
 	end
 	if mobs_debug then self:update_tag() end
@ -453,17 +448,9 @@ end
 local last_crash_warn_time = 0
-local function log_error (stack_trace, info, info2)
+local on_step_error_handler = function ()
-	minetest.log("action", "--- Bug report start (please provide a few lines before this also for context) ---")
+	local info = debug.getinfo(1, "SnlufL")
 	minetest.log("action", "Error: " .. stack_trace)
 	minetest.log("action", "Bug info: " .. info)
 	if info2 then
 		minetest.log("action", "Bug info additional: " .. info2)
 	end
 	minetest.log("action", "--- Bug report end ---")
 end
 local function warn_user_error ()
 	local current_time = os.time()
 	local time_since_warning = current_time - last_crash_warn_time
@ -475,48 +462,27 @@ local function warn_user_error ()
 		last_crash_warn_time = current_time
 		minetest.log("A game crashing bug was prevented. Please provide debug.log information to MineClone2 dev team for investigation. (Search for: --- Bug report start)")
 	end
 	minetest.log("action", "--- Bug report start (please provide a few lines before this also for context) ---")
 	minetest.log("action", "Stack trace: ".. tostring(debug.traceback()))
 	minetest.log("action", "Bug info: ".. dump(info))
 	minetest.log("action", "--- Bug report end ---")
 end
 local on_step_error_handler = function ()
 	warn_user_error ()
 	local info = debug.getinfo(1, "SnlufL")
 	log_error(tostring(debug.traceback()), dump(info))
 end
 -- main mob function
 function mob_class:on_step(dtime)
-	if not DEVELOPMENT then
+	local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime)
 		-- Removed as bundled Lua (5.1 doesn't support xpcall)
 		--local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime)
 		local status, retVal = pcall(on_step_work, self, dtime)
 	if status then
 		return retVal
 		else
 			warn_user_error ()
 			local pos = self.object:get_pos()
 			if pos then
 				local node = minetest.get_node(pos)
 				if node and node.name == "ignore" then
 					minetest.log("warning", "Pos is ignored: " .. dump(pos))
 				end
 			end
 			log_error (dump(retVal), dump(pos), dump(self))
 		end
 	else
 		return on_step_work (self, dtime)
 	end
 end
 local timer = 0
-
+minetest.register_globalstep(function(dtime)
 local function update_lifetimer(dtime)
 	timer = timer + dtime
 	if timer < 1 then return end
 	for _, player in pairs(minetest.get_connected_players()) do
 		local pos = player:get_pos()
-		for _, obj in pairs(minetest.get_objects_inside_radius(pos, LIFETIMER_DISTANCE)) do
+		for _, obj in pairs(minetest.get_objects_inside_radius(pos, 47)) do
 			local lua = obj:get_luaentity()
 			if lua and lua.is_mob then
 				lua.lifetimer = math.max(20, lua.lifetimer)
@ -525,126 +491,23 @@ local function update_lifetimer(dtime)
 		end
 	end
 	timer = 0
 end
 minetest.register_globalstep(function(dtime)
 	update_lifetimer(dtime)
 end)
-
+minetest.register_chatcommand("clearmobs",{
-minetest.register_chatcommand("clearmobs", {
+	privs={maphack=true},
-	privs = { maphack = true },
+	params = "<all>|<nametagged>|<range>",
-	params = "[all|monster|passive|<mob name> [<range>|nametagged|tamed]]",
+	description=S("Removes all spawned mobs except nametagged and tamed ones. all removes all mobs, nametagged only nametagged ones and with the range paramter all mobs in a distance of the current player are removed."),
-	description = S("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."),
+	func=function(n,param)
-	func = function(player, param)
+		local p = minetest.get_player_by_name(n)
-		local default = false
+		local num=tonumber(param)
 		if not param or param == "" then
 			default = true
 			minetest.chat_send_player(player,
 					S("Default usage. Clearing hostile mobs. For more options please type: /help clearmobs"))
 		end
 		local mob, unsafe = param:match("^([%w]+)[ ]?([%w%d]*)$")
 		local all = false
 		local nametagged = false
 		local tamed = false
 		local mob_name, mob_type, range
 		-- Param 1 resolve
 		if mob and mob ~= "" then
 			if mob == "all" then
 				all = true
 			elseif mob == "passive" or mob == "monster" then
 				mob_type = mob
 			elseif mob then
 				mob_name = mob
 			end
 			--minetest.log ("mob: [" .. mob .. "]")
 		else
 			--minetest.log("No valid first param")
 			if default then
 				--minetest.log("Use default")
 				mob_type = "monster"
 			end
 			--return
 		end
 		-- Param 2 resolve
 		if unsafe and unsafe ~= "" then
 			--minetest.log ("unsafe: [" .. unsafe .. "]")
 			if unsafe == "nametagged" then
 				nametagged = true
 			elseif unsafe == "tamed" then
 				tamed = true
 			end
 			local num = tonumber(unsafe)
 			if num then range = num end
 		end
 		local p = minetest.get_player_by_name(player)
 		for _,o in pairs(minetest.luaentities) do
-			if o and o.is_mob then
+			if o.is_mob then
-				local mob_match = false
+				if  param == "all" or
-
+				( param == "nametagged" and o.nametag ) or
-				if all then
+				( param == "" and ( not o.nametag or o.nametag == "" ) and not o.tamed ) or
-					--minetest.log("Match - All mobs specified")
+				( num and num > 0 and vector.distance(p:get_pos(),o.object:get_pos()) <= num ) then
 					mob_match = true
 				elseif mob_type then
 					--minetest.log("Match - o.type: ".. tostring(o.type))
 					--minetest.log("mob_type: ".. tostring(mob_type))
 					if mob_type == "monster" and o.type == mob_type then
 						--minetest.log("Match - monster")
 						mob_match = true
 					elseif mob_type == "passive" and o.type ~= "monster" and o.type ~= "npc" then
 						--minetest.log("Match - passive")
 						mob_match = true
 					else
 						--minetest.log("No match for type.")
 					end
 				elseif mob_name and (o.name == mob_name or string.find(o.name, mob_name)) then
 					--minetest.log("Match - mob_name = ".. tostring(o.name))
 					mob_match = true
 				else
 					--minetest.log("No match - o.type = ".. tostring(o.type))
 					--minetest.log("No match - mob_name = ".. tostring(o.name))
 					--minetest.log("No match - mob_type = ".. tostring(mob_name))
 				end
 				if mob_match then
 					local in_range = true
 					if (not range or range <= 0 ) then
 						in_range = true
 					else
 						if ( vector.distance(p:get_pos(),o.object:get_pos()) <= range ) then
 							in_range = true
 						else
 							--minetest.log("Out of range")
 							in_range = false
 						end
 					end
 					--minetest.log("o.nametag: ".. tostring(o.nametag))
 					if nametagged then
 						if o.nametag then
 							--minetest.log("Namedtagged and it has a name tag. Kill it")
 					o.object:remove()
 				end
 					elseif tamed then
 						if o.tamed then
 							--minetest.log("Tamed. Kill it")
 							o.object:remove()
 						end
 					elseif in_range and (not o.nametag or o.nametag == "") and not o.tamed then
 						--minetest.log("No nametag or tamed. Kill it")
 						o.object:remove()
 					end
 				end
 			end
 		end
 end})
--- a/mods/ENTITIES/mcl_mobs/api.txt
+++ b/mods/ENTITIES/mcl_mobs/api.txt
@ -262,7 +262,6 @@ functions needed for the mob to work properly which contains the following:
 	'custom_visual_size' will not reset visual_size from the base class on reload
 	'noyaw'				If true this mob will not automatically change yaw
 	'particlespawners'	Table of particlespawners attached to the mob. This is implemented in a coord safe manner i.e. spawners are only sent to players within the player_transfer_distance (and automatically removed). This enables infinitely lived particlespawners.
    'attack_frequency'  Attack frequency in seconds. If unset, this defaults to 1. Implemented for melee only atm.
 	mobs:gopath(self,target,callback_arrived)		pathfind a way to target and run callback on arrival
--- 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
@ -77,7 +74,6 @@ function mob_class:feed_tame(clicker, feed_count, breed, tame, notake)
 			if self.food >= feed_count then
 				self.food = 0
 				self.horny = true
 				self.persistent = true
 			end
 		end
@ -322,7 +318,7 @@ function mob_class:toggle_sit(clicker,p)
 		particle = "mobs_mc_wolf_icon_roam.png"
 		self.order = "roam"
 		self.state = "stand"
-		self.walk_chance = 50
+		self.walk_chance = default_walk_chance
 		self.jump = true
 		self:set_animation("stand")
 		-- TODO: Add sitting model
--- a/mods/ENTITIES/mcl_mobs/combat.lua
+++ b/mods/ENTITIES/mcl_mobs/combat.lua
@ -10,8 +10,6 @@ local stuck_path_timeout = 10 -- how long will mob follow path before giving up
 local enable_pathfinding = true
 local TIME_TO_FORGET_TARGET = 15
 local atann = math.atan
 local function atan(x)
 	if not x or x ~= x then
@ -21,8 +19,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()
@ -35,19 +31,14 @@ function mob_class:day_docile()
 	end
 end
-- get this mob to attack the object
+-- attack player/mob
-function mob_class:do_attack(object)
+function mob_class:do_attack(player)
 	if self.state == "attack" or self.state == "die" then
 		return
 	end
-
+	self.attack = player
 	if object:is_player() and not minetest.settings:get_bool("enable_damage") then
 		return
 	end
 	self.attack = object
 	self.state = "attack"
 	-- TODO: Implement war_cry sound without being annoying
@ -338,7 +329,10 @@ end
 -- find someone to attack
 function mob_class:monster_attack()
-	if not damage_enabled or self.passive ~= false or self.state == "attack" or self:day_docile() then
+	if not damage_enabled
 	or self.passive ~= false
 	or self.state == "attack"
 	or self:day_docile() then
 		return
 	end
@ -347,10 +341,8 @@ function mob_class:monster_attack()
 	local player, obj, min_player
 	local type, name = "", ""
 	local min_dist = self.view_range + 1
 	local blacklist_attack = {}
 	local objs = minetest.get_objects_inside_radius(s, self.view_range)
 	local blacklist_attack = {}
 	for n = 1, #objs do
 		if not objs[n]:is_player() then
@ -367,30 +359,32 @@ function mob_class:monster_attack()
 	end
 	for n = 1, #objs do
 		if objs[n]:is_player() then
 			if mcl_mobs.invis[ objs[n]:get_player_name() ] or (not self:object_in_range(objs[n])) then
 				type = ""
 			elseif (self.type == "monster" or self._aggro) then
 				-- self.aggro made player be attacked by npc again if out of range then back in again
 				-- Does it serve a purpose other than that?
 				player = objs[n]
 				type = "player"
 				name = "player"
 			end
 		else
 			obj = objs[n]:get_luaentity()
 			if obj then
 				player = obj.object
 				type = obj.type
 				name = obj.name or ""
 			end
 		end
 		-- 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 (type == "animal" and self.attack_animals == true)) then
-				or (self.extra_hostile and not self.attack_exception(player))) then
+
 			p = player:get_pos()
 			sp = s
@ -406,10 +400,10 @@ function mob_class:monster_attack()
 					attacked_p = true
 				end
 			end
 			-- choose closest player to attack
-			local line_of_sight = self:line_of_sight( sp, p, 2) == true
+			if dist < min_dist
-			if dist < min_dist and not attacked_p and line_of_sight then
+			and not attacked_p
 			and self:line_of_sight( sp, p, 2) == true then
 				min_dist = dist
 				min_player = player
 			end
@ -440,9 +434,11 @@ function mob_class:npc_attack()
 	local objs = minetest.get_objects_inside_radius(s, self.view_range)
 	for n = 1, #objs do
 		obj = objs[n]:get_luaentity()
 		if obj and obj.type == "monster" then
 			p = obj.object:get_pos()
 			sp = s
@ -452,7 +448,8 @@ function mob_class:npc_attack()
 			p.y = p.y + 1
 			sp.y = sp.y + 1
-			if dist < min_dist and self:line_of_sight( sp, p, 2) == true then
+			if dist < min_dist
 			and self:line_of_sight( sp, p, 2) == true then
 				min_dist = dist
 				min_player = obj.object
 			end
@ -521,28 +518,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
@ -559,15 +534,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
@ -679,9 +659,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
@ -697,10 +674,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
@ -714,7 +691,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
@ -724,19 +701,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")
+				kb = kb + 3 * mcl_enchanting.get_enchantment(wielditem, "knockback")
-				-- add player velocity to mob knockback
+			elseif luaentity and luaentity._knockback then
 				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 + 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
@ -829,57 +796,23 @@ end
 function mob_class:check_aggro(dtime)
 	if not self._aggro or not self.attack then return end
-
+	if not self._check_aggro_timer or self._check_aggro_timer > 5 then
 	if not self._check_aggro_timer then
 		self._check_aggro_timer = 0
 	end
 	if self._check_aggro_timer > 5 then
 		self._check_aggro_timer = 0
 		if self.attack then
 			-- TODO consider removing this in favour of what is done in do_states_attack
 			-- Attack is dropped in do_states_attack if out of range, so won't even trigger here
 			-- I do not think this code does anything. Are mobs still loaded in at 128?
 		if not self.attack:get_pos() or vector.distance(self.attack:get_pos(),self.object:get_pos()) > 128 then
 			self._aggro = nil
 			self.attack = nil
 			self.state = "stand"
 		end
 	end
 	end
 	self._check_aggro_timer = self._check_aggro_timer + dtime
 end
 local function clear_aggro(self)
 	self.state = "stand"
 	self:set_velocity( 0)
 	self:set_animation( "stand")
 	self.attack = nil
 	self._aggro = nil
 	self.v_start = false
 	self.timer = 0
 	self.blinktimer = 0
 	self.path.way = nil
 end
 function mob_class:do_states_attack (dtime)
-	self.timer = self.timer + dtime
+	local yaw = self.object:get_yaw() or 0
 	if self.timer > 100 then
 		self.timer = 1
 	end
 	local s = self.object:get_pos()
 	if not s then return end
 	local p = self.attack:get_pos() or s
 	local yaw = self.object:get_yaw() or 0
 	-- stop attacking if player invisible or out of range
 	if not self.attack
 			or not self.attack:get_pos()
@ -887,53 +820,53 @@ function mob_class:do_states_attack (dtime)
 			or self.attack:get_hp() <= 0
 			or (self.attack:is_player() and mcl_mobs.invis[ self.attack:get_player_name() ]) then
-		clear_aggro(self)
+		self.state = "stand"
-		return
+		self:set_velocity( 0)
-	end
+		self:set_animation( "stand")
 		self.attack = nil
 		self.v_start = false
 		self.timer = 0
 		self.blinktimer = 0
 		self.path.way = nil
 	local target_line_of_sight = self:target_visible(s)
 	if not target_line_of_sight then
 		if self.target_time_lost then
 			local time_since_seen = os.time() - self.target_time_lost
 			if time_since_seen > TIME_TO_FORGET_TARGET then
 				self.target_time_lost = nil
 				clear_aggro(self)
 		return
 	end
 		else
 			self.target_time_lost = os.time()
 		end
 	else
 		self.target_time_lost = nil
 	end
 	-- calculate distance from mob and enemy
 	local dist = vector.distance(p, s)
 	if self.attack_type == "explode" then
-		if target_line_of_sight then
+		local vec = {
-			local vec = { x = p.x - s.x, z = p.z - s.z }
+			x = p.x - s.x,
 			z = p.z - s.z
 		}
 		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)
 		end
 		local node_break_radius = self.explosion_radius or 1
 		local entity_damage_radius = self.explosion_damage_radius
 				or (node_break_radius * 2)
 		-- start timer when in reach and line of sight
-		if not self.v_start and dist <= self.reach and target_line_of_sight then
+		if not self.v_start
 				and dist <= self.reach
 				and self:line_of_sight( s, p, 2) then
 			self.v_start = true
 			self.timer = 0
 			self.blinktimer = 0
 			self:mob_sound("fuse", nil, false)
 			-- stop timer if out of reach or direct line of sight
-		elseif self.allow_fuse_reset and self.v_start
+		elseif self.allow_fuse_reset
-				and (dist >= self.explosiontimer_reset_radius or not target_line_of_sight) then
+				and self.v_start
 				and (dist >= self.explosiontimer_reset_radius
 				or not self:line_of_sight( s, p, 2)) then
 			self.v_start = false
 			self.timer = 0
 			self.blinktimer = 0
@ -942,10 +875,10 @@ function mob_class:do_states_attack (dtime)
 		end
 		-- walk right up to player unless the timer is active
-		if self.v_start and (self.stop_to_explode or dist < self.reach) or not target_line_of_sight then
+		if self.v_start and (self.stop_to_explode or dist < self.reach) then
-			self:set_velocity(0)
+			self:set_velocity( 0)
 		else
-			self:set_velocity(self.run_velocity)
+			self:set_velocity( self.run_velocity)
 		end
 		if self.animation and self.animation.run_start then
@ -955,20 +888,25 @@ function mob_class:do_states_attack (dtime)
 		end
 		if self.v_start then
 			self.timer = self.timer + dtime
 			self.blinktimer = (self.blinktimer or 0) + dtime
 			if self.blinktimer > 0.2 then
 				self.blinktimer = 0
 				if self.blinkstatus then
 					self:remove_texture_mod("^[brighten")
 				else
 					self:add_texture_mod("^[brighten")
 				end
 				self.blinkstatus = not self.blinkstatus
 			end
 			if self.timer > self.explosion_timer then
 				local pos = self.object:get_pos()
 				if mobs_griefing and not minetest.is_protected(pos, "") then
@ -1082,45 +1020,54 @@ function mob_class:do_states_attack (dtime)
 		-- move towards enemy if beyond mob reach
 		if dist > self.reach then
 			-- path finding by rnd
-			if enable_pathfinding and self.pathfinding then
+			if self.pathfinding -- only if mob has pathfinding enabled
 					and enable_pathfinding then
 				self:smart_mobs(s, p, dist, dtime)
 			end
 			if self:is_at_cliff_or_danger() then
 				self:set_velocity( 0)
 				self:set_animation( "stand")
 				local yaw = self.object:get_yaw() or 0
 				yaw = self:set_yaw( yaw + 0.78, 8)
 			else
 				if self.path.stuck then
-					self:set_velocity(self.walk_velocity)
+					self:set_velocity( self.walk_velocity)
 				else
-					self:set_velocity(self.run_velocity)
+					self:set_velocity( self.run_velocity)
 				end
 				if self.animation and self.animation.run_start then
-					self:set_animation("run")
+					self:set_animation( "run")
 				else
-					self:set_animation("walk")
+					self:set_animation( "walk")
 				end
 			end
 		else -- rnd: if inside reach range
 			self.path.stuck = false
 			self.path.stuck_timer = 0
 			self.path.following = false -- not stuck anymore
 			self:set_velocity( 0)
-			local attack_frequency = self.attack_frequency or 1
+			if not self.custom_attack then
 				if self.timer > 1 then
 			if self.timer > attack_frequency then
 					self.timer = 0
-				if not self.custom_attack then
+					if self.double_melee_attack
-					if self.double_melee_attack and math.random(1, 2) == 1 then
+							and math.random(1, 2) == 1 then
-						self:set_animation("punch2")
+						self:set_animation( "punch2")
 					else
-						self:set_animation("punch")
+						self:set_animation( "punch")
 					end
 					local p2 = p
@ -1130,6 +1077,8 @@ function mob_class:do_states_attack (dtime)
 					s2.y = s2.y + .5
 					if self:line_of_sight( p2, s2) == true then
 						-- play attack sound
 						self:mob_sound("attack")
 						-- punch player (or what player is attached to)
@ -1141,13 +1090,14 @@ 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
+			else	-- call custom attack every second
 				if self.custom_attack
 						and self.timer > 1 then
 					self.timer = 0
 					self.custom_attack(self, p)
 				end
 			end
@ -1173,7 +1123,7 @@ function mob_class:do_states_attack (dtime)
 		yaw = self:set_yaw( yaw, 0, dtime)
-		local stay_away_from_player = vector.zero()
+		local stay_away_from_player = vector.new(0,0,0)
 		--strafe back and fourth
@ -1190,13 +1140,7 @@ function mob_class:do_states_attack (dtime)
 			if math.random(40) == 1 then
 				self.strafe_direction = self.strafe_direction*-1
 			end
-
+			self.acc = vector.add(vector.multiply(vector.rotate_around_axis(vector.direction(s, p), vector.new(0,1,0), self.strafe_direction), 0.3*self.walk_velocity), stay_away_from_player)
 			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
@ -1236,9 +1180,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
@ -1255,13 +1196,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,16 +1,22 @@
 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
 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)
@ -130,19 +136,6 @@ function mob_class:mob_sound(soundname, is_opinion, fixed_pitch)
 	end
 end
 function mob_class:step_opinion_sound(dtime)
 	if self.state ~= "attack" and self.state ~= PATHFINDING then
 		if self.opinion_sound_cooloff > 0 then
 			self.opinion_sound_cooloff = self.opinion_sound_cooloff - dtime
 		end
 		-- mob plays random sound at times. Should be 120. Zombie and mob farms are ridiculous
 		if math.random(1, 70) == 1 then
 			self:mob_sound("random", true)
 		end
 	end
 end
 function mob_class:add_texture_mod(mod)
 	local full_mod = ""
 	local already_added = false
@ -248,20 +241,16 @@ function mob_class:set_animation(anim, fixed_frame)
 	if not self.animation or not anim then
 		return
 	end
 	if self.jockey and self.object:get_attach() then
 		anim = "jockey"
 	elseif not self.object:get_attach() then
 		self.jockey = nil
 	end
 	if self.state == "die" and anim ~= "die" and anim ~= "stand" then
 		return
 	end
 	if self.jockey then
 		anim = "jockey"
 	end
-	if self.fly and self:flight_check() and anim == "walk" then anim = "fly" end
+	if self:flight_check() and self.fly and anim == "walk" then anim = "fly" end
 	self._current_animation = self._current_animation or ""
@ -300,7 +289,7 @@ local function dir_to_pitch(dir)
 	return -math.atan2(-dir.y, xz)
 end
-local function who_are_you_looking_at (self, dtime)
+local function who_are_you_looking_at (self)
 	local pos = self.object:get_pos()
 	local stop_look_at_player_chance = math.random(833/self.curiosity)
@ -308,26 +297,20 @@ local function who_are_you_looking_at (self, dtime)
 	local stop_look_at_player = stop_look_at_player_chance == 1
-	if self.attack then
+	if self.attack or self.following then
-		if not self.target_time_lost then
+		self._locked_object = self.attack or self.following
 			self._locked_object = self.attack
 		else
 			self._locked_object = nil
 		end
 	elseif self.following then
 		self._locked_object = self.following
 	elseif self._locked_object then
 		if stop_look_at_player then
 			--minetest.log("Stop look: ".. self.name)
 			self._locked_object = nil
 		end
 	elseif not self._locked_object then
-		if mcl_util.check_dtime_timer(self, dtime, "step_look_for_someone", 0.2) then
+		if math.random(1, 30) then
 			--minetest.log("Change look check: ".. self.name)
 			-- For the wither this was 20/60=0.33, so probably need to rebalance and divide rates.
 			-- but frequency of check isn't good as it is costly. Making others too infrequent requires testing
-			local chance = 150/self.curiosity
+			local chance = 20/self.curiosity
 			if chance < 1 then chance = 1 end
 			local look_at_player_chance = math.random(chance)
@ -358,10 +341,9 @@ end
 function mob_class:check_head_swivel(dtime)
 	if not self.head_swivel or type(self.head_swivel) ~= "string" then return end
 	who_are_you_looking_at (self)
-	who_are_you_looking_at (self, dtime)
+	local final_rotation = vector.new(0,0,0)
 	local final_rotation = vector.zero()
 	local oldp,oldr = self.object:get_bone_position(self.head_swivel)
 	if self._locked_object and (self._locked_object:is_player() or self._locked_object:get_luaentity()) and self._locked_object:get_hp() > 0 then
@ -373,14 +355,12 @@ function mob_class:check_head_swivel(dtime)
 			_locked_object_eye_height = self._locked_object:get_properties().eye_height
 		end
 		if _locked_object_eye_height then
 			local self_rot = self.object:get_rotation()
-			-- If a mob is attached, should we really be messing with what they are looking at?
+			if self.object:get_attach() then
 			-- Should this be excluded?
 			if self.object:get_attach() and self.object:get_attach():get_rotation() then
 				self_rot = self.object:get_attach():get_rotation()
 			end
 			if self.rot then
 				local player_pos = self._locked_object:get_pos()
 				local direction_player = vector.direction(vector.add(self.object:get_pos(), vector.new(0, self.head_eye_height*.7, 0)), vector.add(player_pos, vector.new(0, _locked_object_eye_height, 0)))
 				local mob_yaw = math.deg(-(-(self_rot.y)-(-minetest.dir_to_yaw(direction_player))))+self.head_yaw_offset
@ -404,13 +384,14 @@ function mob_class:check_head_swivel(dtime)
 					end
 				end
 			end
 		end
 	elseif not self._locked_object and math.abs(oldr.y) > 3 and math.abs(oldr.x) < 3 then
 		final_rotation = vector.multiply(oldr, 0.9)
 	else
 		--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,14 +147,13 @@ 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,
 		description = def.description,
 		type = def.type,
 		attack_type = def.attack_type,
 		attack_frequency = def.attack_frequency,
 		fly = def.fly or false,
 		fly_in = def.fly_in or {"air", "__airlike"},
 		owner = def.owner or "",
@ -171,7 +170,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,
@ -218,7 +216,6 @@ function mcl_mobs.register_mob(name, def)
 		replace_with = def.replace_with,
 		replace_offset = def.replace_offset or 0,
 		on_replace = def.on_replace,
 		replace_delay = def.replace_delay or 0,
 		timer = 0,
 		env_damage_timer = 0,
 		tamed = false,
@ -288,7 +285,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 +295,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,40 +309,18 @@ 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,
+		on_lightning_strike = def.on_lightning_strike
 		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,
 	}
 	minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
 	if minetest.get_modpath("doc_identifier") ~= nil then
 		doc.sub.identifier.register_object(name, "basics", "mobs")
 		if def.unused ~= true then
 			doc.add_entry("mobs", name, {
 				name = def.description or name,
 				data = final_def,
 			})
 		end
 	end
 	minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
 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)
@ -364,18 +337,15 @@ 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 7,
 		owner_id = def.owner_id,
 		rotate = def.rotate,
-		on_punch = def.on_punch or function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
+		on_punch = function(self)
-			local vel = self.object:get_velocity():length()
+			local vel = self.object:get_velocity()
-			self.object:set_velocity({x=dir.x * vel, y=dir.y * vel, z=dir.z * vel})
+			self.object:set_velocity({x=vel.x * -1, y=vel.y * -1, z=vel.z * -1})
 			self._puncher = puncher
 		end,
 		collisionbox = def.collisionbox or {0, 0, 0, 0, 0, 0},
 		automatic_face_movement_dir = def.rotate
@ -385,12 +355,12 @@ function mcl_mobs.register_arrow(name, def)
 		on_step = def.on_step or function(self, dtime)
-			self.timer = self.timer + dtime
+			self.timer = self.timer + 1
 			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();
@ -438,37 +408,26 @@ 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 _,object in pairs(minetest.get_objects_inside_radius(pos, 1.5)) do
+				for _,player in pairs(minetest.get_objects_inside_radius(pos, 1.5)) do
 					if self.hit_player
-					and object:is_player() then
+					and player:is_player() then
-						self.hit_player(self, object)
+						self.hit_player(self, player)
 						self.object:remove();
 						return
 					end
-					local entity = object:get_luaentity()
+					local entity = player:get_luaentity()
 					if entity
 					and self.hit_mob
 					and entity.is_mob == true
-					and (tostring(object) ~= self.owner_id or self.timer > 2)
+					and tostring(player) ~= self.owner_id
 					and entity.name ~= self.object:get_luaentity().name then
-						self.hit_mob(self, object)
+						self.hit_mob(self, player)
 						self.object:remove();
 						return
 					end
@ -476,9 +435,9 @@ function mcl_mobs.register_arrow(name, def)
 					if entity
 					and self.hit_object
 					and (not entity.is_mob)
-					and (tostring(object) ~= self.owner_id or self.timer > 2)
+					and tostring(player) ~= self.owner_id
 					and entity.name ~= self.object:get_luaentity().name then
-						self.hit_object(self, object)
+						self.hit_object(self, player)
 						self.object:remove();
 						return
 					end
@ -538,11 +497,14 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
 				return def.on_rightclick(pointed_thing.under, under, placer, itemstack)
 			end
-			if pos and within_limits(pos, 0)  and not minetest.is_protected(pos, placer:get_player_name()) then
+			if pos
 			and within_limits(pos, 0)
 			and not minetest.is_protected(pos, placer:get_player_name()) then
 				local name = placer:get_player_name()
 				local privs = minetest.get_player_privs(name)
-
+				local dim = mcl_worlds.pos_to_dimension(placer:get_pos())
-
+				local mob_light_lvl = {mcl_mobs:mob_light_lvl(itemstack:get_name(),dim)}
 				if under.name == "mcl_mobspawners:spawner" then
 					if minetest.is_protected(pointed_thing.under, name) then
 						minetest.record_protection_violation(pointed_thing.under, name)
@ -552,13 +514,6 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
 						minetest.chat_send_player(name, S("You need the “maphack” privilege to change the mob spawner."))
 						return itemstack
 					end
 					local dim = mcl_worlds.pos_to_dimension(placer:get_pos())
 					local mob_light_lvl = {mcl_mobs:mob_light_lvl(itemstack:get_name(),dim)}
 					--minetest.log("min light: " .. mob_light_lvl[1])
 					--minetest.log("max light: " .. mob_light_lvl[2])
 					mcl_mobspawners.setup_spawner(pointed_thing.under, itemstack:get_name(), mob_light_lvl[1], mob_light_lvl[2])
 					if not minetest.is_creative_enabled(name) then
 						itemstack:take_item()
@ -597,7 +552,7 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
 						nametag = string.sub(nametag, 1, MAX_MOB_NAME_LENGTH)
 					end
 					ent.nametag = nametag
-					ent:update_tag()
+					update_tag(ent)
 				end
 				-- if not in creative then take item
--- a/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.dk.tr
+++ b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.dk.tr
@ -1,11 +0,0 @@
 # textdomain: mcl_mobs
 Peaceful mode active! No monsters will spawn.=Fredelig tilstand aktiveret! Ingen monstre vil spawne.
 This allows you to place a single mob.=Dette gør dig i stand til at placere et enkelt monster.
 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.=Placér det blot der hvor du ønsker, at monsteret skal komme. Dyr vil spawne tamme, medmindre du holder snige-knappen nede mens du placerer dem. Hvis du placerer denne på et monsterspawn, ændrer du hvilket monster det spawner.
 You need the “maphack” privilege to change the mob spawner.=Du skal have "maphack" privilegier for at ændre monsterspawneren.
 Name Tag=Navneskilt
 A name tag is an item to name a mob.=Et navneskilt bruges til at navngive et monster.
 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.=Før du bruger navneskiltet, skal du vælge navnet ved en ambolt. Derefter kan du bruge navneskiltet til at navngive et monster. Dette opbruger navneskiltet.
 Only peaceful mobs allowed!=Kun fredelige monstre er tilladt!
 Give names to mobs=Giv navne til monstre
 Set name at anvil=Vælg navn ved en ambolt.
--- a/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.fr.tr
+++ b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.fr.tr
@ -9,5 +9,3 @@ Before you use the name tag, you need to set a name at an anvil. Then you can us
 Only peaceful mobs allowed!=Seuls les mobs pacifiques sont autorisées!
 Give names to mobs=Donne des noms aux mobs
 Set name at anvil=Définir le nom sur l'enclume
 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.=Enlève les mobs spécifiés sauf ceux qui sont nommés et apprivoisés. Pour le deuxième paramètre, utiliser nametagged/tamed pour ne sélectionner que les mobs nommés/apprivoisés, ou une distance pour spécifier la distance maximale par rapport au joueur.
 Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=Usage par défaut. Enlève les mobs hostiles. Pour plus d'options saisir : /help clearmobs
--- a/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.oc.tr
+++ b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.oc.tr
@ -1,13 +0,0 @@
 # textdomain: mcl_mobs
 Peaceful mode active! No monsters will spawn.=Mòde tranquile actiu! Gis de mostre vai aparèisser.
 This allows you to place a single mob.=Quo permet de plaça una creatura.
 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.=Plaçatz z-o a l'endreit que volètz veire la creatura aparèisser. Las bèstias seron dejà domesticadas, defòra si laissatz la tocha se baissar enfonçada. Si z-o plaçatz sobre un generator de creaturas, chamjatz la creatura generada.
 You need the “maphack” privilege to change the mob spawner.=Avètz besonh dau privilègi "maphack" per chamjar le generator de creaturas.
 Name Tag=Étiquette de nom
 A name tag is an item to name a mob.=Una etiqueta z-es un otilh per chamjar le nom de la creatura.
 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.=Davant d'utilizar l'etiqueta, vos fau li botar un nom embei una enclutge. Après, podètz utilizar l'etiqueta per nomar una creatura. L'etiqueta pòt èsser utilizada un còp.
 Only peaceful mobs allowed!=Mas las creaturas pacificas son autorizadas!
 Give names to mobs=Balha daus noms a las creaturas
 Set name at anvil=Botar le nom embei l'enclutge
 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.=Lèva las creaturas specifiadas defòra de las que son nomadas o domesticadas. Per le paramètre segònd, utilizar nomat/domesticat per mas seleccionar las creaturas nomadas/domesticadas, o una distança per specifiar la distança maximum embei li joairi.
 Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=Usage par défaut. Lèva las creaturas ostilas. Per mai d'opcions, escriure : /help clearmobs
--- 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/locale/mcl_mobs.ru.tr
+++ b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.ru.tr
@ -1,13 +1,11 @@
 # textdomain: mcl_mobs
-Peaceful mode active! No monsters will spawn.=Мирный режим включён! Монстры не будут спауниться.
+Peaceful mode active! No monsters will spawn.=Мирный режим включён! Монстры не будут появляться.
-This allows you to place a single mob.=Позволяет вам заспаунить одного моба.
+This allows you to place a single 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.=Используйте предмет там, где вы хотите, чтобы заспаунился моб. Животные будут спауниться уже прирученные, если только вы не удерживаете клавишу [Красться] при размещении. Если использовать на спаунере мобов, изменится создаваемый им моб.
+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.=Просто поместите это туда, где хотите, чтобы появился моб. Животные будут появляться уже прирученные, если это не нужно, удерживайте клавишу [Красться] при размещении. Если поместить это на спаунер, появляющийся из него моб будет изменён.
-You need the “maphack” privilege to change the mob spawner.=Вам нужна привилегия “maphack”, чтобы изменить спаунер мобов.
+You need the “maphack” privilege to change the mob spawner.=Вам нужно обладать привилегией “maphack”, чтобы изменить спаунер моба.
-Name Tag=Бирка
+Name Tag=Именная бирка
-A name tag is an item to name a mob.=Бирка это предмет, дающий мобу имя.
+A name tag is an item to name a 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.=Прежде чем использовать бирку, нужно задать ей имя на наковальне. Тогда вы сможете использовать бирку, чтобы дать имя мобу.
+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.=Прежде чем использовать именную бирку, нужно задать имя на наковальне. Тогда вы сможете использовать бирку, чтобы дать имя мобу.
 Only peaceful mobs allowed!=Разрешены только мирные мобы!
 Give names to mobs=Даёт имена мобам
-Set name at anvil=Задайте имя на наковальне
+Set name at anvil=Задайте имя при помощи наковальни
 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.=Удаляет указанных мобов кроме именованных и прирученных. Для второго параметра используйте nametagged/tamed, чтобы выбрать именованных/прирученных мобов или радиус указывающий максимальную дистанцию от игрока.
 Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=Параметры по умолчанию. Удаляем враждебных мобов. Для дополнительных опций введите: /help clearmobs
--- a/mods/ENTITIES/mcl_mobs/locale/template.txt
+++ b/mods/ENTITIES/mcl_mobs/locale/template.txt
@ -9,5 +9,3 @@ Before you use the name tag, you need to set a name at an anvil. Then you can us
 Only peaceful mobs allowed!=
 Give names to mobs=
 Set name at anvil=
 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.=
 Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=
--- a/mods/ENTITIES/mcl_mobs/mod.conf
+++ b/mods/ENTITIES/mcl_mobs/mod.conf
@ -2,4 +2,4 @@ name = mcl_mobs
 author = PilzAdam
 description = Adds a mob API for mods to add animals or monsters, etc.
 depends = mcl_particles
-optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience, mcl_sculk
+optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience
--- a/mods/ENTITIES/mcl_mobs/movement.lua
+++ b/mods/ENTITIES/mcl_mobs/movement.lua
@ -3,13 +3,13 @@ local mob_class = mcl_mobs.mob_class
 local DEFAULT_FALL_SPEED = -9.81*1.5
 local FLOP_HEIGHT = 6
 local FLOP_HOR_SPEED = 1.5
 local CHECK_HERD_FREQUENCY = 4
 local PATHFINDING = "gowp"
 local node_ice = "mcl_core:ice"
 local node_snowblock = "mcl_core:snowblock"
 local node_snow = "mcl_core:snow"
 local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
 local atann = math.atan
@ -21,19 +21,14 @@ local function atan(x)
 	end
 end
 local registered_fallback_node = minetest.registered_nodes[mcl_mobs.fallback_node]
 -- get node but use fallback for nil or unknown
 local node_ok = function(pos, fallback)
 	fallback = fallback or mcl_mobs.fallback_node
 	local node = minetest.get_node_or_nil(pos)
 	if node and minetest.registered_nodes[node.name] then
 		return node
 	end
 	if fallback then
 	return minetest.registered_nodes[fallback]
 	else
 		return registered_fallback_node
 	end
 end
 -- Returns true is node can deal damage to self
@ -76,67 +71,6 @@ function mob_class:is_node_waterhazard(nodename)
 	return false
 end
 local function raycast_line_of_sight (origin, target)
 	local raycast = minetest.raycast(origin, target, false, true)
 	local los_blocked = false
 	for hitpoint in raycast do
 		if hitpoint.type == "node" then
 			--TODO type object could block vision, for example chests
 			local node = minetest.get_node(minetest.get_pointed_thing_position(hitpoint))
 			if node.name ~= "air" then
 				local nodef = minetest.registered_nodes[node.name]
 				if nodef and nodef.walkable then
 					los_blocked = true
 					break
 				end
 			end
 		end
 	end
 	return not los_blocked
 end
 function mob_class:target_visible(origin)
 	if not origin then return end
 	if not self.attack then return end
 	local target_pos = self.attack:get_pos()
 	if not target_pos then return end
 	local origin_eye_pos = vector.offset(origin, 0, self.head_eye_height, 0)
 	--minetest.log("origin: " .. dump(origin))
 	--minetest.log("origin_eye_pos: " .. dump(origin_eye_pos))
 	local targ_head_height, targ_feet_height
 	if self.attack:is_player() then
 		local cbox = self.object:get_properties().collisionbox
 		targ_head_height = vector.offset(target_pos, 0, cbox[5], 0)
 		targ_feet_height = target_pos -- Cbox would put feet under ground which interferes with ray
 	else
 		targ_head_height = vector.offset(target_pos, 0, self.collisionbox[5], 0)
 		targ_feet_height = vector.offset(target_pos, 0, self.collisionbox[2], 0)
 	end
 	--minetest.log("start targ_head_height: " .. dump(targ_head_height))
 	if raycast_line_of_sight (origin_eye_pos, targ_head_height) then
 		return true
 	end
 	--minetest.log("Start targ_feet_height: " .. dump(targ_feet_height))
 	if raycast_line_of_sight (origin_eye_pos, targ_feet_height) then
 		return true
 	end
 	-- TODO mid way between feet and head
 	return false
 end
 -- check line of sight (BrunoMine)
 function mob_class:line_of_sight(pos1, pos2, stepsize)
@ -267,21 +201,19 @@ end
 -- is mob facing a cliff or danger
 function mob_class:is_at_cliff_or_danger()
-	if self.fear_height == 0 or self._jumping_cliff or self._can_jump_cliff or not self.object:get_luaentity() then -- 0 for no falling protection!
+	if self.fear_height == 0 or self:can_jump_cliff() or self._jumping_cliff or not self.object:get_luaentity() then -- 0 for no falling protection!
 		return false
 	end
 	local yaw = self.object:get_yaw()
 	local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)
 	local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)
 	local pos = self.object:get_pos()
 	local ypos = pos.y + self.collisionbox[2] -- just above floor
 	local free_fall, blocker = minetest.line_of_sight(
-			vector.new(pos.x + dir_x, ypos, pos.z + dir_z),
+		{x = pos.x + dir_x, y = ypos, z = pos.z + dir_z},
-			vector.new(pos.x + dir_x, ypos - self.fear_height, pos.z + dir_z))
+		{x = pos.x + dir_x, y = ypos - self.fear_height, z = pos.z + dir_z})
 	if free_fall then
 		return true
 	else
@ -303,15 +235,7 @@ end
 -- copy the 'mob facing cliff_or_danger check' from above, and rework to avoid water
 function mob_class:is_at_water_danger()
-	if self.water_damage == 0 and self.breath_max == -1 then
+	if not self.object:get_luaentity() or self:can_jump_cliff() or self._jumping_cliff then
 		--minetest.log("Do not need a water check for: " .. self.name)
 		return
 	end
 	local in_water_danger = self:is_node_waterhazard(self.standing_in) or self:is_node_waterhazard(self.standing_on)
 	if in_water_danger then return false end -- If you're in trouble, do not stop
 	if not self.object:get_luaentity() or self._jumping_cliff or self._can_jump_cliff then
 		return false
 	end
 	local yaw = self.object:get_yaw()
@ -326,57 +250,54 @@ function mob_class:is_at_water_danger()
 	local ypos = pos.y + self.collisionbox[2] -- just above floor
-	local los, blocker = minetest.line_of_sight(
+	local free_fall, blocker = minetest.line_of_sight(
-		vector.new(pos.x + dir_x, ypos, pos.z + dir_z),
+		{x = pos.x + dir_x, y = ypos, z = pos.z + dir_z},
-		vector.new(pos.x + dir_x, ypos - 3, pos.z + dir_z))
+		{x = pos.x + dir_x, y = ypos - 3, z = pos.z + dir_z})
-
+	if free_fall then
-	if not los then
+		return true
 	else
 		local bnode = minetest.get_node(blocker)
 		local waterdanger = self:is_node_waterhazard(bnode.name)
-
+		if
-		if waterdanger and not in_water_danger then
+			waterdanger and (self:is_node_waterhazard(self.standing_in) or self:is_node_waterhazard( self.standing_on)) then
 			return false
 		elseif waterdanger and (self:is_node_waterhazard(self.standing_in) or self:is_node_waterhazard(self.standing_on)) == false then
 			return true
 		else
 			local def = minetest.registered_nodes[bnode.name]
 			if def and def.walkable then
 				return false
 			end
 		end
 	end
 	return false
 end
-function mob_class:env_danger_movement_checks(player_in_active_range)
+function mob_class:env_danger_movement_checks(dtime)
 	local yaw = 0
-
+	if self:is_at_water_danger() and self.state ~= "attack" then
-	if not player_in_active_range then return end
+		if math.random(1, 10) <= 6 then
 	if self.state == PATHFINDING
 			or self.state == "attack"
 			or self.state == "stand"
 			or self.state == "runaway" then
 		return
 	end
 	if self:is_at_water_danger() then
 		--minetest.log("At water danger for mob, stop?: " .. self.name)
 		if math.random(1, 10) <= 7 then
 			if self.state ~= "stand" then
 			self:set_velocity(0)
 			self.state = "stand"
 			self:set_animation( "stand")
 			end
 			yaw = yaw + math.random(-0.5, 0.5)
 			yaw = self:set_yaw( yaw, 8)
-			return
+		end
 	else
 		-- This code should probably be moved to movement code
 		if self.move_in_group ~= false then
 			self:check_herd(dtime)
 		end
 	end
-	--[[if self:is_at_cliff_or_danger(can_jump_cliff) then
+	if self:is_at_cliff_or_danger() then
 		if self.state ~= "stand" then
 		self:set_velocity(0)
 		self.state = "stand"
 		self:set_animation( "stand")
 		end
 		local yaw = self.object:get_yaw() or 0
 		yaw = self:set_yaw( yaw + 0.78, 8)
-	end--]]
+	end
 end
 -- jump if facing a solid node (not fences or gates)
@ -416,11 +337,9 @@ function mob_class:do_jump()
 		jump_c_multiplier = v2/self.walk_velocity/2
 	end
 	local yaw_dir = minetest.yaw_to_dir(self.object:get_yaw())
 	-- where is front
-	local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+yaw_dir.x
+	local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+0.6
-	local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+yaw_dir.z
+	local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+0.6
 	-- what is in front of mob?
 	nod = node_ok({
@ -449,7 +368,7 @@ function mob_class:do_jump()
 	end
 	local ndef = minetest.registered_nodes[nod.name]
-	if self.walk_chance == 0 or ndef and ndef.walkable or self._can_jump_cliff then
+	if self.walk_chance == 0 or ndef and ndef.walkable or self:can_jump_cliff() then
 		if minetest.get_item_group(nod.name, "fence") == 0
 		and minetest.get_item_group(nod.name, "fence_gate") == 0
@ -459,7 +378,7 @@ function mob_class:do_jump()
 			v.y = self.jump_height + 0.1 * 3
-			if self._can_jump_cliff then
+			if self:can_jump_cliff() then
 				v=vector.multiply(v, vector.new(2.8,1,2.8))
 			end
@ -543,7 +462,6 @@ end
 -- find and replace what mob is looking for (grass, wheat etc.)
 function mob_class:replace_node(pos)
 	if not self.replace_rate
 	or not self.replace_what
 	or self.child == true
@ -574,21 +492,18 @@ function mob_class:replace_node(pos)
 		local oldnode = {name = what, param2 = node.param2}
 		local newnode = {name = with, param2 = node.param2}
-		local on_replace_return = false
+		local on_replace_return
 		if self.on_replace then
 			on_replace_return = self.on_replace(self, pos, oldnode, newnode)
 		end
 		if on_replace_return ~= false then
 			if mobs_griefing then
 				minetest.after(self.replace_delay, function()
 					if self and self.object and self.object:get_velocity() and self.health > 0 then
 				minetest.set_node(pos, newnode)
 			end
-				end)
+
 			end
 		end
 	end
 end
@ -698,52 +613,76 @@ function mob_class:check_runaway_from()
 end
-- follow player if owner or holding item
+-- follow player if owner or holding item, if fish outta water then flop
-function mob_class:check_follow()
+function mob_class:follow_flop()
 	-- find player to follow
-	if (self.follow ~= "" or self.order == "follow") and not self.following
+	if (self.follow ~= ""
 	or self.order == "follow")
 	and not self.following
 	and self.state ~= "attack"
 	and self.order ~= "sit"
 	and self.state ~= "runaway" then
 		local s = self.object:get_pos()
 		local players = minetest.get_connected_players()
 		for n = 1, #players do
-			if (self:object_in_range(players[n])) and not mcl_mobs.invis[ players[n]:get_player_name() ] then
+
 			if (self:object_in_range(players[n]))
 			and not mcl_mobs.invis[ players[n]:get_player_name() ] then
 				self.following = players[n]
 				break
 			end
 		end
 	end
-	if self.type == "npc" and self.order == "follow"
+	if self.type == "npc"
-			and self.state ~= "attack" and self.order ~= "sit" and self.owner ~= "" then
+	and self.order == "follow"
 	and self.state ~= "attack"
 	and self.order ~= "sit"
 	and self.owner ~= "" then
-		if self.following and self.owner and self.owner ~= self.following:get_player_name() then
+		-- npc stop following player if not owner
 		if self.following
 		and self.owner
 		and self.owner ~= self.following:get_player_name() then
 			self.following = nil
 		end
 	else
 		-- stop following player if not holding specific item,
 		-- mob is horny, fleeing or attacking
-		if self.following and self.following:is_player()
+		if self.following
-				and (self:follow_holding(self.following) == false or self.horny or self.state == "runaway") then
+		and self.following:is_player()
 		and (self:follow_holding(self.following) == false or
 		self.horny or self.state == "runaway") then
 			self.following = nil
 		end
 	end
 	-- follow that thing
 	if self.following then
 		local s = self.object:get_pos()
 		local s = self.object:get_pos()
 		local p
 		if self.following:is_player() then
 			p = self.following:get_pos()
 		elseif self.following.object then
 			p = self.following.object:get_pos()
 		end
 		if p then
 			local dist = vector.distance(p, s)
 			-- dont follow if out of range
 			if (not self:object_in_range(self.following)) then
 				self.following = nil
 			else
@ -753,12 +692,17 @@ function mob_class:check_follow()
 				}
 				local yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate
 				if p.x > s.x then yaw = yaw +math.pi end
 				self:set_yaw( yaw, 2.35)
 				-- anyone but standing npc's can move along
-				if dist > 3 and self.order ~= "stand" then
+				if dist > 3
 				and self.order ~= "stand" then
 					self:set_velocity(self.follow_velocity)
 					if self.walk_chance ~= 0 then
 						self:set_animation( "run")
 					end
@ -766,18 +710,17 @@ function mob_class:check_follow()
 					self:set_velocity(0)
 					self:set_animation( "stand")
 				end
 				return
 			end
 		end
 	end
 end
 function mob_class:flop()
 	-- swimmers flop when out of their element, and swim again when back in
 	if self.fly then
 		local s = self.object:get_pos()
 		if self:flight_check( s) == false then
 		if self:flight_check(s) == false then
 			self.state = "flop"
 			self.object:set_acceleration({x = 0, y = DEFAULT_FALL_SPEED, z = 0})
@ -796,10 +739,11 @@ function mob_class:flop()
 			end
 			self:set_animation( "stand", true)
 			return
 		elseif self.state == "flop" then
 			self.state = "stand"
-			self.object:set_acceleration(vector.zero())
+			self.object:set_acceleration({x = 0, y = 0, z = 0})
 			self:set_velocity(0)
 		end
 	end
@ -826,12 +770,9 @@ end
 local check_herd_timer = 0
 function mob_class:check_herd(dtime)
 	local pos = self.object:get_pos()
-	if not pos or self.state == "attack" then return end
+	if not pos then return end
 	-- Does any mob not move in group. Weird check for something not set?
 	if self.move_in_group == false then return end
 	check_herd_timer = check_herd_timer + dtime
-	if check_herd_timer < CHECK_HERD_FREQUENCY then return end
+	if check_herd_timer < 4 then return end
 	check_herd_timer = 0
 	for _,o in pairs(minetest.get_objects_inside_radius(pos,self.view_range)) do
 		local l = o:get_luaentity()
@ -962,7 +903,7 @@ function mob_class:do_states_walk()
 	end
 end
-function mob_class:do_states_stand(player_in_active_range)
+function mob_class:do_states_stand()
 	local yaw = self.object:get_yaw() or 0
 	if math.random(1, 4) == 1 then
@ -1006,7 +947,6 @@ function mob_class:do_states_stand(player_in_active_range)
 	if self.order == "stand" or self.order == "sleep" or self.order == "work" then
 	else
 		if player_in_active_range then
 		if self.walk_chance ~= 0
 				and self.facing_fence ~= true
 				and math.random(1, 100) <= self.walk_chance
@ -1017,7 +957,6 @@ function mob_class:do_states_stand(player_in_active_range)
 			self:set_animation( "walk")
 		end
 	end
 	end
 end
 function mob_class:do_states_runaway()
--- 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
@ -185,7 +184,7 @@ function mob_class:collision()
 end
 function mob_class:check_death_and_slow_mob()
-	local d = 0.7
+	local d = 0.85
 	local dying = self:check_dying()
 	if dying then d = 0.92 end
@ -199,8 +198,6 @@ end
 -- move mob in facing direction
 function mob_class:set_velocity(v)
 	if not v then return end
 	local c_x, c_y = 0, 0
 	-- can mob be pushed, if so calculate direction
@ -210,15 +207,18 @@ function mob_class:set_velocity(v)
 	-- halt mob if it has been ordered to stay
 	if self.order == "stand" or self.order == "sit" then
-		self.acc = vector.zero()
+	  self.acc=vector.new(0,0,0)
 	  return
 	end
 	local yaw = (self.object:get_yaw() or 0) + self.rotate
 	local vv = self.object:get_velocity()
-
+	if vv then
-	if vv and yaw then
+		self.acc={
-		self.acc = vector.new(((math.sin(yaw) * -v) + c_x) * .4, 0, ((math.cos(yaw) * v) + c_y) * .4)
+		  x = ((math.sin(yaw) * -v) + c_x)*.27,
 		  y = 0,
 		  z = ((math.cos(yaw) * v) + c_y)*.27,
 		}
 	end
 end
@ -328,9 +328,9 @@ function mob_class:set_yaw(yaw, delay, dtime)
 	end
 	if math.deg(yaw) > 360 then
-		yaw=math.rad(math.deg(yaw)%360)
+		yaw=yaw%360
 	elseif math.deg(yaw) < 0 then
-		yaw=math.rad(((360*5)-math.deg(yaw))%360)
+		yaw=((360*5)-yaw)%360
 	end
 	--calculate the shortest way to turn to find our target
@ -354,9 +354,9 @@ function mob_class:set_yaw(yaw, delay, dtime)
 		ddtime = dtime
 	end
-	if math.abs(target_shortest_path_nums) > 10 then
+	if math.abs(target_shortest_path_nums) > 5 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
@ -488,23 +488,11 @@ function mob_class:check_for_death(cause, cmi_cause)
 			self:item_drop(cooked, looting)
 			if ((not self.child) or self.type ~= "animal") and (minetest.get_us_time() - self.xp_timestamp <= math.huge) then
-				local pos = self.object:get_pos()
+				mcl_experience.throw_xp(self.object:get_pos(), math.random(self.xp_min, self.xp_max))
 				local xp_amount = math.random(self.xp_min, self.xp_max)
 				if not mcl_sculk.handle_death(pos, xp_amount) then
 					--minetest.log("Xp not thrown")
 					if minetest.is_creative_enabled("") ~= true then
 						mcl_experience.throw_xp(pos, xp_amount)
 					end
 				else
 					--minetest.log("xp thrown")
 			end
 		end
 	end
 	end
 	-- execute custom death function
 	if self.on_die then
@ -522,12 +510,6 @@ function mob_class:check_for_death(cause, cmi_cause)
 		end
 	end
 	if self.jockey or self.riden_by_jock then
 		self.riden_by_jock = nil
 		self.jockey = nil
 	end
 	local collisionbox
 	if self.collisionbox then
 		collisionbox = table.copy(self.collisionbox)
@ -634,17 +616,9 @@ function mob_class:do_env_damage()
 		return true
 	end
-	local node = minetest.get_node(pos)
+	local sunlight = minetest.get_natural_light(pos, self.time_of_day)
 	if node then
 		if node.name ~= "ignore" then
 			-- put below code in this block if we can prove that unloaded maps are causing crash.
 			-- it should warn then error
 		else
 			--minetest.log("warning", "Pos is ignored: " .. dump(pos))
 		end
 		local sunlight = mcl_util.get_natural_light(pos, self.time_of_day)
 	-- bright light harms mob
 	if self.light_damage ~= 0 and (sunlight or 0) > 12 then
 		if self:deal_light_damage(pos, self.light_damage) then
 			return true
@ -662,8 +636,6 @@ function mob_class:do_env_damage()
 		end
 	end
 	end
 	local y_level = self.collisionbox[2]
 	if self.child then
@ -676,20 +648,13 @@ function mob_class:do_env_damage()
 	self.standing_in = node_ok(pos, "air").name
 	self.standing_on = node_ok(pos2, "air").name
 	local pos3 = vector.offset(pos, 0, 1, 0)
 	self.standing_under = node_ok(pos3, "air").name
 	-- 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]
 	local nodef2 = minetest.registered_nodes[self.standing_on]
 	local nodef3 = minetest.registered_nodes[self.standing_under]
 	-- rain
 	if self.rain_damage > 0 then
@ -761,61 +726,6 @@ function mob_class:do_env_damage()
 		end
 	end
 	-- Cactus damage
 	local near = minetest.find_node_near(pos, 1, "mcl_core:cactus", true)
 	if not near and near ~= nil then
 		near = find_node_near({x=pos.x, y=pos.y-1, z=pos.z}, 1, "mcl_core:cactus", true)
 	end
 	if near then
 		-- is mob touching the cactus?
 		local dist = vector.distance(pos, near)
 		local dist_feet = vector.distance({x=pos.x, y=pos.y-1, z=pos.z}, near)
 		local large_mob = false
 		local medium_mob = false
 		if self.name == "mobs_mc:ender_dragon" or
 			self.name == "mobs_mc:ghast" or
 			self.name == "mobs_mc:guardian_elder" or
 			self.name == "mobs_mc:slime_big" or
 			self.name == "mobs_mc:magma_cube_big" or
 			self.name == "mobs_mc:wither" then
 			large_mob = true
 		elseif self.name == "mobs_mc:hoglin" or
 			self.name == "mobs_mc:zoglin" or
 			self.name == "mobs_mc:horse" or
 			self.name == "mobs_mc:skeleton_horse" or
 			self.name == "mobs_mc:zombie_horse" or
 			self.name == "mobs_mc:donkey" or
 			self.name == "mobs_mc:mule" or
 			self.name == "mobs_mc:iron_golem" or
 			self.name == "mobs_mc:polar_bear" or
 			self.name == "mobs_mc:spider" or
 			self.name == "mobs_mc:cave_spider" or
 			self.name == "mobs_mc:strider" then
 			medium_mob = true
 		end
 		if (not large_mob and not medium_mob and (dist < 1.03 or dist_feet < 1.6)) or (medium_mob and (dist < 1.165 or dist_feet < 1.73)) or (large_mob and (dist < 1.25 or dist_feet < 1.9)) then
 			if self.health ~= 0 then
 				self:damage_mob("cactus", 2)
 				if self:check_for_death("cactus", {type = "environment",
 						pos = pos, node = self.standing_in}) then
 					return true
 				end
 			end
 		end
 	end
 	-- is mob standing on the cactus?
 	if self.standing_on == "mcl_core:cactus" or self.standing_in == "mcl_core:cactus" or self.standing_under == "mcl_core:cactus" then
 		self:damage_mob("cactus", 2)
 		if self:check_for_death("cactus", {type = "environment",
 				pos = pos, node = self.standing_in}) then
 			return true
 		end
 	end
 	-- Drowning damage
 	if self.breath_max ~= -1 then
 		local drowning = false
@ -824,7 +734,7 @@ function mob_class:do_env_damage()
 			if minetest.get_item_group(self.standing_in, "water") == 0 then
 				drowning = true
 			end
-		elseif nodef.drowning > 0 and nodef3.drowning > 0 then
+		elseif nodef.drowning > 0 then
 			drowning = true
 		end
@ -883,19 +793,11 @@ function mob_class:do_env_damage()
 	return self:check_for_death("unknown", {type = "unknown"})
 end
-function mob_class:step_damage (dtime, pos)
+function mob_class:env_damage (dtime, pos)
 	if not self.fire_resistant then
 		mcl_burning.tick(self.object, dtime, self)
 		if not self.object:get_pos() then return true end -- mcl_burning.tick may remove object immediately
 		if self:check_for_death("fire", {type = "fire"}) then
 			return true
 		end
 	end
 	-- environmental damage timer (every 1 second)
 	self.env_damage_timer = self.env_damage_timer + dtime
 	if self.env_damage_timer > 1 then
 		self.env_damage_timer = 0
@ -974,36 +876,47 @@ function mob_class:falling(pos)
 	-- floating in water (or falling)
 	local v = self.object:get_velocity()
 	if v then
 		local new_acceleration
 		if v.y > 0 then
 			-- apply gravity when moving up
-			new_acceleration = vector.new(0, DEFAULT_FALL_SPEED, 0)
+			self.object:set_acceleration({
 				x = 0,
 				y = DEFAULT_FALL_SPEED,
 				z = 0
 			})
 		elseif v.y <= 0 and v.y > self.fall_speed then
 			-- fall downwards at set speed
-			new_acceleration = vector.new(0, self.fall_speed, 0)
+			self.object:set_acceleration({
 				x = 0,
 				y = self.fall_speed,
 				z = 0
 			})
 		else
 			-- stop accelerating once max fall speed hit
-			new_acceleration =vector.zero()
+			self.object:set_acceleration({x = 0, y = 0, z = 0})
 		end
 		self.object:set_acceleration(new_acceleration)
 	end
 	local acc = self.object:get_acceleration()
-	local registered_node = minetest.registered_nodes[node_ok(pos).name]
+	if minetest.registered_nodes[node_ok(pos).name].groups.lava then
 	if registered_node.groups.lava then
 		if acc and self.floats_on_lava == 1 then
-			self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
+			self.object:set_acceleration({
 				x = 0,
 				y = -self.fall_speed / (math.max(1, v.y) ^ 2),
 				z = 0
 			})
 		end
 	end
 	-- in water then float up
-	if registered_node.groups.water then
+	if minetest.registered_nodes[node_ok(pos).name].groups.water then
-		if acc and self.floats == 1 and minetest.registered_nodes[node_ok(vector.offset(pos,0,self.collisionbox[5] -0.25,0)).name].groups.water then
+		if acc and self.floats == 1 then
-			self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
+			self.object:set_acceleration({
 				x = 0,
 				y = -self.fall_speed / (math.max(1, v.y) ^ 2),
 				z = 0
 			})
 		end
 	else
 		-- fall damage onto solid ground
@ -1076,10 +989,10 @@ function mob_class:check_dying()
 	end
 end
-function mob_class:check_suspend(player_in_active_range)
+function mob_class:check_suspend()
 	local pos = self.object:get_pos()
-	if pos and not player_in_active_range then
+	if pos and not self:player_in_active_range() then
 		local node_under = node_ok(vector.offset(pos,0,-1,0)).name
 		self:set_animation( "stand", true)
@ -1087,8 +1000,11 @@ function mob_class:check_suspend(player_in_active_range)
 		local acc = self.object:get_acceleration()
 		if acc then
 			if acc.y > 0 or node_under ~= "air" then
-				self.object:set_acceleration(vector.zero())
+				self.object:set_acceleration(vector.new(0,0,0))
-				self.object:set_velocity(vector.zero())
+				self.object:set_velocity(vector.new(0,0,0))
 			end
 			if acc.y == 0 and node_under == "air" then
 				self:falling(pos)
 			end
 		end
 		return true
--- a/mods/ENTITIES/mcl_mobs/spawning.lua
+++ b/mods/ENTITIES/mcl_mobs/spawning.lua
@ -2,20 +2,14 @@
 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
 local find_nodes_in_area_under_air = minetest.find_nodes_in_area_under_air
-local mt_get_biome_name            = minetest.get_biome_name
+local get_biome_name               = minetest.get_biome_name
 local get_objects_inside_radius    = minetest.get_objects_inside_radius
 local get_connected_players        = minetest.get_connected_players
 local minetest_get_perlin          = minetest.get_perlin
 local math_random    = math.random
 local math_floor     = math.floor
@ -33,11 +27,8 @@ local table_remove   = table.remove
 local pairs = pairs
 local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_spawning", false)
-local function mcl_log (message, property)
+local function mcl_log (message)
 	if LOGGING_ON then
 		if property then
 			message = message .. ": " .. dump(property)
 		end
 		mcl_util.mcl_log (message, "[Mobs spawn]", true)
 	end
 end
@ -61,25 +52,21 @@ local MOB_CAP_INNER_RADIUS = 32
 local aoc_range = 136
 local MISSING_CAP_DEFAULT = 15
-local MOBS_CAP_CLOSE = 10
+local MOBS_CAP_CLOSE = 5
 local SPAWN_MAPGEN_LIMIT  = mcl_vars.mapgen_limit - 150
 local mob_cap = {
 	hostile = tonumber(minetest.settings:get("mcl_mob_cap_monster")) or 70,
-	passive = tonumber(minetest.settings:get("mcl_mob_cap_animal")) or 10,
+	passive = tonumber(minetest.settings:get("mcl_mob_cap_animal")) or 13,
 	ambient = tonumber(minetest.settings:get("mcl_mob_cap_ambient")) or 15,
 	water = tonumber(minetest.settings:get("mcl_mob_cap_water")) or 8,
-	water_ambient = tonumber(minetest.settings:get("mcl_mob_cap_water_ambient")) or 20,
+	water_ambient = tonumber(minetest.settings:get("mcl_mob_cap_water_ambient")) or 20, --currently unused
 	water_underground = tonumber(minetest.settings:get("mcl_mob_cap_water_underground")) or 5,
 	axolotl = tonumber(minetest.settings:get("mcl_mob_cap_axolotl")) or 2, -- TODO should be 5 when lush caves added
 	player = tonumber(minetest.settings:get("mcl_mob_cap_player")) or 75,
 	global_hostile = tonumber(minetest.settings:get("mcl_mob_cap_hostile")) or 300,
 	global_non_hostile = tonumber(minetest.settings:get("mcl_mob_cap_non_hostile")) or 300,
 	total = tonumber(minetest.settings:get("mcl_mob_cap_total")) or 500,
 }
-local peaceful_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_percentage_spawned")) or 30
+local peaceful_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_percentage_spawned")) or 35
 local peaceful_group_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_group_percentage_spawned")) or 15
 local hostile_group_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_hostile_group_percentage_spawned")) or 20
@ -96,6 +83,19 @@ local mobs_spawn = minetest.settings:get_bool("mobs_spawn", true) ~= false
 local spawn_protected = minetest.settings:get_bool("mobs_spawn_protected") ~= false
 local logging = minetest.settings:get_bool("mcl_logging_mobs_spawn",true)
 local noise_params = {
 	offset = 0,
 	scale  = 3,
 	spread = {
 		x = 301,
 		y = 50,
 		z = 304,
 	},
 	seed = 100,
 	octaves = 3,
 	persistence = 0.5,
 }
 -- THIS IS THE BIG LIST OF ALL BIOMES - used for programming/updating mobs
 -- Also used for missing parameter
 -- Please update the list when adding new biomes!
@ -340,32 +340,15 @@ local function count_mobs_all(categorise_by, pos)
 end
 local function count_mobs_total_cap(mob_type)
 	local total = 0
 	local num = 0
 	local hostile = 0
 	local non_hostile = 0
 	for _,l in pairs(minetest.luaentities) do
 		if l.is_mob then
-			total = total + 1
+			if ( mob_type == nil or l.type == mob_type ) and l.can_despawn and not l.nametag then
 			local nametagged = l.nametag and l.nametag ~= ""
 			if ( mob_type == nil or l.type == mob_type ) and not nametagged then
 				if l.spawn_class == "hostile" then
 					hostile = hostile + 1
 				else
 					non_hostile = non_hostile + 1
 				end
 				num = num + 1
 			else
 				mcl_log("l.name", l.name)
 				mcl_log("l.nametag", l.nametag)
 			end
 		end
 	end
-	mcl_log("Total mobs", total)
+	return num
 	mcl_log("hostile", hostile)
 	mcl_log("non_hostile", non_hostile)
 	return num, non_hostile, hostile
 end
 local function output_mob_stats(mob_counts, total_mobs, chat_display)
@ -432,6 +415,7 @@ WARNING: BIOME INTEGRATION NEEDED -> How to get biome through lua??
 local spawn_dictionary = {}
 --this is where all of the spawning information  is kept for mobs that don't naturally spawn
 local non_spawn_dictionary = {}
 local summary_chance = 0
 function mcl_mobs:spawn_setup(def)
 	if not mobs_spawn then return end
@ -493,59 +477,39 @@ function mcl_mobs:spawn_setup(def)
 		check_position   = check_position,
 		on_spawn         = on_spawn,
 	}
 	summary_chance = summary_chance + chance
 end
 function mcl_mobs:mob_light_lvl(mob_name, dimension)
 	local spawn_dictionary_consolidated = {}
-
+	--see if the mob exists in the nonspawn dictionary, if so then return light values
-	if non_spawn_dictionary[mob_name] then
+	if non_spawn_dictionary[mob_name] ~= nil then
 		local mob_dimension = non_spawn_dictionary[mob_name][dimension]
-		if mob_dimension then
+		if mob_name ~= nil then
-			--minetest.log("Found in non spawn dictionary for dimension")
+			return mob_dimension.min_light,mob_dimension.max_light
 			return mob_dimension.min_light, mob_dimension.max_light
 		else
-			--minetest.log("Found in non spawn dictionary but not for dimension")
+			return non_spawn_dictionary[mob_name]["overworld"].min_light, non_spawn_dictionary[mob_name]["overworld"].max_light
 			local overworld_non_spawn_def = non_spawn_dictionary[mob_name]["overworld"]
 			if overworld_non_spawn_def then
 				return overworld_non_spawn_def.min_light, overworld_non_spawn_def.max_light
 			end
 		end
 	--if the mob doesn't exist in non_spawn, check spawn_dictonary
 	else
 		--minetest.log("must be in spawning dictionary")
 		for i,v in pairs(spawn_dictionary) do
-			local current_mob_name = spawn_dictionary[i].name
+			if spawn_dictionary[spawn_dictionary[i].name] == nil then
-			local current_mob_dim = spawn_dictionary[i].dimension
+				spawn_dictionary_consolidated[spawn_dictionary[i].name] = {}
 			if mob_name == current_mob_name then
 				if not spawn_dictionary_consolidated[current_mob_name] then
 					spawn_dictionary_consolidated[current_mob_name] = {}
 			end
-				spawn_dictionary_consolidated[current_mob_name][current_mob_dim] = {
+			spawn_dictionary_consolidated[spawn_dictionary[i].name][dimension] = {
 				["min_light"] = spawn_dictionary[i].min_light,
 				["max_light"] = spawn_dictionary[i].max_light
 			}
 		end	
-		end
+		mob_dimension = spawn_dictionary_consolidated[mob_name][dimension]
-
+		mob_dimension_default = spawn_dictionary_consolidated[mob_name]["overworld"]
-		if spawn_dictionary_consolidated[mob_name] then
+		if spawn_dictionary_consolidated[mob_name] == mob_name and mob_dimension ~= nil then
 			--minetest.log("is in consolidated")
 			local mob_dimension = spawn_dictionary_consolidated[mob_name][dimension]
 			if mob_dimension then
 				--minetest.log("found for dimension")
 			return mob_dimension.min_light, mob_dimension.max_light
 		else
 				--minetest.log("not found for dimension, use overworld def")
 				local mob_dimension_default = spawn_dictionary_consolidated[mob_name]["overworld"]
 				if mob_dimension_default then
 			return mob_dimension_default.min_light, mob_dimension_default.max_light
 		end 
 	end
 		else
 			--minetest.log("not in consolidated")
 		end
 	end
 	minetest.log("action", "There are no light levels for mob (" .. tostring(mob_name) .. ") in dimension (" .. tostring(dimension) .. "). Return defaults")
 	return 0, minetest.LIGHT_MAX+1
 end
 function mcl_mobs:non_spawn_specific(mob_name,dimension,min_light,max_light)
@ -557,7 +521,7 @@ function mcl_mobs:non_spawn_specific(mob_name,dimension,min_light,max_light)
 	}
 end
-function mcl_mobs:spawn_specific(name, dimension, type_of_spawning, biomes, min_light, max_light, interval, chance, aoc, min_height, max_height, day_toggle, on_spawn, check_position)
+function mcl_mobs:spawn_specific(name, dimension, type_of_spawning, biomes, min_light, max_light, interval, chance, aoc, min_height, max_height, day_toggle, on_spawn)
 	-- Do mobs spawn at all?
 	if not mobs_spawn then
@ -594,10 +558,11 @@ function mcl_mobs:spawn_specific(name, dimension, type_of_spawning, biomes, min_
 	spawn_dictionary[key]["min_height"] = min_height
 	spawn_dictionary[key]["max_height"] = max_height
 	spawn_dictionary[key]["day_toggle"] = day_toggle
 	spawn_dictionary[key]["check_position"] = check_position
 	summary_chance = summary_chance + chance
 end
 local two_pi = 2 * math.pi
 local function get_next_mob_spawn_pos(pos)
 	-- TODO We should consider spawning something a little further away sporadically.
@ -664,42 +629,18 @@ local function has_room(self,pos)
 	return true
 end
 mcl_mobs.custom_biomecheck = nil
 function mcl_mobs.register_custom_biomecheck(custom_biomecheck)
 	mcl_mobs.custom_biomecheck = custom_biomecheck
 end
 local function get_biome_name(pos)
 	if mcl_mobs.custom_biomecheck then
 		return mcl_mobs.custom_biomecheck (pos)
 	else
 		local gotten_biome = minetest.get_biome_data(pos)
 		if not gotten_biome then
 			return
 		end
 		gotten_biome = mt_get_biome_name(gotten_biome.biome)
 		--minetest.log ("biome: " .. dump(gotten_biome))
 		return gotten_biome
 	end
 end
 local function spawn_check(pos, spawn_def)
-	if not spawn_def or not pos then return end
+	if not spawn_def then return end
 	dbg_spawn_attempts = dbg_spawn_attempts + 1
 	local dimension = mcl_worlds.pos_to_dimension(pos)
 	local mob_def = minetest.registered_entities[spawn_def.name]
 	local mob_type = mob_def.type
 	local gotten_node = get_node(pos).name
-	if not gotten_node then return end
+	local gotten_biome = minetest.get_biome_data(pos)
-
+	if not gotten_node or not gotten_biome then return end
-	local biome_name = get_biome_name(pos)
+	gotten_biome = get_biome_name(gotten_biome.biome) --makes it easier to work with
 	if not biome_name then return end
 	local is_ground = minetest.get_item_group(gotten_node,"solid") ~= 0
 	if not is_ground then
@ -714,58 +655,25 @@ local function spawn_check(pos, spawn_def)
 	local is_bedrock  = gotten_node == "mcl_core:bedrock"
 	local is_grass = minetest.get_item_group(gotten_node,"grass_block") ~= 0
-	if pos.y >= spawn_def.min_height
+	if pos and spawn_def
 	and pos.y >= spawn_def.min_height
 	and pos.y <= spawn_def.max_height
 	and spawn_def.dimension == dimension
-			and biome_check(spawn_def.biomes, biome_name) then
+	and biome_check(spawn_def.biomes, gotten_biome)
-
+	and (is_ground or spawn_def.type_of_spawning ~= "ground")
 		mcl_log("Spawn level 1 check - Passed")
 		if  (is_ground or spawn_def.type_of_spawning ~= "ground")
 	and (spawn_def.type_of_spawning ~= "ground" or not is_leaf)
 	and has_room(mob_def,pos)
 	and (spawn_def.check_position and spawn_def.check_position(pos) or true)
 	and (not is_farm_animal(spawn_def.name) or is_grass)
 	and (spawn_def.type_of_spawning ~= "water" or is_water)
-				and not is_bedrock
+	and ( not spawn_protected or not minetest.is_protected(pos, "") )
-				and has_room(mob_def,pos)
+	and not is_bedrock then
-				and (spawn_def.check_position and spawn_def.check_position(pos) or spawn_def.check_position == nil)
+		--only need to poll for node light if everything else worked
 				and ( not spawn_protected or not minetest.is_protected(pos, "") ) then
 			mcl_log("Spawn level 2 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
 			else
 		if gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light then
 			return true
 		end
 	end
 		end
 	end
 	return false
 end
@ -880,10 +788,12 @@ minetest.register_chatcommand("spawn_mob",{
 if mobs_spawn then
 	local perlin_noise
 	-- Get pos to spawn, x and z are randomised, y is range
-	local function mob_cap_space (pos, mob_type, mob_counts_close, mob_counts_wide, cap_space_hostile, cap_space_non_hostile)
+	local function mob_cap_space (pos, mob_type, mob_counts_close, mob_counts_wide)
 		-- Some mob examples
 		--type = "monster", spawn_class = "hostile",
@ -899,18 +809,9 @@ if mobs_spawn then
 			mob_total_wide = 0
 		end
-		local cap_space_wide = math.max(type_cap - mob_total_wide, 0)
+		local cap_space_wide = type_cap - mob_total_wide
-
+		if cap_space_wide < 1 then
-		mcl_log("mob_type", mob_type)
+			cap_space_wide = 0
 		mcl_log("cap_space_wide", cap_space_wide)
 		local cap_space_available = 0
 		if mob_type == "hostile" then
 			mcl_log("cap_space_global", cap_space_hostile)
 			cap_space_available = math.min(cap_space_hostile, cap_space_wide)
 		else
 			mcl_log("cap_space_global", cap_space_non_hostile)
 			cap_space_available = math.min(cap_space_non_hostile, cap_space_wide)
 		end
 		local mob_total_close = mob_counts_close[mob_type]
@ -919,11 +820,12 @@ if mobs_spawn then
 			mob_total_close = 0
 		end
-		local cap_space_close = math.max(close_zone_cap - mob_total_close, 0)
+		local cap_space_close = close_zone_cap - mob_total_close
-		cap_space_available = math.min(cap_space_available, cap_space_close)
+		if cap_space_close < 1 then
 			cap_space_close = 0
 		end
-		mcl_log("cap_space_close", cap_space_close)
+		--mcl_log("spawn_class: " .. spawn_class)
 		mcl_log("cap_space_available", cap_space_available)
 		if false and mob_type == "water" then
 			mcl_log("mob_type: " .. mob_type .. " and pos: " .. minetest.pos_to_string(pos))
@ -933,7 +835,7 @@ if mobs_spawn then
 			mcl_log("cap_space_close: " .. cap_space_close)
 		end
-		return cap_space_available
+		return cap_space_wide, cap_space_close
 	end
 	local function find_spawning_position(pos, max_times)
@ -944,7 +846,7 @@ if mobs_spawn then
 		local y_min, y_max = decypher_limits(pos.y)
-		--mcl_log("mapgen_limit: " .. SPAWN_MAPGEN_LIMIT)
+		mcl_log("mapgen_limit: " .. SPAWN_MAPGEN_LIMIT)
 		local i = 0
 		repeat
 			local goal_pos = get_next_mob_spawn_pos(pos)
@ -976,21 +878,9 @@ if mobs_spawn then
 		return spawning_position
 	end
-	local cumulative_chance = nil
+	local function spawn_a_mob(pos)
-	local mob_library_worker_table = nil
+		--create a disconnected clone of the spawn dictionary, prevents memory leak
-	local function initialize_spawn_data()
+		local mob_library_worker_table = table_copy(spawn_dictionary)
 		if not mob_library_worker_table then
 			mob_library_worker_table = table_copy(spawn_dictionary)
 		end
 		if not cumulative_chance then
 			cumulative_chance = 0
 			for k, v in pairs(mob_library_worker_table) do
 				cumulative_chance = cumulative_chance + v.chance
 			end
 		end
 	end
 	local function spawn_a_mob(pos, cap_space_hostile, cap_space_non_hostile)
 		local spawning_position = find_spawning_position(pos, FIND_SPAWN_POS_RETRIES)
 		if not spawning_position then
@ -1003,25 +893,22 @@ if mobs_spawn then
 		--output_mob_stats(mob_counts_wide)
 		--grab mob that fits into the spawning location
-		--use random weighted choice with replacement to grab a mob, don't exclude any possibilities
+		--randomly grab a mob, don't exclude any possibilities
-		--shuffle table once every loop to provide equal inclusion probability to all mobs
+		perlin_noise = perlin_noise or minetest_get_perlin(noise_params)
-		--repeat grabbing a mob to maintain existing spawn rates
+		local noise = perlin_noise:get_3d(spawning_position)
-		local spawn_loop_counter = #mob_library_worker_table
+		local current_summary_chance = summary_chance
 		while spawn_loop_counter > 0 do
 		table.shuffle(mob_library_worker_table)
-			local mob_chance_offset = math_random(1, cumulative_chance)
+
 		while #mob_library_worker_table > 0 do
 			local mob_chance_offset = (math_round(noise * current_summary_chance + 12345) % current_summary_chance) + 1
 			local mob_index = 1
 			local mob_chance = mob_library_worker_table[mob_index].chance
 			local step_chance = mob_chance
 			while step_chance < mob_chance_offset do
 				mob_index = mob_index + 1
 				if mob_index <= #mob_library_worker_table then
 				mob_chance = mob_library_worker_table[mob_index].chance
 				step_chance = step_chance + mob_chance
 				else
 					break
 				end
 			end
 			--minetest.log(mob_def.name.." "..step_chance.. " "..mob_chance)
@ -1029,18 +916,22 @@ if mobs_spawn then
 			if mob_def and mob_def.name and minetest.registered_entities[mob_def.name] then
 				local mob_def_ent = minetest.registered_entities[mob_def.name]
 				--local mob_type = mob_def_ent.type
 				local mob_spawn_class = mob_def_ent.spawn_class
-				local cap_space_available = mob_cap_space (spawning_position, mob_spawn_class, mob_counts_close, mob_counts_wide, cap_space_hostile, cap_space_non_hostile)
+				--mcl_log("mob_spawn_class: " .. mob_spawn_class)
-				if cap_space_available > 0 then
+				local cap_space_wide, cap_space_close = mob_cap_space (spawning_position, mob_spawn_class, mob_counts_close, mob_counts_wide)
 				if cap_space_close > 0 and cap_space_wide > 0 then
 					--mcl_log("Cap space available")
 					-- Spawn caps for animals and water creatures fill up rapidly. Need to throttle this somewhat
 					-- for performance and for early game challenge. We don't want to reduce hostiles though.
 					local spawn_hostile = (mob_spawn_class == "hostile")
 					local spawn_passive = (mob_spawn_class ~= "hostile") and math.random(100) < peaceful_percentage_spawned
-
+					-- or not hostile
 					--mcl_log("Spawn_passive: " .. tostring(spawn_passive))
 					--mcl_log("Spawn_hostile: " .. tostring(spawn_hostile))
@ -1071,10 +962,13 @@ if mobs_spawn then
 							local group_min = mob_def_ent.spawn_in_group_min or 1
 							if not group_min then group_min = 1 end
-							local amount_to_spawn = math.random(group_min, spawn_in_group)
+							local amount_to_spawn = math.random(group_min,spawn_in_group)
 							if amount_to_spawn > cap_space_wide then
 								mcl_log("Spawning quantity: " .. amount_to_spawn)
-							amount_to_spawn = math.min(amount_to_spawn, cap_space_available)
+								mcl_log("Throttle amount to cap space: " .. cap_space_wide)
-							mcl_log("throttled spawning quantity: " .. amount_to_spawn)
+								amount_to_spawn = cap_space_wide
 							end
 							if logging then
 								minetest.log("action", "[mcl_mobs] A group of " ..amount_to_spawn .. " " .. mob_def.name .. " mob spawns on " ..minetest.get_node(vector.offset(spawning_position,0,-1,0)).name .." at " .. minetest.pos_to_string(spawning_position, 1))
@ -1089,7 +983,7 @@ if mobs_spawn then
 						if spawned then
 							--mcl_log("We have spawned")
-							mob_counts_close, mob_counts_wide, total_mobs = count_mobs_all("spawn_class", pos)
+							mob_counts_close, mob_counts_wide, total_mobs = count_mobs_all("type", pos)
 							local new_spawning_position = find_spawning_position(pos, FIND_SPAWN_POS_RETRIES_SUCCESS_RESPIN)
 							if new_spawning_position then
 								mcl_log("Setting new spawning position")
@ -1099,14 +993,15 @@ if mobs_spawn then
 							end
 						end
 					else
-						--mcl_log("Spawn check failed")
+						mcl_log("Spawn check failed")
 					end
 				else
-					--mcl_log("Cap space full")
+					mcl_log("Cap space full")
 				end
 			end
-			spawn_loop_counter = spawn_loop_counter - 1
+			current_summary_chance = current_summary_chance - mob_chance
 			table_remove(mob_library_worker_table, mob_index)
 		end
 	end
@ -1118,17 +1013,10 @@ if mobs_spawn then
 		timer = timer + dtime
 		if timer < WAIT_FOR_SPAWN_ATTEMPT then return end
 		initialize_spawn_data()
 		timer = 0
 		local players = get_connected_players()
-		local total_mobs, total_non_hostile, total_hostile = count_mobs_total_cap()
+		local total_mobs = count_mobs_total_cap()
 		local cap_space_hostile = math.max(mob_cap.global_hostile - total_hostile, 0)
 		local cap_space_non_hostile =  math.max(mob_cap.global_non_hostile - total_non_hostile, 0)
 		mcl_log("global cap_space_hostile", cap_space_hostile)
 		mcl_log("global cap_space_non_hostile", cap_space_non_hostile)
 		if total_mobs > mob_cap.total or total_mobs > #players * mob_cap.player then
 			minetest.log("action","[mcl_mobs] global mob cap reached. no cycle spawning.")
 			return
@ -1139,49 +1027,21 @@ if mobs_spawn then
 			local dimension = mcl_worlds.pos_to_dimension(pos)
 			-- ignore void and unloaded area
 			if dimension ~= "void" and dimension ~= "default" then
-				spawn_a_mob(pos, cap_space_hostile, cap_space_non_hostile)
+				spawn_a_mob(pos)
 			end
 		end
 	end)
 end
 local function despawn_allowed(self)
 	local nametag = self.nametag and self.nametag ~= ""
 	local not_busy = self.state ~= "attack" and self.following == nil
 	if self.can_despawn == true then
 		if not nametag and not_busy and not self.tamed == true and not self.persistent == true then
 			return true
 		end
 	end
 	return false
 end
 function mob_class:despawn_allowed()
 	despawn_allowed(self)
 end
 assert(despawn_allowed({can_despawn=false}) == false, "despawn_allowed - can_despawn false failed")
 assert(despawn_allowed({can_despawn=true}) == true, "despawn_allowed - can_despawn true failed")
 assert(despawn_allowed({can_despawn=true, nametag=""}) == true, "despawn_allowed - blank nametag failed")
 assert(despawn_allowed({can_despawn=true, nametag=nil}) == true, "despawn_allowed - nil nametag failed")
 assert(despawn_allowed({can_despawn=true, nametag="bob"}) == false, "despawn_allowed - nametag failed")
 assert(despawn_allowed({can_despawn=true, state="attack"}) == false, "despawn_allowed - attack state failed")
 assert(despawn_allowed({can_despawn=true, following="blah"}) == false, "despawn_allowed - following state failed")
 assert(despawn_allowed({can_despawn=true, tamed=false}) == true, "despawn_allowed - not tamed")
 assert(despawn_allowed({can_despawn=true, tamed=true}) == false, "despawn_allowed - tamed")
 assert(despawn_allowed({can_despawn=true, persistent=true}) == false, "despawn_allowed - persistent")
 assert(despawn_allowed({can_despawn=true, persistent=false}) == true, "despawn_allowed - not persistent")
 function mob_class:check_despawn(pos, dtime)
 	self.lifetimer = self.lifetimer - dtime
 	-- Despawning: when lifetimer expires, remove mob
-	if remove_far and despawn_allowed(self) then
+	if remove_far
 	and self.can_despawn == true
 	and ((not self.nametag) or (self.nametag == ""))
 	and self.state ~= "attack"
 	and self.following == nil then
 		if self.despawn_immediately or self.lifetimer <= 0 then
 			if logging then
 				minetest.log("action", "[mcl_mobs] Mob "..self.name.." despawns at "..minetest.pos_to_string(pos, 1) .. " lifetimer ran out")
--- a/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.dk.tr
+++ b/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.dk.tr
@ -1,2 +0,0 @@
 # textdomain:mcl_paintings
 Painting=Maleri
--- a/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.es.tr
+++ b/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.es.tr
@ -1,2 +0,0 @@
 # textdomain:mcl_paintings
 Painting=Cuadro
--- a/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.oc.tr
+++ b/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.oc.tr
@ -1,2 +0,0 @@
 # textdomain:mcl_paintings
 Painting=Quadre
--- 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_paintings/locale/mcl_paintings.ru.tr
+++ b/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.ru.tr
@ -1,2 +1,2 @@
 # textdomain:mcl_paintings
-Painting=Картина
+Painting=Рисование
--- 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 minetest.get_node(vector.add(pos, n)).name ~= n.name then
 		if string.find(cn_name, "mcl_heads:wither_skeleton") then
 			cn_name = "mcl_heads:wither_skeleton"
 		end
 		if cn_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 function wither_spawn(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
 	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")
+				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
 				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
@ -191,10 +191,9 @@ Origin of those models:
 * [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0)
    * `mcl_totems_totem.ogg`
        * Source: <https://freesound.org/people/Spennnyyy/sounds/323502/>
-* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) (remixer) and [kantouth](https://freesound.org/people/kantouth/) (original author)
+* [Baŝto](https://opengameart.org/users/ba%C5%9Dto)
    * `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0)
        * Source: <https://opengameart.org/content/walking-skeleton>
            * Based on:  <https://freesound.org/people/kantouth/sounds/115113/>
 * [spookymodem](https://freesound.org/people/spookymodem/)
    * `mobs_mc_skeleton_death.ogg` (CC0)
        * <https://freesound.org/people/spookymodem/sounds/202091/>
@ -305,10 +304,7 @@ 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.
-Sounds not mentioned here are licensed under CC0.
+Sounds not mentioned hre are licensed under CC0.
--- a/mods/ENTITIES/mobs_mc/README.md
+++ b/mods/ENTITIES/mobs_mc/README.md
@ -39,7 +39,7 @@ This mod adds mobs which closely resemble the mobs from the game Minecraft, vers
 * Cave Spider
 * Enderman
 * Zombie Villager
-* Zombie Piglin
+* Zombie Pigman
 * Wither Skeleton
 * Magma Cube
 * Blaze
--- a/mods/ENTITIES/mobs_mc/axolotl.lua
+++ b/mods/ENTITIES/mobs_mc/axolotl.lua
@ -1,9 +1,8 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 local axolotl = {
 	description = S("Axolotl"),
 	type = "animal",
-	spawn_class = "axolotl",
+	spawn_class = "water",
 	can_despawn = true,
 	passive = false,
 	hp_min = 14,
@ -14,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",
@ -79,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",
@ -172,7 +172,7 @@ mcl_mobs:spawn_specific(
 0,
 minetest.LIGHT_MAX+1,
 30,
-100,
+4000,
 3,
 water-16,
 water+1)
--- 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,
 })
@ -150,7 +137,7 @@ mcl_mobs:spawn_specific(
 0,
 maxlight,
 20,
-100,
+5000,
 2,
 mcl_vars.mg_overworld_min,
 mobs_mc.water_level-1)
--- 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(
@ -151,7 +147,7 @@ mcl_mobs:spawn_specific(
 0,
 minetest.LIGHT_MAX+1,
 30,
-1000,
+5000,
 3,
 mcl_vars.mg_nether_min,
 mcl_vars.mg_nether_max)
--- 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},
@ -157,7 +157,7 @@ mcl_mobs:spawn_specific(
 },
 9,
 minetest.LIGHT_MAX+1,
-30, 100,
+30, 17000,
 3,
 mobs_mc.water_level,
 mcl_vars.mg_overworld_max)
--- a/mods/ENTITIES/mobs_mc/cod.lua
+++ b/mods/ENTITIES/mobs_mc/cod.lua
@ -30,9 +30,8 @@ local S = minetest.get_translator(minetest.get_current_modname())
 --###################
 local cod = {
 	description = S("Cod"),
 	type = "animal",
-	spawn_class = "water_ambient",
+	spawn_class = "water",
 	can_despawn = true,
 	passive = true,
 	hp_min = 3,
@ -267,7 +266,7 @@ mcl_mobs:spawn_specific(
 0,
 minetest.LIGHT_MAX+1,
 30,
-750,
+4000,
 3,
 water-16,
 water+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,
@ -105,7 +105,7 @@ mooshroom_def.on_rightclick = function(self, clicker)
 	end
 	local item = clicker:get_wielded_item()
 	-- Use shears to get mushrooms and turn mooshroom into cow
-	if minetest.get_item_group(item:get_name(), "shears") > 0 then
+	if item:get_name() == "mcl_tools:shears" then
 		local pos = self.object:get_pos()
 		minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true)
@ -207,7 +207,7 @@ mcl_mobs:spawn_specific(
 9,
 minetest.LIGHT_MAX+1,
 30,
-80,
+17000,
 10,
 mobs_mc.water_level,
 mcl_vars.mg_overworld_max)
@ -225,7 +225,7 @@ mcl_mobs:spawn_specific(
 9,
 minetest.LIGHT_MAX+1,
 30,
-80,
+17000,
 5,
 mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)
--- a/mods/ENTITIES/mobs_mc/creeper.lua
+++ b/mods/ENTITIES/mobs_mc/creeper.lua
@ -10,7 +10,6 @@ local S = minetest.get_translator("mobs_mc")
 mcl_mobs.register_mob("mobs_mc:creeper", {
 	description = S("Creeper"),
 	type = "monster",
 	spawn_class = "hostile",
 	spawn_in_group = 1,
@ -24,7 +23,6 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
 	mesh = "mobs_mc_creeper.b3d",
 	head_swivel = "Head_Control",
 	bone_eye_height = 2.35,
 	head_eye_height = 1.8;
 	curiosity = 2,
 	textures = {
 		{"mobs_mc_creeper.png",
@ -41,7 +39,7 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
 	},
 	makes_footstep_sound = true,
 	walk_velocity = 1.05,
-	run_velocity = 2.0,
+	run_velocity = 2.1,
 	runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
 	attack_type = "explode",
@ -50,7 +48,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,
@ -136,7 +134,7 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
 })
 mcl_mobs.register_mob("mobs_mc:creeper_charged", {
-	description = S("Charged Creeper"),
+	description = S("Creeper"),
 	type = "monster",
 	spawn_class = "hostile",
 	hp_min = 20,
@ -172,7 +170,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,
@ -407,7 +405,7 @@ mcl_mobs:spawn_specific(
 0,
 7,
 20,
-1000,
+16500,
 2,
 mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)
--- a/mods/ENTITIES/mobs_mc/dolphin.lua
+++ b/mods/ENTITIES/mobs_mc/dolphin.lua
@ -30,7 +30,6 @@ local S = minetest.get_translator(minetest.get_current_modname())
 --###################
 local dolphin = {
 	description = S("Dolphin"),
 	type = "animal",
 	spawn_class = "water",
 	can_despawn = true,
@ -245,7 +244,7 @@ mcl_mobs:spawn_specific(
 0,
 minetest.LIGHT_MAX+1,
 30,
-70,
+4000,
 3,
 water-16,
 water+1)
--- a/mods/ENTITIES/mobs_mc/ender_dragon.lua
+++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua
@ -136,7 +136,6 @@ mcl_mobs.register_mob("mobs_mc:enderdragon", {
 		end
 	end,
 	fire_resistant = true,
 	is_boss = true,
 })
--- a/mods/ENTITIES/mobs_mc/enderman.lua
+++ b/mods/ENTITIES/mobs_mc/enderman.lua
@ -24,12 +24,6 @@
 -- added rain damage.
 -- fixed the grass_with_dirt issue.
 -- How freqeuntly to take and place blocks, in seconds
 local take_frequency_min = 235
 local take_frequency_max = 245
 local place_frequency_min = 235
 local place_frequency_max = 245
 minetest.register_entity("mobs_mc:ender_eyes", {
 	visual = "mesh",
 	mesh = "mobs_mc_spider.b3d",
@ -66,6 +60,13 @@ end
 local pr = PseudoRandom(os.time()*(-334))
 -- How freqeuntly to take and place blocks, in seconds
 local take_frequency_min = 235
 local take_frequency_max = 245
 local place_frequency_min = 235
 local place_frequency_max = 245
 -- Texuture overrides for enderman block. Required for cactus because it's original is a nodebox
 -- and the textures have tranparent pixels.
 local block_texture_overrides
@ -344,8 +345,7 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
 					self:teleport(nil)
 				end
 			end
-		end
+		else return end
 		-- AGRESSIVELY WARP/CHASE PLAYER BEHAVIOUR HERE.
 		if self.state == "attack" then
 			if self.attack then
@ -358,13 +358,11 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
 				end
 			end
 		else --if not attacking try to tp to the dark
 			if dim == 'overworld' then
 			local light = minetest.get_node_light(enderpos)
 			if light and light > minetest.LIGHT_MAX then
 				self:teleport(nil)
 			end
 		end
 		end
 		-- ARROW / DAYTIME PEOPLE AVOIDANCE BEHAVIOUR HERE.
 		-- Check for arrows and people nearby.
@ -389,7 +387,6 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
 				end
 			end
 		end
 		-- PROVOKED BEHAVIOUR HERE.
 		local enderpos = self.object:get_pos()
 		if self.provoked == "broke_contact" then
@ -447,22 +444,6 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
 			end
 		end
 		-- ATTACK ENDERMITE
 		local enderpos = self.object:get_pos()
 		if math.random(1,140) == 1 then
 			local mobsnear = minetest.get_objects_inside_radius(enderpos, 64)
 			for n=1, #mobsnear do
 				local mob = mobsnear[n]
 				if mob then
 					local entity = mob:get_luaentity()
 					if entity and entity.name == "mobs_mc:endermite" then
 						self.attack = mob
 						self.state = 'attack'
 					end
 				end
 			end
 		end
 		-- TAKE AND PLACE STUFF BEHAVIOUR BELOW.
 		if not mobs_griefing then
 			return
@ -490,7 +471,7 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
 					local dug = minetest.get_node_or_nil(take_pos)
 					if dug and dug.name == "air" then
 						self._taken_node = node.name
-						self.persistent = true
+						self.can_despawn = false
 						local def = minetest.registered_nodes[self._taken_node]
 						-- Update animation and texture accordingly (adds visibly carried block)
 						local block_type
@ -541,7 +522,7 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
 				if success then
 					local def = minetest.registered_nodes[self._taken_node]
 					-- Update animation accordingly (removes visible block)
-					self.persistent = false
+					self.can_despawn = true
 					self.animation = select_enderman_animation("normal")
 					self:set_animation(self.animation.current)
 					if def.sounds and def.sounds.place then
@ -668,7 +649,7 @@ mcl_mobs:spawn_specific(
 0,
 minetest.LIGHT_MAX+1,
 30,
-100,
+3000,
 12,
 mcl_vars.mg_end_min,
 mcl_vars.mg_end_max)
@ -816,7 +797,7 @@ mcl_mobs:spawn_specific(
 0,
 7,
 30,
-100,
+19000,
 2,
 mcl_vars.mg_overworld_min,
 mcl_vars.mg_overworld_max)
@ -833,7 +814,7 @@ mcl_mobs:spawn_specific(
 0,
 11,
 30,
-100,
+27500,
 4,
 mcl_vars.mg_nether_min,
 mcl_vars.mg_nether_max)
@ -849,7 +830,7 @@ mcl_mobs:spawn_specific(
 0,
 11,
 30,
-100,
+5000,
 4,
 mcl_vars.mg_nether_min,
 mcl_vars.mg_nether_max)
--- a/Show More
+++ b/Show More
`@ -1 +1 @@`
	`A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more.`	`A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more. Faithful clone of Minecraft 1.12. This is a work in progress! Expect bugs!`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_explosions`
			`@1 was caught in an explosion.=@1 est mort dans une explosion`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_explosions`
			`@1 was caught in an explosion.=@1 z-es mòrt dins una explosion`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_explosions`
			`@1 was caught in an explosion.=@1 foi pego(a) em uma explosão.`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_explosions`
			`@1 was caught in an explosion.=@1 попал(а) под взрыв.`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_explosions`
			`@1 was caught in an explosion.=`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_paintings`
			`Painting=Maleri`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_paintings`
			`Painting=Cuadro`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_paintings`
			`Painting=Quadre`
		`@ -1,2 +0,0 @@`
			`# textdomain:mcl_paintings`
			`Painting=Pintura`