Merge remote-tracking branch 'refs/remotes/origin/main'

mods/minecraft/blocks/wheat.lua

@@ -28,7 +28,7 @@ for i = 1, 7 do
 			},
 		},
 		groups = {dig_immediate=3, not_in_creative_inventory=1, plant=1,attached_node=1, dig_by_water=1,destroy_by_lava_flow=1, dig_by_piston=1},
-	--	sounds = mcl_sounds.node_sound_leaves_defaults(),
+		sounds = block_sound('grass'),
 	})
 end
 
@@ -53,7 +53,7 @@ minetest.register_node("minecraft:wheatblock", {
 		}
 	},
 	groups = {dig_immediate=3, not_in_creative_inventory=1, plant=1,attached_node=1, dig_by_water=1,destroy_by_lava_flow=1, dig_by_piston=1},
-	--sounds = mcl_sounds.node_sound_leaves_defaults(),
+	sounds = block_sound('grass'),
 })
 
 farming:add_plant("plant_wheat", "minecraft:wheatblock", {"minecraft:wheatblock_1", "minecraft:wheatblock_2", "minecraft:wheatblock_3", "minecraft:wheatblock_4", "minecraft:wheatblock_5", "minecraft:wheatblock_6", "minecraft:wheatblock_7"}, 25, 20)

mods/wield3d/.gitignore

@@ -1,6 +0,0 @@
-## Generic ignorable patterns and files
-*~
-.*.swp
-*bak*
-tags
-*.vim

mods/wield3d/description.txt

@@ -1,2 +0,0 @@
-Visible 3d wielded items for Minetest.
-Adds 3d wield-items that are visible in third person view and to other players.

mods/wield3d/init.lua

@@ -16,7 +16,7 @@ local location = {
 
 local function add_wield_entity(player)
 	local name = player:get_player_name()
-	local pos = player:getpos()
+	local pos = player:get_pos()
 	if name and pos then
 		pos.y = pos.y + 0.5
 		local object = minetest.add_entity(pos, "wield3d:wield_entity")