Merge pull request 'Fixes for german locales (2021-04-14_locales_german)' (#1564) from n_to/MineClone2:2021-04-14_locales_german into master

Reviewed-on: MineClone2/MineClone2#1564

CONTRIBUTING.md

@@ -7,13 +7,11 @@ But first, some things to note:
 MineClone 2's development target is to make a free software clone of Minecraft,
 ***version 1.12***, ***PC edition***, *** + Optifine features supported by the Minetest Engine ***.
 
-MineClone 2 is maintained by two persons. Namely, kay27 and EliasFleckenstein. You can find us
-in the Minetest forums (forums.minetest.net), in IRC in the #minetest
+MineClone 2 is maintained by three persons. Namely, kay27, EliasFleckenstein and jordan4ibanez. You can find us
+in the Minetest forums (forums.minetest.net), in IRC in the #mineclone2
 channel on irc.freenode.net. And finally, you can send e-mails to
 <eliasfleckenstein@web.de> or <kay27@bk.ru>.
 
-There is **no** guarantee we will accept anything from anybody.
-
 By sending us patches or asking us to include your changes in this game,
 you agree that they fall under the terms of the LGPLv2.1, which basically
 means they will become part of a free software.
@@ -26,8 +24,7 @@ For small and medium changes:
 
 * Fork the repository
 * Do your change in a new branch
-* Upload the repository somewhere where it can be accessed from the Internet and
-  notify us
+* Create a pull request to get your changes merged into master
 
 For small changes, sending us a patch is also good.
 
@@ -41,40 +38,30 @@ reserve the right to revert everything that we don't like.
 For bigger changes, we strongly recommend to use feature branches and
 discuss with me first.
 
-Contributors will be credited in `README.md`.
+If your code causes bugs and crashes, it is your responsibility to fix them as soon as possible.
 
-## Quality remarks
-Again: There is ***no*** guarantee we will accept anything from anybody.
-But we will gladly take in code from others when we feel it saves us work
-in the long run.
+We mostly use plain merging rather than rebasing or squash merging.
 
-### Inclusion criteria
-Depending on what you add, the chances for inclusion vary:
+Your commit names should be relatively descriptive, e.g. when saying "Fix #issueid", the commit message should also contain the title of the issue.
 
-### High chance for inclusion
-* Gameplay features in Minecraft which are missing in MineClone 2
+Contributors will be credited in `CREDITS.md`.
 
-### Medium chance for inclusion (discuss first)
-* Features which don't a impact on gameplay
-* GUI improvement
-* Features from pocket or console edition
+## Features > 1.12
 
-### Low chance for inclusion (discuss/optimize first)
-* Overhaul of architecture / mod structure
-* Mass-itemstring changes all over the place
-* Added files have a unusual high file size
-* Indentation looks like crazy
-* Single commits which add several unrelated things
-* Gameplay features which don't exist in Minecraft
+If you want to make a feature that was added in a Minecraft version later than 1.12, you should fork MineClone5 (mineclone5 branch in the repository) and add your changes to this.
 
-### Instant rejection
-* Proprietary **anything**
-* Code contains `minetest.env` anywhere
+## What we accept
 
-## Coding style guide
-* Indentations should reflect the code flow
-* Use tabs, not spaces for indentation (tab size = 8)
-* Never use `minetest.env`
+* Every MC features up to version 1.12 JE.
+* Every already finished and working good features from versions above (only when making a MineClone5 PR / Contribution).
+* Except features which couldn't be done easily and bugfree because of Minetest engine limitations. Eg. we CAN extend world boundaries by playing with map chunks, just teleporting player onto next layer after 31000 , but it would cost too much (time, code, bugs, performance, stability, etc).
+* Some features, approved by the rest of the community, I mean maybe some voting and really missing any negative feedback.
+
+## What we reject
+
+* Any features which cause critical bugs, sending them to rework/fix or trying to fix immediately.
+* Some small portions of big entirely missing features which just definitely break gamplay balance give nothing useful
+* Controversial features, which some people support while others do not should be discussed well, with publishing forum announcements, at least during the week. In case if there are still doubts - send them into the mod.
 
 ## Reporting bugs
 Report all bugs and missing Minecraft features here:

CREDITS.md

@@ -0,0 +1,117 @@
+# Credits
+
+## Creator of MineClone
+* davedevils
+
+## Creator of MineClone2
+* Wuzzy
+
+## Maintainers
+* Fleckenstein
+* kay27
+* oilboi
+
+## Developers
+* bzoss
+* AFCMS
+* epCode
+* ryvnf
+* iliekprogrammar
+* MysticTempest
+* Rootyjr
+* Nicu
+* aligator
+* Code-Sploit
+
+## Contributors
+* Laurent Rocher
+* HimbeerserverDE
+* TechDudie
+* Alexander Minges
+* ArTee3
+* ZeDique la Ruleta
+* pitchum
+* wuniversales
+* Bu-Gee
+* David McMackins II
+* Nicholas Niro
+* Wouters Dorian
+* Blue Blancmange
+* Jared Moody
+* Li0n
+* Midgard
+* NO11
+* Saku Laesvuori
+* Yukitty
+* ZedekThePD
+* aldum
+* dBeans
+* nickolas360
+* yutyo
+* ztianyang
+* j45
+
+## MineClone5
+* kay27
+* Debiankaios
+* epCode
+* NO11
+* j45
+
+## Original Mod Authors
+* Wuzzy
+* Fleckenstein
+* BlockMen
+* TenPlus1
+* PilzAdam
+* ryvnf
+* stujones11
+* Arcelmi
+* celeron55
+* maikerumine
+* GunshipPenguin
+* Qwertymine3
+* Rochambeau
+* rubenwardy
+* stu
+* oilboi
+* 4aiman
+* Kahrl
+* Krock
+* UgnilJoZ
+* lordfingle
+* 22i
+* bzoss
+* kilbith
+* xeranas
+* kddekadenz
+* sofar
+* 4Evergreen4
+* jordan4ibanez
+* paramat
+
+## 3D Models
+* 22i
+* tobyplowy
+* epCode
+
+## Textures
+* XSSheep
+* Wuzzy
+* kingoscargames
+* leorockway
+* xMrVizzy
+* yutyo
+
+## Translations
+* Wuzzy
+* Rocher Laurent
+* wuniversales
+* kay27
+* pitchum
+
+## Special thanks
+* celeron55 for creating Minetest
+* Jordach for the jukebox music compilation from Big Freaking Dig
+* 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

LEGAL.md

@@ -0,0 +1,52 @@
+# Legal information
+This is a fan game, not developed or endorsed by Mojang AB.
+
+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 kay27, EliasFleckenstein, Wuzzy, davedevils and countless others)
+is an imitation of Minecraft.
+
+MineClone 2 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 (in the LICENSE.txt file) for more
+details.
+
+In the mods you might find in the read-me or license
+text files a different license. This counts as dual-licensing.
+You can choose which license applies to you: Either the
+license of MineClone 2 (GNU GPLv3) or the mod's license.
+
+MineClone 2 is a direct continuation of the discontinued MineClone
+project by davedevils.
+
+Mod credits:
+See `README.txt` or `README.md` in each mod directory for information about other authors.
+For mods that do not have such a file, the license is the source code license
+of MineClone 2 and the author is Wuzzy.
+
+## License of media (textures and sounds)
+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].
+Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
+License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
+
+The main menu images are release 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)
+http://creativecommons.org/licenses/by-sa/3.0/
+
+See README.txt in each mod directory for detailed information about other authors.
+

MISSING_ENGINE_FEATURES.md

