mirror of
https://github.com/mt-mods/homedecor_modpack.git
synced 2024-12-22 08:00:18 +01:00
remove homedecor_i18n and merged into homedecor_common, fixed meseon global error
This commit is contained in:
parent
8b78caf7c6
commit
0cd8bd7780
@ -1,4 +1,4 @@
|
|||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
|
if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
|
||||||
minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")
|
minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
default
|
default
|
||||||
homedecor_i18n
|
homedecor_common
|
||||||
moreblocks?
|
moreblocks?
|
||||||
gloopblocks?
|
gloopblocks?
|
||||||
stairs?
|
stairs?
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
local modpath = minetest.get_modpath("building_blocks")
|
local modpath = minetest.get_modpath("building_blocks")
|
||||||
|
|
||||||
dofile(modpath.."/alias.lua")
|
dofile(modpath.."/alias.lua")
|
||||||
dofile(modpath.."/node_stairs.lua")
|
dofile(modpath.."/node_stairs.lua")
|
||||||
dofile(modpath.."/others.lua")
|
dofile(modpath.."/others.lua")
|
||||||
dofile(modpath.."/recipes.lua")
|
dofile(modpath.."/recipes.lua")
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
|
local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
|
||||||
|
|
||||||
@ -33,7 +33,7 @@ local function building_blocks_stairs(nodename, def)
|
|||||||
("%s Slab"):format(def.description),
|
("%s Slab"):format(def.description),
|
||||||
def.sounds
|
def.sounds
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
minetest.register_craftitem("building_blocks:sticks", {
|
minetest.register_craftitem("building_blocks:sticks", {
|
||||||
description = S("Small bundle of sticks"),
|
description = S("Small bundle of sticks"),
|
||||||
@ -20,4 +20,4 @@ minetest.register_tool("building_blocks:knife", {
|
|||||||
fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
|
fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
if minetest.get_modpath("moreblocks") then
|
if minetest.get_modpath("moreblocks") then
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
-- Amiga 500 lookalike
|
-- Amiga 500 lookalike
|
||||||
computer.register("computer:shefriendSOO", {
|
computer.register("computer:shefriendSOO", {
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
default
|
default
|
||||||
homedecor_i18n
|
homedecor_common
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
-- This file defines some items in order to not have to depend on other mods.
|
-- This file defines some items in order to not have to depend on other mods.
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
if (not minetest.get_modpath("homedecor")) then
|
if (not minetest.get_modpath("homedecor")) then
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local shapes = {
|
local shapes = {
|
||||||
{ { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },
|
{ { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },
|
||||||
@ -231,7 +231,7 @@ local function step(pos, fields)
|
|||||||
local scr = { formsize, background,
|
local scr = { formsize, background,
|
||||||
t.boardstring, t.previewstring,
|
t.boardstring, t.previewstring,
|
||||||
draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy),
|
draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy),
|
||||||
"label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "),
|
"label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "),
|
||||||
t.score, close, buttons }
|
t.score, close, buttons }
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
default
|
default
|
||||||
homedecor_i18n
|
homedecor_common
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
screwdriver = screwdriver or {}
|
screwdriver = screwdriver or {}
|
||||||
|
|
||||||
|
@ -2,5 +2,4 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
unifieddyes
|
unifieddyes
|
||||||
homedecor_i18n
|
|
||||||
building_blocks
|
building_blocks
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
minetest.register_node(":homedecor:bathroom_tiles_dark", {
|
minetest.register_node(":homedecor:bathroom_tiles_dark", {
|
||||||
description = S("Bathroom/kitchen tiles (dark)"),
|
description = S("Bathroom/kitchen tiles (dark)"),
|
||||||
@ -115,9 +115,6 @@ homedecor.register("medicine_cabinet_open", {
|
|||||||
|
|
||||||
-- "Sanitation" related
|
-- "Sanitation" related
|
||||||
|
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
|
||||||
|
|
||||||
local toilet_sbox = {
|
local toilet_sbox = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
fixed = { -6/16, -8/16, -8/16, 6/16, 9/16, 8/16 },
|
fixed = { -6/16, -8/16, -8/16, 6/16, 9/16, 8/16 },
|
||||||
|
@ -2,5 +2,4 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
unifieddyes
|
unifieddyes
|
||||||
homedecor_i18n
|
|
||||||
creative
|
creative
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local function N_(x) return x end
|
local function N_(x) return x end
|
||||||
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
unifieddyes
|
unifieddyes
|
||||||
homedecor_i18n
|
|
||||||
creative
|
creative
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local function N_(x) return x end
|
local function N_(x) return x end
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
homedecor_i18n
|
|
||||||
building_blocks?
|
building_blocks?
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
-- Nodes that would affect the local temperature e.g. fans, heater, A/C
|
-- Nodes that would affect the local temperature e.g. fans, heater, A/C
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
homedecor.register("air_conditioner", {
|
homedecor.register("air_conditioner", {
|
||||||
description = S("Air Conditioner"),
|
description = S("Air Conditioner"),
|
||||||
|
@ -2,5 +2,4 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
building_blocks?
|
building_blocks?
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local clock_sbox = {
|
local clock_sbox = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
|
@ -1,3 +1,2 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
homedecor_i18n
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
minetest.register_node(":homedecor:cobweb_corner", {
|
minetest.register_node(":homedecor:cobweb_corner", {
|
||||||
description = S("Cobweb"),
|
description = S("Cobweb"),
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
-- crafts for common items that are used by more than one home decor component
|
-- crafts for common items that are used by more than one home decor component
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
-- items
|
-- items
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
default
|
default
|
||||||
homedecor_i18n
|
|
||||||
creative
|
creative
|
||||||
building_blocks?
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
-- vectors to place one node next to or behind another
|
-- vectors to place one node next to or behind another
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
-- This code supplies an oven/stove. Basically it's just a copy of the default furnace with different textures.
|
-- This code supplies an oven/stove. Basically it's just a copy of the default furnace with different textures.
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local function swap_node(pos, name)
|
local function swap_node(pos, name)
|
||||||
local node = minetest.get_node(pos)
|
local node = minetest.get_node(pos)
|
||||||
|
@ -3,11 +3,14 @@
|
|||||||
|
|
||||||
local modpath = minetest.get_modpath("homedecor_common")
|
local modpath = minetest.get_modpath("homedecor_common")
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
|
||||||
|
|
||||||
homedecor = {}
|
homedecor = {}
|
||||||
homedecor.modpath = modpath
|
homedecor.modpath = modpath
|
||||||
|
|
||||||
|
-- Intllib support
|
||||||
|
homedecor.gettext, homedecor.ngettext = dofile(modpath.."/intllib.lua")
|
||||||
|
|
||||||
|
local S = homedecor.gettext
|
||||||
|
|
||||||
-- Determine if the item being pointed at is the underside of a node (e.g a ceiling)
|
-- Determine if the item being pointed at is the underside of a node (e.g a ceiling)
|
||||||
function homedecor.find_ceiling(itemstack, placer, pointed_thing)
|
function homedecor.find_ceiling(itemstack, placer, pointed_thing)
|
||||||
-- most of this is copied from the rotate-and-place function in builtin
|
-- most of this is copied from the rotate-and-place function in builtin
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local default_can_dig = function(pos,player)
|
local default_can_dig = function(pos,player)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
|
@ -2,6 +2,5 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
doors
|
doors
|
||||||
mesecons?
|
mesecons?
|
||||||
|
@ -1,10 +1,13 @@
|
|||||||
-- Node definitions for Homedecor doors
|
-- Node definitions for Homedecor doors
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local function N_(x) return x end
|
local function N_(x) return x end
|
||||||
|
|
||||||
local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
|
local m_rules
|
||||||
|
if minetest.global_exists("mesecon") then
|
||||||
|
m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
|
||||||
|
end
|
||||||
|
|
||||||
-- doors
|
-- doors
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
homedecor_i18n
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
homedecor.register("power_outlet", {
|
homedecor.register("power_outlet", {
|
||||||
description = S("Power Outlet"),
|
description = S("Power Outlet"),
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
homedecor_i18n
|
|
||||||
moreblocks?
|
moreblocks?
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
-- Various home electronics
|
-- Various home electronics
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
homedecor.register("speaker", {
|
homedecor.register("speaker", {
|
||||||
description = S("Large Stereo Speaker"),
|
description = S("Large Stereo Speaker"),
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
creative
|
creative
|
||||||
moreblocks?
|
moreblocks?
|
||||||
building_blocks?
|
building_blocks?
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local function N_(x) return x end
|
local function N_(x) return x end
|
||||||
|
|
||||||
|
@ -2,5 +2,4 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
signs_lib?
|
signs_lib?
|
||||||
|
@ -14,7 +14,7 @@ if signs_modpath then
|
|||||||
sign_post_model = signs_lib.sign_post_model.nodebox
|
sign_post_model = signs_lib.sign_post_model.nodebox
|
||||||
end
|
end
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local materials = {
|
local materials = {
|
||||||
{ S("brass"), "brass" },
|
{ S("brass"), "brass" },
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
homedecor.register("coatrack_wallmount", {
|
homedecor.register("coatrack_wallmount", {
|
||||||
tiles = { homedecor.plain_wood },
|
tiles = { homedecor.plain_wood },
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
unifieddyes
|
unifieddyes
|
||||||
homedecor_i18n
|
|
||||||
wool
|
wool
|
||||||
moreblocks?
|
moreblocks?
|
||||||
technic?
|
technic?
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local table_colors = {
|
local table_colors = {
|
||||||
{ "", S("Table"), homedecor.plain_wood },
|
{ "", S("Table"), homedecor.plain_wood },
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
homedecor_i18n
|
|
||||||
creative
|
creative
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
homedecor.register("bars", {
|
homedecor.register("bars", {
|
||||||
description = S("Bars"),
|
description = S("Bars"),
|
||||||
|
@ -2,7 +2,6 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
creative
|
creative
|
||||||
currency?
|
currency?
|
||||||
bucket?
|
bucket?
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local cutlery_cbox = {
|
local cutlery_cbox = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
|
@ -1 +0,0 @@
|
|||||||
intllib?
|
|
@ -1,7 +0,0 @@
|
|||||||
|
|
||||||
-- This file intentionally left blank.
|
|
||||||
|
|
||||||
homedecor_i18n = { }
|
|
||||||
|
|
||||||
local MP = minetest.get_modpath(minetest.get_current_modname())
|
|
||||||
homedecor_i18n.gettext, homedecor_i18n.ngettext = dofile(MP.."/intllib.lua")
|
|
@ -2,7 +2,6 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
moreblocks?
|
moreblocks?
|
||||||
building_blocks?
|
building_blocks?
|
||||||
technic?
|
technic?
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
-- This file supplies Kitchen stuff like refrigerators, sinks, etc.
|
-- This file supplies Kitchen stuff like refrigerators, sinks, etc.
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local function N_(x) return x end
|
local function N_(x) return x end
|
||||||
|
|
||||||
@ -138,8 +138,6 @@ homedecor.register("dishwasher_"..m, {
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
|
||||||
|
|
||||||
local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png"
|
local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png"
|
||||||
local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)"
|
local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)"
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
homedecor_i18n
|
|
||||||
bucket?
|
bucket?
|
||||||
|
@ -2,7 +2,6 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
unifieddyes
|
unifieddyes
|
||||||
homedecor_i18n
|
|
||||||
creative
|
creative
|
||||||
moreblocks?
|
moreblocks?
|
||||||
building_blocks?
|
building_blocks?
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
-- This file supplies glowlights
|
-- This file supplies glowlights
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local glowlight_nodebox = {
|
local glowlight_nodebox = {
|
||||||
half = homedecor.nodebox.slab_y(1/2),
|
half = homedecor.nodebox.slab_y(1/2),
|
||||||
|
@ -2,7 +2,6 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
unifieddyes
|
unifieddyes
|
||||||
homedecor_i18n
|
|
||||||
building_blocks?
|
building_blocks?
|
||||||
technic?
|
technic?
|
||||||
bucket?
|
bucket?
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
-- The code for ovens, nightstands, refrigerators are basically modified
|
-- The code for ovens, nightstands, refrigerators are basically modified
|
||||||
-- copies of the code for chests and furnaces.
|
-- copies of the code for chests and furnaces.
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
homedecor.register("ceiling_paint", {
|
homedecor.register("ceiling_paint", {
|
||||||
description = S("Textured Ceiling Paint"),
|
description = S("Textured Ceiling Paint"),
|
||||||
@ -470,7 +470,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
|
|||||||
}
|
}
|
||||||
|
|
||||||
if side ~= "horizontal" then
|
if side ~= "horizontal" then
|
||||||
def.groups.not_in_creative_inventory = 1
|
def.groups.not_in_creative_inventory = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
if name == "wood" then
|
if name == "wood" then
|
||||||
@ -489,7 +489,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
|
|||||||
homedecor.white_wood
|
homedecor.white_wood
|
||||||
}
|
}
|
||||||
def2.inventory_image = "homedecor_banister_wood_colored_inv.png"
|
def2.inventory_image = "homedecor_banister_wood_colored_inv.png"
|
||||||
def2.groups.not_in_creative_inventory = 1
|
def2.groups.not_in_creative_inventory = 1
|
||||||
|
|
||||||
unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal")
|
unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal")
|
||||||
end
|
end
|
||||||
@ -630,7 +630,7 @@ homedecor.register("dartboard", {
|
|||||||
--
|
--
|
||||||
-- Mostly my own code; overall template borrowed from game default
|
-- Mostly my own code; overall template borrowed from game default
|
||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
minetest.register_craft( {
|
minetest.register_craft( {
|
||||||
output = "homedecor:flower_pot_terracotta",
|
output = "homedecor:flower_pot_terracotta",
|
||||||
|
@ -2,6 +2,5 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
moreblocks?
|
moreblocks?
|
||||||
building_blocks?
|
building_blocks?
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
homedecor.register("filing_cabinet", {
|
homedecor.register("filing_cabinet", {
|
||||||
description = S("Filing cabinet"),
|
description = S("Filing cabinet"),
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local pframe_cbox = {
|
local pframe_cbox = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local function N_(x) return x end
|
local function N_(x) return x end
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
homedecor_common
|
homedecor_common
|
||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
homedecor_i18n
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
-- Various kinds of tables
|
-- Various kinds of tables
|
||||||
|
|
||||||
|
@ -2,4 +2,3 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
dye
|
dye
|
||||||
homedecor_i18n
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local tg_cbox = {
|
local tg_cbox = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
|
@ -2,5 +2,4 @@ homedecor_common
|
|||||||
default
|
default
|
||||||
basic_materials
|
basic_materials
|
||||||
unifieddyes
|
unifieddyes
|
||||||
homedecor_i18n
|
|
||||||
building_blocks?
|
building_blocks?
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
homedecor.register("window_quartered", {
|
homedecor.register("window_quartered", {
|
||||||
description = S("Window (quartered)"),
|
description = S("Window (quartered)"),
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
default
|
default
|
||||||
homedecor_i18n
|
homedecor_common
|
||||||
screwdriver?
|
screwdriver?
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local inbox = {}
|
local inbox = {}
|
||||||
local screwdriver = rawget(_G, "screwdriver") or {}
|
local screwdriver = rawget(_G, "screwdriver") or {}
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
default
|
default
|
||||||
homedecor_i18n
|
homedecor_common
|
||||||
mesecons_mvps?
|
mesecons_mvps?
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local tmp = {}
|
local tmp = {}
|
||||||
screwdriver = screwdriver or {}
|
screwdriver = screwdriver or {}
|
||||||
@ -299,4 +299,4 @@ minetest.register_craft({
|
|||||||
if minetest.get_modpath("mesecons_mvps") then
|
if minetest.get_modpath("mesecons_mvps") then
|
||||||
mesecon.register_mvps_stopper("itemframes:frame")
|
mesecon.register_mvps_stopper("itemframes:frame")
|
||||||
mesecon.register_mvps_stopper("itemframes:pedestal")
|
mesecon.register_mvps_stopper("itemframes:pedestal")
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
wool
|
wool
|
||||||
bucket
|
bucket
|
||||||
homedecor_i18n
|
homedecor_common
|
||||||
unifieddyes
|
unifieddyes
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
lavalamp = {}
|
lavalamp = {}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
local armchair_cbox = {
|
local armchair_cbox = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
fixed = {
|
fixed = {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable")
|
minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable")
|
||||||
minetest.register_alias("lrfurn:coffeetable_front", "air")
|
minetest.register_alias("lrfurn:coffeetable_front", "air")
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
default
|
default
|
||||||
wool
|
wool
|
||||||
homedecor_i18n
|
homedecor_common
|
||||||
unifieddyes
|
unifieddyes
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
minetest.register_node("lrfurn:endtable", {
|
minetest.register_node("lrfurn:endtable", {
|
||||||
description = S("End Table"),
|
description = S("End Table"),
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
lrfurn = {}
|
lrfurn = {}
|
||||||
screwdriver = screwdriver or {}
|
screwdriver = screwdriver or {}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local longsofa_cbox = {
|
local longsofa_cbox = {
|
||||||
type = "wallmounted",
|
type = "wallmounted",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
local sofa_cbox = {
|
local sofa_cbox = {
|
||||||
type = "wallmounted",
|
type = "wallmounted",
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
default
|
default
|
||||||
homedecor_i18n
|
homedecor_common
|
||||||
homedecor_electronics
|
homedecor_electronics
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
local S = homedecor_i18n.gettext
|
local S = homedecor.gettext
|
||||||
|
|
||||||
screwdriver = screwdriver or {}
|
screwdriver = screwdriver or {}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user