diff --git a/.luacheckrc b/.luacheckrc index 0d05eedf..1161dfd6 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -14,6 +14,7 @@ read_globals = { "intllib", "default", "stairsplus", + "stairs", "signs_lib", "beds", "technic", diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 1ac24f52..065f7405 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -1,4 +1,4 @@ -local S = homedecor.gettext +local S = minetest.get_translator("building_blocks") 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 deleted file mode 100644 index a890df8d..00000000 --- a/building_blocks/depends.txt +++ /dev/null @@ -1,5 +0,0 @@ -default -homedecor_common -moreblocks? -gloopblocks? -stairs? diff --git a/building_blocks/init.lua b/building_blocks/init.lua index fbb81a48..4e2da83d 100644 --- a/building_blocks/init.lua +++ b/building_blocks/init.lua @@ -1,4 +1,3 @@ -local S = homedecor.gettext local modpath = minetest.get_modpath("building_blocks") dofile(modpath.."/alias.lua") diff --git a/building_blocks/locale/building_blocks.de.tr b/building_blocks/locale/building_blocks.de.tr new file mode 100644 index 00000000..51051638 --- /dev/null +++ b/building_blocks/locale/building_blocks.de.tr @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite=Granit + +### node_stairs.lua ### + +Adobe=Adobe +Adobe Slab=Adobestufe +Adobe Stair=Adobetreppe +Brobble Spread=Ziesterboden +Chess board tiling=Schachbrettkacheln +Fake Grass=Falsches Gras +Fake Grass Slab= +Fake Grass Stair= +Fireplace=Kamin +Grate=Rost +Grate Slab=Roststufe +Grate Stair=Rosttreppe +Gravel Spread=Kiesboden +Hardwood=Hartholz +Hardwood Slab=Hartholzstufe +Hardwood Stair=Hartholztreppe +Marble=Marmor +Marble Slab=Marmorstufe +Marble Stair=Marmortreppe +Roof block=Dachblock +Roof block Slab= +Roof block Stair= +Streak Free Glass=Schlierenfreies Glas +Streak Free Glass Slab= +Streak Free Glass Stair= +Tar=Teer +Tar Slab=Teerstufe +Tar Stair=Teertreppe +Tarmac Spread=Asphaltboden +Terrycloth towel=Frottiertuch +Wood Framed Glass=Holzrahmenglas +Wood Framed Glass Slab= +Wood Framed Glass Stair= + +### others.lua ### + +Small bundle of sticks=Kleines Bündel Stöcke +Tar Knife=Teermesser +Tar base=Teerbase diff --git a/building_blocks/locale/building_blocks.es.tr b/building_blocks/locale/building_blocks.es.tr new file mode 100644 index 00000000..1212d5fe --- /dev/null +++ b/building_blocks/locale/building_blocks.es.tr @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite=Granito + +### node_stairs.lua ### + +Adobe=Adobe +Adobe Slab=Losa de adobe +Adobe Stair=Escaleras de adobe +Brobble Spread=Mezcla de Ladroquines +Chess board tiling=Azulejos de ajedrez +Fake Grass=Hierba falsa +Fake Grass Slab= +Fake Grass Stair= +Fireplace=Chimenea +Grate=Reja +Grate Slab=Losa de rejas +Grate Stair=Escaleras de rejas +Gravel Spread=Mezcla de gravilla +Hardwood=Madera dura +Hardwood Slab=Losa de madera dura +Hardwood Stair=Escaleras de madera dura +Marble=Mármol +Marble Slab=Losa de mármol +Marble Stair=Escaleras de mármol +Roof block=Bloque de techo +Roof block Slab= +Roof block Stair= +Streak Free Glass=Vídrio sin rayas +Streak Free Glass Slab= +Streak Free Glass Stair= +Tar=Alquitrán +Tar Slab=Losa de alquitrán +Tar Stair=Escaleras de alquitrán +Tarmac Spread=Mezcla de asfalto +Terrycloth towel=Toalla +Wood Framed Glass=Vídrio enmarcado en madera +Wood Framed Glass Slab= +Wood Framed Glass Stair= + +### others.lua ### + +Small bundle of sticks=Manojo de palitos +Tar Knife=Cuchillo de alquitrán +Tar base=Base de alquitrán diff --git a/building_blocks/locale/building_blocks.fr.tr b/building_blocks/locale/building_blocks.fr.tr new file mode 100644 index 00000000..4ea5fb29 --- /dev/null +++ b/building_blocks/locale/building_blocks.fr.tr @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite=Granit + +### node_stairs.lua ### + +Adobe=Pisé +Adobe Slab=Dalle en pisé +Adobe Stair=Escalier en pisé +Brobble Spread=Tapis rouge +Chess board tiling=Pavage en échiquier +Fake Grass=Herbe synthétique +Fake Grass Slab=Dalle en herbe synthétique +Fake Grass Stair=Escalier en herbe synthétique +Fireplace=Cheminée +Grate=Grille +Grate Slab=Dalle en métal déployé +Grate Stair=Escalier en métal déployé +Gravel Spread=Tapis de gravier +Hardwood=Bois dur (feuillu) +Hardwood Slab=Dalle en bois dur (feuillu) +Hardwood Stair=Escalier en bois dur (feuillu) +Marble=Marbre +Marble Slab=Dalle en marbre +Marble Stair=Marche en marbre +Roof block=Bloc de toit +Roof block Slab=Dalle en bloc de toit +Roof block Stair=Escalier en bloc de toit +Streak Free Glass=Verre anti-rayures +Streak Free Glass Slab=Dalle en verre anti-rayures +Streak Free Glass Stair=Escalier en verre anti-rayures +Tar=Goudron +Tar Slab=Dalle en goudron +Tar Stair=Marche en goudron +Tarmac Spread=Tapis de goudron +Terrycloth towel=Serviette éponge +Wood Framed Glass=Verre encadré de bois +Wood Framed Glass Slab=Dalle en verre encadré de bois +Wood Framed Glass Stair=Escalier en verre encadré de bois + +### others.lua ### + +Small bundle of sticks=Petit fagot de brindilles +Tar Knife=Couteau à goudron +Tar base=Pâte de goudron diff --git a/building_blocks/locale/building_blocks.ms.tr b/building_blocks/locale/building_blocks.ms.tr new file mode 100644 index 00000000..e13b93b8 --- /dev/null +++ b/building_blocks/locale/building_blocks.ms.tr @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite=Granit + +### node_stairs.lua ### + +Adobe=Adob +Adobe Slab=Bidur Adob +Adobe Stair=Tangga Adob +Brobble Spread=Sebaran Batu Merah +Chess board tiling=Jubin Papan Catur +Fake Grass=Rumput Tiruan +Fake Grass Slab= +Fake Grass Stair= +Fireplace=Pendiangan +Grate=Jeriji +Grate Slab=Bidur Jeriji +Grate Stair=Tangga Jeriji +Gravel Spread=Sebaran Kelikir +Hardwood=Kayu Keras +Hardwood Slab=Bidur Kayu Keras +Hardwood Stair=Tangga Kayu Keras +Marble=Marmar +Marble Slab=Bidur Marmar +Marble Stair=Tangga Marmar +Roof block=Blok Bumbung +Roof block Slab= +Roof block Stair= +Streak Free Glass=Kaca Bebas Calar +Streak Free Glass Slab= +Streak Free Glass Stair= +Tar=Tar +Tar Slab=Bidur Tar +Tar Stair=Tangga Tar +Tarmac Spread=Sebaran Tar +Terrycloth towel=Kain Tuala +Wood Framed Glass=Kaca Berbingkai Kayu +Wood Framed Glass Slab= +Wood Framed Glass Stair= + +### others.lua ### + +Small bundle of sticks=Seberkas Kecil Serpihan Kayu +Tar Knife=Pisau Tar +Tar base=Campuran Tar diff --git a/building_blocks/locale/building_blocks.pt.tr b/building_blocks/locale/building_blocks.pt.tr new file mode 100644 index 00000000..0091e85e --- /dev/null +++ b/building_blocks/locale/building_blocks.pt.tr @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite=Granito + +### node_stairs.lua ### + +Adobe=Argila +Adobe Slab=Placa de argila +Adobe Stair=Escada de Argila +Brobble Spread=Calçado +Chess board tiling=Revestimento de xadrez +Fake Grass=Grama Falsa +Fake Grass Slab= +Fake Grass Stair= +Fireplace=Lareira +Grate=Grelha +Grate Slab=Placa de Grelha +Grate Stair=Escade de Grelha +Gravel Spread=Espalhamento de Cascalho +Hardwood=Madeira +Hardwood Slab=Placa de madeira +Hardwood Stair=Escada de madeira +Marble=Mármore +Marble Slab=Placa de Mármore +Marble Stair=Escada de mármore +Roof block=Bloco de telhado +Roof block Slab= +Roof block Stair= +Streak Free Glass=Vidro Sem Riscos +Streak Free Glass Slab= +Streak Free Glass Stair= +Tar=Alcatrão +Tar Slab=Placa de alcatrão +Tar Stair=Escada de alcatrão +Tarmac Spread=Espalhamento das Estradas +Terrycloth towel=Toalha de Roupinha +Wood Framed Glass=Vidro com Bordas de Madeira +Wood Framed Glass Slab= +Wood Framed Glass Stair= + +### others.lua ### + +Small bundle of sticks=Pequeno amontoado de gravetos +Tar Knife=Faca de Alcatrão +Tar base=Base para alcatrão diff --git a/building_blocks/locale/building_blocks.pt_BR.tr b/building_blocks/locale/building_blocks.pt_BR.tr new file mode 100644 index 00000000..0091e85e --- /dev/null +++ b/building_blocks/locale/building_blocks.pt_BR.tr @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite=Granito + +### node_stairs.lua ### + +Adobe=Argila +Adobe Slab=Placa de argila +Adobe Stair=Escada de Argila +Brobble Spread=Calçado +Chess board tiling=Revestimento de xadrez +Fake Grass=Grama Falsa +Fake Grass Slab= +Fake Grass Stair= +Fireplace=Lareira +Grate=Grelha +Grate Slab=Placa de Grelha +Grate Stair=Escade de Grelha +Gravel Spread=Espalhamento de Cascalho +Hardwood=Madeira +Hardwood Slab=Placa de madeira +Hardwood Stair=Escada de madeira +Marble=Mármore +Marble Slab=Placa de Mármore +Marble Stair=Escada de mármore +Roof block=Bloco de telhado +Roof block Slab= +Roof block Stair= +Streak Free Glass=Vidro Sem Riscos +Streak Free Glass Slab= +Streak Free Glass Stair= +Tar=Alcatrão +Tar Slab=Placa de alcatrão +Tar Stair=Escada de alcatrão +Tarmac Spread=Espalhamento das Estradas +Terrycloth towel=Toalha de Roupinha +Wood Framed Glass=Vidro com Bordas de Madeira +Wood Framed Glass Slab= +Wood Framed Glass Stair= + +### others.lua ### + +Small bundle of sticks=Pequeno amontoado de gravetos +Tar Knife=Faca de Alcatrão +Tar base=Base para alcatrão diff --git a/building_blocks/locale/building_blocks.ru.tr b/building_blocks/locale/building_blocks.ru.tr new file mode 100644 index 00000000..c7b5a106 --- /dev/null +++ b/building_blocks/locale/building_blocks.ru.tr @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite=Гранит + +### node_stairs.lua ### + +Adobe=Саман +Adobe Slab=Саманная плита +Adobe Stair=Саманная ступенька +Brobble Spread=Настил кирпичного булыжника +Chess board tiling=Шахматная плитка +Fake Grass=Псевдо трава +Fake Grass Slab= +Fake Grass Stair= +Fireplace=Камин +Grate=Каминная решётка +Grate Slab=Решётчатая плита +Grate Stair=Решётчатая ступенька +Gravel Spread=Настил гравия +Hardwood=Твёрдая древесина +Hardwood Slab=Плита из твёрдой древесины +Hardwood Stair=Ступенька из твёрдой древесины +Marble=Мрамор +Marble Slab=Мраморная блита +Marble Stair=Мраморная ступенька +Roof block=Кровельный блок +Roof block Slab= +Roof block Stair= +Streak Free Glass=Стекло без стыков +Streak Free Glass Slab= +Streak Free Glass Stair= +Tar=Смола +Tar Slab=Плита из смолы +Tar Stair=Ступенька из смолы +Tarmac Spread=Покрытие гудронной смолой +Terrycloth towel=Махровое полотенце +Wood Framed Glass=Деревянное окно +Wood Framed Glass Slab= +Wood Framed Glass Stair= + +### others.lua ### + +Small bundle of sticks=Небольшая связка палок +Tar Knife=Смоляной нож +Tar base=Смоляная основа diff --git a/building_blocks/locale/building_blocks.zh_CN.tr b/building_blocks/locale/building_blocks.zh_CN.tr new file mode 100644 index 00000000..f140881b --- /dev/null +++ b/building_blocks/locale/building_blocks.zh_CN.tr @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite=花岗岩 + +### node_stairs.lua ### + +Adobe=土砖 +Adobe Slab= +Adobe Stair= +Brobble Spread=石砖路面 +Chess board tiling=棋盘铺贴 +Fake Grass=塑料草 +Fake Grass Slab= +Fake Grass Stair= +Fireplace=壁炉 +Grate=磨碎 +Grate Slab= +Grate Stair= +Gravel Spread=碎石路面 +Hardwood=硬木 +Hardwood Slab= +Hardwood Stair= +Marble=大理石 +Marble Slab= +Marble Stair= +Roof block=天台 +Roof block Slab= +Roof block Stair= +Streak Free Glass=无条纹玻璃 +Streak Free Glass Slab= +Streak Free Glass Stair= +Tar=焦油 +Tar Slab= +Tar Stair= +Tarmac Spread=柏油路面 +Terrycloth towel=毛巾 +Wood Framed Glass=木框玻璃 +Wood Framed Glass Slab= +Wood Framed Glass Stair= + +### others.lua ### + +Small bundle of sticks=小捆棍子 +Tar Knife=焦油刀 +Tar base=焦油基 diff --git a/building_blocks/locale/template.txt b/building_blocks/locale/template.txt new file mode 100644 index 00000000..d69b8337 --- /dev/null +++ b/building_blocks/locale/template.txt @@ -0,0 +1,48 @@ +# textdomain: building_blocks + + +### alias.lua ### + +Granite= + +### node_stairs.lua ### + +Adobe= +Adobe Slab= +Adobe Stair= +Brobble Spread= +Chess board tiling= +Fake Grass= +Fake Grass Slab= +Fake Grass Stair= +Fireplace= +Grate= +Grate Slab= +Grate Stair= +Gravel Spread= +Hardwood= +Hardwood Slab= +Hardwood Stair= +Marble= +Marble Slab= +Marble Stair= +Roof block= +Roof block Slab= +Roof block Stair= +Streak Free Glass= +Streak Free Glass Slab= +Streak Free Glass Stair= +Tar= +Tar Slab= +Tar Stair= +Tarmac Spread= +Terrycloth towel= +Wood Framed Glass= +Wood Framed Glass Slab= +Wood Framed Glass Stair= + +### others.lua ### + +Small bundle of sticks= +Tar Knife= +Tar base= diff --git a/building_blocks/mod.conf b/building_blocks/mod.conf new file mode 100644 index 00000000..146d5ef6 --- /dev/null +++ b/building_blocks/mod.conf @@ -0,0 +1,3 @@ +name = building_blocks +depends = default +optional_depends = moreblocks, gloopblocks, stairs diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index daba5679..bfdabdf2 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -1,4 +1,4 @@ -local S = homedecor.gettext +local S = minetest.get_translator("building_blocks") local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"} @@ -29,9 +29,11 @@ local function building_blocks_stairs(nodename, def) stairs.register_stair_and_slab(name,nodename, stairs_groups, def.tiles, - ("%s Stair"):format(def.description), - ("%s Slab"):format(def.description), + def.stair_desc, + def.slab_desc, def.sounds + --FIXME: Missing descriptions for Inner and Outer stairs + -- See https://github.com/minetest/minetest_game/pull/2584 ) end end @@ -40,6 +42,8 @@ end building_blocks_stairs("building_blocks:grate", { drawtype = "glasslike", description = S("Grate"), + stair_desc = S("Grate Stair"), + slab = S("Grate Slab"), tiles = {"building_blocks_grate.png"}, paramtype = "light", sunlight_propagates = true, @@ -50,6 +54,8 @@ building_blocks_stairs("building_blocks:grate", { building_blocks_stairs("building_blocks:smoothglass", { drawtype = "glasslike", description = S("Streak Free Glass"), + stair_desc = S("Streak Free Glass Stair"), + slab_desc = S("Streak Free Glass Slab"), tiles = {"building_blocks_sglass.png"}, paramtype = "light", sunlight_propagates = true, @@ -60,6 +66,8 @@ building_blocks_stairs("building_blocks:smoothglass", { building_blocks_stairs("building_blocks:woodglass", { drawtype = "glasslike", description = S("Wood Framed Glass"), + stair_desc = S("Wood Framed Glass Stair"), + slab_desc = S("Wood Framed Glass Slab"), tiles = {"building_blocks_wglass.png"}, paramtype = "light", sunlight_propagates = true, @@ -71,6 +79,8 @@ building_blocks_stairs("building_blocks:woodglass", { building_blocks_stairs("building_blocks:Adobe", { tiles = {"building_blocks_Adobe.png"}, description = S("Adobe"), + stair_desc = S("Adobe Stair"), + slab_desc = S("Adobe Slab"), is_ground_content = true, groups = {crumbly=3}, sounds = default.node_sound_stone_defaults(), @@ -78,6 +88,8 @@ building_blocks_stairs("building_blocks:Adobe", { building_blocks_stairs("building_blocks:fakegrass", { tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, description = S("Fake Grass"), + stair_desc = S("Fake Grass Stair"), + slab_desc = S("Fake Grass Slab"), is_ground_content = true, groups = {crumbly=3}, sounds = default.node_sound_dirt_defaults({ @@ -88,6 +100,8 @@ building_blocks_stairs("building_blocks:hardwood", { tiles = {"building_blocks_hardwood.png"}, is_ground_content = true, description = S("Hardwood"), + stair_desc = S("Hardwood Stair"), + slab_desc = S("Hardwood Slab"), groups = {choppy=1,flammable=1}, sounds = default.node_sound_wood_defaults(), }) @@ -95,11 +109,15 @@ building_blocks_stairs("building_blocks:Roofing", { tiles = {"building_blocks_Roofing.png"}, is_ground_content = true, description = S("Roof block"), + stair_desc = S("Roof block Stair"), + slab_desc = S("Roof block Slab"), groups = {snappy=3}, sounds = default.node_sound_stone_defaults(), }) building_blocks_stairs("building_blocks:Tar", { description = S("Tar"), + stair_desc = S("Tar Stair"), + slab_desc = S("Tar Slab"), tiles = {"building_blocks_tar.png"}, is_ground_content = true, groups = {crumbly=1, tar_block = 1}, @@ -107,6 +125,8 @@ building_blocks_stairs("building_blocks:Tar", { }) building_blocks_stairs("building_blocks:Marble", { description = S("Marble"), + stair_desc = S("Marble Stair"), + slab_desc = S("Marble Slab"), tiles = {"building_blocks_marble.png"}, is_ground_content = true, groups = {cracky=3, marble = 1}, diff --git a/building_blocks/others.lua b/building_blocks/others.lua index 2cc613f9..39754e18 100644 --- a/building_blocks/others.lua +++ b/building_blocks/others.lua @@ -1,4 +1,4 @@ -local S = homedecor.gettext +local S = minetest.get_translator("building_blocks") minetest.register_craftitem("building_blocks:sticks", { description = S("Small bundle of sticks"), diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index 689643fe..b26cf44a 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -1,5 +1,3 @@ -local S = homedecor.gettext - if minetest.get_modpath("moreblocks") then minetest.register_craft({ output = 'building_blocks:sticks 2',