Merge branch 'master' of https://github.com/Ombridride/minetest-minetestforfun-server

2025-06-28 06:11:47 +02:00 · 2015-06-01 21:58:03 +02:00
parent 75c0a5f12a 582f7a3635
commit e6910dba39
3997 changed files with 2477 additions and 4697 deletions
--- a/other_things/Tableau-valeurs-MFF.ods
+++ b/other_things/Tableau-valeurs-MFF.ods
--- a/other_things/doors-de-davedevils.rar
+++ b/other_things/doors-de-davedevils.rar
--- a/other_things/irc-old-save/.gitignore
+++ b/other_things/irc-old-save/.gitignore
--- a/other_things/irc-old-save/.gitmodules
+++ b/other_things/irc-old-save/.gitmodules
--- a/other_things/irc-old-save/API.md
+++ b/other_things/irc-old-save/API.md
--- a/other_things/irc-old-save/LICENSE.txt
+++ b/other_things/irc-old-save/LICENSE.txt
--- a/other_things/irc-old-save/README.md
+++ b/other_things/irc-old-save/README.md
--- a/other_things/irc-old-save/botcmds.lua
+++ b/other_things/irc-old-save/botcmds.lua
--- a/other_things/irc-old-save/callback.lua
+++ b/other_things/irc-old-save/callback.lua
--- a/other_things/irc-old-save/chatcmds.lua
+++ b/other_things/irc-old-save/chatcmds.lua
--- a/other_things/irc-old-save/config.lua
+++ b/other_things/irc-old-save/config.lua
--- a/other_things/irc-old-save/core.so
+++ b/other_things/irc-old-save/core.so
--- a/other_things/irc-old-save/hooks.lua
+++ b/other_things/irc-old-save/hooks.lua
--- a/other_things/irc-old-save/init.lua
+++ b/other_things/irc-old-save/init.lua
--- a/other_things/irc-old-save/irc/.gitignore
+++ b/other_things/irc-old-save/irc/.gitignore
--- a/other_things/irc-old-save/irc/LICENSE.txt
+++ b/other_things/irc-old-save/irc/LICENSE.txt
--- a/other_things/irc-old-save/irc/README.markdown
+++ b/other_things/irc-old-save/irc/README.markdown
--- a/other_things/irc-old-save/irc/asyncoperations.lua
+++ b/other_things/irc-old-save/irc/asyncoperations.lua
--- a/other_things/irc-old-save/irc/doc/irc.luadoc
+++ b/other_things/irc-old-save/irc/doc/irc.luadoc
--- a/other_things/irc-old-save/irc/handlers.lua
+++ b/other_things/irc-old-save/irc/handlers.lua
--- a/other_things/irc-old-save/irc/init.lua
+++ b/other_things/irc-old-save/irc/init.lua
--- a/other_things/irc-old-save/irc/main.lua
+++ b/other_things/irc-old-save/irc/main.lua
--- a/other_things/irc-old-save/irc/messages.lua
+++ b/other_things/irc-old-save/irc/messages.lua
@ -103,6 +103,12 @@ function msg_meta:fromRFC1459(line)

 	local pos
 	self.command, pos = line:match("(%S+)()")
+	-- /MFF BEGIN
+	if not pos then 
+		minetest.log("error", "[IRC] This crash message was intended to see the value of a breaking variable. line = " .. (line or "nil"))
+		return
+	end
+	-- /MFF END (Mg|06/01/2015)
 	line = line:sub(pos)

 	self.args = self.args or {}
