Modify mod and texture directory hierarchies

111 files changed, 28 insertions, 10 deletions

diff --git a/data/textures/fontlucida.png b/data/clienttextures/fontlucida.png
index c63fa02b7..c63fa02b7 100644
--- a/data/textures/fontlucida.png
+++ b/data/clienttextures/fontlucida.png
diff --git a/data/textures/menulogo.png b/data/clienttextures/menulogo.png
index 76595c48d..76595c48d 100644
--- a/data/textures/menulogo.png
+++ b/data/clienttextures/menulogo.png
diff --git a/data/textures/mud.png b/data/clienttextures/mud.png
index 7cb9c89a6..7cb9c89a6 100644
--- a/data/textures/mud.png
+++ b/data/clienttextures/mud.png
diff --git a/data/scripts/default.lua b/data/mods/default/init.lua
index b677cefd0..a60979ff4 100644
--- a/data/scripts/default.lua
+++ b/data/mods/default/init.lua
@@ -72,6 +72,10 @@ function dump(o, dumped)
 	end
 end
 
+-- Textures:
+-- Mods should prefix their textures with modname_, eg. given the mod
+-- name "foomod", a texture could be called "foomod_superfurnace.png"
+--
 -- Global functions:
 -- minetest.register_entity(name, prototype_table)
 -- minetest.register_globalstep(func)
