Merge branch 'master' into buckets

mods/ENTITIES/mobs_mc/LICENSE-media.md

@@ -190,9 +190,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/>
@@ -306,4 +307,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/ITEMS/mcl_farming/pumpkin.lua

@@ -162,7 +162,9 @@ if minetest.get_modpath("mcl_armor") then
 		end
 	end)
 	minetest.register_on_dieplayer(function(player)
-		remove_pumpkin_hud(player)
+		if not minetest.settings:get_bool("mcl_keepInventory") then
+			remove_pumpkin_hud(player)
+		end
 	end)
 	minetest.register_on_leaveplayer(function(player)
 		pumpkin_hud[player] = nil

mods/PLAYER/mcl_playerplus/init.lua

@@ -189,22 +189,15 @@ minetest.register_globalstep(function(dtime)
 				if vector.length(player_velocity) < 40 then
 					local add_velocity = player.add_velocity or player.add_player_velocity
 					add_velocity(player, vector.multiply(player:get_look_dir(), 4))
-					minetest.add_particlespawner({
+					add_particle({
-						amount = 1,
+						pos = fly_pos,
-						time = 0.1,
+						velocity = {x = 0, y = 0, z = 0},
-						minpos = fly_pos,
+						acceleration = {x = 0, y = 0, z = 0},
-						maxpos = fly_pos,
+						expirationtime = math.random(0.3, 0.5),
-						minvel = {x = 0, y = 0, z = 0},
+						size = math.random(1, 2),
-						maxvel = {x = 0, y = 0, z = 0},
-						minacc = {x = 0, y = 0, z = 0},
-						maxacc = {x = 0, y = 0, z = 0},
-						minexptime = 0.3,
-						maxexptime = 0.5,
-						minsize = 1,
-						maxsize = 2.5,
 						collisiondetection = false,
 						vertical = false,
-						texture = "mcl_particles_crit.png^[colorize:#bc7a57:127",
+						texture = "mcl_particles_bonemeal.png^[colorize:#bc7a57:127",
 						glow = 5,
 					})
 				end