From 5817264a58fb27ace21f8ebbece24d65ec74b290 Mon Sep 17 00:00:00 2001
From: Ombridride <quentinbd@pc18.home>
Date: Sat, 14 Mar 2015 23:18:06 +0100
Subject: [PATCH] Many updates...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update « Multitest » to version 2
- Update world.mt (re-organise, add forceload and add
trmp_minetest_game)
- Remove playerplus (nether use, and cactus has been added to the loop
of the sprint mod)
---
 mods/multitest/craftitems.lua  |  26 +-
 mods/multitest/crafts.lua      | 562 ++++++++++++++++-----------------
 mods/multitest/depends.txt     |   4 +-
 mods/multitest/fuel.lua        |  20 +-
 mods/multitest/init.lua        | 114 +++----
 mods/multitest/nodes.lua       | 368 ++++++++++-----------
 mods/playerplus/README         |   8 -
 mods/playerplus/depends.txt    |   1 -
 mods/playerplus/init.lua       |  60 ----
 worlds/minetestforfun/world.mt | 172 +++++-----
 10 files changed, 636 insertions(+), 699 deletions(-)
 delete mode 100755 mods/playerplus/README
 delete mode 100755 mods/playerplus/depends.txt
 delete mode 100755 mods/playerplus/init.lua

