110 files changed, 18 insertions, 26 deletions

diff --git a/share/server/builtin.lua b/share/builtin.lua
index 9b2bed33f..9b2bed33f 100644
--- a/share/server/builtin.lua
+++ b/share/builtin.lua
diff --git a/share/server/games/mesetint/mods/bucket/depends.txt b/share/games/mesetint/mods/bucket/depends.txt
index 3a7daa1d7..3a7daa1d7 100644
--- a/share/server/games/mesetint/mods/bucket/depends.txt
+++ b/share/games/mesetint/mods/bucket/depends.txt
diff --git a/share/server/games/mesetint/mods/bucket/init.lua b/share/games/mesetint/mods/bucket/init.lua
index 8ed9da522..8ed9da522 100644
--- a/share/server/games/mesetint/mods/bucket/init.lua
+++ b/share/games/mesetint/mods/bucket/init.lua
diff --git a/share/server/games/mesetint/mods/bucket/textures/bucket.png b/share/games/mesetint/mods/bucket/textures/bucket.png
index f165fd209..f165fd209 100644
--- a/share/server/games/mesetint/mods/bucket/textures/bucket.png
+++ b/share/games/mesetint/mods/bucket/textures/bucket.png
diff --git a/share/server/games/mesetint/mods/bucket/textures/bucket_lava.png b/share/games/mesetint/mods/bucket/textures/bucket_lava.png
index 7cf27cd1f..7cf27cd1f 100644
--- a/share/server/games/mesetint/mods/bucket/textures/bucket_lava.png
+++ b/share/games/mesetint/mods/bucket/textures/bucket_lava.png
diff --git a/share/server/games/mesetint/mods/bucket/textures/bucket_water.png b/share/games/mesetint/mods/bucket/textures/bucket_water.png
index f220ec51e..f220ec51e 100644
--- a/share/server/games/mesetint/mods/bucket/textures/bucket_water.png
+++ b/share/games/mesetint/mods/bucket/textures/bucket_water.png
diff --git a/share/server/games/mesetint/mods/default/init.lua b/share/games/mesetint/mods/default/init.lua
index 7823db6b9..7823db6b9 100644
--- a/share/server/games/mesetint/mods/default/init.lua
+++ b/share/games/mesetint/mods/default/init.lua
diff --git a/share/server/games/mesetint/mods/default/textures/crack.png b/share/games/mesetint/mods/default/textures/crack.png
index 499783982..499783982 100644
--- a/share/server/games/mesetint/mods/default/textures/crack.png
+++ b/share/games/mesetint/mods/default/textures/crack.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_apple.png b/share/games/mesetint/mods/default/textures/default_apple.png
index 9593f28f6..9593f28f6 100644
--- a/share/server/games/mesetint/mods/default/textures/default_apple.png
+++ b/share/games/mesetint/mods/default/textures/default_apple.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_book.png b/share/games/mesetint/mods/default/textures/default_book.png
index 176fb6aa9..176fb6aa9 100644
--- a/share/server/games/mesetint/mods/default/textures/default_book.png
+++ b/share/games/mesetint/mods/default/textures/default_book.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_bookshelf.png b/share/games/mesetint/mods/default/textures/default_bookshelf.png
index 5ecc50ff3..5ecc50ff3 100644
--- a/share/server/games/mesetint/mods/default/textures/default_bookshelf.png
+++ b/share/games/mesetint/mods/default/textures/default_bookshelf.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_brick.png b/share/games/mesetint/mods/default/textures/default_brick.png
index 32d77f347..32d77f347 100644
--- a/share/server/games/mesetint/mods/default/textures/default_brick.png
+++ b/share/games/mesetint/mods/default/textures/default_brick.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_cactus_side.png b/share/games/mesetint/mods/default/textures/default_cactus_side.png
index fc479fde6..fc479fde6 100644
--- a/share/server/games/mesetint/mods/default/textures/default_cactus_side.png
+++ b/share/games/mesetint/mods/default/textures/default_cactus_side.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_cactus_top.png b/share/games/mesetint/mods/default/textures/default_cactus_top.png
index f9e68df51..f9e68df51 100644
--- a/share/server/games/mesetint/mods/default/textures/default_cactus_top.png
+++ b/share/games/mesetint/mods/default/textures/default_cactus_top.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_chest_front.png b/share/games/mesetint/mods/default/textures/default_chest_front.png
index c5628af94..c5628af94 100644
--- a/share/server/games/mesetint/mods/default/textures/default_chest_front.png
+++ b/share/games/mesetint/mods/default/textures/default_chest_front.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_chest_lock.png b/share/games/mesetint/mods/default/textures/default_chest_lock.png
index ae038fae5..ae038fae5 100644
--- a/share/server/games/mesetint/mods/default/textures/default_chest_lock.png
+++ b/share/games/mesetint/mods/default/textures/default_chest_lock.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_chest_side.png b/share/games/mesetint/mods/default/textures/default_chest_side.png
index 916dd784d..916dd784d 100644
--- a/share/server/games/mesetint/mods/default/textures/default_chest_side.png
+++ b/share/games/mesetint/mods/default/textures/default_chest_side.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_chest_top.png b/share/games/mesetint/mods/default/textures/default_chest_top.png
index 58c79674d..58c79674d 100644
--- a/share/server/games/mesetint/mods/default/textures/default_chest_top.png
+++ b/share/games/mesetint/mods/default/textures/default_chest_top.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_clay.png b/share/games/mesetint/mods/default/textures/default_clay.png
index 3557429d8..3557429d8 100644
--- a/share/server/games/mesetint/mods/default/textures/default_clay.png
+++ b/share/games/mesetint/mods/default/textures/default_clay.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_clay_brick.png b/share/games/mesetint/mods/default/textures/default_clay_brick.png
index e36648e48..e36648e48 100644
--- a/share/server/games/mesetint/mods/default/textures/default_clay_brick.png
+++ b/share/games/mesetint/mods/default/textures/default_clay_brick.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_clay_lump.png b/share/games/mesetint/mods/default/textures/default_clay_lump.png
index be0bab9d7..be0bab9d7 100644
--- a/share/server/games/mesetint/mods/default/textures/default_clay_lump.png
+++ b/share/games/mesetint/mods/default/textures/default_clay_lump.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_cloud.png b/share/games/mesetint/mods/default/textures/default_cloud.png
index 24091a377..24091a377 100644
--- a/share/server/games/mesetint/mods/default/textures/default_cloud.png
+++ b/share/games/mesetint/mods/default/textures/default_cloud.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_coal_lump.png b/share/games/mesetint/mods/default/textures/default_coal_lump.png
index bad901efa..bad901efa 100644
--- a/share/server/games/mesetint/mods/default/textures/default_coal_lump.png
+++ b/share/games/mesetint/mods/default/textures/default_coal_lump.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_cobble.png b/share/games/mesetint/mods/default/textures/default_cobble.png
index 7d0447419..7d0447419 100644
--- a/share/server/games/mesetint/mods/default/textures/default_cobble.png
+++ b/share/games/mesetint/mods/default/textures/default_cobble.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_dirt.png b/share/games/mesetint/mods/default/textures/default_dirt.png
index 7cb9c89a6..7cb9c89a6 100644
--- a/share/server/games/mesetint/mods/default/textures/default_dirt.png
+++ b/share/games/mesetint/mods/default/textures/default_dirt.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_fence.png b/share/games/mesetint/mods/default/textures/default_fence.png
index 0b99f0eb5..0b99f0eb5 100644
--- a/share/server/games/mesetint/mods/default/textures/default_fence.png
+++ b/share/games/mesetint/mods/default/textures/default_fence.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_furnace_front.png b/share/games/mesetint/mods/default/textures/default_furnace_front.png
index 1620a27c3..1620a27c3 100644
--- a/share/server/games/mesetint/mods/default/textures/default_furnace_front.png
+++ b/share/games/mesetint/mods/default/textures/default_furnace_front.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_furnace_side.png b/share/games/mesetint/mods/default/textures/default_furnace_side.png
index 63cb162fe..63cb162fe 100644
--- a/share/server/games/mesetint/mods/default/textures/default_furnace_side.png
+++ b/share/games/mesetint/mods/default/textures/default_furnace_side.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_glass.png b/share/games/mesetint/mods/default/textures/default_glass.png
index ade0196fe..ade0196fe 100644
--- a/share/server/games/mesetint/mods/default/textures/default_glass.png
+++ b/share/games/mesetint/mods/default/textures/default_glass.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_grass.png b/share/games/mesetint/mods/default/textures/default_grass.png
index 3610bb2bc..3610bb2bc 100644
--- a/share/server/games/mesetint/mods/default/textures/default_grass.png
+++ b/share/games/mesetint/mods/default/textures/default_grass.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_grass_footsteps.png b/share/games/mesetint/mods/default/textures/default_grass_footsteps.png
index 57e063d8c..57e063d8c 100644
--- a/share/server/games/mesetint/mods/default/textures/default_grass_footsteps.png
+++ b/share/games/mesetint/mods/default/textures/default_grass_footsteps.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_grass_side.png b/share/games/mesetint/mods/default/textures/default_grass_side.png
index 4f4f680be..4f4f680be 100644
--- a/share/server/games/mesetint/mods/default/textures/default_grass_side.png
+++ b/share/games/mesetint/mods/default/textures/default_grass_side.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_gravel.png b/share/games/mesetint/mods/default/textures/default_gravel.png
index f08666ad9..f08666ad9 100644
--- a/share/server/games/mesetint/mods/default/textures/default_gravel.png
+++ b/share/games/mesetint/mods/default/textures/default_gravel.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_iron_lump.png b/share/games/mesetint/mods/default/textures/default_iron_lump.png
index edb931018..edb931018 100644
--- a/share/server/games/mesetint/mods/default/textures/default_iron_lump.png
+++ b/share/games/mesetint/mods/default/textures/default_iron_lump.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_junglegrass.png b/share/games/mesetint/mods/default/textures/default_junglegrass.png
index eea87c07c..eea87c07c 100644
--- a/share/server/games/mesetint/mods/default/textures/default_junglegrass.png
+++ b/share/games/mesetint/mods/default/textures/default_junglegrass.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_jungletree.png b/share/games/mesetint/mods/default/textures/default_jungletree.png
index ccd20ac74..ccd20ac74 100644
--- a/share/server/games/mesetint/mods/default/textures/default_jungletree.png
+++ b/share/games/mesetint/mods/default/textures/default_jungletree.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_jungletree_top.png b/share/games/mesetint/mods/default/textures/default_jungletree_top.png
index 2a9b51373..2a9b51373 100644
--- a/share/server/games/mesetint/mods/default/textures/default_jungletree_top.png
+++ b/share/games/mesetint/mods/default/textures/default_jungletree_top.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_ladder.png b/share/games/mesetint/mods/default/textures/default_ladder.png
index 11056359d..11056359d 100644
--- a/share/server/games/mesetint/mods/default/textures/default_ladder.png
+++ b/share/games/mesetint/mods/default/textures/default_ladder.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_lava.png b/share/games/mesetint/mods/default/textures/default_lava.png
index cb02ada13..cb02ada13 100644
--- a/share/server/games/mesetint/mods/default/textures/default_lava.png
+++ b/share/games/mesetint/mods/default/textures/default_lava.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_leaves.png b/share/games/mesetint/mods/default/textures/default_leaves.png
index 7a25126e9..7a25126e9 100644
--- a/share/server/games/mesetint/mods/default/textures/default_leaves.png
+++ b/share/games/mesetint/mods/default/textures/default_leaves.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_mese.png b/share/games/mesetint/mods/default/textures/default_mese.png
index 4c876cdc5..4c876cdc5 100644
--- a/share/server/games/mesetint/mods/default/textures/default_mese.png
+++ b/share/games/mesetint/mods/default/textures/default_mese.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_mineral_coal.png b/share/games/mesetint/mods/default/textures/default_mineral_coal.png
index 3ff9692fb..3ff9692fb 100644
--- a/share/server/games/mesetint/mods/default/textures/default_mineral_coal.png
+++ b/share/games/mesetint/mods/default/textures/default_mineral_coal.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_mineral_iron.png b/share/games/mesetint/mods/default/textures/default_mineral_iron.png
index 51b15d95d..51b15d95d 100644
--- a/share/server/games/mesetint/mods/default/textures/default_mineral_iron.png
+++ b/share/games/mesetint/mods/default/textures/default_mineral_iron.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_mossycobble.png b/share/games/mesetint/mods/default/textures/default_mossycobble.png
index fad1b33ff..fad1b33ff 100644
--- a/share/server/games/mesetint/mods/default/textures/default_mossycobble.png
+++ b/share/games/mesetint/mods/default/textures/default_mossycobble.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_nc_back.png b/share/games/mesetint/mods/default/textures/default_nc_back.png
index f09f41658..f09f41658 100644
--- a/share/server/games/mesetint/mods/default/textures/default_nc_back.png
+++ b/share/games/mesetint/mods/default/textures/default_nc_back.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_nc_front.png b/share/games/mesetint/mods/default/textures/default_nc_front.png
index cad9edab1..cad9edab1 100644
--- a/share/server/games/mesetint/mods/default/textures/default_nc_front.png
+++ b/share/games/mesetint/mods/default/textures/default_nc_front.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_nc_rb.png b/share/games/mesetint/mods/default/textures/default_nc_rb.png
index 7ebc9930d..7ebc9930d 100644
--- a/share/server/games/mesetint/mods/default/textures/default_nc_rb.png
+++ b/share/games/mesetint/mods/default/textures/default_nc_rb.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_nc_side.png b/share/games/mesetint/mods/default/textures/default_nc_side.png
index f954045fb..f954045fb 100644
--- a/share/server/games/mesetint/mods/default/textures/default_nc_side.png
+++ b/share/games/mesetint/mods/default/textures/default_nc_side.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_paper.png b/share/games/mesetint/mods/default/textures/default_paper.png
index ae5c06bc6..ae5c06bc6 100644
--- a/share/server/games/mesetint/mods/default/textures/default_paper.png
+++ b/share/games/mesetint/mods/default/textures/default_paper.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_papyrus.png b/share/games/mesetint/mods/default/textures/default_papyrus.png
index bf0dec7fe..bf0dec7fe 100644
--- a/share/server/games/mesetint/mods/default/textures/default_papyrus.png
+++ b/share/games/mesetint/mods/default/textures/default_papyrus.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_rail.png b/share/games/mesetint/mods/default/textures/default_rail.png
index 18176d9f3..18176d9f3 100644
--- a/share/server/games/mesetint/mods/default/textures/default_rail.png
+++ b/share/games/mesetint/mods/default/textures/default_rail.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_rail_crossing.png b/share/games/mesetint/mods/default/textures/default_rail_crossing.png
index 984640577..984640577 100644
--- a/share/server/games/mesetint/mods/default/textures/default_rail_crossing.png
+++ b/share/games/mesetint/mods/default/textures/default_rail_crossing.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_rail_curved.png b/share/games/mesetint/mods/default/textures/default_rail_curved.png
index 62afa3d2b..62afa3d2b 100644
--- a/share/server/games/mesetint/mods/default/textures/default_rail_curved.png
+++ b/share/games/mesetint/mods/default/textures/default_rail_curved.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_rail_t_junction.png b/share/games/mesetint/mods/default/textures/default_rail_t_junction.png
index 9985f63cd..9985f63cd 100644
--- a/share/server/games/mesetint/mods/default/textures/default_rail_t_junction.png
+++ b/share/games/mesetint/mods/default/textures/default_rail_t_junction.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_sand.png b/share/games/mesetint/mods/default/textures/default_sand.png
index 15101a7eb..15101a7eb 100644
--- a/share/server/games/mesetint/mods/default/textures/default_sand.png
+++ b/share/games/mesetint/mods/default/textures/default_sand.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_sandstone.png b/share/games/mesetint/mods/default/textures/default_sandstone.png
index c4759b4d0..c4759b4d0 100644
--- a/share/server/games/mesetint/mods/default/textures/default_sandstone.png
+++ b/share/games/mesetint/mods/default/textures/default_sandstone.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_sapling.png b/share/games/mesetint/mods/default/textures/default_sapling.png
index 73f502306..73f502306 100644
--- a/share/server/games/mesetint/mods/default/textures/default_sapling.png
+++ b/share/games/mesetint/mods/default/textures/default_sapling.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_scorched_stuff.png b/share/games/mesetint/mods/default/textures/default_scorched_stuff.png
index 9ced2fbe8..9ced2fbe8 100644
--- a/share/server/games/mesetint/mods/default/textures/default_scorched_stuff.png
+++ b/share/games/mesetint/mods/default/textures/default_scorched_stuff.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_sign_wall.png b/share/games/mesetint/mods/default/textures/default_sign_wall.png
index 06eac1ee9..06eac1ee9 100644
--- a/share/server/games/mesetint/mods/default/textures/default_sign_wall.png
+++ b/share/games/mesetint/mods/default/textures/default_sign_wall.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_steel_block.png b/share/games/mesetint/mods/default/textures/default_steel_block.png
index 8e2020081..8e2020081 100644
--- a/share/server/games/mesetint/mods/default/textures/default_steel_block.png
+++ b/share/games/mesetint/mods/default/textures/default_steel_block.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_steel_ingot.png b/share/games/mesetint/mods/default/textures/default_steel_ingot.png
index f6c9414e7..f6c9414e7 100644
--- a/share/server/games/mesetint/mods/default/textures/default_steel_ingot.png
+++ b/share/games/mesetint/mods/default/textures/default_steel_ingot.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_stick.png b/share/games/mesetint/mods/default/textures/default_stick.png
index 2d31797f0..2d31797f0 100644
--- a/share/server/games/mesetint/mods/default/textures/default_stick.png
+++ b/share/games/mesetint/mods/default/textures/default_stick.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_stone.png b/share/games/mesetint/mods/default/textures/default_stone.png
index cad0dbe2b..cad0dbe2b 100644
--- a/share/server/games/mesetint/mods/default/textures/default_stone.png
+++ b/share/games/mesetint/mods/default/textures/default_stone.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tnt_bottom.png b/share/games/mesetint/mods/default/textures/default_tnt_bottom.png
index 8ba2fca0b..8ba2fca0b 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tnt_bottom.png
+++ b/share/games/mesetint/mods/default/textures/default_tnt_bottom.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tnt_side.png b/share/games/mesetint/mods/default/textures/default_tnt_side.png
index d9a2bc4eb..d9a2bc4eb 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tnt_side.png
+++ b/share/games/mesetint/mods/default/textures/default_tnt_side.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tnt_top.png b/share/games/mesetint/mods/default/textures/default_tnt_top.png
index a84ffc9af..a84ffc9af 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tnt_top.png
+++ b/share/games/mesetint/mods/default/textures/default_tnt_top.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_mesepick.png b/share/games/mesetint/mods/default/textures/default_tool_mesepick.png
index a1f3812e0..a1f3812e0 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_mesepick.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_mesepick.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_steelaxe.png b/share/games/mesetint/mods/default/textures/default_tool_steelaxe.png
index 0ad23c93b..0ad23c93b 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_steelaxe.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_steelaxe.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_steelpick.png b/share/games/mesetint/mods/default/textures/default_tool_steelpick.png
index 7982dafeb..7982dafeb 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_steelpick.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_steelpick.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_steelshovel.png b/share/games/mesetint/mods/default/textures/default_tool_steelshovel.png
index ed8413846..ed8413846 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_steelshovel.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_steelshovel.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_steelsword.png b/share/games/mesetint/mods/default/textures/default_tool_steelsword.png
index a74581238..a74581238 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_steelsword.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_steelsword.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_stoneaxe.png b/share/games/mesetint/mods/default/textures/default_tool_stoneaxe.png
index 698ac918f..698ac918f 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_stoneaxe.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_stoneaxe.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_stonepick.png b/share/games/mesetint/mods/default/textures/default_tool_stonepick.png
index b34de6f32..b34de6f32 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_stonepick.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_stonepick.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_stoneshovel.png b/share/games/mesetint/mods/default/textures/default_tool_stoneshovel.png
index ba5243101..ba5243101 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_stoneshovel.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_stoneshovel.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_stonesword.png b/share/games/mesetint/mods/default/textures/default_tool_stonesword.png
index 8f8191f92..8f8191f92 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_stonesword.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_stonesword.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_woodaxe.png b/share/games/mesetint/mods/default/textures/default_tool_woodaxe.png
index 3daa4af72..3daa4af72 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_woodaxe.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_woodaxe.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_woodpick.png b/share/games/mesetint/mods/default/textures/default_tool_woodpick.png
index ea728cca3..ea728cca3 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_woodpick.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_woodpick.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_woodshovel.png b/share/games/mesetint/mods/default/textures/default_tool_woodshovel.png
index 649ab4c38..649ab4c38 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_woodshovel.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_woodshovel.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tool_woodsword.png b/share/games/mesetint/mods/default/textures/default_tool_woodsword.png
index d6c6be325..d6c6be325 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tool_woodsword.png
+++ b/share/games/mesetint/mods/default/textures/default_tool_woodsword.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_torch.png b/share/games/mesetint/mods/default/textures/default_torch.png
index 7a953c222..7a953c222 100644
--- a/share/server/games/mesetint/mods/default/textures/default_torch.png
+++ b/share/games/mesetint/mods/default/textures/default_torch.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_torch_on_ceiling.png b/share/games/mesetint/mods/default/textures/default_torch_on_ceiling.png
index 6965d380e..6965d380e 100644
--- a/share/server/games/mesetint/mods/default/textures/default_torch_on_ceiling.png
+++ b/share/games/mesetint/mods/default/textures/default_torch_on_ceiling.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_torch_on_floor.png b/share/games/mesetint/mods/default/textures/default_torch_on_floor.png
index 76d1dd5ac..76d1dd5ac 100644
--- a/share/server/games/mesetint/mods/default/textures/default_torch_on_floor.png
+++ b/share/games/mesetint/mods/default/textures/default_torch_on_floor.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tree.png b/share/games/mesetint/mods/default/textures/default_tree.png
index 65abfc243..65abfc243 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tree.png
+++ b/share/games/mesetint/mods/default/textures/default_tree.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_tree_top.png b/share/games/mesetint/mods/default/textures/default_tree_top.png
index 2cdd94f80..2cdd94f80 100644
--- a/share/server/games/mesetint/mods/default/textures/default_tree_top.png
+++ b/share/games/mesetint/mods/default/textures/default_tree_top.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_water.png b/share/games/mesetint/mods/default/textures/default_water.png
index e5f8cdc25..e5f8cdc25 100644
--- a/share/server/games/mesetint/mods/default/textures/default_water.png
+++ b/share/games/mesetint/mods/default/textures/default_water.png
diff --git a/share/server/games/mesetint/mods/default/textures/default_wood.png b/share/games/mesetint/mods/default/textures/default_wood.png
index 57c1d7c12..57c1d7c12 100644
--- a/share/server/games/mesetint/mods/default/textures/default_wood.png
+++ b/share/games/mesetint/mods/default/textures/default_wood.png
diff --git a/share/server/games/mesetint/mods/default/textures/heart.png b/share/games/mesetint/mods/default/textures/heart.png
index 6bc183e04..6bc183e04 100644
--- a/share/server/games/mesetint/mods/default/textures/heart.png
+++ b/share/games/mesetint/mods/default/textures/heart.png
diff --git a/share/server/games/mesetint/mods/default/textures/player.png b/share/games/mesetint/mods/default/textures/player.png
index 90adf9747..90adf9747 100644
--- a/share/server/games/mesetint/mods/default/textures/player.png
+++ b/share/games/mesetint/mods/default/textures/player.png
diff --git a/share/server/games/mesetint/mods/default/textures/player_back.png b/share/games/mesetint/mods/default/textures/player_back.png
index 530aa7519..530aa7519 100644
--- a/share/server/games/mesetint/mods/default/textures/player_back.png
+++ b/share/games/mesetint/mods/default/textures/player_back.png
diff --git a/share/server/games/mesetint/mods/default/textures/treeprop.png b/share/games/mesetint/mods/default/textures/treeprop.png
index 77ea4d6d4..77ea4d6d4 100644
--- a/share/server/games/mesetint/mods/default/textures/treeprop.png
+++ b/share/games/mesetint/mods/default/textures/treeprop.png
diff --git a/share/server/games/mesetint/mods/default/textures/wieldhand.png b/share/games/mesetint/mods/default/textures/wieldhand.png
index c4549e5ed..c4549e5ed 100644
--- a/share/server/games/mesetint/mods/default/textures/wieldhand.png
+++ b/share/games/mesetint/mods/default/textures/wieldhand.png
diff --git a/share/server/games/mesetint/mods/experimental/depends.txt b/share/games/mesetint/mods/experimental/depends.txt
index 3a7daa1d7..3a7daa1d7 100644
--- a/share/server/games/mesetint/mods/experimental/depends.txt
+++ b/share/games/mesetint/mods/experimental/depends.txt
diff --git a/share/server/games/mesetint/mods/experimental/init.lua b/share/games/mesetint/mods/experimental/init.lua
index 364eeb10c..364eeb10c 100644
--- a/share/server/games/mesetint/mods/experimental/init.lua
+++ b/share/games/mesetint/mods/experimental/init.lua
diff --git a/share/server/games/mesetint/mods/experimental/textures/experimental_dummyball.png b/share/games/mesetint/mods/experimental/textures/experimental_dummyball.png
index 084676552..084676552 100644
--- a/share/server/games/mesetint/mods/experimental/textures/experimental_dummyball.png
+++ b/share/games/mesetint/mods/experimental/textures/experimental_dummyball.png
diff --git a/share/server/games/mesetint/mods/give_initial_stuff/depends.txt b/share/games/mesetint/mods/give_initial_stuff/depends.txt
index 3a7daa1d7..3a7daa1d7 100644
--- a/share/server/games/mesetint/mods/give_initial_stuff/depends.txt
+++ b/share/games/mesetint/mods/give_initial_stuff/depends.txt
diff --git a/share/server/games/mesetint/mods/give_initial_stuff/init.lua b/share/games/mesetint/mods/give_initial_stuff/init.lua
index 9cf6b51b5..9cf6b51b5 100644
--- a/share/server/games/mesetint/mods/give_initial_stuff/init.lua
+++ b/share/games/mesetint/mods/give_initial_stuff/init.lua
diff --git a/share/server/games/mesetint/mods/legacy/depends.txt b/share/games/mesetint/mods/legacy/depends.txt
index 3a7daa1d7..3a7daa1d7 100644
--- a/share/server/games/mesetint/mods/legacy/depends.txt
+++ b/share/games/mesetint/mods/legacy/depends.txt
diff --git a/share/server/games/mesetint/mods/legacy/init.lua b/share/games/mesetint/mods/legacy/init.lua
index 7f9088ce0..7f9088ce0 100644
--- a/share/server/games/mesetint/mods/legacy/init.lua
+++ b/share/games/mesetint/mods/legacy/init.lua
diff --git a/share/server/games/mesetint/mods/legacy/textures/apple_iron.png b/share/games/mesetint/mods/legacy/textures/apple_iron.png
index 2dffdf014..2dffdf014 100644
--- a/share/server/games/mesetint/mods/legacy/textures/apple_iron.png
+++ b/share/games/mesetint/mods/legacy/textures/apple_iron.png
diff --git a/share/server/games/mesetint/mods/legacy/textures/cooked_rat.png b/share/games/mesetint/mods/legacy/textures/cooked_rat.png
index daad3be0d..daad3be0d 100644
--- a/share/server/games/mesetint/mods/legacy/textures/cooked_rat.png
+++ b/share/games/mesetint/mods/legacy/textures/cooked_rat.png
diff --git a/share/server/games/mesetint/mods/legacy/textures/dungeon_master.png b/share/games/mesetint/mods/legacy/textures/dungeon_master.png
index 3457c8228..3457c8228 100644
--- a/share/server/games/mesetint/mods/legacy/textures/dungeon_master.png
+++ b/share/games/mesetint/mods/legacy/textures/dungeon_master.png
diff --git a/share/server/games/mesetint/mods/legacy/textures/fireball.png b/share/games/mesetint/mods/legacy/textures/fireball.png
index 523142850..523142850 100644
--- a/share/server/games/mesetint/mods/legacy/textures/fireball.png
+++ b/share/games/mesetint/mods/legacy/textures/fireball.png
diff --git a/share/server/games/mesetint/mods/legacy/textures/firefly.png b/share/games/mesetint/mods/legacy/textures/firefly.png
index 40df7fa1c..40df7fa1c 100644
--- a/share/server/games/mesetint/mods/legacy/textures/firefly.png
+++ b/share/games/mesetint/mods/legacy/textures/firefly.png
diff --git a/share/server/games/mesetint/mods/legacy/textures/oerkki1.png b/share/games/mesetint/mods/legacy/textures/oerkki1.png
index 33cbac9e7..33cbac9e7 100644
--- a/share/server/games/mesetint/mods/legacy/textures/oerkki1.png
+++ b/share/games/mesetint/mods/legacy/textures/oerkki1.png
diff --git a/share/server/games/mesetint/mods/legacy/textures/oerkki1_damaged.png b/share/games/mesetint/mods/legacy/textures/oerkki1_damaged.png
index 9b777387c..9b777387c 100644
--- a/share/server/games/mesetint/mods/legacy/textures/oerkki1_damaged.png
+++ b/share/games/mesetint/mods/legacy/textures/oerkki1_damaged.png
diff --git a/share/server/games/mesetint/mods/legacy/textures/rat.png b/share/games/mesetint/mods/legacy/textures/rat.png
index d1a0e2ae2..d1a0e2ae2 100644
--- a/share/server/games/mesetint/mods/legacy/textures/rat.png
+++ b/share/games/mesetint/mods/legacy/textures/rat.png
diff --git a/src/main.cpp b/src/main.cpp
index d08f88417..35595e5aa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1033,8 +1033,13 @@ int main(int argc, char *argv[])
 			// No specific world was commanded
 			// Check if the world is found from the default directory, and if
 			// not, see if the legacy world directory exists.
