Merge remote-tracking branch 'upstream/stable-5' into nalc-dev

Merge tag '5.3.0' into nalc-dev
5.3.0
2025-10-26 21:35:31 +01:00 · 2020-07-18 11:48:46 +02:00 · 2020-07-12 13:11:07 +02:00 · 2020-07-09 22:15:23 +02:00 · 2020-05-09 01:07:25 +02:00 · 2020-04-05 18:48:33 +02:00
63 changed files with 3 additions and 3 deletions
--- a/game.conf
+++ b/game.conf
@@ -1,3 +1,3 @@
-name = Minetest Game
+name = Notre Ami Le Cube 1.2
-author = Minetest
+author = Minetest and Sys4
-description = Bundled by default with Minetest, and aims to be lightweight, moddable, and fairly playable without mods.
+description = Minetest game slightly modified by Sys4
--- a/mods/default/sounds/default_break_glass.1.ogg
+++ b/mods/default/sounds/default_break_glass.1.ogg
--- a/mods/default/sounds/default_break_glass.2.ogg
+++ b/mods/default/sounds/default_break_glass.2.ogg
--- a/mods/default/sounds/default_break_glass.3.ogg
+++ b/mods/default/sounds/default_break_glass.3.ogg
--- a/mods/default/sounds/default_breathless.ogg
+++ b/mods/default/sounds/default_breathless.ogg
--- a/mods/default/sounds/default_chest_close.ogg
+++ b/mods/default/sounds/default_chest_close.ogg
--- a/mods/default/sounds/default_chest_open.ogg
+++ b/mods/default/sounds/default_chest_open.ogg
--- a/mods/default/sounds/default_cool_lava.1.ogg
+++ b/mods/default/sounds/default_cool_lava.1.ogg
--- a/mods/default/sounds/default_cool_lava.2.ogg
+++ b/mods/default/sounds/default_cool_lava.2.ogg
--- a/mods/default/sounds/default_cool_lava.3.ogg
+++ b/mods/default/sounds/default_cool_lava.3.ogg
--- a/mods/default/sounds/default_dig_choppy.ogg
+++ b/mods/default/sounds/default_dig_choppy.ogg
--- a/mods/default/sounds/default_dig_cracky.ogg
+++ b/mods/default/sounds/default_dig_cracky.ogg
--- a/mods/default/sounds/default_dig_crumbly.ogg
+++ b/mods/default/sounds/default_dig_crumbly.ogg
--- a/mods/default/sounds/default_dig_dig_immediate.ogg
+++ b/mods/default/sounds/default_dig_dig_immediate.ogg
--- a/mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg
+++ b/mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg
--- a/mods/default/sounds/default_dig_snappy.ogg
+++ b/mods/default/sounds/default_dig_snappy.ogg
--- a/mods/default/sounds/default_dirt_footstep.1.ogg
+++ b/mods/default/sounds/default_dirt_footstep.1.ogg
--- a/mods/default/sounds/default_dirt_footstep.2.ogg
+++ b/mods/default/sounds/default_dirt_footstep.2.ogg
--- a/mods/default/sounds/default_dirt_footstep.3.ogg
+++ b/mods/default/sounds/default_dirt_footstep.3.ogg
--- a/mods/default/sounds/default_dirt_footstep.4.ogg
+++ b/mods/default/sounds/default_dirt_footstep.4.ogg
--- a/mods/default/sounds/default_dug_node.1.ogg
+++ b/mods/default/sounds/default_dug_node.1.ogg
--- a/mods/default/sounds/default_dug_node.2.ogg
+++ b/mods/default/sounds/default_dug_node.2.ogg
--- a/mods/default/sounds/default_glass_footstep.ogg
+++ b/mods/default/sounds/default_glass_footstep.ogg
--- a/mods/default/sounds/default_grass_footstep.1.ogg
+++ b/mods/default/sounds/default_grass_footstep.1.ogg
--- a/mods/default/sounds/default_grass_footstep.2.ogg
+++ b/mods/default/sounds/default_grass_footstep.2.ogg
--- a/mods/default/sounds/default_grass_footstep.3.ogg
+++ b/mods/default/sounds/default_grass_footstep.3.ogg
--- a/mods/default/sounds/default_grass_footstep.4.ogg
+++ b/mods/default/sounds/default_grass_footstep.4.ogg
--- a/mods/default/sounds/default_gravel_footstep.1.ogg
+++ b/mods/default/sounds/default_gravel_footstep.1.ogg
--- a/mods/default/sounds/default_gravel_footstep.2.ogg
+++ b/mods/default/sounds/default_gravel_footstep.2.ogg
--- a/mods/default/sounds/default_gravel_footstep.3.ogg
+++ b/mods/default/sounds/default_gravel_footstep.3.ogg
--- a/mods/default/sounds/default_gravel_footstep.4.ogg
+++ b/mods/default/sounds/default_gravel_footstep.4.ogg
--- a/mods/default/sounds/default_hard_footstep.1.ogg
+++ b/mods/default/sounds/default_hard_footstep.1.ogg
--- a/mods/default/sounds/default_hard_footstep.2.ogg
+++ b/mods/default/sounds/default_hard_footstep.2.ogg
--- a/mods/default/sounds/default_hard_footstep.3.ogg
+++ b/mods/default/sounds/default_hard_footstep.3.ogg
--- a/mods/default/sounds/default_hard_footstep.4.ogg
+++ b/mods/default/sounds/default_hard_footstep.4.ogg
--- a/mods/default/sounds/default_item_smoke.ogg
+++ b/mods/default/sounds/default_item_smoke.ogg
--- a/mods/default/sounds/default_metal_footstep.1.ogg
+++ b/mods/default/sounds/default_metal_footstep.1.ogg
--- a/mods/default/sounds/default_metal_footstep.2.ogg
+++ b/mods/default/sounds/default_metal_footstep.2.ogg
--- a/mods/default/sounds/default_metal_footstep.3.ogg
+++ b/mods/default/sounds/default_metal_footstep.3.ogg
--- a/mods/default/sounds/default_metal_footstep.4.ogg
+++ b/mods/default/sounds/default_metal_footstep.4.ogg
--- a/mods/default/sounds/default_place_node.1.ogg
+++ b/mods/default/sounds/default_place_node.1.ogg
--- a/mods/default/sounds/default_place_node.2.ogg
+++ b/mods/default/sounds/default_place_node.2.ogg
--- a/mods/default/sounds/default_place_node.3.ogg
+++ b/mods/default/sounds/default_place_node.3.ogg
--- a/mods/default/sounds/default_place_node_hard.1.ogg
+++ b/mods/default/sounds/default_place_node_hard.1.ogg
--- a/mods/default/sounds/default_place_node_hard.2.ogg
+++ b/mods/default/sounds/default_place_node_hard.2.ogg
--- a/mods/default/sounds/default_sand_footstep.1.ogg
+++ b/mods/default/sounds/default_sand_footstep.1.ogg
--- a/mods/default/sounds/default_sand_footstep.2.ogg
+++ b/mods/default/sounds/default_sand_footstep.2.ogg
--- a/mods/default/sounds/default_sand_footstep.3.ogg
+++ b/mods/default/sounds/default_sand_footstep.3.ogg
--- a/mods/default/sounds/default_sand_footstep.4.ogg
+++ b/mods/default/sounds/default_sand_footstep.4.ogg
--- a/mods/default/sounds/default_snow_footstep.1.ogg
+++ b/mods/default/sounds/default_snow_footstep.1.ogg
--- a/mods/default/sounds/default_snow_footstep.2.ogg
+++ b/mods/default/sounds/default_snow_footstep.2.ogg
--- a/mods/default/sounds/default_snow_footstep.3.ogg
+++ b/mods/default/sounds/default_snow_footstep.3.ogg
--- a/mods/default/sounds/default_snow_footstep.4.ogg
+++ b/mods/default/sounds/default_snow_footstep.4.ogg
--- a/mods/default/sounds/default_wood_footstep.1.ogg
+++ b/mods/default/sounds/default_wood_footstep.1.ogg
--- a/mods/default/sounds/default_wood_footstep.2.ogg
+++ b/mods/default/sounds/default_wood_footstep.2.ogg
--- a/mods/default/sounds/default_wood_footstep.3.ogg
+++ b/mods/default/sounds/default_wood_footstep.3.ogg
--- a/mods/default/sounds/default_wood_footstep.4.ogg
+++ b/mods/default/sounds/default_wood_footstep.4.ogg
--- a/mods/default/sounds/health_gain.ogg
+++ b/mods/default/sounds/health_gain.ogg
--- a/mods/default/sounds/lava.ogg
+++ b/mods/default/sounds/lava.ogg
--- a/mods/default/sounds/player_damage.1.ogg
+++ b/mods/default/sounds/player_damage.1.ogg
--- a/mods/default/sounds/player_damage.2.ogg
+++ b/mods/default/sounds/player_damage.2.ogg
--- a/mods/default/sounds/player_falling_damage.ogg
+++ b/mods/default/sounds/player_falling_damage.ogg
--- a/mods/default/sounds/waterfall.ogg
+++ b/mods/default/sounds/waterfall.ogg
Author	SHA1	Message	Date
sys4	3f064d5ed4	Merge remote-tracking branch 'upstream/stable-5' into nalc-dev	2020-07-18 11:48:46 +02:00
sys4	b3e660e897	Merge tag '5.3.0' into nalc-dev 5.3.0	2020-07-12 13:11:07 +02:00
sfan5	cb2c416b51	Merge remote-tracking branch 'origin/stable-5' into HEAD	2020-07-09 22:15:23 +02:00
sys4	2fc9a68aa6	Merge remote-tracking branch 'upstream/stable-5' into nalc-dev	2020-05-09 01:07:25 +02:00
sfan5	dcb3df0a38	Merge remote-tracking branch 'origin/stable-5' into HEAD	2020-04-05 18:48:33 +02:00
sys4	19d903e8b3	Met à jour les sons des pas dans la neige	2019-12-23 19:32:05 +01:00
sys4	721c598fbd	Merge branch 'stable-5' of yunohost.local:minetest/minetest_game into nalc-dev	2019-12-23 19:08:11 +01:00
SmallJoker	0a9e24622f	Merge branch 'master' of https://github.com/minetest/minetest_game into stable-5	2019-10-12 15:53:20 +02:00
sys4	a0c658f4d1	Merge branch 'stable-5' into nalc-dev	2019-04-07 17:57:18 +02:00
sys4	9585eef042	Merge branch 'stable-5' of https://github.com/minetest/minetest_game into stable-5	2019-04-07 17:38:55 +02:00
Paramat	8678265125	Dungeon loot: Avoid empty 'if' branch to satisfy lua check	2019-03-31 22:26:33 +02:00
sfan5	df387e2394	Dungeon loot: Don't crash on unknown items fixes #2228	2019-03-31 22:26:32 +02:00
sys4	2db0287652	Merge remote-tracking branch 'github/stable-5' into nalc-1.1-dev	2019-03-24 15:53:23 +01:00
tenplus1	806b29c2a1	Add food groups to blueberries (#2335 )	2019-03-22 19:20:36 +00:00
sys4-fr	3aa1117f4a	Changements des bruitages du mod default par ceux de MFF.	2018-09-21 22:17:19 +02:00
sys4-fr	630f24e747	Remplacement du nom du jeux.	2018-09-21 20:27:20 +02:00
sofar	d6a66860af	Prevent divide by zero (#2106 ) This forces all explosions to damage entities within the 1 node range. If that needs to be disabled, the damage_radius needs to be set to 0.	2018-05-18 12:50:47 +02:00
paramat	6d850f23a5	Flower spread ABM: Optimise Match maximum spread density to maximum mapgen density for flowers. Place 3 flora nodes at once instead of 1. Change ABM chance value to 300 to match previous spread rate. ABM becomes 3 times less intensive.	2018-05-18 12:50:47 +02:00
paramat	2c1af0861f	Doors: Avoid crash on nil player in 'can dig door'	2018-05-18 12:50:47 +02:00
Jat15	d2ae721235	Stairs: unbind table groups (#2036 ) Unbind table groups for base block, stairs, slabs.	2018-05-18 12:50:18 +02:00
paramat	01db55cee5	default:dirt_with_snow: Re-add to soil group Previously, saplings were not growing if the dirt they are on turned to 'dirt with snow' before growth. Also for consistency with other dirt nodes.	2018-05-06 20:44:30 +02:00
Ekdohibs	4ba2b5179e	Furnace: Fix being able to cook items without enough fuel This was triggered when too much time had elapsed when timer was called. Also, fix timer resolution giving free fuel time.	2018-05-06 20:44:30 +02:00
Diego Martínez	a5092c0df6	creative: Add missing tooltips.	2018-05-06 20:44:30 +02:00
paramat	575c098bae	Book textures: Reset colour profiles to remove warnings	2018-05-06 20:44:22 +02:00
paramat	cddd59b578	Book textures: Replace with more original textures	2018-05-06 20:40:45 +02:00
ezhh	7a4b1e0ce1	Default: Make burntimes more rational and consistent	2017-12-05 21:24:02 +01:00
DTA7	0216fa08ec	Add nil checks for placer	2017-11-19 23:03:38 +01:00
raymoo	ca3e807d35	Creative: Make the placenode registration check for non-player placers	2017-11-19 23:03:38 +01:00
raymoo	ca38bb2390	Creative: Make handle_node_drops override work for non-player diggers	2017-11-19 23:03:38 +01:00
Coder12a	7d07c52d09	Books: Convert \r to \n Some files or editors may use \r instand of \n like notepad++. If you copy text written in notepad++ and pasted into the book. The book will only have one page.	2017-11-19 23:03:38 +01:00
SmallJoker	532013a032	Creative: Cache inventory items on load	2017-11-19 23:03:38 +01:00
tenplus1	a52622669f	TNT: Add tnt.boom defaults This adds def, def.radius and def.damage_radius defaults to the tnt.boom() function if they aren't specified on call.	2017-11-19 23:03:38 +01:00
SmallJoker	ce5e668681	Bones: Return bones when taking the last ItemStack	2017-11-19 23:03:38 +01:00
tenplus1	6530fa914b	Flowers: Add waterlily right-click checks Check for on_rightclick functions of nodes when holding a waterlily.	2017-11-19 23:03:38 +01:00
rubenwardy	86eb0e1617	Sfinv: Remove possibility of infinite loop when homepage doesn't exist	2017-11-19 23:03:38 +01:00
rubenwardy	93fb9b36ce	Sfinv: Rename navigation tabs to reduce chance of a conflict	2017-11-19 23:03:38 +01:00
danielmeek32	09e3505ea1	Chests: Fix locked chest protection against explosions (#1886 ) Fixes #1885	2017-11-19 23:03:38 +01:00
tenplus1	cecbfc1676	Chests: Fix open chest after player leave (#1884 ) This should fix the chest staying open when a player disconnects while inside.	2017-11-19 23:03:38 +01:00
tenplus1	fba6f6a4cf	TNT: Add explode_center flag Add 'explode_centre' flag which when false explodes as normal and when true runs on_blast on centre node as well as dropping items.	2017-11-19 23:03:38 +01:00
tenplus1	6053456af1	Mushroom spread: Optimise and make overridable Move mushroom spread ABM action into a global and overridable function. Optimise spread code. Reduce spread range to reduce spread through walls.	2017-11-19 23:03:38 +01:00
Hybrid Dog	cc2f75b2f9	Register fence: Allow setting nodedefs to 'false'	2017-11-19 23:03:38 +01:00
tenplus1	b6ef71c92e	TNT's tnt:boom cleanup (#1868 ) The tnt:boom node doesn't actually need the on_construct and on_timer functions to remove the node after 0.4 seconds as the tnt_explode function already does this beforehand.	2017-11-19 23:03:38 +01:00
SmallJoker	876da2fbc6	Beds: Do not crash when placing in an unknown node	2017-11-19 23:03:38 +01:00
paramat	ea45ca57a5	Lava cooling: Increase interval to 2 An excessive load has been reported caused by the node searching, so even when no lava is present.	2017-11-19 23:03:34 +01:00
SmallJoker	6fa3ebfa75	Carts: Check for last pathfinder predition too Minor fix to reduce cart jitter slightly	2017-11-19 22:57:28 +01:00
SmallJoker	efe6fb6dfb	TNT: Only burn visually connected powder (#1857 )	2017-11-19 22:57:28 +01:00
SmallJoker	1aeb2baa91	Creative: Prevent unauthorized item access (#1840 )	2017-11-19 22:57:28 +01:00
Ezhh	e4d6425846	Correct farming/stairs dependency (#1838 )	2017-11-19 22:57:28 +01:00
Paramat	81f885795d	Crafting: Remove duplicate reversed recipes (#1777 ) For axes and hoes only use one recipe that matches the appearance of the texture and in inventory.	2017-11-19 22:53:53 +01:00
paramat	f3e29bc2cc	Saplings: Reduce grow time to ABM equivalent Previous times were chosen using statistical maths, but reports suggested this was too long. I tested by timing an ABM acting on 100 nodes, with interval and chance equal to the old sapling ABM. 50 at 4m59s. 99 at 24m58s. 100 at 26m58s. So choose a grow time between 5 and 25 min for tree and bush saplings. If 'can grow' is false at grow time the timer is reset to 5 min.	2017-11-19 22:53:53 +01:00
DS-Minetest	3a72f7b84b	Add backface_culling to open chests and fencegates	2017-11-19 22:53:53 +01:00
Foz	20bd4560f8	TNT: Track TNT owner in metadata for protection mods It is useful for protection mods to know who owns an exploding TNT block. This allows the blocks destroyed by the TNT to be limited to the same ones the owner could destroy without using TNT. TNT placed within a protected area by the area owner, and later ignited by another player will destroy within the protected area nodes the igniter may not otherwise be able to interact with. Any player could significantly increase the size of an explosion by placing more TNT in an adjacent unprotected area if the original TNT block was placed withing 1 node of such a boundary. This feature sounds dangerous, but we are talking about TNT. Players should use it carefully.	2017-11-19 22:53:53 +01:00
SmallJoker	8991b9fe54	Carts: Do not connect rails with gunpowder (#1812 )	2017-11-19 22:53:53 +01:00
Johannes Fritz	aea6c5dd1d	Stairs: Add backface culling to stair meshes If backface culling is not specified for a tile in 'images' it is set to true. Slabs already have backface culling due to being defined as nodeboxes (which are then converted to meshnodes).	2017-11-19 22:53:53 +01:00
paramat	da41caca66	Chests: Check 'def' of node above chest to avoid crash In 'chest_lid_obstructed(pos)' check for nil 'def' to avoid a crash caused by an unknown node above the chest.	2017-11-19 22:53:14 +01:00
red-001	103af98864	Books: Also limit the max size of the title This limits the max size of the full title of the book to `80` letters and the size of the part thats displayed in the tooltip to `35` letters.	2017-11-19 22:53:14 +01:00
red-001	26606b0520	Books: Limit the size of books Really large books just waste hard drive space and the engine is not designed to handle that much data in item metadata, this can cause strange things to happen.	2017-11-19 22:52:00 +01:00
red-001	706844e8bf	Books: Add nil value checks to the book formspec handler	2017-11-19 22:52:00 +01:00
paramat	a56274c230	Stairs: Use one recipe matching inventory appearence No longer have 2 recipes for stairs, choose the one that matches the appearence in inventory (stair rising toward the right). Helps to reduce recipe count now that an increasing number of stairs are being registered.	2017-11-19 22:52:00 +01:00
vorunbekannt75@web.de	3512226867	Default: Revert "Default: Shorter and better ABMs" This reverts commit `e523c3a296` to re-enable the overriding and redefinition of these global functions.	2017-11-19 17:16:32 +01:00
ShadowNinja	d5b9fee6fe	Merge 0.4.16 into stable-0.4	2017-06-03 17:22:59 -04:00
sfan5	437860feff	Merge tag '0.4.15' into stable-0.4 0.4.15	2016-12-22 23:00:57 +01:00