diff --git a/README.md b/README.md
index 8c782d78..86c10662 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 * buildings/
   * [bridges][] ([GPL][lic.gpl3.0]) -- version: [5b5f475 Git][ver.bridges] *2015-08-23* ([patched][patch.bridges])
   * [christmas][] ([MIT][lic.christmas]) -- version [d3bd872 Git][ver.christmas] *2013-01-11* ([patched][patch.christmas])
+  * [doors][] ([MIT][lic.doors] / [CC BY-SA][lic.ccbysa3.0]) -- version: 2021-06-04
   * [elevator][] ([WTFPL][lic.elevator])
   * [fort_spikes][] ([MIT][lic.fort_spikes] / [CC0][lic.cc0]) -- version: [3b98b46 Git][ver.fort_spikes] *2018-06-05*
   * [glass][] ([LGPL][lic.lgpl2.1]) -- version: [1.1][ver.glass] *2021-05-26*
@@ -209,8 +210,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 * [cottages](https://content.minetest.net/packages/Sokomine/cottages/)
 * [cozy](https://github.com/minetest-mods/cozy)
 * [dmobs](https://content.minetest.net/packages/TenPlus1/dmobs/) (DOOMed Mobs)
-* [doors](https://content.minetest.net/packages/TenPlus1/doors/) (Doors Redo)
-* [doors](https://content.minetest.net/packages/sorcerykid/doors/) (Doors Redux)
 * [draconis](https://forum.minetest.net/viewtopic.php?t=22595) (dragons)
 * [drinks](https://content.minetest.net/packages/Nathan.S/drinks/)
 * [extra_doors](https://content.minetest.net/packages/sorcerykid/extra_doors/)
@@ -267,7 +266,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 - campfire? (replace with [new campfire](https://content.minetest.net/packages/VanessaE/new_campfire/))
 - coloredwood?
 - compassgps?
-- doors (minetest_game) (replace with [doors redo](https://content.minetest.net/packages/TenPlus1/doors/) or [doors redux](https://content.minetest.net/packages/sorcerykid/doors/))
 - elevator?
 - env_sounds? (minetest_game) (replace with [sounds](https://content.minetest.net/packages/AntumDeluge/sounds/))
 - fireflies? (minetest_game)
@@ -332,6 +330,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [deploy_nodes]: https://cornernote.github.io/minetest-deploy_nodes/
 [desert_life]: https://forum.minetest.net/viewtopic.php?t=16054
 [dinosaurs_aggressive]: https://github.com/AntumMT/mp-dinosaurs_aggressive
+[doors]: https://content.minetest.net/packages/sorcerykid/doors/
 [drawers]: https://forum.minetest.net/viewtopic.php?t=17134
 [elevator]: https://forum.minetest.net/viewtopic.php?t=12944
 [enchanting]: https://forum.minetest.net/viewtopic.php?t=7354
@@ -457,6 +456,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [lic.crops]: mods/farming/crops/LICENSE
 [lic.deploy_nodes]: mods/modpacks/deploy_nodes/LICENSE
 [lic.dirt_monster]: mods/mobiles/dirt_monster/license.txt
+[lic.doors]: mods/buildings/doors/license.txt
 [lic.drawers]: mods/storage/drawers/LICENSE.txt
 [lic.dungeon_master]: mods/mobiles/dungeon_master/license.txt
 [lic.elevator]: mods/buildings/elevator/readme.txt
@@ -591,6 +591,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.desert_life]: https://github.com/NathanSalapat/desert_life/tree/188f984
 [ver.dinosaurs_aggressive]: https://github.com/AntumMT/mp-dinosaurs_aggressive/tree/874f299
 [ver.dirt_monster]: https://github.com/AntumMT/mod-mob_dirt_monster/tree/40c48e0
+[ver.doors]: https://notabug.org/TenPlus1/doors/src/f0fef3f66c4e002e37a27808719f9983ee630fb7
 [ver.drawers]: https://github.com/minetest-mods/drawers/releases/tag/v0.6.2
 [ver.dungeon_master]: https://github.com/AntumMT/mod-mob_dungeon_master/tree/00c890f
 [ver.enchanting]: https://github.com/AntumMT/mod-enchanting/tree/dee7dde
diff --git a/mods/core/minetest_game/doors/README.txt b/mods/buildings/doors/README.txt
similarity index 74%
rename from mods/core/minetest_game/doors/README.txt
rename to mods/buildings/doors/README.txt
index f9caaffc..4ec907b2 100644
--- a/mods/core/minetest_game/doors/README.txt
+++ b/mods/buildings/doors/README.txt
@@ -1,7 +1,42 @@
+Doors Redo (Edited by TenPlus1)
+
+Based on
+
 Minetest Game mod: doors
 ========================
 See license.txt for license information.
 
+
+Usage
+-----
+
+Doors Redo allows the player to craft a key tool which can be used on any of the
+registered doors to flip between states (open, owned, protected)
+
+
+Key Tool
+--------
+
+The key tool is crafted using 5x steel ingots (2x2 box in lower left and 1 in
+top right).  When held in players hand you can punch a door to flip between each
+state to open, lock (own) and protect the door.
+
+
+Door States
+-----------
+
+OPEN - Doors can be opened by any player or dug up.
+
+OWNED - This locks the door so that only the owner can open or dig the door.
+
+PROTECTED - This also locks the door so that only the players listed for the
+protected area the door sits inside can open the door.
+
+Note: A protection mod must be installed to use Protected mode so that it works
+properly, not having one running will mean all protected doors will open for
+anyone who uses them.
+
+
 Authors of source code
 ----------------------
 Originally by PilzAdam (MIT)
@@ -52,6 +87,9 @@ Glass door textures by Krock and paramat based on textures by VanessaE (CC BY-SA
   doors_door_glass.png
   doors_item_glass.png
 
+TenPlus1 (CC-BY-SA-3.0):
+  doors_key.png
+
 All other textures (created by PilzAdam) (CC BY-SA 3.0):
 
 Door textures were converted to the new texture map by sofar, paramat and
diff --git a/mods/buildings/doors/depends.txt b/mods/buildings/doors/depends.txt
new file mode 100644
index 00000000..5e28beeb
--- /dev/null
+++ b/mods/buildings/doors/depends.txt
@@ -0,0 +1,2 @@
+default
+screwdriver?
diff --git a/mods/core/minetest_game/doors/init.lua b/mods/buildings/doors/init.lua
similarity index 63%
rename from mods/core/minetest_game/doors/init.lua
rename to mods/buildings/doors/init.lua
index 455dfe79..96e8e7e2 100644
--- a/mods/core/minetest_game/doors/init.lua
+++ b/mods/buildings/doors/init.lua
@@ -1,70 +1,95 @@
--- doors/init.lua
 
 -- our API object
-doors = {}
-
-doors.registered_doors = {}
-doors.registered_trapdoors = {}
-
--- Load support for MT game translation.
-local S = minetest.get_translator("doors")
+doors = {
+	mod = "redo",
+	registered_doors = {},
+	registered_trapdoors = {}
+}
 
 
 local function replace_old_owner_information(pos)
+
 	local meta = minetest.get_meta(pos)
 	local owner = meta:get_string("doors_owner")
+
 	if owner and owner ~= "" then
 		meta:set_string("owner", owner)
 		meta:set_string("doors_owner", "")
 	end
 end
 
+
 -- returns an object to a door object or nil
 function doors.get(pos)
+
 	local node_name = minetest.get_node(pos).name
+
 	if doors.registered_doors[node_name] then
+
 		-- A normal upright door
 		return {
+
 			pos = pos,
+
 			open = function(self, player)
+
 				if self:state() then
 					return false
 				end
+
 				return doors.door_toggle(self.pos, nil, player)
 			end,
+
 			close = function(self, player)
+
 				if not self:state() then
 					return false
 				end
+
 				return doors.door_toggle(self.pos, nil, player)
 			end,
+
 			toggle = function(self, player)
 				return doors.door_toggle(self.pos, nil, player)
 			end,
+
 			state = function(self)
+
 				local state = minetest.get_meta(self.pos):get_int("state")
+
 				return state %2 == 1
 			end
 		}
+
 	elseif doors.registered_trapdoors[node_name] then
+
 		-- A trapdoor
 		return {
+
 			pos = pos,
+
 			open = function(self, player)
+
 				if self:state() then
 					return false
 				end
+
 				return doors.trapdoor_toggle(self.pos, nil, player)
 			end,
+
 			close = function(self, player)
+
 				if not self:state() then
 					return false
 				end
+
 				return doors.trapdoor_toggle(self.pos, nil, player)
 			end,
+
 			toggle = function(self, player)
 				return doors.trapdoor_toggle(self.pos, nil, player)
 			end,
+
 			state = function(self)
 				return minetest.get_node(self.pos).name:sub(-5) == "_open"
 			end
@@ -74,16 +99,18 @@ function doors.get(pos)
 	end
 end
 
+
 -- this hidden node is placed on top of the bottom, and prevents
 -- nodes from being placed in the top half of the door.
 minetest.register_node("doors:hidden", {
-	description = S("Hidden Door Segment"),
-	inventory_image = "doors_hidden_segment.png^default_invisible_node_overlay.png",
-	wield_image = "doors_hidden_segment.png^default_invisible_node_overlay.png",
-	drawtype = "airlike",
+	description = "Hidden Door Segment",
+	-- can't use airlike otherwise falling nodes will turn to entities
+	-- and will be forever stuck until door is removed.
+	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
+	use_texture_alpha = "clip",
 	-- has to be walkable for falling nodes to stop falling.
 	walkable = true,
 	pointable = false,
@@ -93,49 +120,61 @@ minetest.register_node("doors:hidden", {
 	drop = "",
 	groups = {not_in_creative_inventory = 1},
 	on_blast = function() end,
-	-- 1px block inside door hinge near node top
+	tiles = {"doors_blank.png"},
+	-- 1px transparent block inside door hinge near node top.
+	node_box = {
+		type = "fixed",
+		fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32}
+	},
+	-- collision_box needed otherise selection box would be full node size
 	collision_box = {
 		type = "fixed",
-		fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32},
-	},
+		fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32}
+	}
 })
 
+
 -- table used to aid door opening/closing
 local transform = {
 	{
-		{v = "_a", param2 = 3},
-		{v = "_a", param2 = 0},
-		{v = "_a", param2 = 1},
-		{v = "_a", param2 = 2},
+		{ v = "_a", param2 = 3 },
+		{ v = "_a", param2 = 0 },
+		{ v = "_a", param2 = 1 },
+		{ v = "_a", param2 = 2 }
 	},
 	{
-		{v = "_c", param2 = 1},
-		{v = "_c", param2 = 2},
-		{v = "_c", param2 = 3},
-		{v = "_c", param2 = 0},
+		{ v = "_b", param2 = 1 },
+		{ v = "_b", param2 = 2 },
+		{ v = "_b", param2 = 3 },
+		{ v = "_b", param2 = 0 }
 	},
 	{
-		{v = "_b", param2 = 1},
-		{v = "_b", param2 = 2},
-		{v = "_b", param2 = 3},
-		{v = "_b", param2 = 0},
+		{ v = "_b", param2 = 1 },
+		{ v = "_b", param2 = 2 },
+		{ v = "_b", param2 = 3 },
+		{ v = "_b", param2 = 0 }
 	},
 	{
-		{v = "_d", param2 = 3},
-		{v = "_d", param2 = 0},
-		{v = "_d", param2 = 1},
-		{v = "_d", param2 = 2},
-	},
+		{ v = "_a", param2 = 3 },
+		{ v = "_a", param2 = 0 },
+		{ v = "_a", param2 = 1 },
+		{ v = "_a", param2 = 2 }
+	}
 }
 
+
 function doors.door_toggle(pos, node, clicker)
-	local meta = minetest.get_meta(pos)
+
+	local meta = minetest.get_meta(pos) ; if not meta then return false end
+
 	node = node or minetest.get_node(pos)
+
 	local def = minetest.registered_nodes[node.name]
 	local name = def.door.name
-
 	local state = meta:get_string("state")
+
 	if state == "" then
+
 		-- fix up lvm-placed right-hinged doors, default closed
 		if node.name:sub(-2) == "_b" then
 			state = 2
@@ -148,10 +187,27 @@ function doors.door_toggle(pos, node, clicker)
 
 	replace_old_owner_information(pos)
 
-	if clicker and not default.can_interact_with_node(clicker, pos) then
-		return false
+	if clicker and not minetest.check_player_privs(clicker, "protection_bypass") then
+
+		local owner = meta:get_string("owner")
+		local prot = meta:get_string("doors_protected")
+
+		if prot ~= "" then
+
+			if minetest.is_protected(pos, clicker:get_player_name()) then
+				return false
+			end
+
+		elseif owner ~= "" then
+
+			if clicker:get_player_name() ~= owner then
+				return false
+			end
+		end
 	end
 
+	local old = state
+
 	-- until Lua-5.2 we have no bitwise operators :(
 	if state % 2 == 1 then
 		state = state - 1
@@ -169,50 +225,66 @@ function doors.door_toggle(pos, node, clicker)
 	end
 
 	if state % 2 == 0 then
+
 		minetest.sound_play(def.door.sounds[1],
-			{pos = pos, gain = def.door.gains[1], max_hear_distance = 10}, true)
+				{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
 	else
 		minetest.sound_play(def.door.sounds[2],
-			{pos = pos, gain = def.door.gains[2], max_hear_distance = 10}, true)
+				{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
 	end
 
 	minetest.swap_node(pos, {
-		name = name .. transform[state + 1][dir+1].v,
-		param2 = transform[state + 1][dir+1].param2
+		name = name .. transform[state + 1][dir + 1].v,
+		param2 = transform[state + 1][dir + 1].param2
 	})
+
 	meta:set_int("state", state)
 
 	return true
 end
 
 
-local function on_place_node(place_to, newnode,
-	placer, oldnode, itemstack, pointed_thing)
+local function on_place_node(place_to, newnode, placer, oldnode, itemstack, pointed_thing)
+
 	-- Run script hook
-	for _, callback in ipairs(minetest.registered_on_placenodes) do
+	local _, callback
+
+	for _, callback in pairs(minetest.registered_on_placenodes) do
+
 		-- Deepcopy pos, node and pointed_thing because callback can modify them
 		local place_to_copy = {x = place_to.x, y = place_to.y, z = place_to.z}
-		local newnode_copy =
-			{name = newnode.name, param1 = newnode.param1, param2 = newnode.param2}
-		local oldnode_copy =
-			{name = oldnode.name, param1 = oldnode.param1, param2 = oldnode.param2}
+		local newnode_copy = {
+			name = newnode.name, param1 = newnode.param1, param2 = newnode.param2}
+		local oldnode_copy = {
+			name = oldnode.name, param1 = oldnode.param1, param2 = oldnode.param2}
 		local pointed_thing_copy = {
-			type  = pointed_thing.type,
+			type = pointed_thing.type,
 			above = vector.new(pointed_thing.above),
 			under = vector.new(pointed_thing.under),
-			ref   = pointed_thing.ref,
+			ref = pointed_thing.ref
 		}
-		callback(place_to_copy, newnode_copy, placer,
-			oldnode_copy, itemstack, pointed_thing_copy)
+
+		callback(place_to_copy, newnode_copy, placer, oldnode_copy, itemstack,
+				pointed_thing_copy)
 	end
 end
 
+
 local function can_dig_door(pos, digger)
+
 	replace_old_owner_information(pos)
-	return default.can_interact_with_node(digger, pos)
+
+	local digger_name = digger and digger:get_player_name()
+
+	if digger_name and minetest.get_player_privs(digger_name).protection_bypass then
+		return true
+	end
+
+	return minetest.get_meta(pos):get_string("owner") == digger_name
 end
 
 function doors.register(name, def)
+
 	if not name:find(":") then
 		name = "doors:" .. name
 	end
@@ -221,31 +293,39 @@ function doors.register(name, def)
 	minetest.register_lbm({
 		name = ":doors:replace_" .. name:gsub(":", "_"),
 		nodenames = {name.."_b_1", name.."_b_2"},
+
 		action = function(pos, node)
+
 			local l = tonumber(node.name:sub(-1))
 			local meta = minetest.get_meta(pos)
 			local h = meta:get_int("right") + 1
 			local p2 = node.param2
 			local replace = {
-				{{type = "a", state = 0}, {type = "a", state = 3}},
-				{{type = "b", state = 1}, {type = "b", state = 2}}
+				{{ type = "a", state = 0 }, { type = "a", state = 3 }},
+				{{ type = "b", state = 1 }, { type = "b", state = 2 }}
 			}
 			local new = replace[l][h]
+
 			-- retain infotext and doors_owner fields
 			minetest.swap_node(pos, {name = name .. "_" .. new.type, param2 = p2})
 			meta:set_int("state", new.state)
+
 			-- properly place doors:hidden at the right spot
 			local p3 = p2
+
 			if new.state >= 2 then
 				p3 = (p3 + 3) % 4
 			end
+
 			if new.state % 2 == 1 then
+
 				if new.state >= 2 then
 					p3 = (p3 + 1) % 4
 				else
 					p3 = (p3 + 3) % 4
 				end
 			end
+
 			-- wipe meta on top node as it's unused
 			minetest.set_node({x = pos.x, y = pos.y + 1, z = pos.z},
 				{name = "doors:hidden", param2 = p3})
@@ -258,6 +338,7 @@ function doors.register(name, def)
 		groups = table.copy(def.groups),
 
 		on_place = function(itemstack, placer, pointed_thing)
+
 			local pos
 
 			if not pointed_thing.type == "node" then
@@ -266,9 +347,12 @@ function doors.register(name, def)
 
 			local node = minetest.get_node(pointed_thing.under)
 			local pdef = minetest.registered_nodes[node.name]
-			if pdef and pdef.on_rightclick and
-					not (placer and placer:is_player() and
-					placer:get_player_control().sneak) then
+
+			if pdef
+			and pdef.on_rightclick
+			and not (placer and placer:is_player()
+			and placer:get_player_control().sneak) then
+
 				return pdef.on_rightclick(pointed_thing.under,
 						node, placer, itemstack, pointed_thing)
 			end
@@ -279,6 +363,7 @@ function doors.register(name, def)
 				pos = pointed_thing.above
 				node = minetest.get_node(pos)
 				pdef = minetest.registered_nodes[node.name]
+
 				if not pdef or not pdef.buildable_to then
 					return itemstack
 				end
@@ -293,6 +378,7 @@ function doors.register(name, def)
 			end
 
 			local pn = placer and placer:get_player_name() or ""
+
 			if minetest.is_protected(pos, pn) or minetest.is_protected(above, pn) then
 				return itemstack
 			end
@@ -303,16 +389,17 @@ function doors.register(name, def)
 				{x = -1, y = 0, z = 0},
 				{x = 0, y = 0, z = 1},
 				{x = 1, y = 0, z = 0},
-				{x = 0, y = 0, z = -1},
+				{x = 0, y = 0, z = -1}
 			}
 
 			local aside = {
 				x = pos.x + ref[dir + 1].x,
 				y = pos.y + ref[dir + 1].y,
-				z = pos.z + ref[dir + 1].z,
+				z = pos.z + ref[dir + 1].z
 			}
 
 			local state = 0
+
 			if minetest.get_item_group(minetest.get_node(aside).name, "door") == 1 then
 				state = state + 2
 				minetest.set_node(pos, {name = name .. "_b", param2 = dir})
@@ -323,11 +410,15 @@ function doors.register(name, def)
 			end
 
 			local meta = minetest.get_meta(pos)
+
 			meta:set_int("state", state)
 
 			if def.protected then
+
+				local pn = placer:get_player_name()
+
 				meta:set_string("owner", pn)
-				meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn))
+				meta:set_string("infotext", "Owned by " .. pn)
 			end
 
 			if not minetest.is_creative_enabled(pn) then
@@ -336,20 +427,23 @@ function doors.register(name, def)
 
 			minetest.sound_play(def.sounds.place, {pos = pos}, true)
 
-			on_place_node(pos, minetest.get_node(pos),
-				placer, node, itemstack, pointed_thing)
+			on_place_node(pos, minetest.get_node(pos), placer, node, itemstack,
+					pointed_thing)
 
 			return itemstack
 		end
 	})
+
 	def.inventory_image = nil
 
 	if def.recipe then
+
 		minetest.register_craft({
 			output = name,
-			recipe = def.recipe,
+			recipe = def.recipe
 		})
 	end
+
 	def.recipe = nil
 
 	if not def.sounds then
@@ -364,32 +458,28 @@ function doors.register(name, def)
 		def.sound_close = "doors_door_close"
 	end
 
-	if not def.gain_open then
-		def.gain_open = 0.3
-	end
-
-	if not def.gain_close then
-		def.gain_close = 0.3
-	end
-
 	def.groups.not_in_creative_inventory = 1
 	def.groups.door = 1
 	def.drop = name
-	def.door = {
-		name = name,
-		sounds = {def.sound_close, def.sound_open},
-		gains = {def.gain_close, def.gain_open},
-	}
+	def.door = {name = name, sounds = {def.sound_close, def.sound_open}}
+
 	if not def.on_rightclick then
+
 		def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+
 			doors.door_toggle(pos, node, clicker)
+
 			return itemstack
 		end
 	end
+
 	def.after_dig_node = function(pos, node, meta, digger)
+
 		minetest.remove_node({x = pos.x, y = pos.y + 1, z = pos.z})
+
 		minetest.check_for_falling({x = pos.x, y = pos.y + 1, z = pos.z})
 	end
+
 	def.on_rotate = function(pos, node, user, mode, new_param2)
 		return false
 	end
@@ -397,37 +487,14 @@ function doors.register(name, def)
 	if def.protected then
 		def.can_dig = can_dig_door
 		def.on_blast = function() end
-		def.on_key_use = function(pos, player)
-			local door = doors.get(pos)
-			door:toggle(player)
-		end
-		def.on_skeleton_key_use = function(pos, player, newsecret)
-			replace_old_owner_information(pos)
-			local meta = minetest.get_meta(pos)
-			local owner = meta:get_string("owner")
-			local pname = player:get_player_name()
-
-			-- verify placer is owner of lockable door
-			if owner ~= pname then
-				minetest.record_protection_violation(pos, pname)
-				minetest.chat_send_player(pname, S("You do not own this locked door."))
-				return nil
-			end
-
-			local secret = meta:get_string("key_lock_secret")
-			if secret == "" then
-				secret = newsecret
-				meta:set_string("key_lock_secret", secret)
-			end
-
-			return secret, S("a locked door"), owner
-		end
-		def.node_dig_prediction = ""
 	else
 		def.on_blast = function(pos, intensity)
+
 			minetest.remove_node(pos)
+
 			-- hidden node doesn't get blasted away.
 			minetest.remove_node({x = pos.x, y = pos.y + 1, z = pos.z})
+
 			return {name}
 		end
 	end
@@ -440,112 +507,137 @@ function doors.register(name, def)
 	def.paramtype = "light"
 	def.paramtype2 = "facedir"
 	def.sunlight_propagates = true
+	def.use_texture_alpha = "clip"
 	def.walkable = true
 	def.is_ground_content = false
 	def.buildable_to = false
-	def.selection_box = {type = "fixed", fixed = {-1/2,-1/2,-1/2,1/2,3/2,-6/16}}
-	def.collision_box = {type = "fixed", fixed = {-1/2,-1/2,-1/2,1/2,3/2,-6/16}}
-	def.use_texture_alpha = "clip"
+	def.selection_box = {type = "fixed", fixed = { -1/2,-1/2,-1/2,1/2,3/2,-6/16}}
+	def.collision_box = {type = "fixed", fixed = { -1/2,-1/2,-1/2,1/2,3/2,-6/16}}
 
 	def.mesh = "door_a.obj"
 	minetest.register_node(":" .. name .. "_a", table.copy(def))
 
+	minetest.register_alias(name .. "_c", name .. "_b")
+
 	def.mesh = "door_b.obj"
 	minetest.register_node(":" .. name .. "_b", table.copy(def))
 
-	def.mesh = "door_a2.obj"
-	minetest.register_node(":" .. name .. "_c", table.copy(def))
-
-	def.mesh = "door_b2.obj"
-	minetest.register_node(":" .. name .. "_d", table.copy(def))
+	minetest.register_alias(name .. "_d", name .. "_a")
 
 	doors.registered_doors[name .. "_a"] = true
 	doors.registered_doors[name .. "_b"] = true
-	doors.registered_doors[name .. "_c"] = true
-	doors.registered_doors[name .. "_d"] = true
 end
 
+
 doors.register("door_wood", {
-		tiles = {{ name = "doors_door_wood.png", backface_culling = true }},
-		description = S("Wooden Door"),
-		inventory_image = "doors_item_wood.png",
-		groups = {node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
-		gain_open = 0.06,
-		gain_close = 0.13,
-		recipe = {
-			{"group:wood", "group:wood"},
-			{"group:wood", "group:wood"},
-			{"group:wood", "group:wood"},
-		}
+	tiles = {{name = "doors_door_wood.png", backface_culling = true}},
+	description = "Wooden Door",
+	inventory_image = "doors_item_wood.png",
+	groups = {node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	recipe = {
+		{"group:wood", "group:wood"},
+		{"group:wood", "group:wood"},
+		{"group:wood", "group:wood"}
+	}
 })
 
+
 doors.register("door_steel", {
-		tiles = {{name = "doors_door_steel.png", backface_culling = true}},
-		description = S("Steel Door"),
-		inventory_image = "doors_item_steel.png",
-		protected = true,
-		groups = {node = 1, cracky = 1, level = 2},
-		sounds = default.node_sound_metal_defaults(),
-		sound_open = "doors_steel_door_open",
-		sound_close = "doors_steel_door_close",
-		gain_open = 0.2,
-		gain_close = 0.2,
-		recipe = {
-			{"default:steel_ingot", "default:steel_ingot"},
-			{"default:steel_ingot", "default:steel_ingot"},
-			{"default:steel_ingot", "default:steel_ingot"},
-		}
+	tiles = {{name = "doors_door_steel.png", backface_culling = true}},
+	description = "Steel Door",
+	inventory_image = "doors_item_steel.png",
+	protected = true,
+	groups = {node = 1, cracky = 1, level = 2},
+	sounds = default.node_sound_stone_defaults(),
+	sound_open = "doors_steel_door_open",
+	sound_close = "doors_steel_door_close",
+	recipe = {
+		{"default:steel_ingot", "default:steel_ingot"},
+		{"default:steel_ingot", "default:steel_ingot"},
+		{"default:steel_ingot", "default:steel_ingot"}
+	}
 })
 
+
 doors.register("door_glass", {
-		tiles = {"doors_door_glass.png"},
-		description = S("Glass Door"),
-		inventory_image = "doors_item_glass.png",
-		groups = {node = 1, cracky=3, oddly_breakable_by_hand=3},
-		sounds = default.node_sound_glass_defaults(),
-		sound_open = "doors_glass_door_open",
-		sound_close = "doors_glass_door_close",
-		gain_open = 0.3,
-		gain_close = 0.25,
-		recipe = {
-			{"default:glass", "default:glass"},
-			{"default:glass", "default:glass"},
-			{"default:glass", "default:glass"},
-		}
+	tiles = { "doors_door_glass.png"},
+	description = "Glass Door",
+	inventory_image = "doors_item_glass.png",
+	groups = {node = 1, cracky = 3, oddly_breakable_by_hand = 3},
+	sounds = default.node_sound_glass_defaults(),
+	sound_open = "doors_glass_door_open",
+	sound_close = "doors_glass_door_close",
+	recipe = {
+		{"default:glass", "default:glass"},
+		{"default:glass", "default:glass"},
+		{"default:glass", "default:glass"}
+	}
 })
 
+
 doors.register("door_obsidian_glass", {
-		tiles = {"doors_door_obsidian_glass.png"},
-		description = S("Obsidian Glass Door"),
-		inventory_image = "doors_item_obsidian_glass.png",
-		groups = {node = 1, cracky=3},
-		sounds = default.node_sound_glass_defaults(),
-		sound_open = "doors_glass_door_open",
-		sound_close = "doors_glass_door_close",
-		gain_open = 0.3,
-		gain_close = 0.25,
-		recipe = {
-			{"default:obsidian_glass", "default:obsidian_glass"},
-			{"default:obsidian_glass", "default:obsidian_glass"},
-			{"default:obsidian_glass", "default:obsidian_glass"},
-		},
+	tiles = { "doors_door_obsidian_glass.png" },
+	description = "Obsidian Glass Door",
+	inventory_image = "doors_item_obsidian_glass.png",
+	groups = {node = 1, cracky = 3},
+	sounds = default.node_sound_glass_defaults(),
+	sound_open = "doors_glass_door_open",
+	sound_close = "doors_glass_door_close",
+	recipe = {
+		{"default:obsidian_glass", "default:obsidian_glass"},
+		{"default:obsidian_glass", "default:obsidian_glass"},
+		{"default:obsidian_glass", "default:obsidian_glass"}
+	}
 })
 
+
+-- special doors (CC0 textures by Phiwari123 and IceAgeComing)
+doors.register("door_phiwari", {
+	tiles = {{name = "doors_door_phiwari.png", backface_culling = true}},
+	description = "Phiwari's Wooden Door",
+	inventory_image = "doors_item_phiwari.png",
+	groups = {node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	recipe = {
+		{"group:wood", "default:obsidian_glass"},
+		{"group:wood", "group:wood"},
+		{"group:wood", "group:wood"}
+	}
+})
+
+
+doors.register("door_iceage", {
+	tiles = {{name = "doors_door_iceage.png", backface_culling = true}},
+	description = "IceAge's Wooden Door",
+	inventory_image = "doors_item_iceage.png",
+	groups = {node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	recipe = {
+		{"group:wood", "default:iron_lump"},
+		{"group:wood", "group:wood"},
+		{"group:wood", "group:wood"}
+	}
+})
+
+
 -- Capture mods using the old API as best as possible.
 function doors.register_door(name, def)
+
 	if def.only_placer_can_open then
 		def.protected = true
 	end
+
 	def.only_placer_can_open = nil
 
 	local i = name:find(":")
 	local modname = name:sub(1, i - 1)
+
 	if not def.tiles then
+
 		if def.protected then
 			def.tiles = {{name = "doors_door_steel.png", backface_culling = true}}
 		else
 			def.tiles = {{name = "doors_door_wood.png", backface_culling = true}}
 		end
+
 		minetest.log("warning", modname .. " registered door \"" .. name .. "\" " ..
 				"using deprecated API method \"doors.register_door()\" but " ..
 				"did not provide the \"tiles\" parameter. A fallback tiledef " ..
@@ -558,30 +650,56 @@ end
 ----trapdoor----
 
 function doors.trapdoor_toggle(pos, node, clicker)
-	node = node or minetest.get_node(pos)
 
 	replace_old_owner_information(pos)
 
-	if clicker and not default.can_interact_with_node(clicker, pos) then
-		return false
+	node = node or minetest.get_node(pos)
+
+	if clicker and not minetest.check_player_privs(clicker, "protection_bypass") then
+
+		local meta = minetest.get_meta(pos) ; if not meta then return false end
+		local owner = meta:get_string("owner")
+		local prot = meta:get_string("doors_protected")
+
+		if prot ~= "" then
+
+			if minetest.is_protected(pos, clicker:get_player_name()) then
+				return false
+			end
+
+		elseif owner ~= "" then
+
+			if clicker:get_player_name() ~= owner then
+				return false
+			end
+		end
 	end
 
 	local def = minetest.registered_nodes[node.name]
 
 	if string.sub(node.name, -5) == "_open" then
+
 		minetest.sound_play(def.sound_close,
-			{pos = pos, gain = def.gain_close, max_hear_distance = 10}, true)
-		minetest.swap_node(pos, {name = string.sub(node.name, 1,
-			string.len(node.name) - 5), param1 = node.param1, param2 = node.param2})
+				{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
+
+		minetest.swap_node(pos, {
+			name = string.sub(node.name, 1, string.len(node.name) - 5),
+			param1 = node.param1, param2 = node.param2
+		})
 	else
 		minetest.sound_play(def.sound_open,
-			{pos = pos, gain = def.gain_open, max_hear_distance = 10}, true)
-		minetest.swap_node(pos, {name = node.name .. "_open",
-			param1 = node.param1, param2 = node.param2})
+				{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
+
+		minetest.swap_node(pos, {
+			name = node.name .. "_open",
+			param1 = node.param1, param2 = node.param2
+		})
 	end
 end
 
+
 function doors.register_trapdoor(name, def)
+
 	if not name:find(":") then
 		name = "doors:" .. name
 	end
@@ -590,7 +708,9 @@ function doors.register_trapdoor(name, def)
 	local name_opened = name.."_open"
 
 	def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+
 		doors.trapdoor_toggle(pos, node, clicker)
+
 		return itemstack
 	end
 
@@ -598,50 +718,29 @@ function doors.register_trapdoor(name, def)
 	def.drawtype = "nodebox"
 	def.paramtype = "light"
 	def.paramtype2 = "facedir"
-	def.is_ground_content = false
 	def.use_texture_alpha = "clip"
+	def.is_ground_content = false
 
 	if def.protected then
+
 		def.can_dig = can_dig_door
 		def.after_place_node = function(pos, placer, itemstack, pointed_thing)
+
 			local pn = placer:get_player_name()
 			local meta = minetest.get_meta(pos)
+
 			meta:set_string("owner", pn)
-			meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn))
+			meta:set_string("infotext", "Owned by "..pn)
 
 			return minetest.is_creative_enabled(pn)
 		end
 
 		def.on_blast = function() end
-		def.on_key_use = function(pos, player)
-			local door = doors.get(pos)
-			door:toggle(player)
-		end
-		def.on_skeleton_key_use = function(pos, player, newsecret)
-			replace_old_owner_information(pos)
-			local meta = minetest.get_meta(pos)
-			local owner = meta:get_string("owner")
-			local pname = player:get_player_name()
-
-			-- verify placer is owner of lockable door
-			if owner ~= pname then
-				minetest.record_protection_violation(pos, pname)
-				minetest.chat_send_player(pname, S("You do not own this trapdoor."))
-				return nil
-			end
-
-			local secret = meta:get_string("key_lock_secret")
-			if secret == "" then
-				secret = newsecret
-				meta:set_string("key_lock_secret", secret)
-			end
-
-			return secret, S("a locked trapdoor"), owner
-		end
-		def.node_dig_prediction = ""
 	else
 		def.on_blast = function(pos, intensity)
+
 			minetest.remove_node(pos)
+
 			return {name}
 		end
 	end
@@ -658,14 +757,6 @@ function doors.register_trapdoor(name, def)
 		def.sound_close = "doors_door_close"
 	end
 
-	if not def.gain_open then
-		def.gain_open = 0.3
-	end
-
-	if not def.gain_close then
-		def.gain_close = 0.3
-	end
-
 	local def_opened = table.copy(def)
 	local def_closed = table.copy(def)
 
@@ -679,13 +770,12 @@ function doors.register_trapdoor(name, def)
 	}
 	def_closed.tiles = {
 		def.tile_front,
-		def.tile_front .. '^[transformFY',
+		def.tile_front .. "^[transformFY",
 		def.tile_side,
 		def.tile_side,
 		def.tile_side,
 		def.tile_side
 	}
-
 	def_opened.node_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
@@ -696,11 +786,11 @@ function doors.register_trapdoor(name, def)
 	}
 	def_opened.tiles = {
 		def.tile_side,
-		def.tile_side .. '^[transform2',
-		def.tile_side .. '^[transform3',
-		def.tile_side .. '^[transform1',
-		def.tile_front .. '^[transform46',
-		def.tile_front .. '^[transform6'
+		def.tile_side .. "^[transform2",
+		def.tile_side .. "^[transform3",
+		def.tile_side .. "^[transform1",
+		def.tile_front .. "^[transform46",
+		def.tile_front .. "^[transform6"
 	}
 
 	def_opened.drop = name_closed
@@ -713,30 +803,26 @@ function doors.register_trapdoor(name, def)
 	doors.registered_trapdoors[name_closed] = true
 end
 
+
 doors.register_trapdoor("doors:trapdoor", {
-	description = S("Wooden Trapdoor"),
+	description = "Trapdoor",
 	inventory_image = "doors_trapdoor.png",
 	wield_image = "doors_trapdoor.png",
 	tile_front = "doors_trapdoor.png",
 	tile_side = "doors_trapdoor_side.png",
-	gain_open = 0.06,
-	gain_close = 0.13,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1},
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1}
 })
 
 doors.register_trapdoor("doors:trapdoor_steel", {
-	description = S("Steel Trapdoor"),
+	description = "Steel Trapdoor",
 	inventory_image = "doors_trapdoor_steel.png",
 	wield_image = "doors_trapdoor_steel.png",
 	tile_front = "doors_trapdoor_steel.png",
 	tile_side = "doors_trapdoor_steel_side.png",
 	protected = true,
-	sounds = default.node_sound_metal_defaults(),
 	sound_open = "doors_steel_door_open",
 	sound_close = "doors_steel_door_close",
-	gain_open = 0.2,
-	gain_close = 0.2,
-	groups = {cracky = 1, level = 2, door = 1},
+	groups = {cracky = 1, level = 2, door = 1}
 })
 
 minetest.register_craft({
@@ -744,7 +830,7 @@ minetest.register_craft({
 	recipe = {
 		{"group:wood", "group:wood", "group:wood"},
 		{"group:wood", "group:wood", "group:wood"},
-		{"", "", ""},
+		{"", "", ""}
 	}
 })
 
@@ -752,15 +838,104 @@ minetest.register_craft({
 	output = "doors:trapdoor_steel",
 	recipe = {
 		{"default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "default:steel_ingot"},
+		{"default:steel_ingot", "default:steel_ingot"}
 	}
 })
 
+-----key tool-----
+
+minetest.register_tool("doors:key", {
+	description = "Key Tool",
+	inventory_image = "doors_key.png",
+
+	on_use = function(itemstack, user, pointed_thing)
+
+		local pos = pointed_thing.under
+
+		if pointed_thing.type ~= "node"
+		or not doors.get(pos) then
+			return
+		end
+
+		replace_old_owner_information(pos)
+
+		local player_name = user:get_player_name()
+		local meta = minetest.get_meta(pos) ; if not meta then return end
+		local owner = meta:get_string("owner")
+		local prot = meta:get_string("doors_protected")
+		local ok = 0
+		local infotext = ""
+
+		if prot == ""
+		and owner == "" then
+
+			-- flip normal to owned
+			if minetest.is_protected(pos, player_name) then
+				minetest.record_protection_violation(pos, player_name)
+			else
+				infotext = "Owned by " .. player_name
+				owner = player_name
+				prot = ""
+				ok = 1
+			end
+
+		elseif prot == ""
+		and owner ~= "" then
+
+			-- flip owned to protected
+			if player_name == owner then
+				infotext = "Protected by " .. player_name
+				owner = ""
+				prot = player_name
+				ok = 1
+			end
+
+		elseif prot ~= ""
+		and owner == "" then
+
+			-- flip protected to normal
+			if player_name == prot then
+				infotext = " "
+				owner = ""
+				prot = ""
+				ok = 1
+			end
+		end
+
+		if ok == 1 then
+
+			meta:set_string("infotext", infotext)
+			meta:set_string("owner", owner)
+			meta:set_string("doors_protected", prot)
+
+			if not minetest.is_creative_enabled(player_name) then
+				itemstack:add_wear(65535 / 50)
+			end
+		end
+
+		return itemstack
+	end
+})
+
+minetest.register_craft({
+	output = "doors:key",
+	recipe = {
+		{"", "", "default:steel_ingot"},
+		{"default:steel_ingot", "default:steel_ingot", ""},
+		{"default:steel_ingot", "default:steel_ingot", ""}
+	}
+})
+
+-- remove default key
+--if minetest.registered_craftitems["default:skeleton_key"] then
+--	minetest.clear_craft({output = "default:skeleton_key"})
+--end
 
 ----fence gate----
 local fence_collision_extra = minetest.settings:get_bool("enable_fence_tall") and 3/8 or 0
 
 function doors.register_fencegate(name, def)
+
 	local fence = {
 		description = def.description,
 		drawtype = "mesh",
@@ -773,20 +948,25 @@ function doors.register_fencegate(name, def)
 		connect_sides = {"left", "right"},
 		groups = def.groups,
 		sounds = def.sounds,
+
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+
 			local node_def = minetest.registered_nodes[node.name]
+
 			minetest.swap_node(pos, {name = node_def.gate, param2 = node.param2})
-			minetest.sound_play(node_def.sound, {pos = pos, gain = 0.15,
+
+			minetest.sound_play(node_def.sound, {pos = pos, gain = 0.3,
 				max_hear_distance = 8}, true)
+
 			return itemstack
 		end,
+
 		selection_box = {
 			type = "fixed",
 			fixed = {-1/2, -1/2, -1/4, 1/2, 1/2, 1/4}
-		},
+		}
 	}
 
-
 	if type(def.texture) == "string" then
 		fence.tiles[1] = {name = def.texture, backface_culling = true}
 	elseif def.texture.backface_culling == nil then
@@ -803,15 +983,17 @@ function doors.register_fencegate(name, def)
 	fence.groups.fence = 1
 
 	local fence_closed = table.copy(fence)
+
 	fence_closed.mesh = "doors_fencegate_closed.obj"
 	fence_closed.gate = name .. "_open"
 	fence_closed.sound = "doors_fencegate_open"
 	fence_closed.collision_box = {
 		type = "fixed",
-		fixed = {-1/2, -1/2, -1/8, 1/2, 1/2 + fence_collision_extra, 1/8}
+		fixed = {-1/2, -1/2, -1/4, 1/2, 1/2 + fence_collision_extra, 1/4}
 	}
 
 	local fence_open = table.copy(fence)
+
 	fence_open.mesh = "doors_fencegate_open.obj"
 	fence_open.gate = name .. "_closed"
 	fence_open.sound = "doors_fencegate_close"
@@ -819,7 +1001,7 @@ function doors.register_fencegate(name, def)
 	fence_open.collision_box = {
 		type = "fixed",
 		fixed = {{-1/2, -1/2, -1/8, -3/8, 1/2 + fence_collision_extra, 1/8},
-			 {-1/2, -3/8, -1/2, -3/8, 3/8,                         0  }}
+			{-1/2, -3/8, -1/2, -3/8, 3/8, 0}},
 	}
 
 	minetest.register_node(":" .. name .. "_closed", fence_closed)
@@ -834,82 +1016,82 @@ function doors.register_fencegate(name, def)
 	})
 end
 
+
 doors.register_fencegate("doors:gate_wood", {
-	description = S("Apple Wood Fence Gate"),
+	description = "Wooden Fence Gate",
 	texture = "default_wood.png",
 	material = "default:wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("doors:gate_acacia_wood", {
-	description = S("Acacia Wood Fence Gate"),
+	description = "Acacia Fence Gate",
 	texture = "default_acacia_wood.png",
 	material = "default:acacia_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("doors:gate_junglewood", {
-	description = S("Jungle Wood Fence Gate"),
+	description = "Junglewood Fence Gate",
 	texture = "default_junglewood.png",
 	material = "default:junglewood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("doors:gate_pine_wood", {
-	description = S("Pine Wood Fence Gate"),
+	description = "Pine Fence Gate",
 	texture = "default_pine_wood.png",
 	material = "default:pine_wood",
-	groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3}
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("doors:gate_aspen_wood", {
-	description = S("Aspen Wood Fence Gate"),
+	description = "Aspen Fence Gate",
 	texture = "default_aspen_wood.png",
 	material = "default:aspen_wood",
-	groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3}
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
-
 ----fuels----
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "doors:trapdoor",
-	burntime = 7,
+	burntime = 7
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "doors:door_wood",
-	burntime = 14,
+	burntime = 14
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "doors:gate_wood_closed",
-	burntime = 7,
+	burntime = 7
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "doors:gate_acacia_wood_closed",
-	burntime = 8,
+	burntime = 8
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "doors:gate_junglewood_closed",
-	burntime = 9,
+	burntime = 9
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "doors:gate_pine_wood_closed",
-	burntime = 6,
+	burntime = 6
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "doors:gate_aspen_wood_closed",
-	burntime = 5,
+	burntime = 5
 })
diff --git a/mods/core/minetest_game/doors/license.txt b/mods/buildings/doors/license.txt
similarity index 100%
rename from mods/core/minetest_game/doors/license.txt
rename to mods/buildings/doors/license.txt
diff --git a/mods/buildings/doors/mod.conf b/mods/buildings/doors/mod.conf
new file mode 100644
index 00000000..bde5a52b
--- /dev/null
+++ b/mods/buildings/doors/mod.conf
@@ -0,0 +1,4 @@
+name = doors
+depends = default
+optional_depends = screwdriver
+description = Replaces default doors and adds protection support with switching key.
diff --git a/mods/core/minetest_game/doors/models/door_a.obj b/mods/buildings/doors/models/door_a.obj
similarity index 98%
rename from mods/core/minetest_game/doors/models/door_a.obj
rename to mods/buildings/doors/models/door_a.obj
index 7948f2f3..bd5127b5 100644
--- a/mods/core/minetest_game/doors/models/door_a.obj
+++ b/mods/buildings/doors/models/door_a.obj
@@ -1,7 +1,7 @@
 # Blender v2.76 (sub 0) OBJ File: 'door_a.blend'
 # www.blender.org
 mtllib door_a.mtl
-o door_a
+o Cube_Cube.001
 v 0.499000 -0.499000 -0.499000
 v 0.499000 1.499000 -0.499000
 v 0.499000 -0.499000 -0.375000
diff --git a/mods/buildings/doors/models/door_b.obj b/mods/buildings/doors/models/door_b.obj
new file mode 100644
index 00000000..c5607b87
--- /dev/null
+++ b/mods/buildings/doors/models/door_b.obj
@@ -0,0 +1,40 @@
+# Blender v2.76 (sub 0) OBJ File: 'door_b.blend'
+# www.blender.org
+mtllib door_b.mtl
+o Cube_Cube.001
+v -0.499000 -0.499000 -0.499000
+v -0.499000 1.499000 -0.499000
+v -0.499000 -0.499000 -0.375000
+v -0.499000 1.499000 -0.375000
+v 0.499000 -0.499000 -0.499000
+v 0.499000 1.499000 -0.499000
+v 0.499000 -0.499000 -0.375000
+v 0.499000 1.499000 -0.375000
+vt 0.842105 1.000000
+vt 0.842105 0.000000
+vt 0.894737 0.000000
+vt 0.894737 1.000000
+vt 0.421053 1.000000
+vt 0.421053 0.000000
+vt 0.947368 0.000000
+vt 0.947368 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 0.500000
+vt 0.947368 0.500000
+vt 1.000000 1.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+usemtl None
+s off
+f 2/1/1 1/2/1 3/3/1 4/4/1
+f 4/5/2 3/6/2 7/2/2 8/1/2
+f 8/4/3 7/3/3 5/7/3 6/8/3
+f 6/9/4 5/10/4 1/6/4 2/5/4
+f 1/11/5 5/12/5 7/13/5 3/7/5
+f 6/8/6 2/13/6 4/12/6 8/14/6
diff --git a/mods/core/minetest_game/doors/models/doors_fencegate_closed.obj b/mods/buildings/doors/models/doors_fencegate_closed.obj
similarity index 100%
rename from mods/core/minetest_game/doors/models/doors_fencegate_closed.obj
rename to mods/buildings/doors/models/doors_fencegate_closed.obj
diff --git a/mods/core/minetest_game/doors/models/doors_fencegate_open.obj b/mods/buildings/doors/models/doors_fencegate_open.obj
similarity index 100%
rename from mods/core/minetest_game/doors/models/doors_fencegate_open.obj
rename to mods/buildings/doors/models/doors_fencegate_open.obj
diff --git a/mods/buildings/doors/screenshot.jpg b/mods/buildings/doors/screenshot.jpg
new file mode 100644
index 00000000..e3e7f40b
Binary files /dev/null and b/mods/buildings/doors/screenshot.jpg differ
diff --git a/mods/core/minetest_game/doors/sounds/doors_door_close.ogg b/mods/buildings/doors/sounds/doors_door_close.ogg
similarity index 100%
rename from mods/core/minetest_game/doors/sounds/doors_door_close.ogg
rename to mods/buildings/doors/sounds/doors_door_close.ogg
diff --git a/mods/core/minetest_game/doors/sounds/doors_door_open.ogg b/mods/buildings/doors/sounds/doors_door_open.ogg
similarity index 100%
rename from mods/core/minetest_game/doors/sounds/doors_door_open.ogg
rename to mods/buildings/doors/sounds/doors_door_open.ogg
diff --git a/mods/core/minetest_game/doors/sounds/doors_fencegate_close.ogg b/mods/buildings/doors/sounds/doors_fencegate_close.ogg
similarity index 100%
rename from mods/core/minetest_game/doors/sounds/doors_fencegate_close.ogg
rename to mods/buildings/doors/sounds/doors_fencegate_close.ogg
diff --git a/mods/core/minetest_game/doors/sounds/doors_fencegate_open.ogg b/mods/buildings/doors/sounds/doors_fencegate_open.ogg
similarity index 100%
rename from mods/core/minetest_game/doors/sounds/doors_fencegate_open.ogg
rename to mods/buildings/doors/sounds/doors_fencegate_open.ogg
diff --git a/mods/core/minetest_game/doors/sounds/doors_glass_door_close.ogg b/mods/buildings/doors/sounds/doors_glass_door_close.ogg
similarity index 100%
rename from mods/core/minetest_game/doors/sounds/doors_glass_door_close.ogg
rename to mods/buildings/doors/sounds/doors_glass_door_close.ogg
diff --git a/mods/core/minetest_game/doors/sounds/doors_glass_door_open.ogg b/mods/buildings/doors/sounds/doors_glass_door_open.ogg
similarity index 100%
rename from mods/core/minetest_game/doors/sounds/doors_glass_door_open.ogg
rename to mods/buildings/doors/sounds/doors_glass_door_open.ogg
diff --git a/mods/core/minetest_game/doors/sounds/doors_steel_door_close.ogg b/mods/buildings/doors/sounds/doors_steel_door_close.ogg
similarity index 100%
rename from mods/core/minetest_game/doors/sounds/doors_steel_door_close.ogg
rename to mods/buildings/doors/sounds/doors_steel_door_close.ogg
diff --git a/mods/core/minetest_game/doors/sounds/doors_steel_door_open.ogg b/mods/buildings/doors/sounds/doors_steel_door_open.ogg
similarity index 100%
rename from mods/core/minetest_game/doors/sounds/doors_steel_door_open.ogg
rename to mods/buildings/doors/sounds/doors_steel_door_open.ogg
diff --git a/mods/buildings/doors/textures/doors_blank.png b/mods/buildings/doors/textures/doors_blank.png
new file mode 100644
index 00000000..1914264c
Binary files /dev/null and b/mods/buildings/doors/textures/doors_blank.png differ
diff --git a/mods/buildings/doors/textures/doors_door_glass.png b/mods/buildings/doors/textures/doors_door_glass.png
new file mode 100644
index 00000000..afc36edb
Binary files /dev/null and b/mods/buildings/doors/textures/doors_door_glass.png differ
diff --git a/mods/buildings/doors/textures/doors_door_iceage.png b/mods/buildings/doors/textures/doors_door_iceage.png
new file mode 100644
index 00000000..39cb956b
Binary files /dev/null and b/mods/buildings/doors/textures/doors_door_iceage.png differ
diff --git a/mods/buildings/doors/textures/doors_door_obsidian_glass.png b/mods/buildings/doors/textures/doors_door_obsidian_glass.png
new file mode 100644
index 00000000..6229c94d
Binary files /dev/null and b/mods/buildings/doors/textures/doors_door_obsidian_glass.png differ
diff --git a/mods/buildings/doors/textures/doors_door_phiwari.png b/mods/buildings/doors/textures/doors_door_phiwari.png
new file mode 100644
index 00000000..5a95fa58
Binary files /dev/null and b/mods/buildings/doors/textures/doors_door_phiwari.png differ
diff --git a/mods/buildings/doors/textures/doors_door_steel.png b/mods/buildings/doors/textures/doors_door_steel.png
new file mode 100644
index 00000000..f42f3350
Binary files /dev/null and b/mods/buildings/doors/textures/doors_door_steel.png differ
diff --git a/mods/buildings/doors/textures/doors_door_wood.png b/mods/buildings/doors/textures/doors_door_wood.png
new file mode 100644
index 00000000..7b18203e
Binary files /dev/null and b/mods/buildings/doors/textures/doors_door_wood.png differ
diff --git a/mods/buildings/doors/textures/doors_item_glass.png b/mods/buildings/doors/textures/doors_item_glass.png
new file mode 100644
index 00000000..ee310a19
Binary files /dev/null and b/mods/buildings/doors/textures/doors_item_glass.png differ
diff --git a/mods/buildings/doors/textures/doors_item_iceage.png b/mods/buildings/doors/textures/doors_item_iceage.png
new file mode 100644
index 00000000..3b71d834
Binary files /dev/null and b/mods/buildings/doors/textures/doors_item_iceage.png differ
diff --git a/mods/buildings/doors/textures/doors_item_obsidian_glass.png b/mods/buildings/doors/textures/doors_item_obsidian_glass.png
new file mode 100644
index 00000000..01690ded
Binary files /dev/null and b/mods/buildings/doors/textures/doors_item_obsidian_glass.png differ
diff --git a/mods/buildings/doors/textures/doors_item_phiwari.png b/mods/buildings/doors/textures/doors_item_phiwari.png
new file mode 100644
index 00000000..aa634f70
Binary files /dev/null and b/mods/buildings/doors/textures/doors_item_phiwari.png differ
diff --git a/mods/core/minetest_game/doors/textures/doors_item_steel.png b/mods/buildings/doors/textures/doors_item_steel.png
similarity index 100%
rename from mods/core/minetest_game/doors/textures/doors_item_steel.png
rename to mods/buildings/doors/textures/doors_item_steel.png
diff --git a/mods/core/minetest_game/doors/textures/doors_item_wood.png b/mods/buildings/doors/textures/doors_item_wood.png
similarity index 100%
rename from mods/core/minetest_game/doors/textures/doors_item_wood.png
rename to mods/buildings/doors/textures/doors_item_wood.png
diff --git a/mods/buildings/doors/textures/doors_key.png b/mods/buildings/doors/textures/doors_key.png
new file mode 100644
index 00000000..e69a71ce
Binary files /dev/null and b/mods/buildings/doors/textures/doors_key.png differ
diff --git a/mods/core/minetest_game/doors/textures/doors_trapdoor.png b/mods/buildings/doors/textures/doors_trapdoor.png
similarity index 100%
rename from mods/core/minetest_game/doors/textures/doors_trapdoor.png
rename to mods/buildings/doors/textures/doors_trapdoor.png
diff --git a/mods/core/minetest_game/doors/textures/doors_trapdoor_side.png b/mods/buildings/doors/textures/doors_trapdoor_side.png
similarity index 100%
rename from mods/core/minetest_game/doors/textures/doors_trapdoor_side.png
rename to mods/buildings/doors/textures/doors_trapdoor_side.png
diff --git a/mods/core/minetest_game/doors/textures/doors_trapdoor_steel.png b/mods/buildings/doors/textures/doors_trapdoor_steel.png
similarity index 100%
rename from mods/core/minetest_game/doors/textures/doors_trapdoor_steel.png
rename to mods/buildings/doors/textures/doors_trapdoor_steel.png
diff --git a/mods/core/minetest_game/doors/textures/doors_trapdoor_steel_side.png b/mods/buildings/doors/textures/doors_trapdoor_steel_side.png
similarity index 100%
rename from mods/core/minetest_game/doors/textures/doors_trapdoor_steel_side.png
rename to mods/buildings/doors/textures/doors_trapdoor_steel_side.png
diff --git a/mods/core/minetest_game/doors/locale/doors.de.tr b/mods/core/minetest_game/doors/locale/doors.de.tr
deleted file mode 100644
index 79707ce8..00000000
--- a/mods/core/minetest_game/doors/locale/doors.de.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Verborgenes Türsegment
-Owned by @1=Eigentum von @1
-You do not own this locked door.=Diese abgeschlossene Tür gehört Ihnen nicht.
-a locked door=eine abgeschlossene Tür
-Wooden Door=Holztür
-Steel Door=Stahltür
-Glass Door=Glastür
-Obsidian Glass Door=Obsidianglastür
-You do not own this trapdoor.=Diese Falltür gehört Ihnen nicht.
-a locked trapdoor=eine abgeschlossene Falltür
-Wooden Trapdoor=Holzfalltür
-Steel Trapdoor=Stahlfalltür
-Apple Wood Fence Gate=Apfelholzzauntor
-Acacia Wood Fence Gate=Akazienholzzauntor
-Jungle Wood Fence Gate=Dschungelholzzauntor
-Pine Wood Fence Gate=Kiefernholzzauntor
-Aspen Wood Fence Gate=Espenholzzauntor
diff --git a/mods/core/minetest_game/doors/locale/doors.eo.tr b/mods/core/minetest_game/doors/locale/doors.eo.tr
deleted file mode 100644
index b5667324..00000000
--- a/mods/core/minetest_game/doors/locale/doors.eo.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Kaŝita Porda Segmento
-Owned by @1=Estas de @1
-You do not own this locked door.=Vi ne posedas ĉi tiu ŝlosita pordo.
-a locked door=ŝlosita pordo
-Wooden Door=Ligna Pordo
-Steel Door=Ŝtala Pordo
-Glass Door=Vitra Pordo
-Obsidian Glass Door=Obsidiana Vitra Pordo
-You do not own this trapdoor.=Vi ne posedas ĉi tiu plankpordo.
-a locked trapdoor=ŝlosita plankpordo
-Wooden Trapdoor=Ligna Plankpordo
-Steel Trapdoor=Ŝtala Plankpordo
-Apple Wood Fence Gate=Poma Ligna Barila Pordo
-Acacia Wood Fence Gate=Akacia Ligna Barila Pordo
-Jungle Wood Fence Gate=Ĝangala Ligna Barila Pordo
-Pine Wood Fence Gate=Pina Ligna Barila Pordo
-Aspen Wood Fence Gate=Tremola Ligna Barila Pordo
diff --git a/mods/core/minetest_game/doors/locale/doors.es.tr b/mods/core/minetest_game/doors/locale/doors.es.tr
deleted file mode 100644
index 677f2dfd..00000000
--- a/mods/core/minetest_game/doors/locale/doors.es.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Segmento de puerta oculta
-Owned by @1=Propiedad de @1
-You do not own this locked door.=Esta puerta cerrada no te pertenece.
-a locked door=una puerta cerrada
-Wooden Door=Puerta de madera
-Steel Door=Puerta de acero
-Glass Door=Puerta de vidrio
-Obsidian Glass Door=Puerta de vidrio de obsidiana
-You do not own this trapdoor.=Esta trampilla no te pertenece.
-a locked trapdoor=una trampilla cerrada
-Wooden Trapdoor=Trampilla de madera
-Steel Trapdoor=Trampilla de acero
-Apple Wood Fence Gate=Puerta de cerca de manzano
-Acacia Wood Fence Gate=Puerta de cerca de acacia
-Jungle Wood Fence Gate=Puerta de cerca de madera tropical
-Pine Wood Fence Gate=Puerta de cerca de pino
-Aspen Wood Fence Gate=Puerta de cerca de álamo
diff --git a/mods/core/minetest_game/doors/locale/doors.fr.tr b/mods/core/minetest_game/doors/locale/doors.fr.tr
deleted file mode 100644
index 930f75cc..00000000
--- a/mods/core/minetest_game/doors/locale/doors.fr.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Segment de porte cachée
-Owned by @1=Possédée par @1
-You do not own this locked door.=Cette porte vérouillée ne vous appartient pas.
-a locked door=une porte verouillée
-Wooden Door=Porte en bois
-Steel Door=Porte en acier
-Glass Door=Porte en verre
-Obsidian Glass Door=Porte en verre d'obsidienne
-You do not own this trapdoor.=Vous ne possédez pas cette trappe.
-a locked trapdoor=une trappe verouillée
-Wooden Trapdoor=Trappe en bois
-Steel Trapdoor=Trappe en acier
-Apple Wood Fence Gate=Porte de clôture en bois de pommier
-Acacia Wood Fence Gate=Porte de clôture en bois d'acacia
-Jungle Wood Fence Gate=Porte de clôture en bois de la jungle
-Pine Wood Fence Gate=Porte de clôture en bois de pin
-Aspen Wood Fence Gate=Porte de clôture en bois de tremble
diff --git a/mods/core/minetest_game/doors/locale/doors.id.tr b/mods/core/minetest_game/doors/locale/doors.id.tr
deleted file mode 100644
index 3b749049..00000000
--- a/mods/core/minetest_game/doors/locale/doors.id.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Bagian Pintu Tersembunyi
-Owned by @1=Milik @1
-You do not own this locked door.=Anda bukan pemilik pintu terkunci ini.
-a locked door=pintu terkunci
-Wooden Door=Pintu Kayu
-Steel Door=Pintu Baja
-Glass Door=Pintu Kaca
-Obsidian Glass Door=Pintu Kaca Obsidian
-You do not own this trapdoor.=Anda bukan pemilik pintu kolong ini.
-a locked trapdoor=pintu kolong terkunci
-Wooden Trapdoor=Pintu Kolong Kayu
-Steel Trapdoor=Pintu Kolong Baja
-Apple Wood Fence Gate=Gerbang Kayu Pohon Apel
-Acacia Wood Fence Gate=Gerbang Kayu Akasia
-Jungle Wood Fence Gate=Gerbang Kayu Pohon Rimba
-Pine Wood Fence Gate=Gerbang Kayu Pinus
-Aspen Wood Fence Gate=Gerbang Kayu Aspen
diff --git a/mods/core/minetest_game/doors/locale/doors.it.tr b/mods/core/minetest_game/doors/locale/doors.it.tr
deleted file mode 100644
index ccd00d36..00000000
--- a/mods/core/minetest_game/doors/locale/doors.it.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Segmento di porta nascosto
-Owned by @1=Di proprietà di @1
-You do not own this locked door.=Non sei il proprietario di questa porta chiusa a chiave.
-a locked door=una porta chiusa a chiave
-Wooden Door=Porta di legno
-Steel Door=Porta d'acciaio
-Glass Door=Porta di vetro
-Obsidian Glass Door=Porta di vetro d'ossidiana
-You do not own this trapdoor.=Non sei il proprietario di questa botola.
-a locked trapdoor=una botola chiusa a chiave
-Wooden Trapdoor=Botola di legno
-Steel Trapdoor=Botola d'acciaio
-Apple Wood Fence Gate=Cancello della recinzione di legno di melo
-Acacia Wood Fence Gate=Cancello della recinzione di legno d'acacia
-Jungle Wood Fence Gate=Cancello della recinzione di legno della giungla
-Pine Wood Fence Gate=Cancello della recinzione di legno di pino
-Aspen Wood Fence Gate=Cancello della recinzione di legno di pioppo
diff --git a/mods/core/minetest_game/doors/locale/doors.jbo.tr b/mods/core/minetest_game/doors/locale/doors.jbo.tr
deleted file mode 100644
index 48daa0a8..00000000
--- a/mods/core/minetest_game/doors/locale/doors.jbo.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=lo se mipri pagbu be lo vrogai
-Owned by @1=.i ti ponse zoi zo'i.@1.zo'i
-You do not own this locked door.=.i do na ponse lo ti selstela vrogai
-a locked door=lo selstela vrogai
-Wooden Door=lo mudri vrogai
-Steel Door=lo gasta vrogai
-Glass Door=lo blaci vrogai
-Obsidian Glass Door=lo je'erma'ablaci blaci vrogai
-You do not own this trapdoor.=.i do na ponse lo ti selstela lolvrogai
-a locked trapdoor=lo selstela lolvrogai
-Wooden Trapdoor=lo mudri lolvrogai
-Steel Trapdoor=lo gasta lolvrogai
-Apple Wood Fence Gate=lo plise mudri garbimvrogai
-Acacia Wood Fence Gate=lo atkaci,ia mudri garbimvrogai
-Jungle Wood Fence Gate=lo glatimdemricfoi mudri garbimvrogai
-Pine Wood Fence Gate=lo ckunu mudri garbimvrogai
-Aspen Wood Fence Gate=lo mudrpopulu garbimvrogai
diff --git a/mods/core/minetest_game/doors/locale/doors.ms.tr b/mods/core/minetest_game/doors/locale/doors.ms.tr
deleted file mode 100644
index 93d6df2e..00000000
--- a/mods/core/minetest_game/doors/locale/doors.ms.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Segmen Pintu Tersembunyi
-Owned by @1=Milik @1
-You do not own this locked door.=Anda bukan pemilik pintu berkunci ini.
-a locked door=pintu berkunci
-Wooden Door=Pintu Kayu
-Steel Door=Pintu Keluli
-Glass Door=Pintu Kaca
-Obsidian Glass Door=Pintu Kaca Obsidia
-You do not own this trapdoor.=Anda bukan pemilik pintu kolong ini.
-a locked trapdoor=pintu kolong berkunci
-Wooden Trapdoor=Pintu Kolong Kayu
-Steel Trapdoor=Pintu Kolong Keluli
-Apple Wood Fence Gate=Pintu Pagar Kayu Epal
-Acacia Wood Fence Gate=Pintu Pagar Kayu Akasia
-Jungle Wood Fence Gate=Pintu Pagar Kayu Hutan
-Pine Wood Fence Gate=Pintu Pagar Kayu Pain
-Aspen Wood Fence Gate=Pintu Pagar Kayu Aspen
diff --git a/mods/core/minetest_game/doors/locale/doors.pt_BR.tr b/mods/core/minetest_game/doors/locale/doors.pt_BR.tr
deleted file mode 100644
index 82324424..00000000
--- a/mods/core/minetest_game/doors/locale/doors.pt_BR.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Segmento de Porta Oculto
-Owned by @1=Propriedade de @1
-You do not own this locked door.=Você não é dono desta porta trancada.
-a locked door=uma porta trancada
-Wooden Door=Porta de Madeira
-Steel Door=Porta de Aço
-Glass Door=Porta de Vidro
-Obsidian Glass Door=Porta de Vidro de Obsidiana
-You do not own this trapdoor.=Você não é dono deste alçapão.
-a locked trapdoor=um alçapão trancado
-Wooden Trapdoor=Alçapão de Madeira
-Steel Trapdoor=Alçapão de Aço
-Apple Wood Fence Gate=Portão de Cerca de Macieira
-Acacia Wood Fence Gate=Portão de Cerca de Acácia
-Jungle Wood Fence Gate=Portão de Cerca de Madeira da Selva
-Pine Wood Fence Gate=Portão de Cerca de Pinheiro
-Aspen Wood Fence Gate=Portão de Cerca de Álamo
diff --git a/mods/core/minetest_game/doors/locale/doors.ru.tr b/mods/core/minetest_game/doors/locale/doors.ru.tr
deleted file mode 100644
index dc5c3c09..00000000
--- a/mods/core/minetest_game/doors/locale/doors.ru.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Спрятанная Часть Двери
-Owned by @1=Владелец: @1
-You do not own this locked door.=Вы не владелец этой заблокированной двери.
-a locked door=заблокированная дверь
-Wooden Door=Деревянная Дверь
-Steel Door=Стальная Дверь
-Glass Door=Стеклянная Дверь
-Obsidian Glass Door=Дверь Из Обсидианового Стекла
-You do not own this trapdoor.=Вы не владелец этого люка.
-a locked trapdoor=заблокированный люк
-Wooden Trapdoor=Деревянный Люк
-Steel Trapdoor=Стальной Люк
-Apple Wood Fence Gate=Яблоневая Деревянная Калитка
-Acacia Wood Fence Gate=Деревянная Калитка Из Акации
-Jungle Wood Fence Gate=Деревянная Калитка Из Тропического Дерева
-Pine Wood Fence Gate=Сосновая Деревянная Калитка
-Aspen Wood Fence Gate=Осиновая Деревянная Калитка
diff --git a/mods/core/minetest_game/doors/locale/doors.se.tr b/mods/core/minetest_game/doors/locale/doors.se.tr
deleted file mode 100644
index 1f856ef1..00000000
--- a/mods/core/minetest_game/doors/locale/doors.se.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Dold dörrsegment
-Owned by @1=Ägd av @1
-You do not own this locked door.=Du äger inte denna låsta dörr.
-a locked door=en låst dörr
-Wooden Door=Trä Dörr
-Steel Door=Stål Dörr
-Glass Door=Glas Dörr
-Obsidian Glass Door=Obsidian Glas Dörr
-You do not own this trapdoor.=Du äger inte denna fallucka
-a locked trapdoor=en låst fallucka
-Wooden Trapdoor=Trä Fallucka
-Steel Trapdoor=Stål Fallucka
-Apple Wood Fence Gate=Äpple Trä Fallucka
-Acacia Wood Fence Gate=Akacia Trä Fallucka
-Jungle Wood Fence Gate=Djungel Trä Fallucka
-Pine Wood Fence Gate=Tall Trä Fallucka
-Aspen Wood Fence Gate=Asp Trä Fallucka
diff --git a/mods/core/minetest_game/doors/locale/doors.sk.tr b/mods/core/minetest_game/doors/locale/doors.sk.tr
deleted file mode 100644
index e6943ac3..00000000
--- a/mods/core/minetest_game/doors/locale/doors.sk.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Skrytá časť dverí
-Owned by @1=Vlastník - @1
-You do not own this locked door.=Nevlastníš tieto uzamknuté dvere.
-a locked door=uzamknuté dvere
-Wooden Door=Drevené dvere
-Steel Door=Oceľové dvere
-Glass Door=Sklenené dvere
-Obsidian Glass Door=Obsidiánové sklenené dvere
-You do not own this trapdoor.=Nevlastníš tieto padacie dvere.
-a locked trapdoor=uzamknuté padacie dvere
-Wooden Trapdoor=Drevené padacie dvere
-Steel Trapdoor=Oceľové padacie dvere
-Apple Wood Fence Gate=Drevený plot z jablone
-Acacia Wood Fence Gate=Drevený plot z akácie
-Jungle Wood Fence Gate=Drevený plot z džungľového dreva
-Pine Wood Fence Gate=Drevený plot z borovice
-Aspen Wood Fence Gate=Drevený plot z osiky
diff --git a/mods/core/minetest_game/doors/locale/doors.zh_CN.tr b/mods/core/minetest_game/doors/locale/doors.zh_CN.tr
deleted file mode 100644
index 50f38c05..00000000
--- a/mods/core/minetest_game/doors/locale/doors.zh_CN.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=隐藏门段
-Owned by @1=由@1拥有
-You do not own this locked door.=这个门不属于你所有。
-a locked door=一扇已上锁的门
-Wooden Door=木门
-Steel Door=铁门
-Glass Door=玻璃门
-Obsidian Glass Door=黑曜石玻璃门
-You do not own this trapdoor.=这个活板门不属于你所有。
-a locked trapdoor=一扇已上锁的活板门
-Wooden Trapdoor=木活板门
-Steel Trapdoor=铁活板门
-Apple Wood Fence Gate=苹果木栅栏门
-Acacia Wood Fence Gate=相思木栅栏门
-Jungle Wood Fence Gate=丛林木栅栏门
-Pine Wood Fence Gate=松木栅栏门
-Aspen Wood Fence Gate=白杨木栅栏门
diff --git a/mods/core/minetest_game/doors/locale/doors.zh_TW.tr b/mods/core/minetest_game/doors/locale/doors.zh_TW.tr
deleted file mode 100644
index 81e06fcc..00000000
--- a/mods/core/minetest_game/doors/locale/doors.zh_TW.tr
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=隱藏門段
-Owned by @1=由@1擁有
-You do not own this locked door.=這個門不屬於你所有。
-a locked door=一扇已上鎖的門
-Wooden Door=木門
-Steel Door=鐵門
-Glass Door=玻璃門
-Obsidian Glass Door=黑曜石玻璃門
-You do not own this trapdoor.=這個活板門不屬於你所有。
-a locked trapdoor=一扇已上鎖的活板門
-Wooden Trapdoor=木活板門
-Steel Trapdoor=鐵活板門
-Apple Wood Fence Gate=蘋果木柵欄門
-Acacia Wood Fence Gate=相思木柵欄門
-Jungle Wood Fence Gate=叢林木柵欄門
-Pine Wood Fence Gate=松木柵欄門
-Aspen Wood Fence Gate=白楊木柵欄門
diff --git a/mods/core/minetest_game/doors/locale/template.txt b/mods/core/minetest_game/doors/locale/template.txt
deleted file mode 100644
index 8b5c349c..00000000
--- a/mods/core/minetest_game/doors/locale/template.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=
-Owned by @1=
-You do not own this locked door.=
-a locked door=
-Wooden Door=
-Steel Door=
-Glass Door=
-Obsidian Glass Door=
-You do not own this trapdoor.=
-a locked trapdoor=
-Wooden Trapdoor=
-Steel Trapdoor=
-Apple Wood Fence Gate=
-Acacia Wood Fence Gate=
-Jungle Wood Fence Gate=
-Pine Wood Fence Gate=
-Aspen Wood Fence Gate=
diff --git a/mods/core/minetest_game/doors/mod.conf b/mods/core/minetest_game/doors/mod.conf
deleted file mode 100644
index de053c27..00000000
--- a/mods/core/minetest_game/doors/mod.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-name = doors
-description = Minetest Game mod: doors
-depends = default
-optional_depends = screwdriver
diff --git a/mods/core/minetest_game/doors/models/door_a2.obj b/mods/core/minetest_game/doors/models/door_a2.obj
deleted file mode 100644
index 3bedc202..00000000
--- a/mods/core/minetest_game/doors/models/door_a2.obj
+++ /dev/null
@@ -1,50 +0,0 @@
-# Blender v2.79 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib door_a2.mtl
-o door_a2
-v -0.499000 1.499000 -0.499000
-v -0.499000 -0.499000 -0.499000
-v -0.499000 -0.499000 -0.375000
-v -0.499000 1.499000 -0.375000
-v 0.499000 -0.499000 -0.375000
-v 0.499000 1.499000 -0.375000
-v 0.499000 -0.499000 -0.499000
-v 0.499000 1.499000 -0.499000
-vt 0.894737 1.000000
-vt 0.894737 0.000000
-vt 0.842105 0.000000
-vt 0.842105 1.000000
-vt 0.421052 1.000000
-vt 0.421052 0.000000
-vt 0.000001 0.000000
-vt 0.000001 1.000000
-vt 0.894737 1.000000
-vt 0.894737 0.000000
-vt 0.947368 0.000000
-vt 0.947368 1.000000
-vt 0.842105 1.000000
-vt 0.842105 0.000000
-vt 0.421052 0.000000
-vt 0.421052 1.000000
-vt 0.947368 0.000000
-vt 0.947368 0.500000
-vt 1.000000 0.500000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 1.000000 0.500000
-vt 0.947368 0.500000
-vt 0.947368 1.000000
-vn -1.0000 -0.0000 0.0000
-vn 0.0000 -0.0000 1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-usemtl None.009
-s 1
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 4/5/2 3/6/2 5/7/2 6/8/2
-f 6/9/3 5/10/3 7/11/3 8/12/3
-f 8/13/4 7/14/4 2/15/4 1/16/4
-f 2/17/5 7/18/5 5/19/5 3/20/5
-f 8/21/6 1/22/6 4/23/6 6/24/6
diff --git a/mods/core/minetest_game/doors/models/door_b.obj b/mods/core/minetest_game/doors/models/door_b.obj
deleted file mode 100644
index 87f1729c..00000000
--- a/mods/core/minetest_game/doors/models/door_b.obj
+++ /dev/null
@@ -1,50 +0,0 @@
-# Blender v2.79 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib door_b.mtl
-o door_b
-v 0.499000 1.499000 -0.499000
-v 0.499000 1.499000 -0.375000
-v 0.499000 -0.499000 -0.375000
-v 0.499000 -0.499000 -0.499000
-v -0.499000 1.499000 -0.375000
-v -0.499000 -0.499000 -0.375000
-v -0.499000 1.499000 -0.499000
-v -0.499000 -0.499000 -0.499000
-vt 0.894736 1.000000
-vt 0.947368 1.000000
-vt 0.947368 0.000000
-vt 0.894736 0.000000
-vt 0.842105 1.000000
-vt 0.421053 1.000000
-vt 0.421053 0.000000
-vt 0.842105 0.000000
-vt 0.842105 1.000000
-vt 0.894736 1.000000
-vt 0.894736 0.000000
-vt 0.842105 0.000000
-vt 0.421053 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 0.421053 0.000000
-vt 1.000000 0.500000
-vt 0.947368 0.500000
-vt 0.947368 1.000000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vt 0.947368 0.000000
-vt 0.947368 0.500000
-vt 1.000000 0.500000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -0.0000 1.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-usemtl None.007
-s 1
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 2/5/2 5/6/2 6/7/2 3/8/2
-f 5/9/3 7/10/3 8/11/3 6/12/3
-f 7/13/4 1/14/4 4/15/4 8/16/4
-f 4/17/5 3/18/5 6/19/5 8/20/5
-f 7/21/6 5/22/6 2/23/6 1/24/6
diff --git a/mods/core/minetest_game/doors/models/door_b2.obj b/mods/core/minetest_game/doors/models/door_b2.obj
deleted file mode 100644
index 35632a5e..00000000
--- a/mods/core/minetest_game/doors/models/door_b2.obj
+++ /dev/null
@@ -1,50 +0,0 @@
-# Blender v2.79 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib door_b2.mtl
-o door_b2
-v 0.499000 1.499000 -0.499000
-v 0.499000 1.499000 -0.375000
-v 0.499000 -0.499000 -0.375000
-v 0.499000 -0.499000 -0.499000
-v -0.499000 1.499000 -0.375000
-v -0.499000 -0.499000 -0.375000
-v -0.499000 1.499000 -0.499000
-v -0.499000 -0.499000 -0.499000
-vt 0.842105 1.000000
-vt 0.894737 1.000000
-vt 0.894737 0.000000
-vt 0.842105 0.000000
-vt 0.421052 1.000000
-vt 0.000001 1.000000
-vt 0.000001 0.000000
-vt 0.421052 0.000000
-vt 0.894737 1.000000
-vt 0.947368 1.000000
-vt 0.947368 0.000000
-vt 0.894737 0.000000
-vt 0.842105 1.000000
-vt 0.421052 1.000000
-vt 0.421052 0.000000
-vt 0.842105 0.000000
-vt 1.000000 0.500000
-vt 0.947368 0.500000
-vt 0.947368 1.000000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vt 0.947368 0.000000
-vt 0.947368 0.500000
-vt 1.000000 0.500000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -0.0000 1.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-usemtl None.010
-s 1
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 2/5/2 5/6/2 6/7/2 3/8/2
-f 5/9/3 7/10/3 8/11/3 6/12/3
-f 7/13/4 1/14/4 4/15/4 8/16/4
-f 4/17/5 3/18/5 6/19/5 8/20/5
-f 7/21/6 5/22/6 2/23/6 1/24/6
diff --git a/mods/core/minetest_game/doors/textures/doors_door_glass.png b/mods/core/minetest_game/doors/textures/doors_door_glass.png
deleted file mode 100644
index ea6fdc1f..00000000
Binary files a/mods/core/minetest_game/doors/textures/doors_door_glass.png and /dev/null differ
diff --git a/mods/core/minetest_game/doors/textures/doors_door_obsidian_glass.png b/mods/core/minetest_game/doors/textures/doors_door_obsidian_glass.png
deleted file mode 100644
index fab25b34..00000000
Binary files a/mods/core/minetest_game/doors/textures/doors_door_obsidian_glass.png and /dev/null differ
diff --git a/mods/core/minetest_game/doors/textures/doors_door_steel.png b/mods/core/minetest_game/doors/textures/doors_door_steel.png
deleted file mode 100644
index 9e33ff1a..00000000
Binary files a/mods/core/minetest_game/doors/textures/doors_door_steel.png and /dev/null differ
diff --git a/mods/core/minetest_game/doors/textures/doors_door_wood.png b/mods/core/minetest_game/doors/textures/doors_door_wood.png
deleted file mode 100644
index c073faf1..00000000
Binary files a/mods/core/minetest_game/doors/textures/doors_door_wood.png and /dev/null differ
diff --git a/mods/core/minetest_game/doors/textures/doors_hidden_segment.png b/mods/core/minetest_game/doors/textures/doors_hidden_segment.png
deleted file mode 100644
index b3b6f34c..00000000
Binary files a/mods/core/minetest_game/doors/textures/doors_hidden_segment.png and /dev/null differ
diff --git a/mods/core/minetest_game/doors/textures/doors_item_glass.png b/mods/core/minetest_game/doors/textures/doors_item_glass.png
deleted file mode 100644
index fcdb153d..00000000
Binary files a/mods/core/minetest_game/doors/textures/doors_item_glass.png and /dev/null differ
diff --git a/mods/core/minetest_game/doors/textures/doors_item_obsidian_glass.png b/mods/core/minetest_game/doors/textures/doors_item_obsidian_glass.png
deleted file mode 100644
index 5780ad8f..00000000
Binary files a/mods/core/minetest_game/doors/textures/doors_item_obsidian_glass.png and /dev/null differ