From 457237049be5fc9e0e4aa3ddb86ebd5e592f499f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikita=20Wi=C5=9Bniewski?= Date: Sat, 22 Apr 2023 08:07:44 +0700 Subject: [PATCH] Prepare branch for merge pt. 1 (fixes #21) update locales, fix use_texture_alpha = 'clip' warnings, fix birch slab tables (we didn't have those apparently XD) --- colored.lua | 2 ++ locale/mcl_decor.fr.tr | 4 ++++ locale/mcl_decor.ru.tr | 4 ++++ locale/template.txt | 4 ++++ misc.lua | 1 + wooden.lua | 1 + 6 files changed, 16 insertions(+) diff --git a/colored.lua b/colored.lua index 940e4e8..32f66c7 100644 --- a/colored.lua +++ b/colored.lua @@ -102,6 +102,7 @@ for _, row in ipairs(mcl_decor.colors) do wooltile..".png".."^mcl_decor_curtain_overlay.png^[transformFY", wooltile..".png".."^mcl_decor_curtain_alpha.png^[makealpha:255,126,126^mcl_decor_curtain_overlay.png", }, + use_texture_alpha = "clip", stack_max = 64, inventory_image = wooltile..".png".."^mcl_decor_curtain_alpha.png^[makealpha:255,126,126^mcl_decor_curtain_overlay.png", wield_image = wooltile..".png".."^mcl_decor_curtain_alpha.png^[makealpha:255,126,126^mcl_decor_curtain_overlay.png", @@ -133,6 +134,7 @@ for _, row in ipairs(mcl_decor.colors) do wooltile..".png".."^mcl_decor_curtain_overlay.png^[transformFY", wooltile..".png".."^mcl_decor_curtain_overlay.png", }, + use_texture_alpha = "clip", walkable = false, sunlight_propagates = true, drawtype = "nodebox", diff --git a/locale/mcl_decor.fr.tr b/locale/mcl_decor.fr.tr index 8c1aa51..9c89890 100644 --- a/locale/mcl_decor.fr.tr +++ b/locale/mcl_decor.fr.tr @@ -23,6 +23,7 @@ Spruce Chair=Chaise en Sapin Mangrove Chair=Chaise en Palétuvier Crimson Chair=Chaise Carmin Warped Chair=Chaise Biscornue +Bamboo Chair= Oak Table=Table en Chêne Acacia Table=Table en Acacia Birch Table=Table en Bouleau @@ -32,6 +33,7 @@ Spruce Table=Table en Sapin Mangrove Table=Table en Palétuvier Crimson Table=Table Carmin Warped Table=Table Biscornue +Bamboo Table= Oak Slab Table=Table Basse en Chêne Dark Oak Slab Table=Table Basse en Chêne Noir Jungle Slab Table=Table Basse en Acajou @@ -41,6 +43,7 @@ Birch Slab Table=Table Basse en Bouleau Mangrove Slab Table=Table Basse en Palétuvier Crimson Slab Table=Table Basse Carmin Warped Slab Table=Table Basse Biscornue +Bamboo Slab Table= Oak Hedge=Haie de Chêne Dark Oak Hedge=Haie de Chêne Noir Jungle Hedge=Haie d'Acajou @@ -96,6 +99,7 @@ Brown Curtains=Rideaux Marron Pink Curtains=Rideaux Rose Lime Curtains=Rideaux Vert Clair Light Blue Curtains=Rideaux Bleu Clair +Oven= Stair= Escalier Slab= Dalle Double=Double diff --git a/locale/mcl_decor.ru.tr b/locale/mcl_decor.ru.tr index c3361a3..1c95432 100644 --- a/locale/mcl_decor.ru.tr +++ b/locale/mcl_decor.ru.tr @@ -23,6 +23,7 @@ Spruce Chair=Еловый стул Mangrove Chair=Мангровый стул Crimson Chair=Багровый стул Warped Chair=Искажённый стул +Bamboo Chair=Бамбуковый стул Oak Table=Дубовый стол Acacia Table=Стол из акации Birch Table=Берёзовый стол @@ -32,6 +33,7 @@ Spruce Table=Еловый стол Mangrove Table=Мангровый стол Crimson Table=Багровый стол Warped Table=Искажённый стол +Bamboo Table=Бамбуковый стол Oak Slab Table=Дубовый полублочный стол Dark Oak Slab Table=Полублочный стол из тёмного дуба Jungle Slab Table=Полублочный стол из тропического дерева @@ -41,6 +43,7 @@ Birch Slab Table=Берёзовый полублочный стол Mangrove Slab Table=Мангровый полублочный стол Crimson Slab Table=Багровый полублочный стол Warped Slab Table=Искажённый полублочный стол +Bamboo Slab Table=Бамбуковый полублочный стол Oak Hedge=Дубовая живая изгородь Dark Oak Hedge=Живая изгородь из тёмного дуба Jungle Hedge=Живая изгородь из тропического дерева @@ -96,6 +99,7 @@ Brown Armchair=Коричневые шторы Pink Armchair=Розовые шторы Lime Armchair=Зелёные лаймовые шторы Light Blue Armchair=Светло-голубые шторы +Oven=Духовка Stair= Ступенька Slab= Плита Double=Двойная diff --git a/locale/template.txt b/locale/template.txt index 73d36f6..1aa7d97 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -23,6 +23,7 @@ Spruce Chair= Mangrove Chair= Crimson Chair= Warped Chair= +Bamboo Chair= Oak Table= Acacia Table= Birch Table= @@ -32,6 +33,7 @@ Spruce Table= Mangrove Table= Crimson Table= Warped Table= +Bamboo Table= Oak Slab Table= Dark Oak Slab Table= Jungle Slab Table= @@ -41,6 +43,7 @@ Birch Slab Table= Mangrove Slab Table= Crimson Slab Table= Warped Slab Table= +Bamboo Slab Table= Oak Hedge= Dark Oak Hedge= Jungle Hedge= @@ -96,6 +99,7 @@ Brown Curtains= Pink Curtains= Lime Curtains= Light Blue Curtains= +Oven= Stair= Slab= Double= diff --git a/misc.lua b/misc.lua index 4f580cd..81e3df3 100644 --- a/misc.lua +++ b/misc.lua @@ -34,6 +34,7 @@ mcl_stairs.register_stair_and_slab_simple("coalquartz_tile", "mcl_decor:coalquar minetest.register_node("mcl_decor:table_lamp", { description = S("Table Lamp"), tiles = {"mcl_decor_table_lamp.png"}, + use_texture_alpha = "clip", drawtype = "mesh", mesh = "mcl_decor_table_lamp.obj", paramtype = "light", diff --git a/wooden.lua b/wooden.lua index 0f5d2f1..1477648 100644 --- a/wooden.lua +++ b/wooden.lua @@ -164,6 +164,7 @@ mcl_decor.register_slab_table("dark_oak", S("Dark Oak Slab Table"), "mcl_core:da mcl_decor.register_slab_table("jungle", S("Jungle Slab Table"), "mcl_core:junglewood", "default_junglewood.png") mcl_decor.register_slab_table("spruce", S("Spruce Slab Table"), "mcl_core:sprucewood", "mcl_core_planks_spruce.png") mcl_decor.register_slab_table("acacia", S("Acacia Slab Table"), "mcl_core:acaciawood", "default_acacia_wood.png") +mcl_decor.register_slab_table("birch", S("Birch Slab Table"), "mcl_core:birchwood", "mcl_core_planks_birch.png") mcl_decor.register_slab_table("mangrove", S("Mangrove Slab Table"), "mcl_mangrove:mangrove_wood", "mcl_mangrove_planks.png") mcl_decor.register_slab_table("crimson", S("Crimson Slab Table"), "mcl_crimson:crimson_hyphae_wood", "mcl_crimson_crimson_hyphae_wood.png") mcl_decor.register_slab_table("warped", S("Warped Slab Table"), "mcl_crimson:warped_hyphae_wood", "mcl_crimson_warped_hyphae_wood.png")