-			world_path = porting::path_user + DIR_DELIM + "server" + DIR_DELIM + "worlds" + DIR_DELIM + "world";
-			std::string legacy_world_path = porting::path_user+DIR_DELIM+".."+DIR_DELIM+"world";
+			world_path = porting::path_user + DIR_DELIM + "worlds" + DIR_DELIM + "world";
+#ifdef RUN_IN_PLACE
+			std::string legacy_world_path = porting::path_user + DIR_DELIM +
+					".." + DIR_DELIM + "world";
+#else
+			std::string legacy_world_path = porting::path_user + DIR_DELIM + "world";
+#endif
 			if(!fs::PathExists(world_path) && fs::PathExists(legacy_world_path)){
 				errorstream<<"Warning: Using legacy world directory \""
 						<<legacy_world_path<<"\""<<std::endl;
@@ -1445,7 +1450,7 @@ int main(int argc, char *argv[])
 				if(menudata.create_world_name != L"")
 				{
 					std::string path = porting::path_user + DIR_DELIM
-							+ "server" + DIR_DELIM + "worlds" + DIR_DELIM
+							"worlds" + DIR_DELIM
 							+ wide_to_narrow(menudata.create_world_name);
 					// Create world if it doesn't exist
 					if(!initializeWorld(path, menudata.create_world_gameid)){
diff --git a/src/server.cpp b/src/server.cpp
index df9a4d390..1060426b3 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -877,10 +877,6 @@ Server::Server(
 	if(!gamespec.isValid())
 		throw ServerError("Supplied invalid gamespec");
 	
-	// Figure out some paths
-	// share/server
-	m_path_share = porting::path_share + DIR_DELIM + "server";
-
 	infostream<<"Server created for gameid \""<<m_gamespec.id<<"\"";
 	if(m_simple_singleplayer_mode)
 		infostream<<" in simple singleplayer mode"<<std::endl;
@@ -894,7 +890,7 @@ Server::Server(
 		infostream<<"- addons: "<<(*i)<<std::endl;
 
 	// Path to builtin.lua
-	std::string builtinpath = m_path_share + DIR_DELIM + "builtin.lua";
+	std::string builtinpath = porting::path_share + DIR_DELIM + "builtin.lua";
 
 	// Add default global mod search path
 	m_modspaths.push_front(m_gamespec.path + DIR_DELIM "mods");
diff --git a/src/server.h b/src/server.h
index 32ce8eb53..328c7fb9c 100644
--- a/src/server.h
+++ b/src/server.h
@@ -640,9 +640,6 @@ private:
 	// functionality
 	bool m_simple_singleplayer_mode;
 
-	// Equivalent of /usr/share/minetest/server
-	std::string m_path_share;
-	
 	// Thread can set; step() will throw as ServerError
 	MutexedVariable<std::string> m_async_fatal_error;
 	
diff --git a/src/subgame.cpp b/src/subgame.cpp
index d34530193..b4ae3185e 100644
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -27,14 +27,13 @@ SubgameSpec findSubgame(const std::string &id)
 {
 	if(id == "")
 		return SubgameSpec();
-	std::string share_server = porting::path_share + DIR_DELIM + "server";
-	std::string user_server = porting::path_user + DIR_DELIM + "server";
+	std::string share = porting::path_share;
+	std::string user = porting::path_user;
 	// Find game directory
-	std::string game_path =
-			user_server + DIR_DELIM + "games" + DIR_DELIM + id;
+	std::string game_path = user + DIR_DELIM + "games" + DIR_DELIM + id;
 	bool user_game = true; // Game is in user's directory
 	if(!fs::PathExists(game_path)){
-		game_path = share_server + DIR_DELIM + "games" + DIR_DELIM + id;
+		game_path = share + DIR_DELIM + "games" + DIR_DELIM + id;
 		user_game = false;
 	}
 	if(!fs::PathExists(game_path))
@@ -42,10 +41,8 @@ SubgameSpec findSubgame(const std::string &id)
 	// Find addon directories
 	std::set<std::string> addon_paths;
 	if(!user_game)
-		addon_paths.insert(share_server + DIR_DELIM + "addons"
-				+ DIR_DELIM + id);
-	addon_paths.insert(user_server + DIR_DELIM + "addons"
-			+ DIR_DELIM + id);
+		addon_paths.insert(share + DIR_DELIM + "addons" + DIR_DELIM + id);
+	addon_paths.insert(user + DIR_DELIM + "addons" + DIR_DELIM + id);
 	// TODO: Read proper name from game_path/game.conf
 	std::string game_name = id;
 	return SubgameSpec(id, game_path, addon_paths, game_name);
@@ -55,10 +52,8 @@ std::set<std::string> getAvailableGameIds()
 {
 	std::set<std::string> gameids;
 	std::set<std::string> gamespaths;
-	gamespaths.insert(porting::path_share + DIR_DELIM + "server"
-			+ DIR_DELIM + "games");
-	gamespaths.insert(porting::path_user + DIR_DELIM + "server"
-			+ DIR_DELIM + "games");
+	gamespaths.insert(porting::path_share + DIR_DELIM + "games");
+	gamespaths.insert(porting::path_user + DIR_DELIM + "games");
 	for(std::set<std::string>::const_iterator i = gamespaths.begin();
 			i != gamespaths.end(); i++){
 		std::vector<fs::DirListNode> dirlist = fs::GetDirListing(*i);
@@ -105,8 +100,7 @@ std::vector<WorldSpec> getAvailableWorlds()
 {
 	std::vector<WorldSpec> worlds;
 	std::set<std::string> worldspaths;
-	worldspaths.insert(porting::path_user + DIR_DELIM + "server"
-			+ DIR_DELIM + "worlds");
+	worldspaths.insert(porting::path_user + DIR_DELIM + "worlds");
 	infostream<<"Searching worlds..."<<std::endl;
 	for(std::set<std::string>::const_iterator i = worldspaths.begin();
 			i != worldspaths.end(); i++){