From d878f10dcda967fe1d68c9b754e06ae8f1fa652a Mon Sep 17 00:00:00 2001
From: Ombridride <quentinbd@gmail.com>
Date: Wed, 22 Apr 2015 23:27:01 +0200
Subject: [PATCH] Re-organize the git repo

---
 other_things/logos/README.md                  |   3 +++
 other_things/{site => logos}/logo.png         | Bin
 other_things/{site => logos}/logo2.png        | Bin
 other_things/{site => logos}/logo3.png        | Bin
 other_things/{site => logos}/logo4.png        | Bin
 other_things/{site => logos}/logo5.png        | Bin
 .../probleme.txt => logos/probleme.txt~}      |   0
 .../minetestmapper-improved/README.md         |  18 ++++++++++++++++++
 .../{infos.txt => README.md~}                 |   0
 other_things/test.txt                         |   0
 other_things/unused_sounds/sounds_here.txt    |   1 -
 11 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 other_things/logos/README.md
 rename other_things/{site => logos}/logo.png (100%)
 rename other_things/{site => logos}/logo2.png (100%)
 rename other_things/{site => logos}/logo3.png (100%)
 rename other_things/{site => logos}/logo4.png (100%)
 rename other_things/{site => logos}/logo5.png (100%)
 rename other_things/{site/probleme.txt => logos/probleme.txt~} (100%)
 create mode 100644 other_things/minetestmapper-improved/README.md
 rename other_things/minetestmapper-improved/{infos.txt => README.md~} (100%)
 delete mode 100644 other_things/test.txt
 delete mode 100644 other_things/unused_sounds/sounds_here.txt

diff --git a/other_things/logos/README.md b/other_things/logos/README.md
new file mode 100644
index 00000000..306260e8
--- /dev/null
+++ b/other_things/logos/README.md
@@ -0,0 +1,3 @@
+Remarque : 
+
+Ajouter d'autres logos avec des cubes ou dessins à l'intérieur serait bien pour la diversité du sondage/vote ! :)
diff --git a/other_things/site/logo.png b/other_things/logos/logo.png
similarity index 100%
rename from other_things/site/logo.png
rename to other_things/logos/logo.png
diff --git a/other_things/site/logo2.png b/other_things/logos/logo2.png
similarity index 100%
rename from other_things/site/logo2.png
rename to other_things/logos/logo2.png
diff --git a/other_things/site/logo3.png b/other_things/logos/logo3.png
similarity index 100%
rename from other_things/site/logo3.png
rename to other_things/logos/logo3.png
diff --git a/other_things/site/logo4.png b/other_things/logos/logo4.png
similarity index 100%
rename from other_things/site/logo4.png
rename to other_things/logos/logo4.png
diff --git a/other_things/site/logo5.png b/other_things/logos/logo5.png
similarity index 100%
rename from other_things/site/logo5.png
rename to other_things/logos/logo5.png
diff --git a/other_things/site/probleme.txt b/other_things/logos/probleme.txt~
similarity index 100%
rename from other_things/site/probleme.txt
rename to other_things/logos/probleme.txt~
diff --git a/other_things/minetestmapper-improved/README.md b/other_things/minetestmapper-improved/README.md
new file mode 100644
index 00000000..4df7fe28
--- /dev/null
+++ b/other_things/minetestmapper-improved/README.md
@@ -0,0 +1,18 @@
+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...
diff --git a/other_things/minetestmapper-improved/infos.txt b/other_things/minetestmapper-improved/README.md~
similarity index 100%
rename from other_things/minetestmapper-improved/infos.txt
rename to other_things/minetestmapper-improved/README.md~
diff --git a/other_things/test.txt b/other_things/test.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/other_things/unused_sounds/sounds_here.txt b/other_things/unused_sounds/sounds_here.txt
deleted file mode 100644
index daeeabde..00000000
--- a/other_things/unused_sounds/sounds_here.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sounds here !