@@ -1,40 +0,0 @@
-# Missing features in Minetest to recreate Minecraft features
-
-A side goal of the MineClone 2 project is to find any shortcomings of Minetest which make it impossible to recreate a Minecraft feature exactly.
-This file lists some of the missing features in Minetest which MineClone 2 would require.
-
-## No workaround possible
-For these features, no easy Lua workaround could be found.
-
-### Lua API
-#### Tools/wielded item
-- “Lock” hotbar for a brief time after using an item, making it impossible to switch item or to attach/mine/build until the delay is over (For eating with delay)
-- Tool charging: Holding down the mouse and releasing it, applying a “power level” (For bow and arrows, more charge = higher arrow range) ([issue 5212](https://github.com/minetest/minetest/issues/5212))
-- [Dual Wielding](http://minecraft.gamepedia.com/Dual_wield)
-- Eating/drinking animation ([issue 2811](https://github.com/minetest/minetest/issues/2811))
-
-#### Nodes
-- Light level 15 for nodes (not sunlight)
-- Nodes makes light level drop by 2 or or more per node ([issue 5209](https://github.com/minetest/minetest/issues/5209))
-
-## Interface
-- Inventory: Hold down right mouse button while holding an item stack to drop items into the slots as you move the mouse. Makes crafting MUCH faster
-- Sneak+Leftclick on crafting output crafts as many items as possible and immediately puts it into the player inventory ([issue 5211](https://github.com/minetest/minetest/issues/5211))
-- Sneak+click puts items in different inventories depending on the item type (maybe group-based)? Required for sneak-clicking to armor slots
-
-## Workaround theoretically possible
-For these features, a workaround (or hack ;-)) by using Lua is theoretically possible. But engine support would be clearly better, more performant, more reliable, etc.
-
-### Lua API
-#### Nodes
-- Change walking speed on block (soul sand)
-- Change jumping height on block (soul sand), 
-- Change object movement speed *through* a block, but for non-liquids (for cobweb)
-- Add `on_walk_over` event
-- Set frequency in which players lose breath. 2 seconds are hardcoded in Minetest, in Minecraft it's 1 second
-- Set damage frequency of `damage_per_second`. In Minecraft many things damage players every half-second rather than every second
-- Possible to damage players directly when they are with the head inside. This allows to add Minecraft-like suffocation
-- Sneak+click on inventory slot should be able to put items into additional “fallback inventories” if the first inventory is full. Useful for large chests
-
-#### Nice-to-haye
-- Utility function to rotate pillar-like nodes, requiring only 3 possible orientations (X, Y, Z). Basically this is `minetest.rotate_node` but with less orientations; the purpur pillar would mess up if a mirrored rotation would be possible. This is already implemented in MCL2, See `mcl_util` for more infos

README.md

@@ -2,7 +2,7 @@
 An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
 Developed by many people. Not developed or endorsed by Mojang AB.
 
-Version: 0.71.0
+Version: 0.72.0 (in development)
 
 ### Gameplay
 You start in a randomly-generated world made entirely of cubes. You can explore
@@ -65,14 +65,6 @@ map builders. They can not be obtained in-game or in the creative inventory.
 Use the `/giveme` chat command to obtain them. See the in-game help for
 an explanation.
 
-#### Incomplete items
-These items do not work yet, but you can get them with `/giveme` for testing:
-
-* Minecart with Chest: `mcl_minecarts:chest_minecart`
-* Minecart with Furnace: `mcl_minecarts:furnace_minecart`
-* Minecart with Hopper: `mcl_minecarts:hopper_minecart`
-* Minecart with Command Block: `mcl_minecarts:command_block_minecart`
-
 ## Installation
 This game requires [Minetest](http://minetest.net) to run (version 5.3.0 or
 later). So you need to install Minetest first. Only stable versions of Minetest
@@ -83,23 +75,37 @@ To install MineClone 2 (if you haven't already), move this directory into the
 “games” directory of your Minetest data directory. Consult the help of
 Minetest to learn more.
 
+## Reporting bugs
+Please report all bugs and missing Minecraft features here:
+
+<https://git.minetest.land/MineClone2/MineClone2/issues>
+
+## Chating with the community
+Join our discord server at:
+
+<https://discord.gg/84GKcxczG3>
+
 ## Project description
 The main goal of **MineClone 2** is to be a clone of Minecraft and to be released as free software.
 
 * **Target of development: Minecraft, PC Edition, version 1.12** (later known as “Java Edition”)
 * MineClone2 also includes Optifine features supported by the Minetest
-* Features of later Minecraft versions might sneak in, but they have a low priority
-* In general, Minecraft is aimed to be cloned as good as Minetest currently permits (no hacks)
+* In general, Minecraft is aimed to be cloned as good as possible
 * Cloning the gameplay has highest priority
-* MineClone 2 will use different graphics and sounds, but with a similar style
-* Cloning the interface has no priority. It will only be roughly imitated
-* Limitations found in Minetest will be written down and reported in the course of development
+* MineClone 2 will use different assets, but with a similar style
+* Limitations found in Minetest will be documented in the course of development
+* Features of later Minecraft versions are collected in the mineclone5 branch
+
+## Using features from newer versions of Minecraft
+For > 1.12 features, checkout MineClone5. It includes features from newer Minecraft versions.
+Download it here: https://git.minetest.land/MineClone2/MineClone2/src/branch/mineclone5
 
 ## Completion status
-This game is currently in **alpha** stage.
-It is playable, but unfinished, many bugs are to be expected.
-Backwards-compability is *not* guaranteed, updating your world might cause small and
-big bugs (such as “missing node” errors or even crashes).
+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 git version of MineClone2 in production, consider using the production branch.
+It is updated weekly and contains relatively stable code for servers.
 
 The following main features are available:
 
@@ -128,7 +134,7 @@ The following main features are available:
 * Clock
 * Compass
 * Sponge
-* Slime block (does not interact with redstone)
+* Slime block
 * Small plants and saplings
 * Dyes
 * Banners
@@ -140,19 +146,19 @@ The following main features are available:
 * Creative inventory
 * Farming
 * Writable books
-* A few server commands
+* Commands
+* Villages
+* The End
 * And more!
 
 The following features are incomplete:
 
-* Generated structures (especially villages)
 * Some monsters and animals
 * Redstone-related things
-* The End
 * Special minecarts
 * A couple of non-trivial blocks and items
 
-Bonus features (not found in Minecraft 1.11):
+Bonus features (not found in Minecraft 1.12):
 
 * 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
@@ -177,148 +183,14 @@ Technical differences from Minecraft:
 * Different textures (Pixel Perfection)
 * Different sounds (various sources)
 * Different engine (Minetest)
+* Different easter eggs
 
 … and finally, MineClone 2 is free software (“free” as in “freedom”)!
 
-## Reporting bugs
-Please report all bugs and missing Minecraft features here:
-
-<https://git.minetest.land/MineClone2/MineClone2/issues>
-
-## Chating with the community
-Join our discord server at:
-
-<https://discord.gg/84GKcxczG3>
-
 ## Other readme files
 
 * `LICENSE.txt`: The GPLv3 license text
 * `CONTRIBUTING.md`: Information for those who want to contribute
-* `MISSING_ENGINE_FEATURES.md`: List of missing features in Minetest which MineClone 2 would need for improvement
 * `API.md`: For Minetest modders who want to mod this game
-
-## Credits
-There are so many people to list (sorry). Check out the respective mod directories for details. This section is only a rough overview of the core authors of this game.
-
-### Coding
-* [Wuzzy](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=3082): Main programmer of most mods (retired)
-* davedevils: Creator of MineClone on which MineClone 2 is based on
-* [ex-bart](https://github.com/ex-bart): Redstone comparators
-* [Rootyjr](https://github.com/Rootyjr): Fishing rod and bugfixes
-* [aligator](https://github.com/aligator): Improvement of doors
-* [ryvnf](https://github.com/ryvnf): Explosion mechanics
-* MysticTempest: Bugfixes
-* [bzoss](https://github.com/bzoss): Status effects, potions, brewing stand
-* kay27 <kay27@bk.ru>: Experience system, bugfixes, optimizations (Current maintainer)
-* [EliasFleckenstein03](https://github.com/EliasFleckenstein03): End crystals, enchanting, burning mobs / players, animated chests, bugfixes (Current maintainer)
-* epCode: Better player animations, new logo
-* 2mac: Fix bug with powered rail
-* Lots of other people: TO BE WRITTEN (see mod directories for details)
-
-#### Mod credits (summary)
-
-* `controls`: Arcelmi
-* `flowlib`: Qwertymine13
-* `walkover`: lordfingle
-* `drippingwater`: kddekadenz
-* `mobs_mc`: maikerumine, 22i and others
-* `awards`: rubenwardy
-* `screwdriver`: RealBadAngel, Maciej Kastakin, Minetest contributors
-* `xpanes`: Minetest contributors
-* `mesecons` mods: Jeija and contributors
-* `wieldview`: Stuart Jones
-* `mcl_meshhand`: Based on `newhand` by jordan4ibanez
-* `mcl_mobs`: Based on Mobs Redo [`mobs`] by TenPlus1 and contributors
-* Most other mods: Wuzzy
-
-Detailed credits for each mod can be found in the individual mod directories.
-
-### Graphics
-* [XSSheep](http://www.minecraftforum.net/members/XSSheep): Main author; creator of the Pixel Perfection resource pack of Minecraft 1.11
-* [Wuzzy](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=3082): Main menu imagery and various edits and additions of texture pack
-* [kingoscargames](https://github.com/kingoscargames): Various edits and additions of existing textures
-* [leorockway](https://github.com/leorockway): Some edits of mob textures
-* [xMrVizzy](https://minecraft.curseforge.com/members/xMrVizzy): Glazed terracotta (textures are subject to be replaced later)
-* yutyo <tanakinci2002@gmail.com>: MineClone 2 logo
-* Other authors: GUI images
-
-### Translations
-* Wuzzy: German
-* Rocher Laurent <rocherl@club-internet.fr>: French
-* wuniversales: Spanish
-* kay27 <kay27@bk.ru>: Russian
-
-### Models
-* [22i](https://github.com/22i): Creator of all models
-* [tobyplowy](https://github.com/tobyplowy): UV-mapping fixes to said models
-
-### Sounds and music
-Various sources. See the respective mod directories for details.
-
-### Special thanks
-
-* davedevils for starting MineClone, the original version of this game
-* Wuzzy for starting and maintaining MineClone2 for several years
-* celeron55 for creating Minetest
-* Minetest's modding community for providing a huge selection of mods, some of which ended up in MineClone 2
-* Jordach for the jukebox music compilation from Big Freaking Dig
-* 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
-* XSSheep for creating the Pixel Perfection resource pack
-* [22i](https://github.com/22i) for providing great models and support
-* [maikerumine](http://github.com/maikerumine) for kicking off mobs and biomes
-
-## Info for programmers
-You find interesting and useful infos in `API.md`.
-
-## Legal information
-This is a fan game, not developed or endorsed by Mojang AB.
-
-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 kay27, EliasFleckenstein, Wuzzy, davedevils and countless others)
-is an imitation of Minecraft.
-
-MineClone 2 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 (in the LICENSE.txt file) for more
-details.
-
-In the mods you might find in the read-me or license
-text files a different license. This counts as dual-licensing.
-You can choose which license applies to you: Either the
-license of MineClone 2 (GNU GPLv3) or the mod's license.
-
-MineClone 2 is a direct continuation of the discontinued MineClone
-project by davedevils.
-
-Mod credits:
-See `README.txt` or `README.md` in each mod directory for information about other authors.
-For mods that do not have such a file, the license is the source code license
-of MineClone 2 and the author is Wuzzy.
-
-### License of media (textures and sounds)
-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].
-Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
-License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
-
-The main menu images are release 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)
-http://creativecommons.org/licenses/by-sa/3.0/
-
-See README.txt in each mod directory for detailed information about other authors.
+* `LEGAL.md`: Legal information
+* `CREDITS.md`: List of everyone who contributed

mods/CORE/mcl_particles/init.lua

@@ -66,3 +66,58 @@ function mcl_particles.delete_node_particlespawners(pos)
 	end
 	return false
 end
+
+-- 3 exptime variants because the animation is not tied to particle expiration time.
+-- 3 colorized variants to imitate minecraft's
+local smoke_pdef_cached = {}
+
+function mcl_particles.spawn_smoke(pos, name, smoke_pdef_base)
+	local min = math.min
+	local new_minpos = vector.add(pos, smoke_pdef_base.minrelpos)
+	local new_maxpos = vector.add(pos, smoke_pdef_base.maxrelpos)
+
+	-- populate the cache
+	if smoke_pdef_cached[name] then
+		for i, smoke_pdef in ipairs(smoke_pdef_cached[name]) do
+			smoke_pdef.minpos = new_minpos
+			smoke_pdef.maxpos = new_maxpos
+			mcl_particles.add_node_particlespawner(pos, smoke_pdef, "high")
+		end
+		-- cache already populated
+	else
+		smoke_pdef_cached[name] = {}
+
+		local smoke_pdef = table.copy(smoke_pdef_base)
+		smoke_pdef.amount = smoke_pdef_base.amount / 9
+		smoke_pdef.time = 0
+		smoke_pdef.animation = {
+			type = "vertical_frames",
+			aspect_w = 8,
+			aspect_h = 8,
+			-- length = 3 exptime variants
+		}
+		smoke_pdef.collisiondetection = true
+		smoke_pdef.minpos = new_minpos
+		smoke_pdef.maxpos = new_maxpos
+
+		-- the last frame plays for 1/8 * N seconds, so we can take advantage of it
+		-- to have varying exptime for each variant.
+		local exptimes = { 0.175, 0.375, 1.0 }
+		local colorizes = { "199", "209", "243" } -- round(78%, 82%, 90% of 256) - 1
+
+		for _,exptime in ipairs(exptimes) do
+			for _,colorize in ipairs(colorizes) do
+				smoke_pdef.maxexptime = exptime * smoke_pdef_base.maxexptime
+				smoke_pdef.animation.length = exptime + 0.1
+				-- minexptime must be set such that the last frame is actully rendered,
+				-- even if its very short. Larger exptime -> larger range
+				smoke_pdef.minexptime = min(exptime, (7.0/8.0 * (exptime + 0.1) + 0.1))
+				smoke_pdef.texture = "mcl_particles_smoke_anim.png^[colorize:#000000:" ..colorize
+
+				mcl_particles.add_node_particlespawner(pos, smoke_pdef, "high")
+
+				table.insert(smoke_pdef_cached[name], table.copy(smoke_pdef))
+			end
+		end
+	end
+end

mods/ENTITIES/mobs_mc/skeleton+stray.lua

@@ -30,13 +30,14 @@ local skeleton = {
 		"mcl_bows_bow_0.png", -- bow
 		"mobs_mc_skeleton.png", -- skeleton
 	} },
-	visual_size = {x=3, y=3},
+	visual_size = {x=1, y=1},
 	makes_footstep_sound = true,
-	sounds = {
-		random = "mobs_mc_skeleton_random",
-		death = "mobs_mc_skeleton_death",
-		damage = "mobs_mc_skeleton_hurt",
-		distance = 16,
+	textures = {
+		{
+			"mobs_mc_empty.png", -- armor
+			"mobs_mc_skeleton.png", -- texture
+			"mcl_bows_bow_0.png", -- wielded_item
+		}
 	},
 	walk_velocity = 1.2,
 	run_velocity = 2.4,
@@ -111,9 +112,9 @@ local stray = table.copy(skeleton)
 stray.mesh = "mobs_mc_stray.b3d"
 stray.textures = {
 	{
-		"mcl_bows_bow_0.png",
-		"mobs_mc_stray.png",
 		"mobs_mc_stray_overlay.png",
+		"mobs_mc_stray.png",
+		"mcl_bows_bow_0.png",
 	},
 }
 -- TODO: different sound (w/ echo)
@@ -140,8 +141,8 @@ mobs:register_mob("mobs_mc:stray", stray)
 
 -- Overworld spawn
 mobs:spawn_specific(
-"mobs_mc:skeleton", 
-"overworld", 
+"mobs_mc:skeleton",
+"overworld",
 "ground",
 {
 "Mesa",
@@ -284,36 +285,36 @@ mobs:spawn_specific(
 "ExtremeHillsM_underground",
 "JungleEdgeM_underground",
 },
-0, 
-7, 
-20, 
-17000, 
-2, 
-mobs_mc.spawn_height.overworld_min, 
+0,
+7,
+20,
+17000,
+2,
+mobs_mc.spawn_height.overworld_min,
 mobs_mc.spawn_height.overworld_max)
 
 
 -- Nether spawn
 mobs:spawn_specific(
-"mobs_mc:skeleton", 
-"nether", 
-"ground", 
+"mobs_mc:skeleton",
+"nether",
+"ground",
 {
 "Nether"
 },
-0, 
-7, 
-30, 
-10000, 
-3, 
-mobs_mc.spawn_height.nether_min, 
+0,
+7,
+30,
+10000,
+3,
+mobs_mc.spawn_height.nether_min,
 mobs_mc.spawn_height.nether_max)
 
 -- Stray spawn
 -- TODO: Spawn directly under the sky
 mobs:spawn_specific(
-"mobs_mc:stray", 
-"overworld", 
+"mobs_mc:stray",
+"overworld",
 "ground",
 {
 "ColdTaiga",
@@ -321,12 +322,12 @@ mobs:spawn_specific(
 "IcePlains",
 "ExtremeHills+_snowtop",
 },
-0, 
-7, 
-20, 
-19000, 
-2, 
-mobs_mc.spawn_height.water, 
+0,
+7,
+20,
+19000,
+2,
+mobs_mc.spawn_height.water,
 mobs_mc.spawn_height.overworld_max)
 
 

mods/ENTITIES/mobs_mc/skeleton_wither.lua

@@ -25,11 +25,12 @@ mobs:register_mob("mobs_mc:witherskeleton", {
 	mesh = "mobs_mc_witherskeleton.b3d",
 	textures = {
 		{
-			"default_tool_stonesword.png", -- sword
+			"mobs_mc_empty.png", -- armor
 			"mobs_mc_wither_skeleton.png", -- wither skeleton
+			"default_tool_stonesword.png", -- sword
 		}
 	},
-	visual_size = {x=3.6, y=3.6},
+	visual_size = {x=1.2, y=1.2},
 	makes_footstep_sound = true,
 	sounds = {
 		random = "mobs_mc_skeleton_random",
@@ -110,4 +111,4 @@ mobs_mc.spawn_height.nether_min,
 mobs_mc.spawn_height.nether_max)
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:witherskeleton", S("Wither Skeleton"), "mobs_mc_spawn_icon_witherskeleton.png", 0)
+mobs:register_egg("mobs_mc:witherskeleton", S("Wither Skeleton"), "mobs_mc_spawn_icon_witherskeleton.png", 0)

mods/ENTITIES/mobs_mc/zombie.lua

@@ -58,7 +58,11 @@ local zombie = {
 	visual = "mesh",
 	mesh = "mobs_mc_zombie.b3d",
 	textures = {
-		{"mobs_mc_zombie.png"},
+		{
+			"mobs_mc_empty.png", -- armor
+			"mobs_mc_zombie.png", -- texture
+			"mobs_mc_empty.png", -- wielded_item
+		}
 	},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
@@ -111,7 +115,13 @@ mobs:register_mob("mobs_mc:baby_zombie", baby_zombie)
 -- Husk.
 -- Desert variant of the zombie
 local husk = table.copy(zombie)
-husk.textures = {{"mobs_mc_husk.png"}}
+husk.textures = {
+		{
+			"mobs_mc_empty.png", -- armor
+			"mobs_mc_husk.png", -- texture
+			"mobs_mc_empty.png", -- wielded_item
+		}
+	}
 husk.ignited_by_sunlight = false
 husk.sunlight_damage = 0
 husk.drops = drops_common
@@ -136,8 +146,8 @@ mobs:register_mob("mobs_mc:baby_husk", baby_husk)
 -- Spawning
 
 mobs:spawn_specific(
-"mobs_mc:zombie", 
-"overworld", 
+"mobs_mc:zombie",
+"overworld",
 "ground",
 {
 "FlowerForest_underground",
@@ -220,17 +230,17 @@ mobs:spawn_specific(
 "MesaBryce_sandlevel",
 "Mesa_sandlevel",
 },
-0, 
-7, 
-30, 
-6000, 
-4, 
-mobs_mc.spawn_height.overworld_min, 
+0,
+7,
+30,
+6000,
+4,
+mobs_mc.spawn_height.overworld_min,
 mobs_mc.spawn_height.overworld_max)
 -- Baby zombie is 20 times less likely than regular zombies
 mobs:spawn_specific(
-"mobs_mc:baby_zombie", 
-"overworld", 
+"mobs_mc:baby_zombie",
+"overworld",
 "ground",
 {
 "FlowerForest_underground",
@@ -313,18 +323,18 @@ mobs:spawn_specific(
 "MesaBryce_sandlevel",
 "Mesa_sandlevel",
 },
-0, 
-7, 
-30, 
-60000, 
-4, 
-mobs_mc.spawn_height.overworld_min, 
+0,
+7,
+30,
+60000,
+4,
+mobs_mc.spawn_height.overworld_min,
 mobs_mc.spawn_height.overworld_max)
 
 
 mobs:spawn_specific(
-"mobs_mc:husk", 
-"overworld", 
+"mobs_mc:husk",
+"overworld",
 "ground",
 {
 "Desert",
@@ -332,29 +342,29 @@ mobs:spawn_specific(
 "Savanna",
 "Savanna_beach",
 },
-0, 
-7, 
-30, 
-6500, 
-4, 
-mobs_mc.spawn_height.overworld_min, 
+0,
+7,
+30,
+6500,
+4,
+mobs_mc.spawn_height.overworld_min,
 mobs_mc.spawn_height.overworld_max)
 mobs:spawn_specific(
-"mobs_mc:baby_husk", 
-"overworld", 
-"ground", 
+"mobs_mc:baby_husk",
+"overworld",
+"ground",
 {
 "Desert",
 "SavannaM",
 "Savanna",
 "Savanna_beach",
 },
-0, 
-7, 
-30, 
-65000, 
-4, 
-mobs_mc.spawn_height.overworld_min, 
+0,
+7,
+30,
+65000,
+4,
+mobs_mc.spawn_height.overworld_min,
 mobs_mc.spawn_height.overworld_max)
 
 -- Spawn eggs

mods/HUD/mcl_credits/init.lua

@@ -27,9 +27,9 @@ mcl_credits.people = {
 		"Rootyjr",
 		"Nicu",
 		"aligator",
+		"Code-Sploit",
 	}},
 	{"Contributors", 0x52FF00, {
-		"Code-Sploit",
 		"Laurent Rocher",
 		"HimbeerserverDE",
 		"TechDudie",
@@ -55,6 +55,7 @@ mcl_credits.people = {
 		"nickolas360",
 		"yutyo",
 		"ztianyang",
+		"j45",
 	}},
 	{"MineClone5", 0xA60014, {
 		"kay27",
@@ -63,6 +64,38 @@ mcl_credits.people = {
 		"NO11",
 		"j45",
 	}},
+	{"Original Mod Authors", 0x343434, {
+		"Wuzzy",
+		"Fleckenstein",
+		"BlockMen",
+		"TenPlus1",
+		"PilzAdam",
+		"ryvnf",
+		"stujones11",
+		"Arcelmi",
+		"celeron55",
+		"maikerumine",
+		"GunshipPenguin",
+		"Qwertymine3",
+		"Rochambeau",
+		"rubenwardy",
+		"stu",
+		"oilboi",
+		"4aiman",
+		"Kahrl",
+		"Krock",
+		"UgnilJoZ",
+		"lordfingle",
+		"22i",
+		"bzoss",
+		"kilbith",
+		"xeranas",
+		"kddekadenz",
+		"sofar",
+		"4Evergreen4",
+		"jordan4ibanez",
+		"paramat",
+	}},
 	{"3D Models", 0x0019FF, {
 		"22i",
 		"tobyplowy",

mods/ITEMS/mcl_armor/init.lua

@@ -83,21 +83,6 @@ minetest.register_tool("mcl_armor:helmet_diamond",{
 	on_secondary_use = armor.on_armor_use,
 })
 
-minetest.register_tool("mcl_armor:helmet_netherite",{
-	description = S("Netherite Helmet"),
-	_doc_items_longdesc = longdesc,
-	_doc_items_usagehelp = usage,
-	inventory_image = "mcl_armor_inv_helmet_netherite.png",
-	groups = {armor_head=1, mcl_armor_points=3, mcl_armor_uses=407, mcl_armor_toughness=2, enchantability=10 },
-	_repair_material = "mcl_netherite:netherite_ingot",
-	sounds = {
-		_mcl_armor_equip = "mcl_armor_equip_diamond",
-		_mcl_armor_unequip = "mcl_armor_unequip_diamond",
-	},
-	on_place = armor.on_armor_use,
-	on_secondary_use = armor.on_armor_use,
-})
-
 minetest.register_tool("mcl_armor:helmet_chain", {
 	description = S("Chain Helmet"),
 	_doc_items_longdesc = longdesc,
@@ -175,21 +160,6 @@ minetest.register_tool("mcl_armor:chestplate_diamond",{
 	on_secondary_use = armor.on_armor_use,
 })
 
-minetest.register_tool("mcl_armor:chestplate_netherite",{
-	description = S("Netherite Chestplate"),
-	_doc_items_longdesc = longdesc,
-	_doc_items_usagehelp = usage,
-	inventory_image = "mcl_armor_inv_chestplate_netherite.png",
-	groups = {armor_torso=1, mcl_armor_points=8, mcl_armor_uses=592, mcl_armor_toughness=2, enchantability=10 },
-	_repair_material = "mcl_netherite:netherite_ingot",
-	sounds = {
-		_mcl_armor_equip = "mcl_armor_equip_diamond",
-		_mcl_armor_unequip = "mcl_armor_unequip_diamond",
-	},
-	on_place = armor.on_armor_use,
-	on_secondary_use = armor.on_armor_use,
-})
-
 minetest.register_tool("mcl_armor:chestplate_chain", {
 	description = S("Chain Chestplate"),
 	_doc_items_longdesc = longdesc,
@@ -267,21 +237,6 @@ minetest.register_tool("mcl_armor:leggings_diamond",{
 	on_secondary_use = armor.on_armor_use,
 })
 
-minetest.register_tool("mcl_armor:leggings_netherite",{
-	description = S("Netherite Leggings"),
-	_doc_items_longdesc = longdesc,
-	_doc_items_usagehelp = usage,
-	inventory_image = "mcl_armor_inv_leggings_netherite.png",
-	groups = {armor_legs=1, mcl_armor_points=6, mcl_armor_uses=555, mcl_armor_toughness=2, enchantability=10 },
-	_repair_material = "mcl_netherite:netherite_ingot",
-	sounds = {
-		_mcl_armor_equip = "mcl_armor_equip_diamond",
-		_mcl_armor_unequip = "mcl_armor_unequip_diamond",
-	},
-	on_place = armor.on_armor_use,
-	on_secondary_use = armor.on_armor_use,
-})
-
 minetest.register_tool("mcl_armor:leggings_chain", {
 	description = S("Chain Leggings"),
 	_doc_items_longdesc = longdesc,
@@ -373,21 +328,6 @@ minetest.register_tool("mcl_armor:boots_chain", {
 	on_secondary_use = armor.on_armor_use,
 })
 
-minetest.register_tool("mcl_armor:boots_netherite", {
-	description = S("Netherite Boots"),
-	_doc_items_longdesc = longdesc,
-	_doc_items_usagehelp = usage,
-	inventory_image = "mcl_armor_inv_boots_netherite.png",
-	groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=481, enchantability=1 },
-	_repair_material = "mcl_netherite:netherite_ingot",
-	sounds = {
-		_mcl_armor_equip = "mcl_armor_equip_chainmail",
-		_mcl_armor_unequip = "mcl_armor_unequip_chainmail",
-	},
-	on_place = armor.on_armor_use,
-	on_secondary_use = armor.on_armor_use,
-})
-
 -- Register Craft Recipies
 
 local craft_ingreds = {

mods/ITEMS/mcl_banners/init.lua

@@ -35,6 +35,49 @@ mcl_banners.colors = {
 	["unicolor_light_blue"] = {"light_blue", S("Light Blue Banner"), "mcl_wool:light_blue", "#4040CF", "mcl_dye:lightblue", N("Light Blue") },
 }
 
+
+local pattern_names = {
+      "",
+      "border",
+      "bricks",
+      "circle",
+      "creeper",
+      "cross",
+      "curly_border",
+      "diagonal_up_left",
+      "diagonal_up_right",
+      "diagonal_right",
+      "diagonal_left",
+      "flower",
+      "gradient",
+      "gradient_up",
+      "half_horizontal_bottom",
+      "half_horizontal",
+      "half_vertical",
+      "half_vertical_right",
+      "thing",
+      "rhombus",
+      "skull",
+      "small_stripes",
+      "square_bottom_left",
+      "square_bottom_right",
+      "square_top_left",
+      "square_top_right",
+      "straight_cross",
+      "stripe_bottom",
+      "stripe_center",
+      "stripe_downleft",
+      "stripe_downright",
+      "stripe_left",
+      "stripe_middle",
+      "stripe_right",
+      "stripe_top",
+      "triangle_bottom",
+      "triangle_top",
+      "triangles_bottom",
+      "triangles_top",
+}
+
 local colors_reverse = {}
 for k,v in pairs(mcl_banners.colors) do
 	colors_reverse["mcl_banners:banner_item_"..v[1]] = k
@@ -300,24 +343,72 @@ minetest.register_node("mcl_banners:hanging_banner", {
 	end,
 })
 
+-- for pattern_name, pattern in pairs(patterns) do
 for colorid, colortab in pairs(mcl_banners.colors) do
+    for i, pattern_name in ipairs(pattern_names) do
 	local itemid = colortab[1]
 	local desc = colortab[2]
 	local wool = colortab[3]
 	local colorize = colortab[4]
 
-	local itemstring = "mcl_banners:banner_item_"..itemid
-	local inv
-	if colorize then
-		inv = "mcl_banners_item_base.png^(mcl_banners_item_overlay.png^[colorize:"..colorize..")"
+	local itemstring
+	if pattern_name == "" then
+		itemstring = "mcl_banners:banner_item_" .. itemid
 	else
-		inv = "mcl_banners_item_base.png^mcl_banners_item_overlay.png"
+		itemstring = "mcl_banners:banner_preview" .. "_" .. pattern_name .. "_" .. itemid
 	end
 
+	local inv
+	local base
+	local finished_banner
+	if pattern_name == "" then
+	    if colorize then
+		-- Base texture with base color
+		base = "mcl_banners_item_base.png^(mcl_banners_item_overlay.png^[colorize:"..colorize..")^[resize:32x32"
+	    else
+		base = "mcl_banners_item_base.png^mcl_banners_item_overlay.png^[resize:32x32"
+	    end
+	    finished_banner = base
+	else
+		-- Banner item preview background
+		base = "mcl_banners_item_base.png^(mcl_banners_item_overlay.png^[colorize:#CCCCCC)^[resize:32x32"
+
+		desc = S("Preview Banner")
+
+		local pattern = "mcl_banners_" .. pattern_name .. ".png"
+		local color = colorize
+
+		-- Generate layer texture
+
+		-- TODO: The layer texture in the icon is squished
+		-- weirdly because the width/height aspect ratio of
+		-- the banner icon is 1:1.5, whereas the aspect ratio
+		-- of the banner entity is 1:2. A solution would be to
+		-- redraw the pattern textures as low-resolution pixel
+		-- art and use that instead.
+
+		local layer = "(([combine:20x40:-2,-2="..pattern.."^[resize:16x24^[colorize:"..color..":"..layer_ratio.."))"
+
+		function escape(text)
+			 return text:gsub("%^", "\\%^"):gsub(":", "\\:") -- :gsub("%(", "\\%("):gsub("%)", "\\%)")
+		end
+
+		finished_banner = "[combine:32x32:0,0=" .. escape(base) .. ":8,4=" .. escape(layer)
+	end
+
+	inv = finished_banner
+
 	-- Banner items.
-	-- This is the player-visible banner item. It comes in 16 base colors.
+	-- This is the player-visible banner item. It comes in 16 base colors with a lot of patterns.
 	-- The multiple items are really only needed for the different item images.
 	-- TODO: Combine the items into only 1 item.
+	local groups
+	if pattern_name == "" then
+		groups = { banner = 1, deco_block = 1, flammable = -1 }
+	else
+		groups = { not_in_creative_inventory = 1 }
+	end
+
 	minetest.register_craftitem(itemstring, {
 		description = desc,
 		_tt_help = S("Paintable decoration"),
@@ -326,7 +417,7 @@ for colorid, colortab in pairs(mcl_banners.colors) do
 		wield_image = inv,
 		-- Banner group groups together the banner items, but not the nodes.
 		-- Used for crafting.
-		groups = { banner = 1, deco_block = 1, flammable = -1 },
+		groups = groups,
 		stack_max = 16,
 
 		on_place = function(itemstack, placer, pointed_thing)
@@ -492,6 +583,7 @@ for colorid, colortab in pairs(mcl_banners.colors) do
 		-- Add item to node alias
 		doc.add_entry_alias("nodes", "mcl_banners:standing_banner", "craftitems", itemstring)
 	end
+    end
 end
 
 if minetest.get_modpath("doc") then

mods/ITEMS/mcl_banners/patterncraft.lua

@@ -253,6 +253,11 @@ for colorid, colortab in pairs(mcl_banners.colors) do
 	dye_to_colorid_mapping[colortab[5]] = colorid
 end
 
+local dye_to_itemid_mapping = {}
+for colorid, colortab in pairs(mcl_banners.colors) do
+	dye_to_itemid_mapping[colortab[5]] = colortab[1]
+end
+
 -- Create a banner description containing all the layer names
 mcl_banners.make_advanced_banner_description = function(description, layers)
 	if layers == nil or #layers == 0 then
@@ -491,7 +496,14 @@ local banner_pattern_craft = function(itemstack, player, old_craft_grid, craft_i
 		imeta:set_string("description", ometa:get_string("description"))
 		imeta:set_string("name", mname)
 	end
-	return itemstack
+
+	if craft_predict then
+		local itemid_prefix = "mcl_banners:banner_preview"
+		local coloritemid = dye_to_itemid_mapping[dye]
+		return ItemStack(itemid_prefix .. "_" .. matching_pattern .. "_" .. coloritemid)
+	else
+		return itemstack
+	end
 end
 
 minetest.register_craft_predict(function(itemstack, player, old_craft_grid, craft_inv)

mods/ITEMS/mcl_compass/locale/mcl_compass.de.tr

@@ -1,4 +1,4 @@
 # textdomain: mcl_compass
-Compasses are tools which point to the world origin (X@=0, Z@=0) or the spawn point in the Overworld.=Kompasse sind Werkzeuge, die zum Ursprungspunkt der Welt (X@=0, Z@=0) oder den Einstiegspunkt der Welt zeigen.
+Compasses are tools which point to the world origin (X@=0, Z@=0) or the spawn point in the Overworld.=Kompasse sind Werkzeuge, die zum Ursprungspunkt der Welt (X@=0, Z@=0) oder zum Einstiegspunkt der Welt zeigen.
 Compass=Kompass
 Points to the world origin=Zeigt zum Startpunkt der Welt

mods/ITEMS/mcl_core/functions.lua

@@ -190,6 +190,22 @@ minetest.register_abm({
 	end,
 })
 
+-- Make cactus destroy items
+minetest.register_abm({
+	label = "Cactus destroy items",
+	nodenames = {"mcl_core:cactus"},
+	interval = 1,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		for _,object in pairs(minetest.get_objects_inside_radius(pos, 0.9)) do
+			if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
+				object:remove()
+			end
+		end
+	end,
+})
+
+
 minetest.register_abm({
 	label = "Sugar canes growth",
 	nodenames = {"mcl_core:reeds"},

mods/ITEMS/mcl_doors/locale/mcl_doors.de.tr

@@ -16,9 +16,9 @@ Birch Trapdoor=Birkenfalltür
 Spruce Trapdoor=Fichtenfalltür
 Dark Oak Trapdoor=Schwarzeichenfalltür
 Jungle Trapdoor=Dschungelfalltür
-Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.=Holzfalltüren sind horizontale Barrieren, die von Hand oder mit einem Redstone-Signal geöffnet oder geschlossen werden können. Sie belegen den oberen oder unteren Teil eines Blocks, je nach dem, wie sie platziert wurden. Wenn geöffnet, können sie wie eine Leiter erklommen werden.
+Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.=Holzfalltüren sind horizontale Barrieren, die von Hand oder mit einem Redstone-Signal geöffnet oder geschlossen werden können. Sie belegen den oberen oder unteren Teil eines Blocks, je nachdem, wie sie platziert wurden. Wenn geöffnet, können sie wie eine Leiter erklommen werden.
 To open or close the trapdoor, rightclick it or send a redstone signal to it.=Um die Falltür zu öffnen oder zu schließen, rechtsklicken Sie sie oder schicken Sie ein Redstone-Signal zu ihr.
 Iron Trapdoor=Eisenfalltür
-Iron trapdoors are horizontal barriers which can only be opened and closed by redstone signals, but not by hand. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.=Eisenfalltüren sind horizontale Barrieren, die nur mit einem Redstone-Signal geöffnet oder geschlossen werden können, nicht von Hand. Sie belegen den oberen oder unteren Teil eines Blocks, je nach dem, wie sie platziert wurden. Wenn geöffnet, können sie wie eine Leiter erklommen werden.
+Iron trapdoors are horizontal barriers which can only be opened and closed by redstone signals, but not by hand. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.=Eisenfalltüren sind horizontale Barrieren, die nur mit einem Redstone-Signal geöffnet oder geschlossen werden können, nicht von Hand. Sie belegen den oberen oder unteren Teil eines Blocks, je nachdem, wie sie platziert wurden. Wenn geöffnet, können sie wie eine Leiter erklommen werden.
 Openable by players and redstone power=Zu öffnen von Spielern und Redstoneenergie
 Openable by redstone power=Zu öffnen von Redstoneenergie

mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.de.tr

@@ -17,8 +17,8 @@ Efficiency=Effizienz
 Increases mining speed.=Erhöht Grabegeschwindigkeit.
 Feather Falling=Federfall
 Reduces fall damage.=Reduziert Fallschaden.
-Fire Aspect=Feieraspekt
-Sets target on fire.=Zündes das Ziel an.
+Fire Aspect=Feueraspekt
+Sets target on fire.=Zündet das Ziel an.
 Fire Protection=Feuerschutz
 Reduces fire damage.=Reduziert Feuerschaden
 Flame=Flamme
@@ -31,7 +31,7 @@ Impaling=Aufspießen
 Trident deals additional damage to ocean mobs.=Dreizack richtet Zusatzschaden an Ozeanmobs an.
 Infinity=Unendlichkeit
 Shooting consumes no regular arrows.=Schüsse verbrauchen keine regulären Pfeile.
-Knockback=Rückschlag.
+Knockback=Rückschlag
 Increases knockback.=Verstärkt Rückschlag.
 Looting=Plünderer
 Increases mob loot.=Erhöht Abwürfe von Mobs.
@@ -43,7 +43,7 @@ Lure=Köder
 Decreases time until rod catches something.=Reduziert die Zeit, bis die Angel etwas fängt.
 Mending=Ausbessern
 Repair the item while gaining XP orbs.=Gegenstand reparieren, während man Erfahrungskugeln erhält.
-Multishot=Mehrschuss
+Multishot=Mehrfachschuss
 Shoot 3 arrows at the cost of one.=3 Pfeile zum Preis von 1 schießen.
 Piercing=Durchbohren
 Arrows passes through multiple objects.=Pfeile durchdringen mehrere Objekte.
@@ -74,7 +74,7 @@ Increases sweeping attack damage.=Erhöht Schwungangriffsschaden.
 Thorns=Dornen
 Reflects some of the damage taken when hit, at the cost of reducing durability with each proc.=Reflektiert etwas des Schadens beim Erleiden eines Treffers, auf Kosten der Haltbarkeit.
 Unbreaking=Haltbarkeit
-Increases item durability.=Erhöht Haldbarkeit des Gegenstands.
+Increases item durability.=Erhöht Haltbarkeit des Gegenstands.
 Inventory=Inventar
 @1 Lapis Lazuli=@1 Lapislazuli
 @1 Enchantment Levels=@1 Verzauberungsstufen

mods/ITEMS/mcl_farming/hoes.lua

@@ -55,7 +55,6 @@ local uses = {
 	iron = 251,
 	gold = 33,
 	diamond = 1562,
-	netherite = 2031,
 }
 
 local hoe_tt = S("Turns block into farmland")
@@ -274,24 +273,3 @@ minetest.register_craft({
 		{"mcl_core:stick", ""}
 	}
 })
-
-minetest.register_tool("mcl_farming:hoe_netherite", {
-	description = S("Netherite Hoe"),
-	_tt_help = hoe_tt.."\n"..S("Uses: @1", uses.netherite),
-	_doc_items_longdesc = hoe_longdesc,
-	_doc_items_usagehelp = hoe_usagehelp,
-	inventory_image = "farming_tool_netheritehoe.png",
-	wield_scale = mcl_vars.tool_wield_scale,
-	on_place = hoe_on_place_function(uses.netherite),
-	groups = { tool=1, hoe=1, enchantability=10 },
-	tool_capabilities = {
-		full_punch_interval = 0.25,
-		damage_groups = { fleshy = 4, },
-		punch_attack_uses = uses.netherite,
-	},
-	_repair_material = "mcl_nether:netherite_ingot",
-	_mcl_toollike_wield = true,
-	_mcl_diggroups = {
-		hoey = { speed = 8, level = 5, uses = uses.netherite }
-	},
-})

mods/ITEMS/mcl_fences/locale/mcl_fences.de.tr

@@ -1,6 +1,6 @@
 # textdomain: mcl_fences
 Fences are structures which block the way. Fences will connect to each other and solid blocks. They cannot be jumped over with a simple jump.=Zäune sind Gebäude, die den Weg blockieren. Sie verbinden sich gegenseitig und anderen festen Blöcken. Man kann sie nicht mit normalen Sprüngen überspringen.
-Fence gates can be opened or closed and can't be jumped over. Fences will connect nicely to fence gates.=Zauntore können geöffnet und geschlossen werden und können nicht übersprungen werden. Zäune werden sich gut mit Zauntoren verbinden.
+Fence gates can be opened or closed and can't be jumped over. Fences will connect nicely to fence gates.=Zauntore können geöffnet und geschlossen werden und können nicht übersprungen werden. Zäune lassen sich gut mit Zauntoren verbinden.
 Right-click the fence gate to open or close it.=Rechtsklicken Sie auf ein Zauntor, um es zu öffnen oder zu schließen.
 Oak Fence=Eichenzaun
 Oak Fence Gate=Eichenzauntor

mods/ITEMS/mcl_fire/init.lua

@@ -47,94 +47,16 @@ local alldirs=
 	{ x = 0, y = 0, z = 1}
 }
 
--- 3 exptime variants because the animation is not tied to particle expiration time.
--- 3 colorized variants to imitate minecraft's
-local smoke_pdef_base = {
-	amount = 0.001,
-	time = 0,
-	-- minpos = vector.add(pos, { x = -0.45, y = -0.45, z = -0.45 }),
-	-- maxpos = vector.add(pos, { x = 0.45, y = 0.45, z = 0.45 }),
+local smoke_pdef = {
+	amount = 0.009,
+	maxexptime = 4.0,
 	minvel = { x = -0.1, y = 0.3, z = -0.1 },
 	maxvel = { x = 0.1, y = 1.6, z = 0.1 },
-	-- minexptime = 3 exptime variants,
-	-- maxexptime = 3 exptime variants
 	minsize = 4.0,
 	maxsize = 4.5,
-	-- texture = "mcl_particles_smoke_anim.png^[colorize:#000000:(3 colourize variants)",
-	animation = {
-		type = "vertical_frames",
-		aspect_w = 8,
-		aspect_h = 8,
-		-- length = 3 exptime variants
-	},
-	collisiondetection = true,
+	minrelpos = { x = -0.45, y = -0.45, z = -0.45 },
+	maxrelpos = { x = 0.45, y = 0.45, z = 0.45 },
 }
-local smoke_pdef_cached = {}
-local spawn_smoke = function(pos)
-	local min = math.min
-	local new_minpos = vector.add(pos, { x = -0.45, y = -0.45, z = -0.45 })
-	local new_maxpos = vector.add(pos, { x = 0.45, y = 0.45, z = 0.45 })
-
-	-- populate the cache
-	if not next(smoke_pdef_cached) then
-		-- the last frame plays for 1/8 * N seconds, so we can take advantage of it
-		-- to have varying exptime for each variant.
-		local exptimes = { 0.75, 1.5, 4.0 }
-		local colorizes = { "199", "209", "243" } -- round(78%, 82%, 90% of 256) - 1
-
-		local id = 1
-		for _,exptime in ipairs(exptimes) do
-			for _,colorize in ipairs(colorizes) do
-				smoke_pdef_base.minpos = new_minpos
-				smoke_pdef_base.maxpos = new_maxpos
-				smoke_pdef_base.maxexptime = exptime
-				smoke_pdef_base.animation.length = exptime + 0.1
-				-- minexptime must be set such that the last frame is actully rendered,
-				-- even if its very short. Larger exptime -> larger range
-				smoke_pdef_base.minexptime = min(exptime, (7.0/8.0 * (exptime + 0.1) + 0.1))
-				smoke_pdef_base.texture = "mcl_particles_smoke_anim.png^[colorize:#000000:" ..colorize
-
-				smoke_pdef_cached[id] = table.copy(smoke_pdef_base)
-
-				mcl_particles.add_node_particlespawner(pos, smoke_pdef_cached[id], "high")
-
-				id = id + 1
-			end
-		end
-
-		-- cache already populated
-	else
-		for i, smoke_pdef in ipairs(smoke_pdef_cached) do
-			smoke_pdef.minpos = new_minpos
-			smoke_pdef.maxpos = new_maxpos
-			mcl_particles.add_node_particlespawner(pos, smoke_pdef, "high")
-		end
-	end
-
---[[ Old smoke pdef
-	local spawn_smoke = function(pos)
-	mcl_particles.add_node_particlespawner(pos, {
-		amount = 0.1,
-		time = 0,
-		minpos = vector.add(pos, { x = -0.45, y = -0.45, z = -0.45 }),
-		maxpos = vector.add(pos, { x = 0.45, y = 0.45, z = 0.45 }),
-		minvel = { x = 0, y = 0.5, z = 0 },
-		maxvel = { x = 0, y = 0.6, z = 0 },
-		minexptime = 2.0,
-		maxexptime = 2.0,
-		minsize = 3.0,
-		maxsize = 4.0,
-		texture = "mcl_particles_smoke_anim.png^[colorize:#000000:127",
-		animation = {
-			type = "vertical_frames",
-			aspect_w = 8,
-			aspect_h = 8,
-			length = 2.1,
-		},
-	}, "high")
-	-- ]]
-
-end
 
 --
 -- Items
@@ -303,7 +225,7 @@ minetest.register_node("mcl_fire:fire", {
 		end
 
 		fire_timer(pos)
-		spawn_smoke(pos)
+		mcl_particles.spawn_smoke(pos, "fire", smoke_pdef)
 	end,
 	on_destruct = function(pos)
 		mcl_particles.delete_node_particlespawners(pos)
@@ -367,7 +289,7 @@ minetest.register_node("mcl_fire:eternal_fire", {
 		if has_mcl_portals then --Calling directly minetest.get_modpath consumes 4x more compute time
 			mcl_portals.light_nether_portal(pos)
 		end
-		spawn_smoke(pos)
+		mcl_particles.spawn_smoke(pos, "fire", smoke_pdef)
 	end,
 	on_destruct = function(pos)
 		mcl_particles.delete_node_particlespawners(pos)
@@ -627,7 +549,7 @@ minetest.register_lbm({
 	nodenames = {"group:fire"},
 	run_at_every_load = true,
 	action = function(pos, node)
-		spawn_smoke(pos)
+		mcl_particles.spawn_smoke(pos, "fire", smoke_pdef)
 	end,
 })
 

mods/ITEMS/mcl_fishing/locale/mcl_fishing.de.tr

@@ -7,12 +7,12 @@ Raw fish is obtained by fishing and is a food item which can be eaten safely. Co
 Cooked Fish=Gekochter Fisch
 Mmh, fish! This is a healthy food item.=Mhh, Fisch! Ein gesundes Lebensmittel.
 Raw Salmon=Roher Lachs
-Raw salmon is obtained by fishing and is a food item which can be eaten safely. Cooking it improves its nutritional value.=Lohen Lachs erhält man beim Angeln. Er ist ein Lebensmittel, der sicher verzehrt werden kann.
+Raw salmon is obtained by fishing and is a food item which can be eaten safely. Cooking it improves its nutritional value.=Rohen Lachs erhält man beim Angeln. Er ist ein Lebensmittel, das sicher verzehrt werden kann.
 Cooked Salmon=Gekochter Lachs
 This is a healthy food item which can be eaten.=Ein gesundes essbares Lebensmittel.
 Clownfish=Clownfisch
-Clownfish may be obtained by fishing (and luck) and is a food item which can be eaten safely.=Einen Clownfisch kann man beim Angeln mit etwas Glück fangen. Er ist ein Lebensmittel, der sicher verzehrt werden kann.
+Clownfish may be obtained by fishing (and luck) and is a food item which can be eaten safely.=Einen Clownfisch kann man beim Angeln mit etwas Glück fangen. Er ist ein Lebensmittel, das sicher verzehrt werden kann.
 Pufferfish=Kugelfisch
-Pufferfish are a common species of fish and can be obtained by fishing. They can technically be eaten, but they are very bad for humans. Eating a pufferfish only restores 1 hunger point and will poison you very badly (which drains your health non-fatally) and causes serious food poisoning (which increases your hunger).=Kugelfische sind eine verbreitete Fischart, die geangelt werden können. Sie können theoretisch gegessen werden, aber sie sind sehr schlecht für Menschen. Es gibt nur 1 Hungerpunkt und es wird Sie schwer vergiften (was Ihre Gesundheit verringert, aber nicht bis zum Tod) und Ihr Hungerpegel wird aufgrund der schweren Lebensmittelvergiftung stark ansteigen.
+Pufferfish are a common species of fish and can be obtained by fishing. They can technically be eaten, but they are very bad for humans. Eating a pufferfish only restores 1 hunger point and will poison you very badly (which drains your health non-fatally) and causes serious food poisoning (which increases your hunger).=Kugelfische sind eine verbreitete Fischart, die geangelt werden kann. Sie können theoretisch gegessen werden, aber sie sind sehr schlecht für Menschen. Es gibt nur 1 Hungerpunkt und es wird Sie schwer vergiften (was Ihre Gesundheit verringert, aber nicht bis zum Tod) und Ihr Hungerpegel wird aufgrund der schweren Lebensmittelvergiftung stark ansteigen.
 Catches fish in water=Fängt Fische im Wasser
 Very poisonous=Sehr giftig

mods/ITEMS/mcl_flowers/locale/mcl_flowers.de.tr

@@ -12,9 +12,9 @@ Allium=Sternlauch
 Azure Bluet=Porzellansternchen
 Blue Orchid=Blaue Orchidee
 Tall Grass=Hohes Gras
-Tall grass is a small plant which often occurs on the surface of grasslands. It can be harvested for wheat seeds. By using bone meal, tall grass can be turned into double tallgrass which is two blocks high.=Hohes Gras ist eine kleine Pflanze, die oft auf Wiesenflächen wächst. Es kann für Weizensamen abgeerntet werden. Mit Knochenmehl wird sich hohes Gras zu doppelhohem Gras verwandeln.
+Tall grass is a small plant which often occurs on the surface of grasslands. It can be harvested for wheat seeds. By using bone meal, tall grass can be turned into double tallgrass which is two blocks high.=Hohes Gras ist eine kleine Pflanze, die oft auf Wiesenflächen wächst. Es kann für Weizensamen abgeerntet werden. Mit Knochenmehl lässt sich hohes Gras zu doppelhohem Gras verwandeln.
 Fern=Farn
-Ferns are small plants which occur naturally in jungles and taigas. They can be harvested for wheat seeds. By using bone meal, a fern can be turned into a large fern which is two blocks high.=Farne sind kleine Pflanzen, die oft in Dschungeln und Taigas vorkommen. Sie können für Weizensamen abgeerntet werden. Mit Knochenmehl wird sich ein Farn zu einem großen Farn, der zwei Blöcke hoch ist, verwandeln.
+Ferns are small plants which occur naturally in jungles and taigas. They can be harvested for wheat seeds. By using bone meal, a fern can be turned into a large fern which is two blocks high.=Farne sind kleine Pflanzen, die oft in Dschungeln und Taigas vorkommen. Sie können für Weizensamen abgeerntet werden. Mit Knochenmehl lässt sich ein Farn zu einem großen Farn, der zwei Blöcke hoch ist, verwandeln.
 (Top Part)=(Oberseite)
 Peony=Pfingstrose
 A peony is a large plant which occupies two blocks. It is mainly used in dye production.=Eine Pfingstrose ist eine große Pflanze, die zwei Blöcke hoch ist. Sie wird hauptsächlich für die Farbenproduktion gebraucht.

mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.de.tr

@@ -61,7 +61,7 @@ This item is mainly used for crafting.=Dieser Gegenstand wird hauptsächlich in
 Magma Cream=Magmacreme
 Magma cream is a crafting component.=Magmacreme ist eine Fertigungskomponente.
 Ghast Tear=Ghast-Träne
-Place this item in an item frame as decoration.=Platzieren Sie diesen Gegenstand in einem Rahmel als Deko.
+Place this item in an item frame as decoration.=Platzieren Sie diesen Gegenstand in einem Rahmen als Deko.
 Nether Star=Nether-Stern
 
 A nether star is dropped when the Wither dies. Place it in an item frame to show the world how hardcore you are! Or just as decoration.=Ein Netherstern wird abgeworfen, wenn der Wither stirbt. Platzieren Sie ihn in einen Rahmen, um der Welt zu zeigen, wie großartig Sie sind!

mods/ITEMS/mcl_nether/init.lua

@@ -52,21 +52,6 @@ minetest.register_node("mcl_nether:quartz_ore", {
 	_mcl_fortune_drop = mcl_core.fortune_drop_ore
 })
 
-minetest.register_node("mcl_nether:ancient_debris", {
-	description = S("Ancient Debris"),
-	_doc_items_longdesc = S("Ancient debris can be found in the nether and is very very rare."),
-	stack_max = 64,
-	tiles = {"mcl_nether_ancient_debris_top.png", "mcl_nether_ancient_debris_side.png"},
-	is_ground_content = true,
-	groups = {pickaxey=4, building_block=1, material_stone=1, xp=0},
-	drop = 'mcl_nether:ancient_debris',
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 1200,
-	_mcl_hardness = 30,
-	_mcl_silk_touch_drop = true,
-	_mcl_fortune_drop = mcl_core.fortune_drop_ore
-})
-
 -- For eternal fire on top of netherrack and magma blocks
 -- (this code does not require a dependency on mcl_fire)
 local eternal_after_destruct = function(pos, oldnode)
@@ -268,22 +253,6 @@ minetest.register_craftitem("mcl_nether:quartz", {
 	groups = { craftitem = 1 },
 })
 
-minetest.register_craftitem("mcl_nether:netherite_scrap", {
-	description = S("Netherite Scrap"),
-	_doc_items_longdesc = S("Netherite scrap is a crafting ingredient for netherite ingots."),
-	inventory_image = "mcl_nether_netherite_scrap.png",
-	stack_max = 64,
-	groups = { craftitem = 1 },
-})
-
-minetest.register_craftitem("mcl_nether:netherite_ingot", {
-	description = S("Netherite Ingot"),
-	_doc_items_longdesc = S("Netherite ingots can be used with a smithing table to upgrade items to netherite."),
-	inventory_image = "mcl_nether_netherite_ingot.png",
-	stack_max = 64,
-	groups = { craftitem = 1 },
-})
-
 minetest.register_craftitem("mcl_nether:netherbrick", {
 	description = S("Nether Brick"),
 	_doc_items_longdesc = S("Nether bricks are the main crafting ingredient for crafting nether brick blocks and nether fences."),
@@ -299,13 +268,6 @@ minetest.register_craft({
 	cooktime = 10,
 })
 
-minetest.register_craft({
-	type = "cooking",
-	output = "mcl_nether:netherite_scrap",
-	recipe = "mcl_nether:ancient_debris",
-	cooktime = 10,
-})
-
 minetest.register_craft({
 	output = 'mcl_nether:quartz_block',
 	recipe = {
@@ -377,14 +339,5 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "mcl_nether:netherite_ingot",
-	recipe = {
-		{'mcl_nether:netherite_scrap', 'mcl_nether:netherite_scrap', 'mcl_nether:netherite_scrap'},
-		{'mcl_nether:netherite_scrap', 'mcl_core:gold_ingot', 'mcl_core:gold_ingot'},
-		{'mcl_core:gold_ingot', 'mcl_core:gold_ingot', ''},
-	}
-})
-
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/nether_wart.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/lava.lua")

mods/ITEMS/mcl_tools/init.lua

@@ -175,27 +175,6 @@ minetest.register_tool("mcl_tools:pick_diamond", {
 	},
 })
 
-minetest.register_tool("mcl_tools:pick_netherite", {
-	description = S("Netherite Pickaxe"),
-	_doc_items_longdesc = pickaxe_longdesc,
-	inventory_image = "default_tool_netheritepick.png",
-	wield_scale = wield_scale,
-	groups = { tool=1, pickaxe=1, dig_speed_class=5, enchantability=10 },
-	tool_capabilities = {
-		-- 1/1.2
-		full_punch_interval = 0.83333333,
-		max_drop_level=5,
-		damage_groups = {fleshy=6},
-		punch_attack_uses = 1016,
-	},
-	sound = { breaks = "default_tool_breaks" },
-	_repair_material = "mcl_nether:netherite_ingot",
-	_mcl_toollike_wield = true,
-	_mcl_diggroups = {
-		pickaxey = { speed = 8, level = 5, uses = 2031 }
-	},
-})
-
 local make_grass_path = function(itemstack, placer, pointed_thing)
 	-- Use pointed node's on_rightclick function first, if present
 	local node = minetest.get_node(pointed_thing.under)
@@ -372,28 +351,6 @@ minetest.register_tool("mcl_tools:shovel_diamond", {
 	},
 })
 
-minetest.register_tool("mcl_tools:shovel_netherite", {
-	description = S("Netherite Shovel"),
-	_doc_items_longdesc = shovel_longdesc,
-	_doc_items_usagehelp = shovel_use,
-	inventory_image = "default_tool_netheriteshovel.png",
-	wield_scale = wield_scale,
-	groups = { tool=1, shovel=1, dig_speed_class=5, enchantability=10 },
-	tool_capabilities = {
-		full_punch_interval = 1,
-		max_drop_level=5,
-		damage_groups = {fleshy=5},
-		punch_attack_uses = 1016,
-	},
-	on_place = make_grass_path,
-	sound = { breaks = "default_tool_breaks" },
-	_repair_material = "mcl_nether:netherite_ingot",
-	_mcl_toollike_wield = true,
-	_mcl_diggroups = {
-		shovely = { speed = 8, level = 5, uses = 2031 }
-	},
-})
-
 -- Axes
 
 local make_stripped_trunk = function(itemstack, placer, pointed_thing)
@@ -548,27 +505,6 @@ minetest.register_tool("mcl_tools:axe_diamond", {
 	},
 })
 
-minetest.register_tool("mcl_tools:axe_netherite", {
-	description = S("Netherite Axe"),
-	_doc_items_longdesc = axe_longdesc,
-	inventory_image = "default_tool_netheriteaxe.png",
-	wield_scale = wield_scale,
-	groups = { tool=1, axe=1, dig_speed_class=5, enchantability=10 },
-	tool_capabilities = {
-		full_punch_interval = 1.0,
-		max_drop_level=5,
-		damage_groups = {fleshy=10},
-		punch_attack_uses = 1016,
-	},
-	on_place = make_stripped_trunk,
-	sound = { breaks = "default_tool_breaks" },
-	_repair_material = "mcl_nether:netherite_ingot",
-	_mcl_toollike_wield = true,
-	_mcl_diggroups = {
-		axey = { speed = 8, level = 5, uses = 2031 }
-	},
-})
-
 -- Swords
 minetest.register_tool("mcl_tools:sword_wood", {
 	description = S("Wooden Sword"),
@@ -671,26 +607,6 @@ minetest.register_tool("mcl_tools:sword_diamond", {
 		swordy_cobweb = { speed = 8, level = 5, uses = 1562 }
 	},
 })
-minetest.register_tool("mcl_tools:sword_netherite", {
-	description = S("Netherite Sword"),
-	_doc_items_longdesc = sword_longdesc,
-	inventory_image = "default_tool_netheritesword.png",
-	wield_scale = wield_scale,
-	groups = { weapon=1, sword=1, dig_speed_class=5, enchantability=10 },
-	tool_capabilities = {
-		full_punch_interval = 0.625,
-		max_drop_level=5,
-		damage_groups = {fleshy=9},
-		punch_attack_uses = 2031,
-	},
-	sound = { breaks = "default_tool_breaks" },
-	_repair_material = "mcl_nether:netherite_ingot",
-	_mcl_toollike_wield = true,
-	_mcl_diggroups = {
-		swordy = { speed = 8, level = 5, uses = 2031 },
-		swordy_cobweb = { speed = 8, level = 5, uses = 2031 }
-	},
-})
 
 --Shears
 minetest.register_tool("mcl_tools:shears", {

mods/ITEMS/mcl_torches/api.lua

@@ -1,3 +1,14 @@
+local smoke_pdef = {
+	amount = 0.5,
+	maxexptime = 2.0,
+	minvel = { x = 0.0, y = 0.5, z = 0.0 },
+	maxvel = { x = 0.0, y = 0.6, z = 0.0 },
+	minsize = 1.5,
+	maxsize = 1.5,
+	minrelpos = { x = -1/16, y = 0.04, z = -1/16 },
+	maxrelpos = { x =  1/16, y = 0.06, z =  1/16 },
+}
+
 local spawn_flames_floor = function(pos)
 	-- Flames
 	mcl_particles.add_node_particlespawner(pos, {
@@ -15,52 +26,39 @@ local spawn_flames_floor = function(pos)
 		glow = minetest.registered_nodes[minetest.get_node(pos).name].light_source,
 	}, "low")
 	-- Smoke
-	mcl_particles.add_node_particlespawner(pos, {
-		amount = 0.5,
-		time = 0,
-		minpos = vector.add(pos, { x = -1/16, y = 0.04, z = -1/16 }),
-		maxpos = vector.add(pos, { x = -1/16, y = 0.06, z = -1/16 }),
-		minvel = { x = 0, y = 0.5, z = 0 },
-		maxvel = { x = 0, y = 0.6, z = 0 },
-		minexptime = 2.0,
-		maxexptime = 2.0,
-		minsize = 1.5,
-		maxsize = 1.5,
-		texture = "mcl_particles_smoke_anim.png",
-		animation = {
-			type = "vertical_frames",
-			aspect_w = 8,
-			aspect_h = 8,
-			length = 2.05,
-		},
-	}, "medium")
+	mcl_particles.spawn_smoke(pos, "torch", smoke_pdef)
 end
 
 local spawn_flames_wall = function(pos)
 	local minrelpos, maxrelpos
 	local node = minetest.get_node(pos)
 	local dir = minetest.wallmounted_to_dir(node.param2)
+
+	local smoke_pdef = table.copy(smoke_pdef)
+
 	if dir.x < 0 then
-		minrelpos = { x = -0.38, y = 0.04, z = -0.1 }
-		maxrelpos = { x = -0.2, y = 0.14, z = 0.1 }
+		smoke_pdef.minrelpos = { x = -0.38, y = 0.04, z = -0.1 }
+		smoke_pdef.maxrelpos = { x = -0.2, y = 0.14, z = 0.1 }
 	elseif dir.x > 0 then
-		minrelpos = { x = 0.2, y = 0.04, z = -0.1 }
-		maxrelpos = { x = 0.38, y = 0.14, z = 0.1 }
+		smoke_pdef.minrelpos = { x = 0.2, y = 0.04, z = -0.1 }
+		smoke_pdef.maxrelpos = { x = 0.38, y = 0.14, z = 0.1 }
 	elseif dir.z < 0 then
-		minrelpos = { x = -0.1, y = 0.04, z = -0.38 }
-		maxrelpos = { x = 0.1, y = 0.14, z = -0.2 }
+		smoke_pdef.minrelpos = { x = -0.1, y = 0.04, z = -0.38 }
+		smoke_pdef.maxrelpos = { x = 0.1, y = 0.14, z = -0.2 }
 	elseif dir.z > 0 then
-		minrelpos = { x = -0.1, y = 0.04, z = 0.2 }
-		maxrelpos = { x = 0.1, y = 0.14, z = 0.38 }
+		smoke_pdef.minrelpos = { x = -0.1, y = 0.04, z = 0.2 }
+		smoke_pdef.maxrelpos = { x = 0.1, y = 0.14, z = 0.38 }
 	else
 		return
 	end
+
+
 	-- Flames
 	mcl_particles.add_node_particlespawner(pos, {
 		amount = 8,
 		time = 0,
-		minpos = vector.add(pos, minrelpos),
-		maxpos = vector.add(pos, maxrelpos),
+		minpos = vector.add(pos, smoke_pdef.minrelpos),
+		maxpos = vector.add(pos, smoke_pdef.maxrelpos),
 		minvel = { x = -0.01, y = 0, z = -0.01 },
 		maxvel = { x = 0.01, y = 0.1, z = 0.01 },
 		minexptime = 0.3,
@@ -71,25 +69,7 @@ local spawn_flames_wall = function(pos)
 		glow = minetest.registered_nodes[node.name].light_source,
 	}, "low")
 	-- Smoke
-	mcl_particles.add_node_particlespawner(pos, {
-		amount = 0.5,
-		time = 0,
-		minpos = vector.add(pos, minrelpos),
-		maxpos = vector.add(pos, maxrelpos),
-		minvel = { x = 0, y = 0.5, z = 0 },
-		maxvel = { x = 0, y = 0.6, z = 0 },
-		minexptime = 2.0,
-		maxexptime = 2.0,
-		minsize = 1.5,
-		maxsize = 1.5,
-		texture = "mcl_particles_smoke_anim.png",
-		animation = {
-			type = "vertical_frames",
-			aspect_w = 8,
-			aspect_h = 8,
-			length = 2.05,
-		},
-	}, "medium")
+	mcl_particles.spawn_smoke(pos, "torch", smoke_pdef)
 end
 
 local remove_flames = function(pos)

mods/ITEMS/mcl_wool/locale/mcl_wool.de.tr

@@ -22,7 +22,7 @@ Blue Carpet=Blauer Teppich
 Magenta Wool=Magenta Wolle
 Magenta Carpet=Magenta Teppich
 Orange Wool=Orange Wolle
-Orange Carpet=Orange Teppich
+Orange Carpet=Oranger Teppich
 Purple Wool=Violette Wolle
 Purple Carpet=Violetter Teppich
 Brown Wool=Braune Wolle

mods/ITEMS/screwdriver/locale/screwdriver.de.tr

@@ -1,2 +1,2 @@
 # textdomain: screwdriver
-Screwdriver=Schraubendreher
+Screwdriver=Schraubenzieher