merge upstream

mods/doors/init.lua

@@ -78,6 +78,8 @@ end
 -- 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",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -168,10 +170,10 @@ function doors.door_toggle(pos, node, clicker)
 
 	if state % 2 == 0 then
 		minetest.sound_play(def.door.sounds[1],
-			{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
+			{pos = pos, gain = def.door.gains[1], max_hear_distance = 10}, true)
 	else
 		minetest.sound_play(def.door.sounds[2],
-			{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
+			{pos = pos, gain = def.door.gains[2], max_hear_distance = 10}, true)
 	end
 
 	minetest.swap_node(pos, {
@@ -258,10 +260,11 @@ function doors.register(name, def)
 		on_place = function(itemstack, placer, pointed_thing)
 			local pos
 
-			if not pointed_thing.type == "node" then
+			if pointed_thing.type ~= "node" then
 				return itemstack
 			end
 
+			local doorname = itemstack:get_name()
 			local node = minetest.get_node(pointed_thing.under)
 			local pdef = minetest.registered_nodes[node.name]
 			if pdef and pdef.on_rightclick and
@@ -313,10 +316,10 @@ function doors.register(name, def)
 			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})
+				minetest.set_node(pos, {name = doorname .. "_b", param2 = dir})
 				minetest.set_node(above, {name = "doors:hidden", param2 = (dir + 3) % 4})
 			else
-				minetest.set_node(pos, {name = name .. "_a", param2 = dir})
+				minetest.set_node(pos, {name = doorname .. "_a", param2 = dir})
 				minetest.set_node(above, {name = "doors:hidden", param2 = dir})
 			end
 
@@ -328,7 +331,7 @@ function doors.register(name, def)
 				meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn))
 			end
 
-			if not (creative and creative.is_enabled_for and creative.is_enabled_for(pn)) then
+			if not minetest.is_creative_enabled(pn) then
 				itemstack:take_item()
 			end
 
@@ -362,12 +365,21 @@ 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 },
+		sounds = {def.sound_close, def.sound_open},
+		gains = {def.gain_close, def.gain_open},
 	}
 	if not def.on_rightclick then
 		def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
@@ -434,18 +446,19 @@ function doors.register(name, def)
 	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 = def.use_texture_alpha or "clip"
 
-	def.mesh = "door_a.obj"
-	minetest.register_node(":" .. name .. "_a", def)
+	def.mesh = "door_a.b3d"
+	minetest.register_node(":" .. name .. "_a", table.copy(def))
 
-	def.mesh = "door_b.obj"
-	minetest.register_node(":" .. name .. "_b", def)
+	def.mesh = "door_b.b3d"
+	minetest.register_node(":" .. name .. "_b", table.copy(def))
 
-	def.mesh = "door_a2.obj"
-	minetest.register_node(":" .. name .. "_c", def)
+	def.mesh = "door_b.b3d"
+	minetest.register_node(":" .. name .. "_c", table.copy(def))
 
-	def.mesh = "door_b2.obj"
-	minetest.register_node(":" .. name .. "_d", def)
+	def.mesh = "door_a.b3d"
+	minetest.register_node(":" .. name .. "_d", table.copy(def))
 
 	doors.registered_doors[name .. "_a"] = true
 	doors.registered_doors[name .. "_b"] = true