diff --git a/data/textures/apple.png b/data/mods/default/textures/apple.png
index 9593f28f6..9593f28f6 100644
--- a/data/textures/apple.png
+++ b/data/mods/default/textures/apple.png
diff --git a/data/textures/apple_iron.png b/data/mods/default/textures/apple_iron.png
index 2dffdf014..2dffdf014 100644
--- a/data/textures/apple_iron.png
+++ b/data/mods/default/textures/apple_iron.png
diff --git a/data/textures/book.png b/data/mods/default/textures/book.png
index 176fb6aa9..176fb6aa9 100644
--- a/data/textures/book.png
+++ b/data/mods/default/textures/book.png
diff --git a/data/textures/bookshelf.png b/data/mods/default/textures/bookshelf.png
index 5ecc50ff3..5ecc50ff3 100644
--- a/data/textures/bookshelf.png
+++ b/data/mods/default/textures/bookshelf.png
diff --git a/data/textures/brick.png b/data/mods/default/textures/brick.png
index 32d77f347..32d77f347 100644
--- a/data/textures/brick.png
+++ b/data/mods/default/textures/brick.png
diff --git a/data/textures/cactus_side.png b/data/mods/default/textures/cactus_side.png
index fc479fde6..fc479fde6 100644
--- a/data/textures/cactus_side.png
+++ b/data/mods/default/textures/cactus_side.png
diff --git a/data/textures/cactus_top.png b/data/mods/default/textures/cactus_top.png
index f9e68df51..f9e68df51 100644
--- a/data/textures/cactus_top.png
+++ b/data/mods/default/textures/cactus_top.png
diff --git a/data/textures/chest_front.png b/data/mods/default/textures/chest_front.png
index c5628af94..c5628af94 100644
--- a/data/textures/chest_front.png
+++ b/data/mods/default/textures/chest_front.png
diff --git a/data/textures/chest_lock.png b/data/mods/default/textures/chest_lock.png
index ae038fae5..ae038fae5 100644
--- a/data/textures/chest_lock.png
+++ b/data/mods/default/textures/chest_lock.png
diff --git a/data/textures/chest_side.png b/data/mods/default/textures/chest_side.png
index 916dd784d..916dd784d 100644
--- a/data/textures/chest_side.png
+++ b/data/mods/default/textures/chest_side.png
diff --git a/data/textures/chest_top.png b/data/mods/default/textures/chest_top.png
index 58c79674d..58c79674d 100644
--- a/data/textures/chest_top.png
+++ b/data/mods/default/textures/chest_top.png
diff --git a/data/textures/clay.png b/data/mods/default/textures/clay.png
index 3557429d8..3557429d8 100644
--- a/data/textures/clay.png
+++ b/data/mods/default/textures/clay.png
diff --git a/data/textures/clay_brick.png b/data/mods/default/textures/clay_brick.png
index e36648e48..e36648e48 100644
--- a/data/textures/clay_brick.png
+++ b/data/mods/default/textures/clay_brick.png
diff --git a/data/textures/cloud.png b/data/mods/default/textures/cloud.png
index 24091a377..24091a377 100644
--- a/data/textures/cloud.png
+++ b/data/mods/default/textures/cloud.png
diff --git a/data/textures/cobble.png b/data/mods/default/textures/cobble.png
index 7d0447419..7d0447419 100644
--- a/data/textures/cobble.png
+++ b/data/mods/default/textures/cobble.png
diff --git a/data/textures/cooked_rat.png b/data/mods/default/textures/cooked_rat.png
index daad3be0d..daad3be0d 100644
--- a/data/textures/cooked_rat.png
+++ b/data/mods/default/textures/cooked_rat.png
diff --git a/data/textures/crack.png b/data/mods/default/textures/crack.png
index 499783982..499783982 100644
--- a/data/textures/crack.png
+++ b/data/mods/default/textures/crack.png
diff --git a/data/textures/dungeon_master.png b/data/mods/default/textures/dungeon_master.png
index 3457c8228..3457c8228 100644
--- a/data/textures/dungeon_master.png
+++ b/data/mods/default/textures/dungeon_master.png
diff --git a/data/textures/fence.png b/data/mods/default/textures/fence.png
index 0b99f0eb5..0b99f0eb5 100644
--- a/data/textures/fence.png
+++ b/data/mods/default/textures/fence.png
diff --git a/data/textures/fireball.png b/data/mods/default/textures/fireball.png
index 523142850..523142850 100644
--- a/data/textures/fireball.png
+++ b/data/mods/default/textures/fireball.png
diff --git a/data/textures/firefly.png b/data/mods/default/textures/firefly.png
index 40df7fa1c..40df7fa1c 100644
--- a/data/textures/firefly.png
+++ b/data/mods/default/textures/firefly.png
diff --git a/data/textures/furnace_front.png b/data/mods/default/textures/furnace_front.png
index 1620a27c3..1620a27c3 100644
--- a/data/textures/furnace_front.png
+++ b/data/mods/default/textures/furnace_front.png
diff --git a/data/textures/furnace_side.png b/data/mods/default/textures/furnace_side.png
index 63cb162fe..63cb162fe 100644
--- a/data/textures/furnace_side.png
+++ b/data/mods/default/textures/furnace_side.png
diff --git a/data/textures/glass.png b/data/mods/default/textures/glass.png
index 8598ce670..8598ce670 100644
--- a/data/textures/glass.png
+++ b/data/mods/default/textures/glass.png
diff --git a/data/textures/grass.png b/data/mods/default/textures/grass.png
index 3610bb2bc..3610bb2bc 100644
--- a/data/textures/grass.png
+++ b/data/mods/default/textures/grass.png
diff --git a/data/textures/grass_footsteps.png b/data/mods/default/textures/grass_footsteps.png
index 57e063d8c..57e063d8c 100644
--- a/data/textures/grass_footsteps.png
+++ b/data/mods/default/textures/grass_footsteps.png
diff --git a/data/textures/grass_side.png b/data/mods/default/textures/grass_side.png
index 4f4f680be..4f4f680be 100644
--- a/data/textures/grass_side.png
+++ b/data/mods/default/textures/grass_side.png
diff --git a/data/textures/gravel.png b/data/mods/default/textures/gravel.png
index f08666ad9..f08666ad9 100644
--- a/data/textures/gravel.png
+++ b/data/mods/default/textures/gravel.png
diff --git a/data/textures/heart.png b/data/mods/default/textures/heart.png
index 6bc183e04..6bc183e04 100644
--- a/data/textures/heart.png
+++ b/data/mods/default/textures/heart.png
diff --git a/data/textures/junglegrass.png b/data/mods/default/textures/junglegrass.png
index eea87c07c..eea87c07c 100644
--- a/data/textures/junglegrass.png
+++ b/data/mods/default/textures/junglegrass.png
diff --git a/data/textures/jungletree.png b/data/mods/default/textures/jungletree.png
index ccd20ac74..ccd20ac74 100644
--- a/data/textures/jungletree.png
+++ b/data/mods/default/textures/jungletree.png
diff --git a/data/textures/jungletree_top.png b/data/mods/default/textures/jungletree_top.png
index 2a9b51373..2a9b51373 100644
--- a/data/textures/jungletree_top.png
+++ b/data/mods/default/textures/jungletree_top.png
diff --git a/data/textures/ladder.png b/data/mods/default/textures/ladder.png
index 11056359d..11056359d 100644
--- a/data/textures/ladder.png
+++ b/data/mods/default/textures/ladder.png
diff --git a/data/textures/lava.png b/data/mods/default/textures/lava.png
index cb02ada13..cb02ada13 100644
--- a/data/textures/lava.png
+++ b/data/mods/default/textures/lava.png
diff --git a/data/textures/leaves.png b/data/mods/default/textures/leaves.png
index 7a25126e9..7a25126e9 100644
--- a/data/textures/leaves.png
+++ b/data/mods/default/textures/leaves.png
diff --git a/data/textures/lump_of_clay.png b/data/mods/default/textures/lump_of_clay.png
index be0bab9d7..be0bab9d7 100644
--- a/data/textures/lump_of_clay.png
+++ b/data/mods/default/textures/lump_of_clay.png
diff --git a/data/textures/lump_of_coal.png b/data/mods/default/textures/lump_of_coal.png
index bad901efa..bad901efa 100644
--- a/data/textures/lump_of_coal.png
+++ b/data/mods/default/textures/lump_of_coal.png
diff --git a/data/textures/lump_of_iron.png b/data/mods/default/textures/lump_of_iron.png
index edb931018..edb931018 100644
--- a/data/textures/lump_of_iron.png
+++ b/data/mods/default/textures/lump_of_iron.png
diff --git a/data/textures/mese.png b/data/mods/default/textures/mese.png
index 4c876cdc5..4c876cdc5 100644
--- a/data/textures/mese.png
+++ b/data/mods/default/textures/mese.png
diff --git a/data/textures/mineral_coal.png b/data/mods/default/textures/mineral_coal.png
index 3ff9692fb..3ff9692fb 100644
--- a/data/textures/mineral_coal.png
+++ b/data/mods/default/textures/mineral_coal.png
diff --git a/data/textures/mineral_iron.png b/data/mods/default/textures/mineral_iron.png
index 51b15d95d..51b15d95d 100644
--- a/data/textures/mineral_iron.png
+++ b/data/mods/default/textures/mineral_iron.png
diff --git a/data/textures/mossycobble.png b/data/mods/default/textures/mossycobble.png
index fad1b33ff..fad1b33ff 100644
--- a/data/textures/mossycobble.png
+++ b/data/mods/default/textures/mossycobble.png
diff --git a/data/mods/default/textures/mud.png b/data/mods/default/textures/mud.png
new file mode 100644
index 000000000..7cb9c89a6
--- /dev/null
+++ b/data/mods/default/textures/mud.png
diff --git a/data/textures/nc_back.png b/data/mods/default/textures/nc_back.png
index f09f41658..f09f41658 100644
--- a/data/textures/nc_back.png
+++ b/data/mods/default/textures/nc_back.png
diff --git a/data/textures/nc_front.png b/data/mods/default/textures/nc_front.png
index cad9edab1..cad9edab1 100644
--- a/data/textures/nc_front.png
+++ b/data/mods/default/textures/nc_front.png
diff --git a/data/textures/nc_rb.png b/data/mods/default/textures/nc_rb.png
index 7ebc9930d..7ebc9930d 100644
--- a/data/textures/nc_rb.png
+++ b/data/mods/default/textures/nc_rb.png
diff --git a/data/textures/nc_side.png b/data/mods/default/textures/nc_side.png
index f954045fb..f954045fb 100644
--- a/data/textures/nc_side.png
+++ b/data/mods/default/textures/nc_side.png
diff --git a/data/textures/oerkki1.png b/data/mods/default/textures/oerkki1.png
index 33cbac9e7..33cbac9e7 100644
--- a/data/textures/oerkki1.png
+++ b/data/mods/default/textures/oerkki1.png
diff --git a/data/textures/oerkki1_damaged.png b/data/mods/default/textures/oerkki1_damaged.png
index 9b777387c..9b777387c 100644
--- a/data/textures/oerkki1_damaged.png
+++ b/data/mods/default/textures/oerkki1_damaged.png
diff --git a/data/textures/paper.png b/data/mods/default/textures/paper.png
index ae5c06bc6..ae5c06bc6 100644
--- a/data/textures/paper.png
+++ b/data/mods/default/textures/paper.png
diff --git a/data/textures/papyrus.png b/data/mods/default/textures/papyrus.png
index bf0dec7fe..bf0dec7fe 100644
--- a/data/textures/papyrus.png
+++ b/data/mods/default/textures/papyrus.png
diff --git a/data/textures/player.png b/data/mods/default/textures/player.png
index 90adf9747..90adf9747 100644
--- a/data/textures/player.png
+++ b/data/mods/default/textures/player.png
diff --git a/data/textures/player_back.png b/data/mods/default/textures/player_back.png
index 530aa7519..530aa7519 100644
--- a/data/textures/player_back.png
+++ b/data/mods/default/textures/player_back.png
diff --git a/data/textures/rail.png b/data/mods/default/textures/rail.png
index 18176d9f3..18176d9f3 100644
--- a/data/textures/rail.png
+++ b/data/mods/default/textures/rail.png
diff --git a/data/textures/rail_crossing.png b/data/mods/default/textures/rail_crossing.png
index 984640577..984640577 100644
--- a/data/textures/rail_crossing.png
+++ b/data/mods/default/textures/rail_crossing.png
diff --git a/data/textures/rail_curved.png b/data/mods/default/textures/rail_curved.png
index 62afa3d2b..62afa3d2b 100644
--- a/data/textures/rail_curved.png
+++ b/data/mods/default/textures/rail_curved.png
diff --git a/data/textures/rail_t_junction.png b/data/mods/default/textures/rail_t_junction.png
index 9985f63cd..9985f63cd 100644
--- a/data/textures/rail_t_junction.png
+++ b/data/mods/default/textures/rail_t_junction.png
diff --git a/data/textures/rat.png b/data/mods/default/textures/rat.png
index d1a0e2ae2..d1a0e2ae2 100644
--- a/data/textures/rat.png
+++ b/data/mods/default/textures/rat.png
diff --git a/data/textures/sand.png b/data/mods/default/textures/sand.png
index 15101a7eb..15101a7eb 100644
--- a/data/textures/sand.png
+++ b/data/mods/default/textures/sand.png
diff --git a/data/textures/sandstone.png b/data/mods/default/textures/sandstone.png
index c4759b4d0..c4759b4d0 100644
--- a/data/textures/sandstone.png
+++ b/data/mods/default/textures/sandstone.png
diff --git a/data/textures/sapling.png b/data/mods/default/textures/sapling.png
index 73f502306..73f502306 100644
--- a/data/textures/sapling.png
+++ b/data/mods/default/textures/sapling.png
diff --git a/data/textures/scorched_stuff.png b/data/mods/default/textures/scorched_stuff.png
index 9ced2fbe8..9ced2fbe8 100644
--- a/data/textures/scorched_stuff.png
+++ b/data/mods/default/textures/scorched_stuff.png
diff --git a/data/textures/sign.png b/data/mods/default/textures/sign.png
index 2e0b3cbef..2e0b3cbef 100644
--- a/data/textures/sign.png
+++ b/data/mods/default/textures/sign.png
diff --git a/data/textures/sign_back.png b/data/mods/default/textures/sign_back.png
index 779e4bc2c..779e4bc2c 100644
--- a/data/textures/sign_back.png
+++ b/data/mods/default/textures/sign_back.png
diff --git a/data/textures/sign_wall.png b/data/mods/default/textures/sign_wall.png
index 06eac1ee9..06eac1ee9 100644
--- a/data/textures/sign_wall.png
+++ b/data/mods/default/textures/sign_wall.png
diff --git a/data/textures/skybox1.png b/data/mods/default/textures/skybox1.png
index 9801d5f4f..9801d5f4f 100644
--- a/data/textures/skybox1.png
+++ b/data/mods/default/textures/skybox1.png
diff --git a/data/textures/skybox1_dawn.png b/data/mods/default/textures/skybox1_dawn.png
index 9711c4781..9711c4781 100644
--- a/data/textures/skybox1_dawn.png
+++ b/data/mods/default/textures/skybox1_dawn.png
diff --git a/data/textures/skybox1_night.png b/data/mods/default/textures/skybox1_night.png
index 32e43a63e..32e43a63e 100644
--- a/data/textures/skybox1_night.png
+++ b/data/mods/default/textures/skybox1_night.png
diff --git a/data/textures/skybox2.png b/data/mods/default/textures/skybox2.png
index a8c94b4d2..a8c94b4d2 100644
--- a/data/textures/skybox2.png
+++ b/data/mods/default/textures/skybox2.png
diff --git a/data/textures/skybox2_dawn.png b/data/mods/default/textures/skybox2_dawn.png
index a761dff2d..a761dff2d 100644
--- a/data/textures/skybox2_dawn.png
+++ b/data/mods/default/textures/skybox2_dawn.png
diff --git a/data/textures/skybox2_night.png b/data/mods/default/textures/skybox2_night.png
index beb07a9cf..beb07a9cf 100644
--- a/data/textures/skybox2_night.png
+++ b/data/mods/default/textures/skybox2_night.png
diff --git a/data/textures/skybox3.png b/data/mods/default/textures/skybox3.png
index 2776ec712..2776ec712 100644
--- a/data/textures/skybox3.png
+++ b/data/mods/default/textures/skybox3.png
diff --git a/data/textures/skybox3_dawn.png b/data/mods/default/textures/skybox3_dawn.png
index 22c8cbef5..22c8cbef5 100644
--- a/data/textures/skybox3_dawn.png
+++ b/data/mods/default/textures/skybox3_dawn.png
diff --git a/data/textures/skybox3_night.png b/data/mods/default/textures/skybox3_night.png
index bb509789b..bb509789b 100644
--- a/data/textures/skybox3_night.png
+++ b/data/mods/default/textures/skybox3_night.png
diff --git a/data/textures/steel_block.png b/data/mods/default/textures/steel_block.png
index 8e2020081..8e2020081 100644
--- a/data/textures/steel_block.png
+++ b/data/mods/default/textures/steel_block.png
diff --git a/data/textures/steel_ingot.png b/data/mods/default/textures/steel_ingot.png
index f6c9414e7..f6c9414e7 100644
--- a/data/textures/steel_ingot.png
+++ b/data/mods/default/textures/steel_ingot.png
diff --git a/data/textures/stick.png b/data/mods/default/textures/stick.png
index 2d31797f0..2d31797f0 100644
--- a/data/textures/stick.png
+++ b/data/mods/default/textures/stick.png
diff --git a/data/textures/stone.png b/data/mods/default/textures/stone.png
index cad0dbe2b..cad0dbe2b 100644
--- a/data/textures/stone.png
+++ b/data/mods/default/textures/stone.png
diff --git a/data/textures/tnt_bottom.png b/data/mods/default/textures/tnt_bottom.png
index 8ba2fca0b..8ba2fca0b 100644
--- a/data/textures/tnt_bottom.png
+++ b/data/mods/default/textures/tnt_bottom.png
diff --git a/data/textures/tnt_side.png b/data/mods/default/textures/tnt_side.png
index d9a2bc4eb..d9a2bc4eb 100644
--- a/data/textures/tnt_side.png
+++ b/data/mods/default/textures/tnt_side.png
diff --git a/data/textures/tnt_top.png b/data/mods/default/textures/tnt_top.png
index a84ffc9af..a84ffc9af 100644
--- a/data/textures/tnt_top.png
+++ b/data/mods/default/textures/tnt_top.png
diff --git a/data/textures/tool_mesepick.png b/data/mods/default/textures/tool_mesepick.png
index a1f3812e0..a1f3812e0 100644
--- a/data/textures/tool_mesepick.png
+++ b/data/mods/default/textures/tool_mesepick.png
diff --git a/data/textures/tool_steelaxe.png b/data/mods/default/textures/tool_steelaxe.png
index 0ad23c93b..0ad23c93b 100644
--- a/data/textures/tool_steelaxe.png
+++ b/data/mods/default/textures/tool_steelaxe.png
diff --git a/data/textures/tool_steelpick.png b/data/mods/default/textures/tool_steelpick.png
index 7982dafeb..7982dafeb 100644
--- a/data/textures/tool_steelpick.png
+++ b/data/mods/default/textures/tool_steelpick.png
diff --git a/data/textures/tool_steelshovel.png b/data/mods/default/textures/tool_steelshovel.png
index ed8413846..ed8413846 100644
--- a/data/textures/tool_steelshovel.png
+++ b/data/mods/default/textures/tool_steelshovel.png
diff --git a/data/textures/tool_steelsword.png b/data/mods/default/textures/tool_steelsword.png
index a74581238..a74581238 100644
--- a/data/textures/tool_steelsword.png
+++ b/data/mods/default/textures/tool_steelsword.png
diff --git a/data/textures/tool_stoneaxe.png b/data/mods/default/textures/tool_stoneaxe.png
index 698ac918f..698ac918f 100644
--- a/data/textures/tool_stoneaxe.png
+++ b/data/mods/default/textures/tool_stoneaxe.png
diff --git a/data/textures/tool_stonepick.png b/data/mods/default/textures/tool_stonepick.png
index b34de6f32..b34de6f32 100644
--- a/data/textures/tool_stonepick.png
+++ b/data/mods/default/textures/tool_stonepick.png
diff --git a/data/textures/tool_stoneshovel.png b/data/mods/default/textures/tool_stoneshovel.png
index ba5243101..ba5243101 100644
--- a/data/textures/tool_stoneshovel.png
+++ b/data/mods/default/textures/tool_stoneshovel.png
diff --git a/data/textures/tool_stonesword.png b/data/mods/default/textures/tool_stonesword.png
index 8f8191f92..8f8191f92 100644
--- a/data/textures/tool_stonesword.png
+++ b/data/mods/default/textures/tool_stonesword.png
diff --git a/data/textures/tool_woodaxe.png b/data/mods/default/textures/tool_woodaxe.png
index 3daa4af72..3daa4af72 100644
--- a/data/textures/tool_woodaxe.png
+++ b/data/mods/default/textures/tool_woodaxe.png
diff --git a/data/textures/tool_woodpick.png b/data/mods/default/textures/tool_woodpick.png
index ea728cca3..ea728cca3 100644
--- a/data/textures/tool_woodpick.png
+++ b/data/mods/default/textures/tool_woodpick.png
diff --git a/data/textures/tool_woodshovel.png b/data/mods/default/textures/tool_woodshovel.png
index 649ab4c38..649ab4c38 100644
--- a/data/textures/tool_woodshovel.png
+++ b/data/mods/default/textures/tool_woodshovel.png
diff --git a/data/textures/tool_woodsword.png b/data/mods/default/textures/tool_woodsword.png
index d6c6be325..d6c6be325 100644
--- a/data/textures/tool_woodsword.png
+++ b/data/mods/default/textures/tool_woodsword.png
diff --git a/data/textures/torch.png b/data/mods/default/textures/torch.png
index 7a953c222..7a953c222 100644
--- a/data/textures/torch.png
+++ b/data/mods/default/textures/torch.png
diff --git a/data/textures/torch_on_ceiling.png b/data/mods/default/textures/torch_on_ceiling.png
index 6965d380e..6965d380e 100644
--- a/data/textures/torch_on_ceiling.png
+++ b/data/mods/default/textures/torch_on_ceiling.png
diff --git a/data/textures/torch_on_floor.png b/data/mods/default/textures/torch_on_floor.png
index 76d1dd5ac..76d1dd5ac 100644
--- a/data/textures/torch_on_floor.png
+++ b/data/mods/default/textures/torch_on_floor.png
diff --git a/data/textures/tree.png b/data/mods/default/textures/tree.png
index 65abfc243..65abfc243 100644
--- a/data/textures/tree.png
+++ b/data/mods/default/textures/tree.png
diff --git a/data/textures/tree_top.png b/data/mods/default/textures/tree_top.png
index 2cdd94f80..2cdd94f80 100644
--- a/data/textures/tree_top.png
+++ b/data/mods/default/textures/tree_top.png
diff --git a/data/textures/treeprop.png b/data/mods/default/textures/treeprop.png
index 77ea4d6d4..77ea4d6d4 100644
--- a/data/textures/treeprop.png
+++ b/data/mods/default/textures/treeprop.png
diff --git a/data/textures/unknown_block.png b/data/mods/default/textures/unknown_block.png
index a27cb8ca9..a27cb8ca9 100644
--- a/data/textures/unknown_block.png
+++ b/data/mods/default/textures/unknown_block.png
diff --git a/data/textures/unknown_object.png b/data/mods/default/textures/unknown_object.png
index 4d6a98d56..4d6a98d56 100644
--- a/data/textures/unknown_object.png
+++ b/data/mods/default/textures/unknown_object.png
diff --git a/data/textures/water.png b/data/mods/default/textures/water.png
index e5f8cdc25..e5f8cdc25 100644
--- a/data/textures/water.png
+++ b/data/mods/default/textures/water.png
diff --git a/data/textures/wood.png b/data/mods/default/textures/wood.png
index 57c1d7c12..57c1d7c12 100644
--- a/data/textures/wood.png
+++ b/data/mods/default/textures/wood.png
diff --git a/src/game.cpp b/src/game.cpp
index 6c75863c0..fc87deb29 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -256,9 +256,9 @@ void draw_hotbar(video::IVideoDriver *driver, gui::IGUIFont *font,
 	/*
 		Draw hearts
 	*/
+	video::ITexture *heart_texture = tsrc->getTextureRaw("heart.png");
+	if(heart_texture)
 	{
-		video::ITexture *heart_texture =
-				driver->getTexture(getTexturePath("heart.png").c_str());
 		v2s32 p = pos + v2s32(0, -20);
 		for(s32 i=0; i<halfheartcount/2; i++)
 		{
diff --git a/src/server.cpp b/src/server.cpp
index ee5e301f1..9a7f1e972 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -997,13 +997,27 @@ Server::Server(
 	// Export API
 	scriptapi_export(m_lua, this);
 	// Load and run scripts
-	std::string defaultscript = porting::path_data + DIR_DELIM
-			+ "scripts" + DIR_DELIM + "default.lua";
-	bool success = script_load(m_lua, defaultscript.c_str());
-	if(!success){
-		errorstream<<"Server: Failed to load and run "
-				<<defaultscript<<std::endl;
-		assert(0);
+	core::list<std::string> modspaths;
+	modspaths.push_back(porting::path_data + DIR_DELIM + "mods");
+	for(core::list<std::string>::Iterator i = modspaths.begin();
+			i != modspaths.end(); i++){
+		std::string modspath = *i;
+		std::vector<fs::DirListNode> dirlist = fs::GetDirListing(modspath);
+		for(u32 j=0; j<dirlist.size(); j++){
+			if(!dirlist[j].dir)
+				continue;
+			std::string modname = dirlist[j].name;
+			infostream<<"Server: Loading mod \""<<modname<<"\" script..."
+					<<std::endl;
+			std::string scriptpath = modspath + DIR_DELIM + modname
+					+ DIR_DELIM + "init.lua";
+			bool success = script_load(m_lua, scriptpath.c_str());
+			if(!success){
+				errorstream<<"Server: Failed to load and run "
+						<<scriptpath<<std::endl;
+				assert(0);
+			}
+		}
 	}
 	
 	// Initialize Environment
diff --git a/src/tile.cpp b/src/tile.cpp
index c8fffffa7..eb3616f02 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -132,7 +132,7 @@ std::string getTexturePath(const std::string &filename)
 	*/
 	if(fullpath == "")
 	{
-		std::string rel_path = std::string("textures")+DIR_DELIM+filename;
+		std::string rel_path = std::string("clienttextures")+DIR_DELIM+filename;
 		std::string testpath = porting::path_data + DIR_DELIM + rel_path;
 		// Check all filename extensions. Returns "" if not found.
 		fullpath = getImagePath(testpath);