Merge pull request 'Fix meshhand with mcl_skins disabled' (#3864) from skins into master

Reviewed-on: MineClone2/MineClone2#3864
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>

CREDITS.md

@@ -27,6 +27,7 @@
 * jordan4ibanez
 * iliekprogrammar
 * kabou
+* kay27
 * Faerraven / Michieal
 * MysticTempest
 * NO11
@@ -70,7 +71,6 @@
 * erlehmann
 * E
 * n_to
-* kay27
 * debiankaios
 * Gustavo6046 / wallabra
 * CableGuy67
@@ -111,6 +111,7 @@
 * uqers
 * Niterux
 * appgurueu
+* seventeenthShulker
 
 ## Music
 * Jordach for the jukebox music compilation from Big Freaking Dig

LEGAL.md

@@ -38,11 +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/)
 
-The main menu images are release under: [CC0](https://creativecommons.org/publicdomain/zero/1.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)

MODELS.md

@@ -1,13 +1,14 @@
-#Models in Minetest/Mineclone2
+# 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
+## Recommended software
 
-###Blender
+### 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. 
 
@@ -19,14 +20,16 @@ Blitz 3D (.b3d) Is one of the main animated model formats used for entities in t
 
 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
+## Types of model formats
+
+### Animated, skinned models
 
-###Animated, skinned models
 * Blitz 3D files (.b3d)
 
 * Microsoft DirectX (.x) (binary & text, compression is not supported)
 
-###Static meshes
+### Static meshes
+
 * Wavefront OBJ (.obj)
 
 Note: The sometimes accompanying .mtl files are not supported and can safely be deleted.
@@ -45,16 +48,18 @@ Note: Do not use .b3d and .x files for static meshes at the moment, Minetest cur
 
 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
+## Pros & Cons of .b3d vs .x
+
+### B3D
 
-###B3D
 * [+] Binary format means a small size
 
 * [-] Difficult to postprocess after exporting
 
 * [-] Difficult to debug problems
 
-###X (text version)
+### X (text version)
+
 * [+] Can be parsed easily with lua scripts
 
 * [+] Can be easily generated by scripts

README.md

@@ -79,12 +79,14 @@ 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>
-* 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

RELEASE.md

@@ -1,10 +1,11 @@
 ### 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 version in game.conf
+# Update CREDITS.md
+# Update version in game.conf
 
+```
 lua tools/generate_ingame_credits.lua
 
 git add CREDITS.md
@@ -18,10 +19,11 @@ git commit -m "Pre-release update credits and set version 0.83.0"
 git tag 0.83.0
 
 git push origin 0.83.0
+```
 
-#Update version in game.conf to the next version with -SNAPSHOT suffix
+# Update version in game.conf to the next version with -SNAPSHOT suffix
 
-git commit -m "Post-release set version 0.84.0-SNAPSHOT"
+`git commit -m "Post-release set version 0.84.0-SNAPSHOT"`
 
 ### Hotfix Release
 
@@ -32,15 +34,17 @@ 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)
@@ -53,11 +57,13 @@ git checkout -b hotfix_bug_1_branch
 
 * 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.
 
@@ -71,5 +77,13 @@ Note: If you have to do more than 1 hotfix release, can do it on the same releas
 
 ##### Inform people
 
-* Add a comment to the forum post with the release number and what is involved, and maintainer will update main post.
-* Add a comment in Discord announcement
+* Upload video to YouTube
+* Add a comment to the forum post with the release number and change log. Maintainer will update main post with code link.
+* 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

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.84.0-SNAPSHOT
+version=0.85.0-SNAPSHOT

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_chached_reason then
-		return mt_reason._mcl_chached_reason
+	if mt_reason._mcl_cached_reason then
+		return mt_reason._mcl_cached_reason
 	end
 
 	local mcl_reason

mods/ENTITIES/mobs_mc/LICENSE-media.md