@@ -458,6 +471,8 @@ doors.register("door_wood", {
 		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"},
@@ -474,6 +489,8 @@ doors.register("door_steel", {
 		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"},
@@ -489,6 +506,8 @@ doors.register("door_glass", {
 		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"},
@@ -504,6 +523,8 @@ doors.register("door_obsidian_glass", {
 		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"},
@@ -550,12 +571,12 @@ function doors.trapdoor_toggle(pos, node, clicker)
 
 	if string.sub(node.name, -5) == "_open" then
 		minetest.sound_play(def.sound_close,
-			{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
+			{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})
 	else
 		minetest.sound_play(def.sound_open,
-			{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
+			{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})
 	end
@@ -579,6 +600,7 @@ function doors.register_trapdoor(name, def)
 	def.paramtype = "light"
 	def.paramtype2 = "facedir"
 	def.is_ground_content = false
+	def.use_texture_alpha = def.use_texture_alpha or "clip"
 
 	if def.protected then
 		def.can_dig = can_dig_door
@@ -588,7 +610,7 @@ function doors.register_trapdoor(name, def)
 			meta:set_string("owner", pn)
 			meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn))
 
-			return (creative and creative.is_enabled_for and creative.is_enabled_for(pn))
+			return minetest.is_creative_enabled(pn)
 		end
 
 		def.on_blast = function() end
@@ -637,13 +659,25 @@ 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)
 
-	def_closed.node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
-	}
+	if def.nodebox_closed and def.nodebox_opened then
+		def_closed.node_box = def.nodebox_closed
+	else
+		def_closed.node_box = {
+		    type = "fixed",
+		    fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
+		}
+	end
 	def_closed.selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
@@ -657,10 +691,14 @@ function doors.register_trapdoor(name, def)
 		def.tile_side
 	}
 
-	def_opened.node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
-	}
+	if def.nodebox_opened and def.nodebox_closed then
+		def_opened.node_box = def.nodebox_opened
+	else
+		def_opened.node_box = {
+		    type = "fixed",
+		    fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
+		}
+	end
 	def_opened.selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
@@ -690,6 +728,8 @@ doors.register_trapdoor("doors:trapdoor", {
 	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},
 })
 
@@ -703,6 +743,8 @@ doors.register_trapdoor("doors:trapdoor_steel", {
 	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},
 })
 
@@ -742,8 +784,8 @@ function doors.register_fencegate(name, def)
 		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.3,
+			minetest.swap_node(pos, {name = node_def._gate, param2 = node.param2})
+			minetest.sound_play(node_def._gate_sound, {pos = pos, gain = 0.15,
 				max_hear_distance = 8}, true)
 			return itemstack
 		end,
@@ -771,8 +813,8 @@ function doors.register_fencegate(name, def)
 
 	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._gate = name .. "_open"
+	fence_closed._gate_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}
@@ -780,8 +822,8 @@ function doors.register_fencegate(name, def)
 
 	local fence_open = table.copy(fence)
 	fence_open.mesh = "doors_fencegate_open.obj"
-	fence_open.gate = name .. "_closed"
-	fence_open.sound = "doors_fencegate_close"
+	fence_open._gate = name .. "_closed"
+	fence_open._gate_sound = "doors_fencegate_close"
 	fence_open.groups.not_in_creative_inventory = 1
 	fence_open.collision_box = {
 		type = "fixed",

mods/doors/locale/doors.eo.tr

@@ -0,0 +1,18 @@
+# textdomain: doors
+Hidden Door Segment=Kaŝita Porda Segmento
+Owned by @1=Posedita de @1
+You do not own this locked door.=Vi ne posedas ĉi tiun ŝlositan pordon.
+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 tiun plankpordon.
+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

mods/doors/locale/doors.it.tr

@@ -1,19 +1,18 @@
-# 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
-Owned by @1=Di proprietà di @1
-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
+# 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

mods/doors/locale/doors.ja.tr

@@ -0,0 +1,18 @@
+# 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=ポプラのフェンスゲート

mods/doors/locale/doors.jbo.tr

@@ -0,0 +1,18 @@
+# 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 plisymudri garbimvrogai
+Acacia Wood Fence Gate=lo atkaci,ia mudri garbimvrogai
+Jungle Wood Fence Gate=lo glatimdemricfoi mudri garbimvrogai
+Pine Wood Fence Gate=lo ku'urmudri garbimvrogai
+Aspen Wood Fence Gate=lo mudrpopulu garbimvrogai

mods/doors/locale/doors.pl.tr

@@ -0,0 +1,18 @@
+# textdomain: doors
+Hidden Door Segment=Ukryty segment drzwi
+Owned by @1=Właściciel: @1
+You do not own this locked door.=Nie jesteś właścicielem tych zablokowanych drzwi.
+a locked door=zablokowane drzwi
+Wooden Door=Drewniane drzwi
+Steel Door=Stalowe drzwi
+Glass Door=Szklane drzwi
+Obsidian Glass Door=Drzwi z obsydianowego szkła
+You do not own this trapdoor.=Nie jesteś właścicielem tego włazu.
+a locked trapdoor=zablokowany właz
+Wooden Trapdoor=Drewniany właz
+Steel Trapdoor=Stalowy właz
+Apple Wood Fence Gate=Furtka z jabłkowego drzewa
+Acacia Wood Fence Gate=Furtka z akacjowego drzewa
+Jungle Wood Fence Gate=Furtka z dżunglowego drzewa
+Pine Wood Fence Gate=Furtka z sosnowego drzewa
+Aspen Wood Fence Gate=Furtka z brzozowego drzewa

mods/doors/locale/doors.pt_BR.tr

@@ -0,0 +1,18 @@
+# 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

mods/doors/locale/doors.se.tr

@@ -1,19 +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
-Owned by @1=Ägd av @1
-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

mods/doors/locale/doors.sk.tr

@@ -0,0 +1,18 @@
+# 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

mods/doors/locale/doors.sv.tr

@@ -0,0 +1,18 @@
+# textdomain: doors
+Hidden Door Segment=Dolt 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åldörr
+Glass Door=Glasdörr
+Obsidian Glass Door=Obsidianglasdö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ålfallucka
+Apple Wood Fence Gate=Äppleträfallucka
+Acacia Wood Fence Gate=Akaciaträfallucka
+Jungle Wood Fence Gate=Djungelträfallucka
+Pine Wood Fence Gate=Tallträfallucka
+Aspen Wood Fence Gate=Aspträfallucka

mods/doors/locale/doors.uk.tr

@@ -0,0 +1,18 @@
+# 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=Осикова Дерев'яна Хвіртка

mods/doors/locale/doors.zh_CN.tr

@@ -1,17 +1,17 @@
 # textdomain: doors
 Hidden Door Segment=隐藏门段
-Owned by @1=由@1拥有
-You do not own this locked door.=这个门不属于你所有。
+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.=这个活板门不属于你所有。
+You do not own this trapdoor.=这个活板门不属于你。
 a locked trapdoor=一扇已上锁的活板门
 Wooden Trapdoor=木活板门
 Steel Trapdoor=铁活板门
-Apple Wood Fence Gate=用苹果树做的木栅栏门
+Apple Wood Fence Gate=苹果木栅栏门
 Acacia Wood Fence Gate=相思木栅栏门
 Jungle Wood Fence Gate=丛林木栅栏门
 Pine Wood Fence Gate=松木栅栏门

mods/doors/locale/doors.zh_TW.tr

@@ -11,7 +11,7 @@ You do not own this trapdoor.=這個活板門不屬於你所有。
 a locked trapdoor=一扇已上鎖的活板門
 Wooden Trapdoor=木活板門
 Steel Trapdoor=鐵活板門
-Apple Wood Fence Gate=用蘋果樹做的木柵欄門
+Apple Wood Fence Gate=蘋果木柵欄門
 Acacia Wood Fence Gate=相思木柵欄門
 Jungle Wood Fence Gate=叢林木柵欄門
 Pine Wood Fence Gate=松木柵欄門

mods/doors/models/door_a.obj

@@ -1,40 +0,0 @@
-# Blender v2.76 (sub 0) OBJ File: 'door_a.blend'
-# www.blender.org
-mtllib door_a.mtl
-o door_a
-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.894737 1.000000
-vt 0.894737 0.000000
-vt 0.842105 0.000000
-vt 0.421053 1.000000
-vt 0.421053 0.000000
-vt 0.947368 1.000000
-vt 0.947368 0.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.500000
-vt 0.947368 0.500000
-vt 1.000000 1.000000
-vt 1.000000 0.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 4/2/1 3/3/1 1/4/1
-f 4/5/2 8/1/2 7/4/2 3/6/2
-f 8/2/3 6/7/3 5/8/3 7/3/3
-f 6/9/4 2/5/4 1/6/4 5/10/4
-f 1/11/5 3/12/5 7/7/5 5/13/5
-f 6/14/6 8/8/6 4/12/6 2/11/6

mods/doors/models/door_a2.obj

@@ -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

mods/doors/models/door_b.obj

@@ -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

mods/doors/models/door_b2.obj

@@ -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