--- a/other_things/irc-old-save/irc/push-luadoc.sh
+++ b/other_things/irc-old-save/irc/push-luadoc.sh
--- a/other_things/irc-old-save/irc/set.lua
+++ b/other_things/irc-old-save/irc/set.lua
--- a/other_things/irc-old-save/irc/util.lua
+++ b/other_things/irc-old-save/irc/util.lua
--- a/other_things/irc-old-save/messages.lua
+++ b/other_things/irc-old-save/messages.lua
--- a/other_things/irc-old-save/player_part.lua
+++ b/other_things/irc-old-save/player_part.lua
--- a/other_things/irc-old-save/unix.so
+++ b/other_things/irc-old-save/unix.so
--- a/other_things/logos/README.md
+++ b/other_things/logos/README.md
--- a/other_things/logos/logo.png
+++ b/other_things/logos/logo.png
--- a/other_things/logos/logo2.png
+++ b/other_things/logos/logo2.png
--- a/other_things/logos/logo3.png
+++ b/other_things/logos/logo3.png
--- a/other_things/logos/logo4.png
+++ b/other_things/logos/logo4.png
--- a/other_things/logos/logo5.png
+++ b/other_things/logos/logo5.png
--- a/other_things/minetestmapper-improved/README.md
+++ b/other_things/minetestmapper-improved/README.md
--- a/other_things/minetestmapper-improved/colors(mientestmapper-need-merged-in-main-file).txt
+++ b/other_things/minetestmapper-improved/colors(mientestmapper-need-merged-in-main-file).txt
--- a/other_things/minetestmapper-improved/colors(vanessae-main-file).txt
+++ b/other_things/minetestmapper-improved/colors(vanessae-main-file).txt
--- a/other_things/shields_inv_shield_mithril_lapin.png
+++ b/other_things/shields_inv_shield_mithril_lapin.png
--- a/other_things/unused_sounds/Monstreloup.ogg
+++ b/other_things/unused_sounds/Monstreloup.ogg
--- a/other_things/unused_sounds/Obani
+++ b/other_things/unused_sounds/Obani
--- a/other_things/unused_sounds/event.ogg
+++ b/other_things/unused_sounds/event.ogg
--- a/other_things/unused_sounds/hit_hunger1.ogg
+++ b/other_things/unused_sounds/hit_hunger1.ogg
--- a/other_things/unused_sounds/hit_hunger2.ogg
+++ b/other_things/unused_sounds/hit_hunger2.ogg
--- a/other_things/unused_sounds/monstre.ogg
+++ b/other_things/unused_sounds/monstre.ogg
--- a/other_things/unused_sounds/randomsound.ogg
+++ b/other_things/unused_sounds/randomsound.ogg
--- a/other_things/update_sources.txt
+++ b/other_things/update_sources.txt
--- a/other_things/équilibrage
+++ b/other_things/équilibrage
@ -1,29 +0,0 @@
-wood		chest 	/ 	leggs			boot /	helmet	/ shield 	-  enchanted		=> 		total (approximatif)
-			3		+ 	3				1	+		1	+	3 		-	4				=>		6 + 4 = 11(12)		=> réduction 1 unité / 0.5 coeur
-
-cactus		chest 	/ 	leggs			boot /	helmet	/ shield	-	enchanted		=> 		total
-			4		+ 	4				1.5	+		1.5	+	3 		-	4				=>		8 + 5 = 14(15)		=> réduction 1 unité / 0.5 coeur
-
-steel		chest 	/ 	leggs			boot /	helmet	/ shield						=> 		total
-			5		+ 	5				2	+		2	+	3							=>		10 + 7 = 18			=> réduction 1 unité / 0.5 coeur
-
-
-
-
-bronze		chest 	/ 	leggs			boot /	helmet	/ shield						=> 		total
-			5.5		+ 	5.5				2.5	+		2.5	+	5							=>		11 + 9 = 21			=> réduction 2 unités / 1 coeur
-
-gold		chest 	/ 	leggs			boot /	helmet	/ shield						=> 		total
-			7		+ 	7				3	+		3	+	6							=>		14 + 11 = 26		=> réduction 2 unités / 1 coeur
-
-
-
-
-diamond		chest 	/ 	leggs			boot /	helmet	/ shield						=> 		total
-			8		+ 	8				4	+		4	+	7							=>		16 + 14 = 31		=> réduction 3 unités / 1.5 coeur
-
-
-
-
-mithril		chest 	/ 	leggs			boot /	helmet	/ shield						=> 		total
-			11		+ 	11				5	+		5	+	9							=>		22 + 18 = 41		=> réduction 4 unités / 2 coeurs