@@ -191,9 +191,10 @@ Origin of those models:
 * [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0)
     * `mcl_totems_totem.ogg`
         * Source: <https://freesound.org/people/Spennnyyy/sounds/323502/>
-* [Baŝto](https://opengameart.org/users/ba%C5%9Dto)
+* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) (remixer) and [kantouth](https://freesound.org/people/kantouth/) (original author)
     * `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0)
         * Source: <https://opengameart.org/content/walking-skeleton>
+            * Based on:  <https://freesound.org/people/kantouth/sounds/115113/>
 * [spookymodem](https://freesound.org/people/spookymodem/)
     * `mobs_mc_skeleton_death.ogg` (CC0)
         * <https://freesound.org/people/spookymodem/sounds/202091/>
@@ -307,4 +308,4 @@ Origin of those models:
 
 Note: Many of these sounds have been more or less modified to fit the game.
 
-Sounds not mentioned hre are licensed under CC0.
+Sounds not mentioned here are licensed under CC0.

mods/ENTITIES/mobs_mc/villager.lua

@@ -351,7 +351,7 @@ local professions = {
 	leatherworker = {
 		name = N("Leatherworker"),
 		texture = "mobs_mc_villager_leatherworker.png",
-		jobsite = "mcl_cauldrons:cauldron",
+		jobsite = "group:cauldron",
 		trades = {
 			{
 			{ { "mcl_mobitems:leather", 9, 12 }, E1 },
@@ -1008,7 +1008,15 @@ end
 ----- JOBSITE LOGIC
 local function get_profession_by_jobsite(js)
 	for k,v in pairs(professions) do
-		if v.jobsite == js then return k end
+		if v.jobsite == js then
+			return k
+		-- Catch Nitwit doesn't have a jobsite
+		elseif v.jobsite and v.jobsite:find("^group:") then
+			local group = v.jobsite:gsub("^group:", "")
+			if minetest.get_item_group(js, group) > 0 then
+				return k
+			end
+		end
 	end
 end
 

mods/HELP/doc/doc_items/locale/doc_items.pt_BR.tr

@@ -53,8 +53,8 @@ Range: 4=Range: 4
 Rating @1=Classificação @1
 # @1 is minimal rating, @2 is maximum rating
 Rating @1-@2=Classificação @1-@2
-The fall damage on this block is increased by @1%.=O dano por queda nesse bloco é aumentado em @ 1%.
-The fall damage on this block is reduced by @1%.=O dano por queda nesse bloco é reduzido em @ 1%.
+The fall damage on this block is increased by @1%.=O dano por queda nesse bloco é aumentado em @1%.
+The fall damage on this block is reduced by @1%.=O dano por queda nesse bloco é reduzido em @1%.
 This block allows light to propagate with a small loss of brightness, and sunlight can even go through losslessly.=Esse bloco permite que a luz se propague com uma pequena perda de brilho, e a luz solar pode até passar sem perdas.
 This block allows light to propagate with a small loss of brightness.=Esse bloco permite que a luz se propague com uma pequena perda de brilho.
 This block allows sunlight to propagate without loss in brightness.=Esse bloco permite que a luz solar se propague sem perda de brilho.
@@ -78,7 +78,7 @@ This block connects to this block: @1.=Esse bloco se conecta a esse bloco: @1.
 This block decreases your breath and causes a drowning damage of @1 hit point every 2 seconds.=Esse bloco diminui a sua respiração e causa um dano por afogamento de @1 ponto de vida a cada 2 segundos.
 This block decreases your breath and causes a drowning damage of @1 hit points every 2 seconds.=Esse bloco diminui a sua respiração e causa um dano por afogamento de @1 pontos de vida a cada 2 segundos.
 This block is a light source with a light level of @1.=Esse bloco é uma fonte de luz com um nível de luz de @1.
-This block glows faintly with a light level of @1.=Esse bloco tem um brilho fraco com um nível de luz de @ 1.
+This block glows faintly with a light level of @1.=Esse bloco tem um brilho fraco com um nível de luz de @1.
 This block is a building block for creating various buildings.=Esse bloco é um bloco de construção para criar vários edifícios.
 This block is a liquid with these properties:=Esse bloco é um líquido com as seguintes propriedades:
 This block is affected by gravity and can fall.=Esse bloco é afetado pela gravidade e pode cair.
@@ -123,7 +123,7 @@ any level=qualquer nível
 level 0=nível 0
 level 0-@1=nivel 0-@1
 unknown=desconhecido
-Unknown item (@1)=Item desconhecido
+Unknown item (@1)=Item desconhecido (@1)
 • @1: @2=
 • @1: @2 HP=
 • @1: @2, @3=

mods/HUD/mcl_base_textures/init.lua

@@ -1 +0,0 @@
--- This mod has no code and is only a collection of textures.

mods/HUD/mcl_base_textures/mod.conf

@@ -1,3 +0,0 @@
-name = mcl_base_textures
-author = Wuzzy
-description = Provides core textures needed by Minetest.

mods/HUD/mcl_credits/people.lua

@@ -29,6 +29,7 @@ return {
 		"jordan4ibanez",
 		"iliekprogrammar",
 		"kabou",
+		"kay27",
 		"Faerraven / Michieal",
 		"MysticTempest",
 		"NO11",
@@ -72,7 +73,6 @@ return {
 		"erlehmann",
 		"E",
 		"n_to",
-		"kay27",
 		"debiankaios",
 		"Gustavo6046 / wallabra",
 		"CableGuy67",
@@ -113,6 +113,7 @@ return {
 		"uqers",
 		"Niterux",
 		"appgurueu",
+		"seventeenthShulker",
 	}},
 	{S("Music"), 0xA60014, {
 		"Jordach for the jukebox music compilation from Big Freaking Dig",

mods/ITEMS/mcl_bamboo/bamboo_base.lua

@@ -203,11 +203,11 @@ local bamboo_def = {
 		if node_above_name ~= "mcl_core:water_source" and node_above_name ~= "mcl_core:lava_source"
 				and node_above_name ~= "mcl_nether:nether_lava_source" then
 			local _, position = minetest.item_place(place_item, placer, pointed_thing, fdir)
-			if not minetest.is_creative_enabled(placer:get_player_name()) then
-				itemstack:take_item(1)
-			end
-			if rand_height and rand_height > 1 then
-				if position then
+			if position then
+				if not minetest.is_creative_enabled(placer:get_player_name()) then
+					itemstack:take_item(1)
+				end
+				if rand_height and rand_height > 1 then
 					mcl_bamboo.mcl_log("Setting Height Data...")
 					meta = minetest.get_meta(position)
 					if meta then

mods/ITEMS/mcl_bamboo/locale/mcl_bamboo.ru.tr

@@ -0,0 +1,45 @@
+# textdomain: mcl_bamboo
+
+### bamboo_base.lua ###
+
+Bamboo=Бамбук
+Bamboo Mosaic Plank=Бамбуковая мозаика
+Bamboo Plank=Бамбуковые доски
+Stripped Bamboo Block=Блок обтёсанного бамбука
+Bamboo Block=Блок бамбука
+
+### bamboo_items.lua ###
+
+A bamboo button is a redstone component made out of stone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second.=Бамбуковая кнопка - это компонент красного камня, который изготовлен из краснокаменной руды. Ее можно нажать, чтобы обеспечить питание красному камню. При нажатии он приводит в действие соседние компоненты красного камня на 1 секунду.
+
+A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.=Деревянная нажимная пластина - это компонент красного камня, который снабжает окружающие блоки энергией красного камня, в то время как любой подвижный объект (включая выпавшие предметы, игроков и мобов) стоит на ней.
+
+Bamboo=Бамбук
+Bamboo Button=Бамбуковая кнопка
+Bamboo Door=Бамбуковая дверь
+Bamboo Fence=Бамбуковый забор
+Bamboo Fence Gate=Бамбуковая калитка
+Bamboo Mosaic Slab=Плита из бамбуковой мозаики
+Bamboo Mosaic Stair=Ступеньки из бамбуковой мозаики
+Bamboo Plank Slab=Бамбуковая плита из досок
+Bamboo Plank Stair=Бамбуковые ступеньки из досок
+Bamboo Pressure Plate=Бамбуковая нажимная плита
+Bamboo Slab=Бамбуковая плита
+Bamboo Stair=Бамбуковые ступеньки
+Bamboo Trapdoor=Бамбуковый люк
+Double Bamboo Mosaic Slab=Двойная бамбуковая мозаичная плита
+Double Bamboo Plank Slab=Двойная бамбуковая дощатая плита
+Double Bamboo Slab=Двойная бамбуковая плита
+Double Stripped Bamboo Slab=Двойная обтесанная бамбуковая плита
+Scaffolding=Строительные леса
+Scaffolding (horizontal)=Строительные леса (горизонтальный)
+Scaffolding block used to climb up or out across areas.=Блок строительных лесов, используемый для подъема вверх или перемещения по другим участкам.
+Stripped Bamboo Slab=Обтесанная бамбуковая плита
+Stripped Bamboo Stair=Обтесанные бамбуковые ступеньки
+
+To open or close the trapdoor, rightclick it or send a redstone signal to it.=Чтобы открыть или закрыть люк, щелкните по нему правой кнопкой мыши или отправьте на него сигнал redstone.
+
+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.=Деревянные люки - это горизонтальные барьеры, которые можно открывать и закрывать вручную или по сигналу красного камня. Они занимают верхнюю или нижнюю часть блока, в зависимости от того, как они были размещены. Когда они открыты, по ним можно подниматься, как по лестнице.
+
+Wooden doors are 2-block high barriers which can be opened or closed by hand and by a redstone signal.=Деревянные двери представляют собой барьеры высотой в 2 блока, которые можно открывать или закрывать вручную и по сигналу redstone.
+To open or close a wooden door, rightclick it or supply its lower half with a redstone signal.=Чтобы открыть или закрыть деревянную дверь, щелкните по ней правой кнопкой мыши или снабдите ее нижнюю половину сигналом красного камня.

mods/ITEMS/mcl_beacons/locale/mcl_beacons.ru.tr

@@ -0,0 +1,6 @@
+# textdomain: mcl_beacons
+Beacon=Маяк
+Beacon:=Маяк:
+Primary Power:=Основной эффект:
+Inventory:=Инвентарь:
+

mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.ru.tr

@@ -0,0 +1,29 @@
+# textdomain: mcl_blackstone
+Blackstone=Чернит
+Polished Blackstone=Полированный чернит
+Chiseled Polished Blackstone=Резной полированный чернит
+Polished Blackstone Bricks=Полированный чернокаменный кирпич 
+Basalt=Базальт
+Polished Basalt=Полированный базальт
+Blackstone Slab=Чернитная плита
+Polished Blackstone Slab=Плита из полированного чернита
+Chiseled Polished Blackstone Slab=Резная полированная чернитная плита
+Polished Blackstone Brick Slab=Плита из полированно-чернитного кирпича
+Blackstone Stair=Чернитные ступеньки
+Polished Blackstone Stair=Ступеньки из полированно-чернитного кирпича
+Chiseled Polished Blackstone Stair=Резные полированные чернитные ступеньки
+Polished Blackstone Brick Stair=Ступеньки из полированно-чернитного кирпича
+Quartz Bricks=Кварцевые кирпичи
+Soul Torch=Факел душ
+Torches are light sources which can be placed at the side or on the top of most blocks.=Факелы - это источники света, которые могут быть размещены сбоку или сверху большинства блоков.
+Soul Lantern=Фонарь душ
+Soul Soil=Почва душ
+Eternal Soul Fire=Пламя душ
+Gilded Blackstone=Золочёный чернит
+Nether Gold Ore=Незерская золотая руда
+Smooth Basalt=Гладкий базальт
+Blackstone Wall=Чернитная стена
+Double Blackstone Slab=Двойная чернитная плита
+Polished Double Blackstone Slab=Полированная двойная чернитная плита
+Double Chiseled Polished Blackstone Slab=Двойная резная полированная чернитная плита
+Double Polished Blackstone Brick Slab=Двойная плита из полированно-чернитного кирпича

mods/ITEMS/mcl_bows/crossbow.lua

@@ -105,8 +105,20 @@ local function player_shoot_arrow(wielditem, player, power, damage, is_critical)
 	local yaw = player:get_look_horizontal()
 
 	if has_multishot_enchantment then
-		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir.x, y=dir.y, z=dir.z + .2}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
-		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir.x, y=dir.y, z=dir.z - .2}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
+		-- calculate rotation by 10 degrees 'left' and 'right' of facing direction
+		local pitch = player:get_look_vertical()
+		local pitch_c = math.cos(pitch)
+		local pitch_s = math.sin(pitch)
+		local yaw_c = math.cos(yaw + math.pi / 2)
+		local yaw_s = math.sin(yaw + math.pi / 2)
+
+		local rot_left =  {x =   yaw_c * pitch_s * math.pi / 18, y =   pitch_c * math.pi / 18, z =   yaw_s * pitch_s * math.pi / 18}
+		local rot_right = {x = - yaw_c * pitch_s * math.pi / 18, y = - pitch_c * math.pi / 18, z = - yaw_s * pitch_s * math.pi / 18}
+		local dir_left = vector.rotate(dir, rot_left)
+		local dir_right = vector.rotate(dir, rot_right)
+
+		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir_left.x, y=dir_left.y, z=dir_left.z}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
+		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir_right.x, y=dir_right.y, z=dir_right.z}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false)
 		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, dir, yaw, player, power, damage, is_critical, player:get_wielded_item(), true)
 	else
 		mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, dir, yaw, player, power, damage, is_critical, player:get_wielded_item(), true)

mods/ITEMS/mcl_cherry_blossom/locale/mcl_cherry_blossom.ru.tr

@@ -0,0 +1,24 @@
+# textdomain: mcl_cherry_blossom
+Cherry Log=Вишнёвое бревно
+The trunk of a cherry blossom tree.=Ствол цветущего вишневого дерева.
+Stripped Cherry Log=Обтёсанное вишнёвое бревно
+The stripped trunk of a cherry blossom tree.=Обтёсанный ствол цветущей вишни.
+Cherry Bark=Вишня
+This is a decorative block surrounded by the bark of a tree trunk.=Это декоративный блок, окруженный корой ствола дерева.
+Stripped Cherry Wood=Обтёсанная вишнёвая древесина
+The stripped wood of a cherry blossom tree.=Обтёсанная древесина цветущей вишни.
+Cherry Wood Planks=Вишнёвые доски
+Cherry Leaves=Вишнёвые листья
+Cherry blossom leaves are grown from cherry blossom trees.=Листья цветущей вишни выращивают на вишневых деревьях.
+Cherry Sapling=Саженец вишни
+Cherry blossom sapling can be planted to grow cherry trees.=Саженец цветущей вишни можно посадить для выращивания вишневых деревьев.
+Cherry Door=Вишнёвая дверь
+Cherry Trapdoor=Вишнёвый люк
+Cherry Stairs=Вишнёвые ступеньки
+Cherry Slab=Вишнёвая плита
+Double Cherry Slab=Двойная вишнёвая плита 
+Cherry Sign=Вишнёвая табличка
+Cherry Fence=Вишнёвый забор
+Cherry Gate=Вишнёвая калитка
+Cherry Pressure Plate=Вишнёвая нажимная плита
+Cherry Button=Вишнёвая кнопка

mods/ITEMS/mcl_core/locale/mcl_core.pt_BR.tr

@@ -217,8 +217,7 @@ Stripped Spruce Wood=Madeira de Pinheiro Descascada
 Stone Bricks=Tijolo de Rocha
 Sugar=Açúcar
 Sugar Canes=Cana de Açúcar
-Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.=
-Canas de açúcar são plantas que possui alguns usos em fabricações. Canas de açúcar crescerão lentamente até 3 blocos quando estão próximas da água e são colocadas em blocos de grama, terra, areia, areia vermelha, podzol ou terra infértil.
+Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.=Canas de açúcar são plantas que possui alguns usos em fabricações. Canas de açúcar crescerão lentamente até 3 blocos quando estão próximas da água e são colocadas em blocos de grama, terra, areia, areia vermelha, podzol ou terra infértil. Quando uma cana de açúcar é quebrada, todas as canas de açúcar conectadas acima também se quebrarão.
 Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=Canas de açúcar só podem ser colocados emcima de outras canas de açúcar ou sobre blocos em qual elas podem crescer.
 Sugar comes from sugar canes and is used to make sweet foods.=Açúcar vem de canas de açúcar e é utilizado para fazer doces comidas.
 The stripped trunk of an acacia tree.=O tronco descascado de uma acácia.

mods/ITEMS/mcl_crimson/init.lua

@@ -681,7 +681,7 @@ mcl_doors:register_trapdoor("mcl_crimson:crimson_trapdoor", {
 	_doc_items_longdesc = S("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."),
 	_doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."),
 	tile_front = "mcl_crimson_crimson_trapdoor.png",
-	tile_side = "mcl_crimson_crimson_hyphae_wood.png",
+	tile_side = "mcl_crimson_crimson_trapdoor_side.png",
 	wield_image = "mcl_crimson_crimson_trapdoor.png",
 	groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1},
 	_mcl_hardness = 3,
@@ -719,7 +719,7 @@ mcl_doors:register_trapdoor("mcl_crimson:warped_trapdoor", {
 	_doc_items_longdesc = S("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."),
 	_doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."),
 	tile_front = "mcl_crimson_warped_trapdoor.png",
-	tile_side = "mcl_crimson_warped_hyphae_wood.png",
+	tile_side = "mcl_crimson_warped_trapdoor_side.png",
 	wield_image = "mcl_crimson_warped_trapdoor.png",
 	groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1},
 	_mcl_hardness = 3,

mods/ITEMS/mcl_flowerpots/init.lua

@@ -209,3 +209,9 @@ mcl_flowerpots.register_potted_flower("mcl_core:deadbush", {
 	desc = S("Dead Bush"),
 	image = "default_dry_shrub.png",
 })
+
+mcl_flowerpots.register_potted_flower("mcl_cherry_blossom:cherrysapling", {
+	name = "cherrysapling",
+	desc = S("Cherry Sapling"),
+	image = "mcl_cherry_blossom_sapling.png",
+})

mods/ITEMS/mcl_flowerpots/locale/template.txt

@@ -24,3 +24,4 @@ Flower Pot=
 Flower pots are decorative blocks in which flowers and other small plants can be placed.=
 Just place a plant on the flower pot. Flower pots can hold small flowers (not higher than 1 block), saplings, ferns, dead bushes, mushrooms and cacti. Rightclick a potted plant to retrieve the plant.=
 Can hold a small flower or plant=
+Cherry Sapling Flower Pot=

mods/ITEMS/mcl_mangrove/init.lua

@@ -298,7 +298,7 @@ mcl_doors:register_trapdoor("mcl_mangrove:mangrove_trapdoor", {
 	_doc_items_longdesc = S("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."),
 	_doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."),
 	tile_front = "mcl_mangrove_trapdoor.png",
-	tile_side = "mcl_mangrove_planks.png",
+	tile_side = "mcl_mangrove_trapdoor_side.png",
 	wield_image = "mcl_mangrove_trapdoor.png",
 	groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1},
 	_mcl_hardness = 3,

mods/PLAYER/mcl_meshhand/init.lua

@@ -85,16 +85,16 @@ function mcl_meshhand.update_player(player)
 	end
 end
 
+minetest.register_on_joinplayer(function(player)
+	player:get_inventory():set_size("hand", 1)
+end)
+
 if mcl_skins_enabled then
 	mcl_player.register_on_visual_change(mcl_meshhand.update_player)
 else
 	minetest.register_on_joinplayer(mcl_meshhand.update_player)
 end
 
-minetest.register_on_joinplayer(function(player)
-	player:get_inventory():set_size("hand", 1)
-end)
-
 -- This is needed to deal damage when punching mobs
 -- with random items in hand in survival mode
 minetest.override_item("", {

releasenotes/0_84-the_very_nice_release.md

@@ -0,0 +1,160 @@
+### 0.84 - The Very Nice release
+
+### Contributors
+#### New contributors
+
+* appgurueu
+* kbundg
+* megustanlosfrijoles
+* Niterux
+* seventeenthShulker
+* Temak
+* uqers
+
+#### Returning contributors
+
+* 3raven
+* AncientMariner
+* chmodsayshello
+* cora
+* epCode
+* Exhale
+* FlamingRCCars
+* FossFanatic
+* MrRar
+* Nicu
+* PrairieWind
+* rudzik8
+* SmokeyDope
+* Wbjitscool
+
+## Important Info
+
+### New server commands
+
+minetest.register_chatcommand("music", {
+params = "[on|off|invert [<player name>]]",
+description = S("Turns music for yourself or another player on or off."),
+
+
+### New settings added
+
+#Maximum amount of hostile mobs (default:300)
+mcl_mob_cap_hostile (Global hostile mob cap) int 300 0 2048
+
+#Maximum amount of non-hostile mobs (default:300)
+mcl_mob_cap_non_hostile (Global non-hostile mob cap) int 300 0 2048
+
+#Maximum amount of ambient water mobs that will spawn near a player (default:20)
+mcl_mob_cap_water_ambient (Mob cap ambient water) int 20 0 1024
+
+#Maximum amount of underground water mobs that will spawn near a player (default:5)
+mcl_mob_cap_water_underground (Mob cap underground water) int 5 0 1024
+
+#Maximum amount of axolotl mobs that will spawn near a player (default:5)
+mcl_mob_cap_axolotl (Mob cap axolotl) int 5 0 1024
+
+## Change Log
+
+### Gameplay Improvements
+
+* Cherry Blossoms - Saplings added as loot, and trees and craftables added. Initial changes to enable a Wood API. - PrairieWind, SmokeyDope, Wbjitscool
+* Fix issue with drops turning black due to clipping into walls and floors and visually demonstrate drops merging - AncientMariner
+* Hoglins attack frequency reduced now due to new attack_frequency mob setting - AncientMariner
+* Hostile mobs should lose aggro if they cannot see their target - AncientMariner
+* Nerf skeleton attack - AncientMariner
+* Split global cap for peaceful and hostile. Introduce underground water, ambient water, axolotl cap. Slight peaceful spawn balancing. Mob spawning can have more density in some instances. Slightly less passive mob spawning. Some mobs were not counted in cap calculations. Refreshed cap space after spawning in cycle. - AncientMariner
+* Prevent slime blocks from 'connecting' to honey blocks when pushing/pulling, like in Minecraft - seventeenthShulker
+* Add support for external custom skins mod - MrRar
+* Double doors fixed - FossFanatic
+* Make elytra enchantable and the enchanted elytra usable - PrairieWind/FlamingRCCars/MrRar
+* Remove slimes from mushroom islands - AncientMariner
+* Remove Flower Forest Beaches from Wolf biome spawn list - PrairieWind
+* Make Piglin Brutes drop golden axes = PrairieWind
+* Make end crystals explode when nearby crystals are punched and explode - PrairieWind
+* Improved pig riding - PrairieWind
+
+
+### Visual Improvements
+
+* Incorporate sheep eating animation. - epCode
+* New textures for warped for Crimson Fungus, Crimson Fungus planks, Warped Hyphae planks - Exhale
+* New sweet berry textures - SmokeyDope
+* Add Piglin and Creeper description names to death message - AncientMariner
+* Creeper should not walk to player if it does not have line of sight. Mob shouldn't look at player it does not have line of sight to. - AncientMariner
+* Remove one cause of extra jittering in mobs - AncientMariner
+* Update dead bush generation - PrairieWind
+* Fix a typo in the Acquire Hardware achievement - uqers
+* Clean-up mcl_bamboo text - rudzik8
+
+
+### Sounds
+
+* Add more fishing sounds! - Niterux
+* Add max_hear_distance flag to composter sounds - SmokeyDope
+* Add barrel sounds - SmokeyDope
+
+
+### Translations
+
+* Update russian translation - Temak
+* (french) translation enhancements - 3raven
+* Add spanish translations - megustanlosfrijoles
+
+
+### Performance
+
+* Reduce network activity for elytra flying rocket particles - AncientMariner
+* Mapgen Performance Improvements - FossFanatic
+* Migrate beacons back to abm - chmodsayshello
+* Frequent danger checks and movement actions removed from non-moving and out of range mobs - AncientMariner
+* Duplicate jump and danger checks removed from mob processing - AncientMariner
+* Decreased frequency of processing for some mob actions - AncientMariner
+* Only run certain checks if applicable for mob - AncientMariner
+
+
+### Multiplayer
+
+* Add global cooldown for the bed quick chat feature - chmodsayshello/AncientMariner
+* Music toggle for players connecting to servers - chmodsayshello
+* Make sure dying sign text respects protection - AncientMariner
+
+
+### Code Quality
+
+* Oxidation API - PrairieWind
+* Fix sign color requirement and translation issue - PrairieWind
+* Standardise despawn logic and add asserts. Add persistent flag for mobs that have been interacted with. - AncientMariner
+* Replace the zombie pigman with the zombified piglin - AncientMariner
+* Clean up crash code and convert to new style vectors - AncientMariner
+* Fix png start warning and double slab description warning. - AncientMariner
+* OptiPNG a bunch of textures - PrairieWind
+* Beds mesecons dependency incorrectly named - AncientMariner
+* Rename Bucket Textures - AncientMariner
+* Fix global variable references and exit mob_step if missing pos - AncientMariner
+* Fix texture modifiers relying on undocumented behavior - appgurueu
+
+
+### Fixes
+
+* Piglins no longer aggro for enchanted gold armour - AncientMariner
+* Drop pumpkins, melons and buttons via piston or dirt next to piston - AncientMariner
+* Llamas and other mobs change skin color - AncientMariner
+* Mobs more easily jump from stationary up a block - epCode
+* Fix waterlogged mangrove roots leaving water in the nether - AncientMariner
+* Prevent ALL furnaces from being moved (xp dupe fix) - chmodsayshello
+* Fix gilded blackstone fortune dupe - cora
+* Lightning rod param2 is now saved upon being struck - AncientMariner
+* Adjust hot stuff achievement to use new lava bucket texture name - SmokeyDope
+* Fix dropped out bamboo lines from translation work - AncientMariner
+* Zombie piglin no longer prevent sleep unless hostile. - AncientMariner
+
+
+### Crashes
+
+* Fix crash when creeper explodes in minecart - AncientMariner
+* Fix crash when using a named spawn egg - cora
+* Fix crash when parrot sits on shoulder - AncientMariner
+* Fix 2 automated wool farm crash and elytra fly over unknown block crash - AncientMariner
+* Change order of numbers passed into random that crash on some Lua versions - AncientMariner
+* solar panels: No crash when minetest.get_natural_light() return nil - MrRar