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

other_things/irc-old-save/hooks.lua

@@ -7,6 +7,20 @@ local b64e = require("mime").b64
 irc.hooks = {}
 irc.registered_hooks = {}
 
+local accent_chars = { {"À", "A"},{"Á", "A"},{"Â", "A"},{"Ã", "A"},{"Ä", "A"},{"Å", "A"},{"Ç", "C"},{"È", "E"},{"É", "E"},{"Ê", "E"},
+				{"Ë", "E"},{"<EFBFBD>", "I"},{"Í", "I"},{"<EFBFBD>", "I"},{"Ï", "I"},{"Ñ", "N"},{"Ò", "O"},{"Ó", "O"},{"Ô", "O"},{"Õ", "O"},
+				{"Ö", "O"},{"<EFBFBD>", "O"},{"Ù", "U"},{"Ú", "U"},{"Û", "U"},{"Ü", "U"},{"<EFBFBD>", "Y"},{"à", "a"},{"á", "a"},{"â", "a"},
+				{"ã", "a"},{"ä", "a"},{"å", "a"},{"ç", "c"},{"è", "e"},{"é", "e"},{"ê", "e"},{"ë", "e"},{"ì", "i"},{"í", "i"},
+				{"î", "i"},{"ï", "i"},{"ñ", "n"},{"ò", "o"},{"ó", "o"},{"ô", "o"},{"õ", "o"},{"ö", "o"},{"<EFBFBD>", "o"},{"ù", "u"},
+				{"ú", "u"},{"û", "u"},{"ü", "u"},{"<EFBFBD>", "Y"}
+				}
+
+local function subaccent(text)
+	for _, c in pairs(accent_chars) do
+		text = text:gsub(c[1], c[2])
+	end
+	return text:gsub(stripped_chars, "")
+end
 
 -- TODO: Add proper conversion from CP1252 to UTF-8.
 local stripped_chars = {"\2", "\31"}
@@ -18,7 +32,7 @@ stripped_chars = "["..table.concat(stripped_chars, "").."]"
 local function normalize(text)
 	-- Strip colors
 	text = text:gsub("\3[0-9][0-9,]*", "")
-
+	text = subaccent(text)
 	return text:gsub(stripped_chars, "")
 end
 

other_things/minetestmapper-improved/infos.txt

@@ -0,0 +1,17 @@
+Merge "colors(mientestmapper-need-merged-in-main-file).txt" => to => "colors(vanessae-main-file).txt"
+
+Instructions :
+	1) If similar colored items are found, keep the Vanessae colors
+	2) If items are nearly the same, add it to Vanessae colors.txt file and keep the colors RGB and trasnparency from Vanessae
+	3) Be carful, organize the code ! 
+
+Remaining 1050 lines...
+
+When the merged work is over : 
+	1) Rename "colors(vanessae-main-file).txt" => colors.txt
+	2) Moved it to "~/worlds/minetestforfun/"
+	3) Erase the older "colors.txt" file
+
+If you contribute to this files, thank you for your work ! (i worked for the moment 6 to 8 hours on this hug merge...)
+
+PS : Meld isn't recommanded...

other_things/scripts/copy_homdecor_mesh.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Script created by LeMagnesium on 4/18/15
+# This script should be launched from the root of the clone or deeper in it
+# It copies all the meshes from homdecor from the mmdb's copy I have to our
+# own version
+# @param : $1 or the fresh clone from the mmdb's path while $2 is the static
+# path to our version
+
+if [ -z $1 ]
+then
+	echo "Missing parameter : source"
+else
+	if [ -z $2 ]
+	then
+		echo "Missing parameter : target"
+	else
+		cp $1/lavalamp/models/* $2/lavalamp/models/
+		cp $1/chains/models/* $2/chains/models/
+		cp $1/computer/models/* $2/computer/models/
+		cp $1/plasmascreen/models/* $2/plasmascreen/models/
+		cp $1/homedecor_3d_extras/models/* $2/homedecor_3d_extras/models/
+		cp $1/inbox/models/* $2/inbox/models/
+		cp $1/homedecor/models/* $2/homedecor/models/
+		cp $1/lrfurn/models/* $2/lrfurn/models/
+		echo "Done."
+	fi
+fi

other_things/scripts/rebase_active_branches.sh

@@ -0,0 +1,16 @@
+# Rebase actives branches
+# Script by LeMagnesium (20/12/15)
+# @param : Branches to rebase from master
+# Must be ran from the root of the repo or a subdirectory
+
+for branch in $( git branch ); do
+	if [ branch != "master" ];
+	then
+		git checkout $branch
+		git pull origin $branch
+		git rebase master
+		git push -f origin $branch
+	fi
+done
+
+git checkout master

other_things/scripts/reverse-mff.sh

@@ -0,0 +1,15 @@
+# Reversing script
+
+cd ~/Programmation/Gits/Ombridride-minetest-minetestforfun-server-access/
+
+# Removed old files... While saving IRC mod
+
+rm -rf ./mods/*
+rm -rf ./minetestforfun_game/*
+
+
+# Copy files
+cp -Rf ~/.minetest/worlds/NodesJustWannaHaveFun/worldmods/* ./mods/
+cp -Rf ~/.minetest/games/minetestforfun_game/* ./minetestforfun_game/
+
+echo "Finished"

other_things/scripts/update-mff.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Update MinetestForFun Sources
+
+datecom=`date`
+echo "[$datecom] Updated MinetestForFun Sources by $USER" >> ~/.git_sh_history
+
+cd ~/Programmation/
+cd Gits/Ombridride-minetest-minetestforfun-server-access
+
+# If argument is passed, then update the clone
+if [ ! -z $1 ]
+then
+	echo "=> Getting lastest sources..."
+	# Actualize MFF's clone
+	git checkout master
+	git pull origin master
+else
+	echo "=> Skipping clone actualization"
+fi
+
+echo "=> Copying files..."
+cd mods
+rm -rf ~/.minetest/worlds/NodesJustWannaHaveFun/worldmods/*
+cp -R ./* ~/.minetest/worlds/NodesJustWannaHaveFun/worldmods/
+
+cd ..
+rm -rf ~/.minetest/games/minetestforfun_game
+cp -r ./minetestforfun_game ~/.minetest/games
+
+cp -f ./worlds/minetestforfun/news.txt ~/.minetest/worlds/NodesJustWannaHaveFun/
+
+echo "== Finished =="
+sleep 2

other_things/site/probleme.txt

@@ -0,0 +1 @@
+Remarque : entre le logo1 et le logo2, le logo 1 est bien équilibré, tandis que le logo2 a des parties qui sont inégale les deux lignes entourants le logo sont trop haute/basse, si tu visionnes les deux a la suite, la différences est flagrante

other_things/équilibrage armures.txt

@@ -0,0 +1,29 @@
+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