diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 8d6520b0..1ac24f52 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar") diff --git a/building_blocks/depends.txt b/building_blocks/depends.txt index 641d412a..a890df8d 100644 --- a/building_blocks/depends.txt +++ b/building_blocks/depends.txt @@ -1,5 +1,5 @@ default -homedecor_i18n +homedecor_common moreblocks? gloopblocks? stairs? diff --git a/building_blocks/init.lua b/building_blocks/init.lua index fc0c9e4c..fbb81a48 100644 --- a/building_blocks/init.lua +++ b/building_blocks/init.lua @@ -1,7 +1,7 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local modpath = minetest.get_modpath("building_blocks") dofile(modpath.."/alias.lua") dofile(modpath.."/node_stairs.lua") dofile(modpath.."/others.lua") -dofile(modpath.."/recipes.lua") \ No newline at end of file +dofile(modpath.."/recipes.lua") diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index b0fecb4c..daba5679 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext 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), def.sounds ) - end + end end end diff --git a/building_blocks/others.lua b/building_blocks/others.lua index 180aa707..2cc613f9 100644 --- a/building_blocks/others.lua +++ b/building_blocks/others.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_craftitem("building_blocks: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} } }, -}) \ No newline at end of file +}) diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index 42ac0a8b..689643fe 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext if minetest.get_modpath("moreblocks") then minetest.register_craft({ diff --git a/computer/computers.lua b/computer/computers.lua index b9d3dc47..06b04a93 100644 --- a/computer/computers.lua +++ b/computer/computers.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext -- Amiga 500 lookalike computer.register("computer:shefriendSOO", { diff --git a/computer/depends.txt b/computer/depends.txt index 947d2a71..997cb0b2 100644 --- a/computer/depends.txt +++ b/computer/depends.txt @@ -1,2 +1,2 @@ default -homedecor_i18n +homedecor_common diff --git a/computer/miscitems.lua b/computer/miscitems.lua index bbef89ba..1eb0634b 100644 --- a/computer/miscitems.lua +++ b/computer/miscitems.lua @@ -2,7 +2,7 @@ -- 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 diff --git a/computer/tetris.lua b/computer/tetris.lua index 023fc4d3..85e91513 100644 --- a/computer/tetris.lua +++ b/computer/tetris.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local shapes = { { { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } }, @@ -231,7 +231,7 @@ local function step(pos, fields) local scr = { formsize, background, t.boardstring, t.previewstring, 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 } diff --git a/fake_fire/depends.txt b/fake_fire/depends.txt index de194855..997cb0b2 100644 --- a/fake_fire/depends.txt +++ b/fake_fire/depends.txt @@ -1,2 +1,2 @@ -default -homedecor_i18n +default +homedecor_common diff --git a/fake_fire/init.lua b/fake_fire/init.lua index 55099768..6bdf0b21 100644 --- a/fake_fire/init.lua +++ b/fake_fire/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext screwdriver = screwdriver or {} diff --git a/homedecor_bathroom/depends.txt b/homedecor_bathroom/depends.txt index 949c189c..8cb6cfda 100644 --- a/homedecor_bathroom/depends.txt +++ b/homedecor_bathroom/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n building_blocks diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index 51f341bb..0811b700 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_node(":homedecor:bathroom_tiles_dark", { description = S("Bathroom/kitchen tiles (dark)"), @@ -115,9 +115,6 @@ homedecor.register("medicine_cabinet_open", { -- "Sanitation" related - -local S = homedecor_i18n.gettext - local toilet_sbox = { type = "fixed", fixed = { -6/16, -8/16, -8/16, 6/16, 9/16, 8/16 }, diff --git a/homedecor_bedroom/depends.txt b/homedecor_bedroom/depends.txt index 9242a25b..f2e42cf9 100644 --- a/homedecor_bedroom/depends.txt +++ b/homedecor_bedroom/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n creative diff --git a/homedecor_bedroom/init.lua b/homedecor_bedroom/init.lua index 86b00fe5..fc3f7339 100644 --- a/homedecor_bedroom/init.lua +++ b/homedecor_bedroom/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end diff --git a/homedecor_books/depends.txt b/homedecor_books/depends.txt index ed0ab327..ddb63ed1 100644 --- a/homedecor_books/depends.txt +++ b/homedecor_books/depends.txt @@ -1,6 +1,5 @@ homedecor_common default unifieddyes -homedecor_i18n creative diff --git a/homedecor_books/init.lua b/homedecor_books/init.lua index fb272c0b..3bdce05c 100644 --- a/homedecor_books/init.lua +++ b/homedecor_books/init.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end diff --git a/homedecor_climate_control/depends.txt b/homedecor_climate_control/depends.txt index aae5ef28..f37b6553 100644 --- a/homedecor_climate_control/depends.txt +++ b/homedecor_climate_control/depends.txt @@ -1,5 +1,4 @@ homedecor_common default basic_materials -homedecor_i18n building_blocks? diff --git a/homedecor_climate_control/init.lua b/homedecor_climate_control/init.lua index 75fe7aa9..5524f261 100644 --- a/homedecor_climate_control/init.lua +++ b/homedecor_climate_control/init.lua @@ -1,6 +1,6 @@ -- 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", { description = S("Air Conditioner"), diff --git a/homedecor_clocks/depends.txt b/homedecor_clocks/depends.txt index d581ebf7..ff3cb2b6 100644 --- a/homedecor_clocks/depends.txt +++ b/homedecor_clocks/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials dye -homedecor_i18n building_blocks? diff --git a/homedecor_clocks/init.lua b/homedecor_clocks/init.lua index 6bb610d7..42510601 100644 --- a/homedecor_clocks/init.lua +++ b/homedecor_clocks/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local clock_sbox = { type = "fixed", diff --git a/homedecor_cobweb/depends.txt b/homedecor_cobweb/depends.txt index b3703586..917d5132 100644 --- a/homedecor_cobweb/depends.txt +++ b/homedecor_cobweb/depends.txt @@ -1,3 +1,2 @@ homedecor_common default -homedecor_i18n diff --git a/homedecor_cobweb/init.lua b/homedecor_cobweb/init.lua index 0e7e0d75..eae886e2 100644 --- a/homedecor_cobweb/init.lua +++ b/homedecor_cobweb/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_node(":homedecor:cobweb_corner", { description = S("Cobweb"), diff --git a/homedecor_common/crafts.lua b/homedecor_common/crafts.lua index db76b7b9..547ef186 100644 --- a/homedecor_common/crafts.lua +++ b/homedecor_common/crafts.lua @@ -1,6 +1,6 @@ -- crafts for common items that are used by more than one home decor component -local S = homedecor_i18n.gettext +local S = homedecor.gettext -- items diff --git a/homedecor_common/depends.txt b/homedecor_common/depends.txt index b01e59f1..a78a220e 100644 --- a/homedecor_common/depends.txt +++ b/homedecor_common/depends.txt @@ -1,4 +1,3 @@ default -homedecor_i18n creative -building_blocks? + diff --git a/homedecor_common/expansion.lua b/homedecor_common/expansion.lua index bd87e90e..26efc6a8 100644 --- a/homedecor_common/expansion.lua +++ b/homedecor_common/expansion.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext -- vectors to place one node next to or behind another diff --git a/homedecor_common/furnaces.lua b/homedecor_common/furnaces.lua index 36a79391..d628273a 100644 --- a/homedecor_common/furnaces.lua +++ b/homedecor_common/furnaces.lua @@ -1,6 +1,6 @@ -- 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 node = minetest.get_node(pos) diff --git a/homedecor_common/init.lua b/homedecor_common/init.lua index 13392d8e..6d81c44b 100644 --- a/homedecor_common/init.lua +++ b/homedecor_common/init.lua @@ -3,11 +3,14 @@ local modpath = minetest.get_modpath("homedecor_common") -local S = homedecor_i18n.gettext - homedecor = {} 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) function homedecor.find_ceiling(itemstack, placer, pointed_thing) -- most of this is copied from the rotate-and-place function in builtin diff --git a/homedecor_i18n/intllib.lua b/homedecor_common/intllib.lua similarity index 100% rename from homedecor_i18n/intllib.lua rename to homedecor_common/intllib.lua diff --git a/homedecor_common/inventory.lua b/homedecor_common/inventory.lua index dd091339..2a49228c 100644 --- a/homedecor_common/inventory.lua +++ b/homedecor_common/inventory.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local default_can_dig = function(pos,player) local meta = minetest.get_meta(pos) diff --git a/homedecor_i18n/locale/de.po b/homedecor_common/locale/de.po similarity index 100% rename from homedecor_i18n/locale/de.po rename to homedecor_common/locale/de.po diff --git a/homedecor_i18n/locale/es.po b/homedecor_common/locale/es.po similarity index 100% rename from homedecor_i18n/locale/es.po rename to homedecor_common/locale/es.po diff --git a/homedecor_i18n/locale/fr.po b/homedecor_common/locale/fr.po similarity index 100% rename from homedecor_i18n/locale/fr.po rename to homedecor_common/locale/fr.po diff --git a/homedecor_i18n/locale/it.po b/homedecor_common/locale/it.po similarity index 100% rename from homedecor_i18n/locale/it.po rename to homedecor_common/locale/it.po diff --git a/homedecor_i18n/locale/ms.po b/homedecor_common/locale/ms.po similarity index 100% rename from homedecor_i18n/locale/ms.po rename to homedecor_common/locale/ms.po diff --git a/homedecor_i18n/locale/pt.po b/homedecor_common/locale/pt.po similarity index 100% rename from homedecor_i18n/locale/pt.po rename to homedecor_common/locale/pt.po diff --git a/homedecor_i18n/locale/pt_BR.po b/homedecor_common/locale/pt_BR.po similarity index 100% rename from homedecor_i18n/locale/pt_BR.po rename to homedecor_common/locale/pt_BR.po diff --git a/homedecor_i18n/locale/ru.po b/homedecor_common/locale/ru.po similarity index 100% rename from homedecor_i18n/locale/ru.po rename to homedecor_common/locale/ru.po diff --git a/homedecor_i18n/locale/template.pot b/homedecor_common/locale/template.pot similarity index 100% rename from homedecor_i18n/locale/template.pot rename to homedecor_common/locale/template.pot diff --git a/homedecor_i18n/tools/updatepo.sh b/homedecor_common/tools/updatepo.sh similarity index 100% rename from homedecor_i18n/tools/updatepo.sh rename to homedecor_common/tools/updatepo.sh diff --git a/homedecor_doors_and_gates/depends.txt b/homedecor_doors_and_gates/depends.txt index f111618f..b93a08fe 100644 --- a/homedecor_doors_and_gates/depends.txt +++ b/homedecor_doors_and_gates/depends.txt @@ -2,6 +2,5 @@ homedecor_common default basic_materials dye -homedecor_i18n doors mesecons? diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 5a76bf99..1435cbe3 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -1,10 +1,13 @@ -- Node definitions for Homedecor doors -local S = homedecor_i18n.gettext +local S = homedecor.gettext 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 diff --git a/homedecor_electrical/depends.txt b/homedecor_electrical/depends.txt index be47402e..fb5d6010 100644 --- a/homedecor_electrical/depends.txt +++ b/homedecor_electrical/depends.txt @@ -1,4 +1,3 @@ homedecor_common default basic_materials -homedecor_i18n diff --git a/homedecor_electrical/init.lua b/homedecor_electrical/init.lua index ae4dd8c0..c135021a 100644 --- a/homedecor_electrical/init.lua +++ b/homedecor_electrical/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("power_outlet", { description = S("Power Outlet"), diff --git a/homedecor_electronics/depends.txt b/homedecor_electronics/depends.txt index 54783361..68793864 100644 --- a/homedecor_electronics/depends.txt +++ b/homedecor_electronics/depends.txt @@ -1,5 +1,4 @@ homedecor_common default basic_materials -homedecor_i18n moreblocks? diff --git a/homedecor_electronics/init.lua b/homedecor_electronics/init.lua index 5843f034..004a6398 100644 --- a/homedecor_electronics/init.lua +++ b/homedecor_electronics/init.lua @@ -1,6 +1,6 @@ -- Various home electronics -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("speaker", { description = S("Large Stereo Speaker"), diff --git a/homedecor_exterior/depends.txt b/homedecor_exterior/depends.txt index 98c73413..4f9910bc 100644 --- a/homedecor_exterior/depends.txt +++ b/homedecor_exterior/depends.txt @@ -1,7 +1,6 @@ homedecor_common default dye -homedecor_i18n creative moreblocks? building_blocks? diff --git a/homedecor_exterior/init.lua b/homedecor_exterior/init.lua index a4bcb04f..efe3883f 100644 --- a/homedecor_exterior/init.lua +++ b/homedecor_exterior/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end diff --git a/homedecor_fences/depends.txt b/homedecor_fences/depends.txt index bb6198ed..8505ec7c 100644 --- a/homedecor_fences/depends.txt +++ b/homedecor_fences/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials dye -homedecor_i18n signs_lib? diff --git a/homedecor_fences/init.lua b/homedecor_fences/init.lua index 7742d7ad..94badf60 100644 --- a/homedecor_fences/init.lua +++ b/homedecor_fences/init.lua @@ -14,7 +14,7 @@ if signs_modpath then sign_post_model = signs_lib.sign_post_model.nodebox end -local S = homedecor_i18n.gettext +local S = homedecor.gettext local materials = { { S("brass"), "brass" }, diff --git a/homedecor_foyer/depends.txt b/homedecor_foyer/depends.txt index 2a66bdcf..d0de51e9 100644 --- a/homedecor_foyer/depends.txt +++ b/homedecor_foyer/depends.txt @@ -1,4 +1,3 @@ homedecor_common default dye -homedecor_i18n diff --git a/homedecor_foyer/init.lua b/homedecor_foyer/init.lua index baa07771..0b466f3c 100644 --- a/homedecor_foyer/init.lua +++ b/homedecor_foyer/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("coatrack_wallmount", { tiles = { homedecor.plain_wood }, diff --git a/homedecor_furniture/depends.txt b/homedecor_furniture/depends.txt index 5bb2547c..016b9c4a 100644 --- a/homedecor_furniture/depends.txt +++ b/homedecor_furniture/depends.txt @@ -1,7 +1,6 @@ homedecor_common default unifieddyes -homedecor_i18n wool moreblocks? technic? diff --git a/homedecor_furniture/init.lua b/homedecor_furniture/init.lua index cf0666ff..108f28d2 100644 --- a/homedecor_furniture/init.lua +++ b/homedecor_furniture/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local table_colors = { { "", S("Table"), homedecor.plain_wood }, diff --git a/homedecor_furniture_medieval/depends.txt b/homedecor_furniture_medieval/depends.txt index 4948e7e6..dccb7bc8 100644 --- a/homedecor_furniture_medieval/depends.txt +++ b/homedecor_furniture_medieval/depends.txt @@ -1,4 +1,3 @@ homedecor_common default -homedecor_i18n creative diff --git a/homedecor_furniture_medieval/init.lua b/homedecor_furniture_medieval/init.lua index e0932a44..9fb9a9ef 100644 --- a/homedecor_furniture_medieval/init.lua +++ b/homedecor_furniture_medieval/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("bars", { description = S("Bars"), diff --git a/homedecor_gastronomy/depends.txt b/homedecor_gastronomy/depends.txt index cd30824b..c378b98e 100644 --- a/homedecor_gastronomy/depends.txt +++ b/homedecor_gastronomy/depends.txt @@ -2,7 +2,6 @@ homedecor_common default basic_materials dye -homedecor_i18n creative currency? bucket? diff --git a/homedecor_gastronomy/init.lua b/homedecor_gastronomy/init.lua index eef49f00..2d0a3996 100644 --- a/homedecor_gastronomy/init.lua +++ b/homedecor_gastronomy/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local cutlery_cbox = { type = "fixed", diff --git a/homedecor_i18n/depends.txt b/homedecor_i18n/depends.txt deleted file mode 100644 index 77e8d97c..00000000 --- a/homedecor_i18n/depends.txt +++ /dev/null @@ -1 +0,0 @@ -intllib? diff --git a/homedecor_i18n/init.lua b/homedecor_i18n/init.lua deleted file mode 100644 index 1256ff19..00000000 --- a/homedecor_i18n/init.lua +++ /dev/null @@ -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") diff --git a/homedecor_kitchen/depends.txt b/homedecor_kitchen/depends.txt index b01982e0..d122ec02 100644 --- a/homedecor_kitchen/depends.txt +++ b/homedecor_kitchen/depends.txt @@ -2,7 +2,6 @@ homedecor_common default basic_materials dye -homedecor_i18n moreblocks? building_blocks? technic? diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index 38275a97..56cc9c75 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -1,6 +1,6 @@ -- 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 @@ -138,8 +138,6 @@ homedecor.register("dishwasher_"..m, { }) end -local S = homedecor_i18n.gettext - 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)" diff --git a/homedecor_laundry/depends.txt b/homedecor_laundry/depends.txt index 480f9332..4536f367 100644 --- a/homedecor_laundry/depends.txt +++ b/homedecor_laundry/depends.txt @@ -1,5 +1,4 @@ homedecor_common default basic_materials -homedecor_i18n bucket? diff --git a/homedecor_lighting/depends.txt b/homedecor_lighting/depends.txt index 4187addc..67304af7 100644 --- a/homedecor_lighting/depends.txt +++ b/homedecor_lighting/depends.txt @@ -2,7 +2,6 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n creative moreblocks? building_blocks? diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index 2e508021..e5e0df71 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -1,6 +1,6 @@ -- This file supplies glowlights -local S = homedecor_i18n.gettext +local S = homedecor.gettext local glowlight_nodebox = { half = homedecor.nodebox.slab_y(1/2), diff --git a/homedecor_misc/depends.txt b/homedecor_misc/depends.txt index 2d48d544..92ae6dc6 100644 --- a/homedecor_misc/depends.txt +++ b/homedecor_misc/depends.txt @@ -2,7 +2,6 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n building_blocks? technic? bucket? diff --git a/homedecor_misc/init.lua b/homedecor_misc/init.lua index 548d728d..afeee27e 100644 --- a/homedecor_misc/init.lua +++ b/homedecor_misc/init.lua @@ -7,7 +7,7 @@ -- The code for ovens, nightstands, refrigerators are basically modified -- copies of the code for chests and furnaces. -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("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 - def.groups.not_in_creative_inventory = 1 + def.groups.not_in_creative_inventory = 1 end if name == "wood" then @@ -489,7 +489,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do homedecor.white_wood } 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") end @@ -630,7 +630,7 @@ homedecor.register("dartboard", { -- -- Mostly my own code; overall template borrowed from game default -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_craft( { output = "homedecor:flower_pot_terracotta", diff --git a/homedecor_office/depends.txt b/homedecor_office/depends.txt index 43559e02..f3234aeb 100644 --- a/homedecor_office/depends.txt +++ b/homedecor_office/depends.txt @@ -2,6 +2,5 @@ homedecor_common default basic_materials dye -homedecor_i18n moreblocks? building_blocks? diff --git a/homedecor_office/init.lua b/homedecor_office/init.lua index 7a7f4525..e6deb152 100644 --- a/homedecor_office/init.lua +++ b/homedecor_office/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("filing_cabinet", { description = S("Filing cabinet"), diff --git a/homedecor_pictures_and_paintings/depends.txt b/homedecor_pictures_and_paintings/depends.txt index 2a66bdcf..d0de51e9 100644 --- a/homedecor_pictures_and_paintings/depends.txt +++ b/homedecor_pictures_and_paintings/depends.txt @@ -1,4 +1,3 @@ homedecor_common default dye -homedecor_i18n diff --git a/homedecor_pictures_and_paintings/init.lua b/homedecor_pictures_and_paintings/init.lua index e0377a7f..66081074 100644 --- a/homedecor_pictures_and_paintings/init.lua +++ b/homedecor_pictures_and_paintings/init.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local pframe_cbox = { type = "fixed", diff --git a/homedecor_roofing/depends.txt b/homedecor_roofing/depends.txt index 2a66bdcf..d0de51e9 100644 --- a/homedecor_roofing/depends.txt +++ b/homedecor_roofing/depends.txt @@ -1,4 +1,3 @@ homedecor_common default dye -homedecor_i18n diff --git a/homedecor_roofing/init.lua b/homedecor_roofing/init.lua index 4d24e0b7..31f2a1e2 100644 --- a/homedecor_roofing/init.lua +++ b/homedecor_roofing/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local function N_(x) return x end diff --git a/homedecor_tables/depends.txt b/homedecor_tables/depends.txt index be47402e..fb5d6010 100644 --- a/homedecor_tables/depends.txt +++ b/homedecor_tables/depends.txt @@ -1,4 +1,3 @@ homedecor_common default basic_materials -homedecor_i18n diff --git a/homedecor_tables/init.lua b/homedecor_tables/init.lua index 7fb5dee7..d32b51db 100644 --- a/homedecor_tables/init.lua +++ b/homedecor_tables/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext -- Various kinds of tables diff --git a/homedecor_trash_cans/depends.txt b/homedecor_trash_cans/depends.txt index 2d665e31..ac31e7dd 100644 --- a/homedecor_trash_cans/depends.txt +++ b/homedecor_trash_cans/depends.txt @@ -2,4 +2,3 @@ homedecor_common default basic_materials dye -homedecor_i18n diff --git a/homedecor_trash_cans/init.lua b/homedecor_trash_cans/init.lua index 0791a316..dbd4e111 100644 --- a/homedecor_trash_cans/init.lua +++ b/homedecor_trash_cans/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local tg_cbox = { type = "fixed", diff --git a/homedecor_windows_and_treatments/depends.txt b/homedecor_windows_and_treatments/depends.txt index ef56acdf..8c8316ab 100644 --- a/homedecor_windows_and_treatments/depends.txt +++ b/homedecor_windows_and_treatments/depends.txt @@ -2,5 +2,4 @@ homedecor_common default basic_materials unifieddyes -homedecor_i18n building_blocks? diff --git a/homedecor_windows_and_treatments/init.lua b/homedecor_windows_and_treatments/init.lua index 7a58ab25..04bc3765 100644 --- a/homedecor_windows_and_treatments/init.lua +++ b/homedecor_windows_and_treatments/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext homedecor.register("window_quartered", { description = S("Window (quartered)"), diff --git a/inbox/depends.txt b/inbox/depends.txt index ace758c7..e13666d7 100644 --- a/inbox/depends.txt +++ b/inbox/depends.txt @@ -1,3 +1,3 @@ default -homedecor_i18n +homedecor_common screwdriver? diff --git a/inbox/init.lua b/inbox/init.lua index 5ee77a8c..29c17455 100644 --- a/inbox/init.lua +++ b/inbox/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local inbox = {} local screwdriver = rawget(_G, "screwdriver") or {} diff --git a/itemframes/depends.txt b/itemframes/depends.txt index 29ebd95a..ae7019b6 100644 --- a/itemframes/depends.txt +++ b/itemframes/depends.txt @@ -1,3 +1,3 @@ default -homedecor_i18n +homedecor_common mesecons_mvps? diff --git a/itemframes/init.lua b/itemframes/init.lua index 21fac2f3..d424c383 100644 --- a/itemframes/init.lua +++ b/itemframes/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local tmp = {} screwdriver = screwdriver or {} @@ -299,4 +299,4 @@ minetest.register_craft({ if minetest.get_modpath("mesecons_mvps") then mesecon.register_mvps_stopper("itemframes:frame") mesecon.register_mvps_stopper("itemframes:pedestal") -end \ No newline at end of file +end diff --git a/lavalamp/depends.txt b/lavalamp/depends.txt index 99442029..bbc40a75 100644 --- a/lavalamp/depends.txt +++ b/lavalamp/depends.txt @@ -1,4 +1,4 @@ wool bucket -homedecor_i18n +homedecor_common unifieddyes diff --git a/lavalamp/init.lua b/lavalamp/init.lua index 756bf1d3..fd1a8150 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext lavalamp = {} diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua index fcb84e57..6950cad0 100644 --- a/lrfurn/armchairs.lua +++ b/lrfurn/armchairs.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local armchair_cbox = { type = "fixed", fixed = { diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua index 827657ac..8b095cec 100644 --- a/lrfurn/coffeetable.lua +++ b/lrfurn/coffeetable.lua @@ -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_front", "air") diff --git a/lrfurn/depends.txt b/lrfurn/depends.txt index 973de176..398a4107 100644 --- a/lrfurn/depends.txt +++ b/lrfurn/depends.txt @@ -1,4 +1,4 @@ default wool -homedecor_i18n +homedecor_common unifieddyes diff --git a/lrfurn/endtable.lua b/lrfurn/endtable.lua index a318376f..470e907e 100644 --- a/lrfurn/endtable.lua +++ b/lrfurn/endtable.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext minetest.register_node("lrfurn:endtable", { description = S("End Table"), diff --git a/lrfurn/init.lua b/lrfurn/init.lua index 631e79a4..a23aff4f 100644 --- a/lrfurn/init.lua +++ b/lrfurn/init.lua @@ -1,4 +1,4 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext lrfurn = {} screwdriver = screwdriver or {} diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua index eeb3ca23..2df177c8 100644 --- a/lrfurn/longsofas.lua +++ b/lrfurn/longsofas.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local longsofa_cbox = { type = "wallmounted", diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua index 6f89beaf..7d1cd53a 100644 --- a/lrfurn/sofas.lua +++ b/lrfurn/sofas.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext local sofa_cbox = { type = "wallmounted", diff --git a/plasmascreen/depends.txt b/plasmascreen/depends.txt index 3ea0d975..5a0ba066 100644 --- a/plasmascreen/depends.txt +++ b/plasmascreen/depends.txt @@ -1,3 +1,3 @@ default -homedecor_i18n +homedecor_common homedecor_electronics diff --git a/plasmascreen/init.lua b/plasmascreen/init.lua index 183d1f93..37ec395d 100644 --- a/plasmascreen/init.lua +++ b/plasmascreen/init.lua @@ -1,5 +1,5 @@ -local S = homedecor_i18n.gettext +local S = homedecor.gettext screwdriver = screwdriver or {}