diff --git a/mods/multitest/craftitems.lua b/mods/multitest/craftitems.lua
index d8cef05d..8e931133 100755
--- a/mods/multitest/craftitems.lua
+++ b/mods/multitest/craftitems.lua
@@ -1,14 +1,14 @@
-minetest.register_craftitem("multitest:handle_grip", {
-    description = "Grip",
-    inventory_image = "multitest_handle_grip.png",
-})
-
-minetest.register_craftitem("multitest:rubber", {
-    description = "Rubber",
-    inventory_image = "multitest_rubber.png",
-})
-
-minetest.register_craftitem("multitest:rubber_raw", {
-    description = "Raw Rubber",
-    inventory_image = "multitest_rubber_raw.png",
+minetest.register_craftitem("multitest:handle_grip", {
+    description = "Grip",
+    inventory_image = "multitest_handle_grip.png",
+})
+
+minetest.register_craftitem("multitest:rubber", {
+    description = "Rubber",
+    inventory_image = "multitest_rubber.png",
+})
+
+minetest.register_craftitem("multitest:rubber_raw", {
+    description = "Raw Rubber",
+    inventory_image = "multitest_rubber_raw.png",
 })
\ No newline at end of file
diff --git a/mods/multitest/crafts.lua b/mods/multitest/crafts.lua
index ae828b1c..2bc0c307 100755
--- a/mods/multitest/crafts.lua
+++ b/mods/multitest/crafts.lua
@@ -1,282 +1,282 @@
-minetest.register_craft({
-    output = "multitest:shears",
-    recipe = {
-        {"default:steel_ingot", "", "default:steel_ingot"},
-        {"", "default:wood", ""},
-        {"multitest:handle_grip", "", "multitest:handle_grip"}
-    }
-})
-
-minetest.register_craft({
-    output = "multitest:wood_shears",
-    recipe = {
-        {"default:tree", "", "default:tree"},
-        {"", "default:wood", ""},
-        {"multitest:handle_grip", "", "multitest:handle_grip"}
-    }
-})
-
-minetest.register_craft({
-    output = "multitest:stone_shears",
-    recipe = {
-        {"default:cobble", "", "default:cobble"},
-        {"", "default:wood", ""},
-        {"multitest:handle_grip", "", "multitest:handle_grip"}
-    }
-})
-
-minetest.register_craft({
-        output = "multitest:rubber_raw 4",
-        recipe = {
-        {"default:clay_lump", "default:papyrus", "default:clay_lump"},
-        {"default:papyrus", "bucket:bucket_water", "default:papyrus"},
-        {"default:clay_lump", "default:papyrus", "default:clay_lump"},
-    },
-    replacements = {{ "bucket:bucket_water", "bucket:bucket_empty" }}
-})
-
-minetest.register_craft({
-	type = "cooking",
-	recipe = "multitest:rubber_raw",
-	output = "multitest:rubber",
-})
-
-minetest.register_craft({
-    output = "multitest:handle_grip 2",
-    recipe = {
-        {"", "", ""},
-        {"multitest:rubber", "multitest:rubber", "multitest:rubber"},
-        {"", "", ""}
-    }
-})
-
-minetest.register_craft({
-    type = "cooking",
-    recipe = "multitest:blackcobble",
-    output = "multitest:blackstone",
-})
-
-minetest.register_craft({
-    output = "multitest:rubberblock",
-    recipe = {
-        {"multitest:rubber", "multitest:rubber", ""},
-        {"multitest:rubber", "multitest:rubber", ""},
-        {"", "", ""}
-    }
-})
-
-minetest.register_craft({
-    output = "multitest:scraper",
-    recipe = {
-        {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-        {"", "default:steel_ingot", ""},
-        {"", "multitest:handle_grip", ""}
-    }
-})
-
-minetest.register_craft({
-        output = "multitest:blackstone_paved",
-        recipe = {
-        {"multitest:scraper", "multitest:blackstone", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-    replacements = {{ "multitest:scraper", "multitest:scraper" }}
-})
-
-minetest.register_craft({
-        output = "multitest:rubber 4",
-        recipe = {
-        {"multitest:rubberblock", "", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:blackstone",
-        recipe = {
-        {"default:stone", "default:stone", "default:stone"},
-        {"default:stone", "dye:black", "default:stone"},
-        {"default:stone", "default:stone", "default:stone"},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:blackstone_brick",
-        recipe = {
-        {"multitest:blackstone", "multitest:blackstone", ""},
-        {"multitest:blackstone", "multitest:blackstone", ""},
-        {"", "", ""},
-    },
-})
-
---[[ maintenant dans farming redo
-minetest.register_craft({
-        output = "multitest:hayblock 4",
-        recipe = {
-        {"farming:wheat", "farming:wheat", "farming:wheat"},
-        {"farming:wheat", "farming:wheat", "farming:wheat"},
-        {"farming:wheat", "farming:wheat", "farming:wheat"},
-    },
-})
---]]
-
-minetest.register_craft({
-        output = "multitest:checkered_floor",
-        recipe = {
-        {"default:stone", "multitest:blackstone", ""},
-        {"multitest:blackstone", "default:stone", ""},
-        {"", "", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:checkered_floor",
-        recipe = {
-        {"multitest:blackstone", "default:stone", ""},
-        {"default:stone", "multitest:blackstone", ""},
-        {"", "", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:checkered_floor",
-        recipe = {
-        {"multitest:blackstone", "default:stone", ""},
-        {"default:stone", "multitest:blackstone", ""},
-        {"", "", ""},
-    },
-})
-
-for i, v in ipairs(multitest.colors) do
-    minetest.register_craft({
-        output = "multitest:carpet_"..v.." 4",
-        recipe = {
-            {"wool:"..v, "wool:"..v, ""},
-            {"", "", ""},
-            {"", "", ""},
-        },
-    })
-end
-
-minetest.register_craft({
-        output = "multitest:lamp",
-        recipe = {
-        {"", "default:tree", ""},
-        {"default:tree", "default:torch", "default:tree"},
-        {"", "default:tree", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:door_mat",
-        recipe = {
-        {"wool:black", "wool:black", "wool:black"},
-        {"wool:black", "wool:brown", "wool:black"},
-        {"wool:black", "wool:black", "wool:black"},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:andesite 4",
-        recipe = {
-        {"default:stone", "default:stone", "default:stone"},
-        {"default:cobble", "default:cobble", "default:cobble"},
-        {"default:stone", "default:stone", "default:stone"},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:andesite_smooth",
-        recipe = {
-        {"multitest:andesite", "multitest:scraper", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-    replacements = {{ "multitest:scraper", "multitest:scraper" }}
-})
-
-minetest.register_craft({
-        output = "multitest:granite 4",
-        recipe = {
-        {"multitest:andesite", "default:bronze_ingot", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:granite_smooth",
-        recipe = {
-        {"multitest:granite", "multitest:scraper", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-    replacements = {{ "multitest:scraper", "multitest:scraper" }}
-})
-
-minetest.register_craft({
-        output = "multitest:diorite 4",
-        recipe = {
-        {"multitest:andesite", "default:clay_lump", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:diorite_smooth",
-        recipe = {
-        {"multitest:diorite", "multitest:scraper", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-    replacements = {{ "multitest:scraper", "multitest:scraper" }}
-})
-
-minetest.register_craft({
-        output = "multitest:diorite",
-        recipe = {
-        {"multitest:diorite_smooth", "", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:granite",
-        recipe = {
-        {"multitest:granite_smooth", "", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:andesite",
-        recipe = {
-        {"multitest:andesite_smooth", "", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-})
-
-minetest.register_craft({
-        output = "multitest:sandstone_carved",
-        recipe = {
-        {"default:sandstone", "multitest:scraper", ""},
-        {"", "", ""},
-        {"", "", ""},
-    },
-    replacements = {{ "multitest:scraper", "multitest:scraper" }}
-})
-
-minetest.register_craft({
-        output = "multitest:sponge_block 4",
-        recipe = {
-        {"", "dye:yellow", ""},
-        {"", "wool:white", ""},
-        {"", "farming:wheat", ""},
-    },
+minetest.register_craft({
+    output = "multitest:shears",
+    recipe = {
+        {"default:steel_ingot", "", "default:steel_ingot"},
+        {"", "default:wood", ""},
+        {"multitest:handle_grip", "", "multitest:handle_grip"}
+    }
+})
+
+minetest.register_craft({
+    output = "multitest:wood_shears",
+    recipe = {
+        {"default:tree", "", "default:tree"},
+        {"", "default:wood", ""},
+        {"multitest:handle_grip", "", "multitest:handle_grip"}
+    }
+})
+
+minetest.register_craft({
+    output = "multitest:stone_shears",
+    recipe = {
+        {"default:cobble", "", "default:cobble"},
+        {"", "default:wood", ""},
+        {"multitest:handle_grip", "", "multitest:handle_grip"}
+    }
+})
+
+minetest.register_craft({
+        output = "multitest:rubber_raw 4",
+        recipe = {
+        {"default:clay_lump", "default:papyrus", "default:clay_lump"},
+        {"default:papyrus", "bucket:bucket_water", "default:papyrus"},
+        {"default:clay_lump", "default:papyrus", "default:clay_lump"},
+    },
+    replacements = {{ "bucket:bucket_water", "bucket:bucket_empty" }}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	recipe = "multitest:rubber_raw",
+	output = "multitest:rubber",
+})
+
+minetest.register_craft({
+    output = "multitest:handle_grip 2",
+    recipe = {
+        {"", "", ""},
+        {"multitest:rubber", "multitest:rubber", "multitest:rubber"},
+        {"", "", ""}
+    }
+})
+
+minetest.register_craft({
+    type = "cooking",
+    recipe = "multitest:blackcobble",
+    output = "multitest:blackstone",
+})
+
+minetest.register_craft({
+    output = "multitest:rubberblock",
+    recipe = {
+        {"multitest:rubber", "multitest:rubber", ""},
+        {"multitest:rubber", "multitest:rubber", ""},
+        {"", "", ""}
+    }
+})
+
+minetest.register_craft({
+    output = "multitest:scraper",
+    recipe = {
+        {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+        {"", "default:steel_ingot", ""},
+        {"", "multitest:handle_grip", ""}
+    }
+})
+
+minetest.register_craft({
+        output = "multitest:blackstone_paved",
+        recipe = {
+        {"multitest:scraper", "multitest:blackstone", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+    replacements = {{ "multitest:scraper", "multitest:scraper" }}
+})
+
+minetest.register_craft({
+        output = "multitest:rubber 4",
+        recipe = {
+        {"multitest:rubberblock", "", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:blackstone",
+        recipe = {
+        {"default:stone", "default:stone", "default:stone"},
+        {"default:stone", "dye:black", "default:stone"},
+        {"default:stone", "default:stone", "default:stone"},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:blackstone_brick",
+        recipe = {
+        {"multitest:blackstone", "multitest:blackstone", ""},
+        {"multitest:blackstone", "multitest:blackstone", ""},
+        {"", "", ""},
+    },
+})
+
+--[[ maintenant dans farming redo
+minetest.register_craft({
+        output = "multitest:hayblock 4",
+        recipe = {
+        {"farming:wheat", "farming:wheat", "farming:wheat"},
+        {"farming:wheat", "farming:wheat", "farming:wheat"},
+        {"farming:wheat", "farming:wheat", "farming:wheat"},
+    },
+})
+--]]
+
+minetest.register_craft({
+        output = "multitest:checkered_floor",
+        recipe = {
+        {"default:stone", "multitest:blackstone", ""},
+        {"multitest:blackstone", "default:stone", ""},
+        {"", "", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:checkered_floor",
+        recipe = {
+        {"multitest:blackstone", "default:stone", ""},
+        {"default:stone", "multitest:blackstone", ""},
+        {"", "", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:checkered_floor",
+        recipe = {
+        {"multitest:blackstone", "default:stone", ""},
+        {"default:stone", "multitest:blackstone", ""},
+        {"", "", ""},
+    },
+})
+
+for i, v in ipairs(multitest.colors) do
+    minetest.register_craft({
+        output = "multitest:carpet_"..v.." 4",
+        recipe = {
+            {"wool:"..v, "wool:"..v, ""},
+            {"", "", ""},
+            {"", "", ""},
+        },
+    })
+end
+
+minetest.register_craft({
+        output = "multitest:lamp",
+        recipe = {
+        {"", "default:tree", ""},
+        {"default:tree", "default:torch", "default:tree"},
+        {"", "default:tree", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:door_mat",
+        recipe = {
+        {"wool:black", "wool:black", "wool:black"},
+        {"wool:black", "wool:brown", "wool:black"},
+        {"wool:black", "wool:black", "wool:black"},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:andesite 4",
+        recipe = {
+        {"default:stone", "default:stone", "default:stone"},
+        {"default:cobble", "default:cobble", "default:cobble"},
+        {"default:stone", "default:stone", "default:stone"},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:andesite_smooth",
+        recipe = {
+        {"multitest:andesite", "multitest:scraper", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+    replacements = {{ "multitest:scraper", "multitest:scraper" }}
+})
+
+minetest.register_craft({
+        output = "multitest:granite 4",
+        recipe = {
+        {"multitest:andesite", "default:bronze_ingot", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:granite_smooth",
+        recipe = {
+        {"multitest:granite", "multitest:scraper", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+    replacements = {{ "multitest:scraper", "multitest:scraper" }}
+})
+
+minetest.register_craft({
+        output = "multitest:diorite 4",
+        recipe = {
+        {"multitest:andesite", "default:clay_lump", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:diorite_smooth",
+        recipe = {
+        {"multitest:diorite", "multitest:scraper", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+    replacements = {{ "multitest:scraper", "multitest:scraper" }}
+})
+
+minetest.register_craft({
+        output = "multitest:diorite",
+        recipe = {
+        {"multitest:diorite_smooth", "", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:granite",
+        recipe = {
+        {"multitest:granite_smooth", "", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:andesite",
+        recipe = {
+        {"multitest:andesite_smooth", "", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+})
+
+minetest.register_craft({
+        output = "multitest:sandstone_carved",
+        recipe = {
+        {"default:sandstone", "multitest:scraper", ""},
+        {"", "", ""},
+        {"", "", ""},
+    },
+    replacements = {{ "multitest:scraper", "multitest:scraper" }}
+})
+
+minetest.register_craft({
+        output = "multitest:sponge_block 4",
+        recipe = {
+        {"", "dye:yellow", ""},
+        {"", "wool:white", ""},
+        {"", "farming:wheat", ""},
+    },
 })
\ No newline at end of file
diff --git a/mods/multitest/depends.txt b/mods/multitest/depends.txt
index 034a95e6..efe819e4 100755
--- a/mods/multitest/depends.txt
+++ b/mods/multitest/depends.txt
@@ -1,3 +1,3 @@
-default
-stairs
+default
+stairs
 wool
\ No newline at end of file
diff --git a/mods/multitest/fuel.lua b/mods/multitest/fuel.lua
index adaef9e8..2f1f53c2 100755
--- a/mods/multitest/fuel.lua
+++ b/mods/multitest/fuel.lua
@@ -1,11 +1,11 @@
-minetest.register_craft({
-	type = "fuel",
-	recipe = "multitest:rubber",
-	burntime = 5,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "multitest:rubberblock",
-	burntime = 3,
+minetest.register_craft({
+	type = "fuel",
+	recipe = "multitest:rubber",
+	burntime = 5,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "multitest:rubberblock",
+	burntime = 3,
 })
\ No newline at end of file
diff --git a/mods/multitest/init.lua b/mods/multitest/init.lua
index 90820558..748a2085 100755
--- a/mods/multitest/init.lua
+++ b/mods/multitest/init.lua
@@ -1,57 +1,57 @@
-multitest = {}
-
-multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", 
-"dark_grey", "green", "grey", "magenta", "orange", 
-"pink", "red", "violet", "white", "yellow"}
-
-multitest.colornames = {"Black", "Blue", "Brown", "Cyan", "Dark Green",
-"Dark Grey", "Green", "Grey", "Magenta", "Orange",
-"Pink", "Red", "Violet", "White", "Yellow"}
-
-dofile(minetest.get_modpath("multitest").."/crafts.lua")
-dofile(minetest.get_modpath("multitest").."/craftitems.lua")
-dofile(minetest.get_modpath("multitest").."/nodes.lua")
-dofile(minetest.get_modpath("multitest").."/fuel.lua")
-
-minetest.register_tool("multitest:shears", {
-    description = "Shears",
-    inventory_image = "multitest_shears.png",
-    tool_capabilities = {
-        max_drop_level=3,
-        groupcaps= {
-            crumbly={times={[1]=5.00, [2]=3.50, [3]=3.00}, uses=80, maxlevel=1}
-        }
-    }
-})
-
-minetest.register_tool("multitest:wood_shears", {
-    description = "Wood Shears",
-    inventory_image = "multitest_wood_shears.png",
-    tool_capabilities = {
-        max_drop_level=3,
-        groupcaps= {
-            crumbly={times={[1]=3.00, [2]=2.50, [3]=1.00}, uses=40, maxlevel=1}
-        }
-    }
-})
-
-minetest.register_tool("multitest:stone_shears", {
-    description = "Stone Shears",
-    inventory_image = "multitest_stone_shears.png",
-    tool_capabilities = {
-        max_drop_level=3,
-        groupcaps= {
-            crumbly={times={[1]=4.00, [2]=3.00, [3]=1.50}, uses=50, maxlevel=1}
-        }
-    }
-})
-
-minetest.register_tool("multitest:scraper", {
-    description = "Scraper",
-    inventory_image = "multitest_scraper.png",
-    tool_capabilities = {
-        max_drop_level=3,
-        groupcaps= {
-        }
-    }
-})
+multitest = {}
+
+multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", 
+"dark_grey", "green", "grey", "magenta", "orange", 
+"pink", "red", "violet", "white", "yellow"}
+
+multitest.colornames = {"Black", "Blue", "Brown", "Cyan", "Dark Green",
+"Dark Grey", "Green", "Grey", "Magenta", "Orange",
+"Pink", "Red", "Violet", "White", "Yellow"}
+
+dofile(minetest.get_modpath("multitest").."/crafts.lua")
+dofile(minetest.get_modpath("multitest").."/craftitems.lua")
+dofile(minetest.get_modpath("multitest").."/nodes.lua")
+dofile(minetest.get_modpath("multitest").."/fuel.lua")
+
+minetest.register_tool("multitest:shears", {
+    description = "Shears",
+    inventory_image = "multitest_shears.png",
+    tool_capabilities = {
+        max_drop_level=3,
+        groupcaps= {
+            crumbly={times={[1]=5.00, [2]=3.50, [3]=3.00}, uses=80, maxlevel=1}
+        }
+    }
+})
+
+minetest.register_tool("multitest:wood_shears", {
+    description = "Wood Shears",
+    inventory_image = "multitest_wood_shears.png",
+    tool_capabilities = {
+        max_drop_level=3,
+        groupcaps= {
+            crumbly={times={[1]=3.00, [2]=2.50, [3]=1.00}, uses=40, maxlevel=1}
+        }
+    }
+})
+
+minetest.register_tool("multitest:stone_shears", {
+    description = "Stone Shears",
+    inventory_image = "multitest_stone_shears.png",
+    tool_capabilities = {
+        max_drop_level=3,
+        groupcaps= {
+            crumbly={times={[1]=4.00, [2]=3.00, [3]=1.50}, uses=50, maxlevel=1}
+        }
+    }
+})
+
+minetest.register_tool("multitest:scraper", {
+    description = "Scraper",
+    inventory_image = "multitest_scraper.png",
+    tool_capabilities = {
+        max_drop_level=3,
+        groupcaps= {
+        }
+    }
+})
diff --git a/mods/multitest/nodes.lua b/mods/multitest/nodes.lua
index 6b820292..fd95cce8 100755
--- a/mods/multitest/nodes.lua
+++ b/mods/multitest/nodes.lua
@@ -1,184 +1,184 @@
--- nodes
-minetest.register_node("multitest:rubberblock", {
-    description = "Rubber Block",
-	tiles = {"multitest_rubberblock.png"},
-	groups = {oddly_breakable_by_hand=5,crumbly=3},
-})
-
-minetest.register_node("multitest:blackstone", {
-    description = "Blackstone",
-	tiles = {"multitest_blackstone.png"},
-	groups = {cracky=3, stone=1},
-	drop = 'multitest:blackcobble',
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:blackcobble", {
-    description = "Black Cobblestone",
-	tiles = {"multitest_blackcobble.png"},
-	groups = {cracky=2, stone=2},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:blackstone_paved", {
-    description = "Paved Blackstone",
-	tiles = {"multitest_blackstone_paved.png"},
-	groups = {cracky=2, stone=1},
-	sounds = default.node_sound_stone_defaults(),	
-})
-
-minetest.register_node("multitest:blackstone_paved", {
-    description = "Paved Blackstone",
-	tiles = {"multitest_blackstone_paved.png"},
-	groups = {cracky=2, stone=1},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:blackstone_brick", {
-    description = "Blackstone Bricks",
-	tiles = {"multitest_blackstone_brick.png"},
-	groups = {cracky=2, stone=1},
-	sounds = default.node_sound_stone_defaults(),
-})
-
---[[ maintenant dans farming redo
-minetest.register_node("multitest:hayblock", {
-	description = "Hay Bale",
-	tiles = {"multitest_hayblock_top.png", "multitest_hayblock_top.png", "multitest_hayblock.png"},
-	paramtype2 = "facedir",
-	groups = {snappy=1,flammable=2,crumbly=1,cracky=4,oddly_breakable_by_hand=2},
-	sounds = default.node_sound_sand_defaults(),
-	on_place = minetest.rotate_node
-})
---]]
-
-minetest.register_node("multitest:checkered_floor", {
-    description = "Checkered Floor",
-	tiles = {"multitest_checkered_floor.png"},
-	groups = {cracky=2, oddly_breakable_by_hand=4},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:lamp", {
-	description = "Lamp",
-	tiles = {"multitest_lamp.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	light_source = LIGHT_MAX-1,
-	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-	sounds = default.node_sound_glass_defaults(),
-})
-
-minetest.register_node("multitest:andesite", {
-	description = "Andesite",
-	tiles = {"multitest_andesite.png"},
-	groups = {cracky=3,},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:diorite", {
-	description = "Diorite",
-	tiles = {"multitest_diorite.png"},
-	groups = {cracky=3,},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:granite", {
-	description = "Granite",
-	tiles = {"multitest_granite.png"},
-	groups = {cracky=3,},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:andesite_smooth", {
-	description = "Smooth Andesite",
-	tiles = {"multitest_andesite_smooth.png"},
-	groups = {cracky=3,},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:diorite_smooth", {
-	description = "Smooth Diorite",
-	tiles = {"multitest_diorite_smooth.png"},
-	groups = {cracky=3,},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:granite_smooth", {
-	description = "Smooth Granite",
-	tiles = {"multitest_granite_smooth.png"},
-	groups = {cracky=3,},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("multitest:sandstone_carved", {
-	description = "Carved Sandstone",
-	tiles = {"multitest_sandstone_carved_top.png", "multitest_sandstone_carved_top.png", "multitest_sandstone_carved.png"},
-	groups = {crumbly=2,cracky=4,},
-	sounds = default.node_sound_sand_defaults(),
-})
-
--- stairs:stair_blackstone
-stairs.register_stair_and_slab("blackstone", "multitest:blackstone", 
-	{cracky=3, stone=1}, 
-	{"multitest_blackstone.png"}, 
-	"Blackstone Stairs", 
-	"Blackstone Slab", nil)
-
-stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", 
-	{cracky=3, stone=1}, 
-	{"multitest_blackcobble.png"}, 
-	"Black Cobble Stairs", 
-	"Black Cobble Slab", nil)
-
-stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", 
-	{cracky=3, stone=1}, 
-	{"multitest_blackstone_brick.png"}, 
-	"Blackstonestone brick Stairs", 
-	"Blackstone Brick Slab", nil)
-
-stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", 
-	{cracky=3, stone=1}, 
-	{"multitest_blackstone_paved.png"}, 
-	"Paved Blackstone Stairs", 
-	"Paved Blackstone Slab", nil)
-
--- others
-for i, v in ipairs(multitest.colors) do
-	minetest.register_node("multitest:carpet_"..v, {
-		tiles = {"wool_"..v..".png"},
-		description = multitest.colornames[i].."Carpet",
-		groups = {oddly_breakable_by_hand=2,flammable=3},
-		drawtype="nodebox",
-		paramtype = "light",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.5, -0.5, -0.5, 0.5, -0.4, 0.5},
-			}
-		}
-	})
-end
-
-minetest.register_node("multitest:door_mat", {
-	description = "Door Mat",
-	tiles = {"multitest_door_mat.png"},
-	inventory_image = "multitest_door_mat.png",
-	wield_image = "multitest_door_mat.png",
-	groups = {oddly_breakable_by_hand=2,flammable=3},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, -0.5, -0.363675, 0.5, -0.454674, 0.426703},
-		}
-	}
-})
-
-minetest.register_node("multitest:sponge_block", {
-	description = "Sponge block",
-	tiles = {"multitest_sponge_block.png"},
-	groups = {oddly_breakable_by_hand=3,},
-})
+-- nodes
+minetest.register_node("multitest:rubberblock", {
+    description = "Rubber Block",
+	tiles = {"multitest_rubberblock.png"},
+	groups = {oddly_breakable_by_hand=5,crumbly=3},
+})
+
+minetest.register_node("multitest:blackstone", {
+    description = "Blackstone",
+	tiles = {"multitest_blackstone.png"},
+	groups = {cracky=3, stone=1},
+	drop = 'multitest:blackcobble',
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:blackcobble", {
+    description = "Black Cobblestone",
+	tiles = {"multitest_blackcobble.png"},
+	groups = {cracky=2, stone=2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:blackstone_paved", {
+    description = "Paved Blackstone",
+	tiles = {"multitest_blackstone_paved.png"},
+	groups = {cracky=2, stone=1},
+	sounds = default.node_sound_stone_defaults(),	
+})
+
+minetest.register_node("multitest:blackstone_paved", {
+    description = "Paved Blackstone",
+	tiles = {"multitest_blackstone_paved.png"},
+	groups = {cracky=2, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:blackstone_brick", {
+    description = "Blackstone Bricks",
+	tiles = {"multitest_blackstone_brick.png"},
+	groups = {cracky=2, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+--[[ maintenant dans farming redo
+minetest.register_node("multitest:hayblock", {
+	description = "Hay Bale",
+	tiles = {"multitest_hayblock_top.png", "multitest_hayblock_top.png", "multitest_hayblock.png"},
+	paramtype2 = "facedir",
+	groups = {snappy=1,flammable=2,crumbly=1,cracky=4,oddly_breakable_by_hand=2},
+	sounds = default.node_sound_sand_defaults(),
+	on_place = minetest.rotate_node
+})
+--]]
+
+minetest.register_node("multitest:checkered_floor", {
+    description = "Checkered Floor",
+	tiles = {"multitest_checkered_floor.png"},
+	groups = {cracky=2, oddly_breakable_by_hand=4},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:lamp", {
+	description = "Lamp",
+	tiles = {"multitest_lamp.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	light_source = LIGHT_MAX-1,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+	sounds = default.node_sound_glass_defaults(),
+})
+
+minetest.register_node("multitest:andesite", {
+	description = "Andesite",
+	tiles = {"multitest_andesite.png"},
+	groups = {cracky=3,},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:diorite", {
+	description = "Diorite",
+	tiles = {"multitest_diorite.png"},
+	groups = {cracky=3,},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:granite", {
+	description = "Granite",
+	tiles = {"multitest_granite.png"},
+	groups = {cracky=3,},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:andesite_smooth", {
+	description = "Smooth Andesite",
+	tiles = {"multitest_andesite_smooth.png"},
+	groups = {cracky=3,},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:diorite_smooth", {
+	description = "Smooth Diorite",
+	tiles = {"multitest_diorite_smooth.png"},
+	groups = {cracky=3,},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:granite_smooth", {
+	description = "Smooth Granite",
+	tiles = {"multitest_granite_smooth.png"},
+	groups = {cracky=3,},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("multitest:sandstone_carved", {
+	description = "Carved Sandstone",
+	tiles = {"multitest_sandstone_carved_top.png", "multitest_sandstone_carved_top.png", "multitest_sandstone_carved.png"},
+	groups = {crumbly=2,cracky=4,},
+	sounds = default.node_sound_sand_defaults(),
+})
+
+-- stairs:stair_blackstone
+stairs.register_stair_and_slab("blackstone", "multitest:blackstone", 
+	{cracky=3, stone=1}, 
+	{"multitest_blackstone.png"}, 
+	"Blackstone Stairs", 
+	"Blackstone Slab", nil)
+
+stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", 
+	{cracky=3, stone=1}, 
+	{"multitest_blackcobble.png"}, 
+	"Black Cobble Stairs", 
+	"Black Cobble Slab", nil)
+
+stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", 
+	{cracky=3, stone=1}, 
+	{"multitest_blackstone_brick.png"}, 
+	"Blackstonestone brick Stairs", 
+	"Blackstone Brick Slab", nil)
+
+stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", 
+	{cracky=3, stone=1}, 
+	{"multitest_blackstone_paved.png"}, 
+	"Paved Blackstone Stairs", 
+	"Paved Blackstone Slab", nil)
+
+-- others
+for i, v in ipairs(multitest.colors) do
+	minetest.register_node("multitest:carpet_"..v, {
+		tiles = {"wool_"..v..".png"},
+		description = multitest.colornames[i].."Carpet",
+		groups = {oddly_breakable_by_hand=2,flammable=3},
+		drawtype="nodebox",
+		paramtype = "light",
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.5, -0.5, 0.5, -0.4, 0.5},
+			}
+		}
+	})
+end
+
+minetest.register_node("multitest:door_mat", {
+	description = "Door Mat",
+	tiles = {"multitest_door_mat.png"},
+	inventory_image = "multitest_door_mat.png",
+	wield_image = "multitest_door_mat.png",
+	groups = {oddly_breakable_by_hand=2,flammable=3},
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.363675, 0.5, -0.454674, 0.426703},
+		}
+	}
+})
+
+minetest.register_node("multitest:sponge_block", {
+	description = "Sponge block",
+	tiles = {"multitest_sponge_block.png"},
+	groups = {oddly_breakable_by_hand=3,},
+})
diff --git a/mods/playerplus/README b/mods/playerplus/README
deleted file mode 100755
index 4142ddb2..00000000
--- a/mods/playerplus/README
+++ /dev/null
@@ -1,8 +0,0 @@
-PlayerPlus mod for minetest
----------------------------
-
-This mod lets the player walk faster when walking on ice, also walking on snow slows them down and touching a cactus will hurt... enjoy
-
-0.1 - Initial release
-
-Released under WTFPL
\ No newline at end of file
diff --git a/mods/playerplus/depends.txt b/mods/playerplus/depends.txt
deleted file mode 100755
index 331d858c..00000000
--- a/mods/playerplus/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff --git a/mods/playerplus/init.lua b/mods/playerplus/init.lua
deleted file mode 100755
index 47af9946..00000000
--- a/mods/playerplus/init.lua
+++ /dev/null
@@ -1,60 +0,0 @@
-
--- walking on ice makes player walk faster, also cactus hurts player when touched
--- by TenPlus1
-
-local time = 0
-minetest.register_globalstep(function(dtime)
-
-	time = time + dtime
-
-	-- every 1 second
-	if time > 1 then
-	
-		-- check players
-		for _,player in ipairs(minetest.get_connected_players()) do
-			
-			-- is it me?
-			if player:is_player() then
-
-				-- where am I?
-				local pos = player:getpos()
-				
-				-- what am I standing on?
-				pos.y = pos.y - 0.1 -- just under player to detect snow also
-				local nod = minetest.get_node(pos).name
-				
-				-- standing on ice? if so walk faster
-				if nod == "default:ice" then
-					player:set_physics_override(1.3, 1, 1)
-				-- standing on snow? if so walk slower
-				elseif nod == "default:snow" or nod == "default:snowblock" then
-					player:set_physics_override(0.7, 1, 1)
-				else
-					player:set_physics_override(1, 1, 1) -- (default speed, jump, gravity)
-				end
-				
-				-- am I near a cactus?
-				pos.y = pos.y + 0.1
-				local near = minetest.find_node_near(pos, 1, "default:cactus")
-				if near then
-					pos = near
-					
-					-- am I touching the cactus? if so it hurts
-					for _,object in ipairs(minetest.get_objects_inside_radius(pos, 1.0)) do
-						if object:get_hp() > 0 then
-							object:set_hp(object:get_hp()-1)
-						end
-					end
-
-				end
-				
-				-- reset time and break entity check
-				time = 0
-				break
-			end
-		end
-		
-		-- incase none of the above happened, reset time for next check
-		time = 0
-	end
-end)
diff --git a/worlds/minetestforfun/world.mt b/worlds/minetestforfun/world.mt
index 4762f03a..a0664449 100644
--- a/worlds/minetestforfun/world.mt
+++ b/worlds/minetestforfun/world.mt
@@ -4,23 +4,22 @@ redis_hash = IGNORED
 redis_address = localhost
 
 load_mod_moreores = true
+load_mod_darkage = true
+load_mod_quartz = true
 load_mod_moreblocks = true
 load_mod_unifieddyes = true
-load_mod_homedecor = true
 load_mod_coloredwood = true
+load_mod_colouredstonebricks = true
+load_mod_colormachine = true
+load_mod_bedrock = true
 
-load_mod_soundset = true
-load_mod_ambience = true
+load_mod_worldedit = true
+load_mod_worldedit_commands = true
+load_mod_worldedit_gui = true
+load_mod_worldedit_infinity = true
+load_mod_worldedit_limited = true
+load_mod_worldedit_shortcommands = true
 
-load_mod_building_blocks = true
-load_mod_computer = true
-load_mod_fake_fire = true
-load_mod_homedecor_3d_extras = true
-load_mod_inbox = true
-load_mod_itemframes = true
-load_mod_lrfurn = true
-load_mod_plasmascreen = true
-load_mod_signs_lib = true
 load_mod_bushes_classic = true
 load_mod_flowers_plus = true
 load_mod_junglegrass = true
@@ -29,31 +28,57 @@ load_mod_plants_lib = true
 load_mod_poisonivy = true
 load_mod_vines = true
 load_mod_moretrees = true
+load_mod_along_shore = true
+load_mod_bushes = true
+load_mod_cavestuff = true
+load_mod_dryplants = true
+load_mod_ferns = true
+load_mod_molehills = true
+load_mod_trunks = true
+load_mod_woodsoils = true
+load_mod_youngtrees = true
+load_mod_columnia = true
+load_mod_clams = true
+load_mod_stairsshine = true
+load_mod_whiteshell = true
+load_mod_mushroom = true
+
+load_mod_nether = true
+load_mod_vector_extras = true
+load_mod_glow = true
+load_mod_riesenpilz = true
+load_mod_mapfix = true
+load_mod_seacobble = true
+load_mod_seacoral = true
+load_mod_seaglass = true
+load_mod_seagravel = true
+load_mod_sealamps = true
+load_mod_seaplants = true
+load_mod_seastone = true
+load_mod_seastonebrick = true
+load_mod_seawrecks = true
+load_mod_noairblocks = true
+load_mod_snow = true
+load_mod_christmas_craft = true
+
+load_mod_homedecor = true
+load_mod_computer = true
+load_mod_fake_fire = true
+load_mod_homedecor_3d_extras = true
+load_mod_itemframes = true
+load_mod_lrfurn = true
+load_mod_plasmascreen = true
+load_mod_arrow_signs = true
+load_mod_chains = true
+load_mod_signs_lib = true
 load_mod_locked_sign = true
 load_mod_fences = true
 load_mod_stained_glass = true
+load_mod_framedglass = true
+load_mod_paintings = true
+load_mod_multitest = true
 load_mod_lavalamp = true
 load_mod_lantern = true
-load_mod_money = true
-load_mod_beds = true
-load_mod_throwing = true
-load_mod_3d_armor = true
-load_mod_shields = true
-load_mod_wieldview = true
-load_mod_worldedit = true
-load_mod_worldedit_commands = true
-load_mod_worldedit_gui = true
-load_mod_worldedit_infinity = true
-load_mod_worldedit_limited = true
-load_mod_worldedit_shortcommands = true
-load_mod_maptools = true
-load_mod_awards = true
-load_mod_fail = true
-load_mod_bedrock = true
-load_mod_builtin_item = true
-load_mod_chatplus = true
-load_mod_gauges = true
-load_mod_item_drop = true
 load_mod_jumping = true
 
 load_mod_mesecons = true
@@ -88,82 +113,52 @@ load_mod_mesecons_noteblock = true
 load_mod_bobblocks = true
 load_mod_pipeworks = true
 
-load_mod_names_per_ip = true
-load_mod_paintings = true
-load_mod_snow = true
-load_mod_along_shore = true
-load_mod_bushes = true
-load_mod_cavestuff = true
-load_mod_dryplants = true
-load_mod_ferns = true
-load_mod_molehills = true
-load_mod_trunks = true
-load_mod_woodsoils = true
-load_mod_youngtrees = true
-load_mod_columnia = true
-load_mod_clams = true
-load_mod_stairsshine = true
-load_mod_whiteshell = true
-load_mod_mushroom = true
 load_mod_factions = true
-load_mod_arrow_signs = true
-load_mod_death_messages = true
-load_mod_colouredstonebricks = true
-load_mod_chains = true
 load_mod_wiki = true
 load_mod_intweak = true
-load_mod_notice = true
-load_mod_multitest = true
-load_mod_framedglass = true
-load_mod_darkage = true
-load_mod_colormachine = true
-load_mod_quartz = true
+
 load_mod_screwdriver = true
 load_mod_bone = true
 load_mod_carts = true
-load_mod_dropondie = true
 load_mod_sponge = true
 
 load_mod_mobs = true
 load_mod_tsm_pyramids = true
+load_mod_trmp_minetest_game = true
 load_mod_lavatemple = true
 
-load_mod_christmas_craft = true
-load_mod_noairblocks = true
-load_mod_seacobble = true
-load_mod_seacoral = true
-load_mod_seaglass = true
-load_mod_seagravel = true
-load_mod_sealamps = true
-load_mod_seaplants = true
-load_mod_seastone = true
-load_mod_seastonebrick = true
-load_mod_seawrecks = true
-
 load_mod_beginners_chest = true
+load_mod_forceload = true
 load_mod_more_chests = true
 load_mod_chesttools = true
 
-load_mod_nether = true
-load_mod_vector_extras = true
-load_mod_glow = true
-load_mod_riesenpilz = true
-load_mod_mapfix = true
-
-load_mod_unified_inventory = true
-load_mod_u_skins = true
-
 load_mod_farming = true
 load_mod_food = true
 load_mod_fishing = true
+
 load_mod_hud = true
+load_mod_gauges = true
 load_mod_sprint = true
 load_mod_mana = true
+load_mod_awards = true
+load_mod_fail = true
+
+load_mod_unified_inventory = true
+load_mod_u_skins = true
+load_mod_dropondie = true
+load_mod_item_drop = true
+
+load_mod_throwing = true
+load_mod_3d_armor = true
+load_mod_shields = true
+load_mod_wieldview = true
 load_mod_returnmirror = true
-load_mod_playerplus = false
 
 load_mod_xban2 = true
+load_mod_names_per_ip = true
 load_mod_inventorycheck = true
+load_mod_maptools = true
+load_mod_notice = true
 load_mod_name_restrictions = true
 load_mod_whoison = true
 load_mod_player_inactive = true
@@ -171,15 +166,26 @@ load_mod_spawn = true
 load_mod__misc = true
 load_mod_news = true
 load_mod_random_messages = true
+load_mod_death_messages = true
 load_mod_shutdown = true
 load_mod_irc = true
 load_mod_irc_commands = true
 
+load_mod_soundset = true
+load_mod_ambience = true
+
 load_mod_areas = true
 load_mod_markers = true
+load_mod_builtin_falling = true
+
+load_mod_building_blocks = true
+load_mod_inbox = true
+load_mod_money = true
+load_mod_beds = true
+load_mod_builtin_item = true
+load_mod_chatplus = true
 
 load_mod_future_ban = false
-load_mod_builtin_falling = false
 load_mod_textures = false
 load_mod_minetest-minetestforfun-server-master = false
 load_mod_mesecons_doors = false