Merge branch 'master' of https://git.minetest.land/JoseDouglas26/MineClone2

mods/ENTITIES/mcl_dripping/init.lua

@@ -6,7 +6,6 @@ local math = math
 
 mcl_dripping = {}
 
-
 ---@param pos Vector
 ---@param liquid string
 ---@param sound SimpleSoundSpec

mods/ITEMS/mcl_copper/crafting.lua

@@ -226,6 +226,55 @@ minetest.register_craft({
 	},
 })
 
+minetest.register_craft({
+	output = "mcl_copper:block_cut 4",
+	recipe = {
+		{ "mcl_copper:block", "mcl_copper:block" },
+		{ "mcl_copper:block", "mcl_copper:block" },
+	},
+})
+
+minetest.register_craft({
+	output = "mcl_copper:block_exposed_cut 4",
+	recipe = {
+		{ "mcl_copper:block_exposed", "mcl_copper:block_exposed" },
+		{ "mcl_copper:block_exposed", "mcl_copper:block_exposed" },
+	},
+})
+
+minetest.register_craft({
+	output = "mcl_copper:block_oxidized_cut 4",
+	recipe = {
+		{ "mcl_copper:block_oxidized", "mcl_copper:block_oxidized" },
+		{ "mcl_copper:block_oxidized", "mcl_copper:block_oxidized" },
+	},
+})
+
+minetest.register_craft({
+	output = "mcl_copper:block_weathered_cut 4",
+	recipe = {
+		{ "mcl_copper:block_weathered", "mcl_copper:block_weathered" },
+		{ "mcl_copper:block_weathered", "mcl_copper:block_weathered" },
+	},
+})
+
+local waxable_blocks = { "block", "block_cut", "block_exposed", "block_exposed_cut", "block_weathered", "block_weathered_cut", "block_oxidized", "block_oxidized_cut" }
+
+for _, w in ipairs(waxable_blocks) do
+	minetest.register_craft({
+		output = "mcl_copper:waxed_"..w,
+		recipe = {
+			{ "mcl_copper:"..w, "mcl_honey:honeycomb" },
+		},
+	})
+end
+
+local cuttable_blocks = { "block", "waxed_block", "block_exposed", "waxed_block_exposed", "block_weathered", "waxed_block_weathered", "block_oxidized", "waxed_block_oxidized" }
+
+for _, c in ipairs(cuttable_blocks) do
+	mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c.."_cut", 4)
+end
+
 minetest.register_craft({
 	output = "mcl_copper:copper_ingot 9",
 	recipe = {

mods/ITEMS/mcl_copper/functions.lua

@@ -61,10 +61,19 @@ end
 local function register_oxidation_and_scraping(mod_name, subname, decay_chain)
 	local item, oxidized_item
 
-	for i = 1, #decay_chain - 1 do
+local slab_oxidization = {
-		item = mod_name..":"..subname..decay_chain[i]
+	{ "cut", "exposed_cut" },
-		oxidized_item = mod_name..":"..subname..decay_chain[i + 1]
+	{ "cut_top", "exposed_cut_top" },
+	{ "cut_double", "exposed_cut_double" },
+	{ "exposed_cut", "weathered_cut" },
+	{ "exposed_cut_top", "weathered_cut_top" },
+	{ "exposed_cut_double", "weathered_cut_double" },
+	{ "weathered_cut", "oxidized_cut" },
+	{ "weathered_cut_top", "oxidized_cut_top" },
+	{ "weathered_cut_double", "oxidized_cut_double" },
+}
 
+<<<<<<< HEAD
 		for _, subnode in pairs(mcl_copper.subnodes[subname]) do
 			if subnode == "" then
 				minetest.override_item(item, {_mcl_oxidized_variant = oxidized_item})
@@ -118,11 +127,70 @@ end
 --- containing the list of subnames of the block oxidation chain (without the waxed variants subnames).
 local function register_waxing_and_scraping(mod_name, subname, decay_chain)
 	local waxed_item, unwaxed_item
+=======
+local def
+local def_variant_oxidized
+local def_variant_waxed
+local def_variant_scraped
 
-	for i = 1, #decay_chain do
+-- set up oxidized and waxed variants.
-		waxed_item = mod_name..":"..subname..decay_chain[i]
+for i = 1, #stair_oxidization do
-		unwaxed_item = mod_name..":"..subname:gsub("waxed_", "")..decay_chain[i]
+	-- stairs
+	def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1]
+	def_variant_oxidized = "mcl_stairs:stair_copper_" .. stair_oxidization[i][2]
+	minetest.override_item(def, { _mcl_oxidized_variant = def_variant_oxidized })
 
+	def_variant_waxed = "mcl_stairs:stair_waxed_copper_" .. stair_oxidization[i][1]
+	minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed })
+
+	-- slabs
+	def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1]
+	def_variant_oxidized = "mcl_stairs:slab_copper_" .. slab_oxidization[i][2]
+	minetest.override_item(def, { _mcl_oxidized_variant = def_variant_oxidized })
+
+	def_variant_waxed = "mcl_stairs:slab_waxed_copper_" .. slab_oxidization[i][1]
+	minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed })
+end
+
+-- Set up scraped variants.
+for i = 1, #stair_oxidization do
+	-- does both stairs and slabs.
+	if i > 3 then
+		def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1]
+		def_variant_scraped = "mcl_stairs:stair_copper_" .. stair_oxidization[i - 3][1]
+		minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+
+		def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1]
+		def_variant_scraped = "mcl_stairs:slab_copper_" .. slab_oxidization[i - 3][1]
+		minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+	end
+	if i > 6 then
+		def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][2]
+		def_variant_scraped = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1]
+		minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+
+		def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][2]
+		def_variant_scraped = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1]
+		minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+	end
+end
+
+-- Set up scraped variants for waxed stairs.
+local waxed_variants = {
+	{ "waxed_copper_cut", "copper_cut" },
+	{ "waxed_copper_exposed_cut", "copper_exposed_cut" },
+	{ "waxed_copper_weathered_cut", "copper_weathered_cut" },
+	{ "waxed_copper_oxidized_cut", "copper_oxidized_cut" },
+}
+>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
+
+for i = 1, #waxed_variants do
+	-- stairs
+	def = "mcl_stairs:stair_" .. waxed_variants[i][1]
+	def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2]
+	minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+
+<<<<<<< HEAD
 		for _, subnode in pairs(mcl_copper.subnodes[subname:gsub("waxed_", "")]) do
 			if subnode == "" then
 				minetest.override_item(waxed_item, {_mcl_stripped_variant = unwaxed_item})
@@ -174,6 +242,36 @@ local decay_chain = {
 	"_exposed",
 	"_weathered",
 	"_oxidized"
+=======
+	def = "mcl_stairs:stair_" .. waxed_variants[i][1] .. "_inner"
+	def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2] .. "_inner"
+	minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+
+	def = "mcl_stairs:stair_" .. waxed_variants[i][1] .. "_outer"
+	def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2] .. "_outer"
+	minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+
+	-- slab
+	def = "mcl_stairs:slab_" .. waxed_variants[i][1]
+	def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2]
+	minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+
+	def = "mcl_stairs:slab_" .. waxed_variants[i][1] .. "_top"
+	def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2] .. "_top"
+	minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+
+	def = "mcl_stairs:slab_" .. waxed_variants[i][1] .. "_double"
+	def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2] .. "_double"
+	minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
+
+end
+
+-- Waxed Oxidized Slabs and Stairs
+local oxidized_slabs = {
+	"oxidized_cut",
+	"oxidized_cut_double",
+	"oxidized_cut_top"
+>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
 }
 -- Blocks per mod. {mod_name, unwaxed (first on decay chain), waxed (first waxed on decay chain)}
 local mods_and_blocks = {
@@ -189,6 +287,7 @@ for _, mod_and_blocks in pairs(mods_and_blocks) do
 	local oxidize_and_scrap = mod_and_blocks[2]
 	local wax_and_scrap = mod_and_blocks[3]
 
+<<<<<<< HEAD
 	register_oxidation_and_scraping(mod, oxidize_and_scrap, decay_chain)
 	register_waxing_and_scraping(mod, wax_and_scrap, decay_chain)
 end
@@ -209,4 +308,22 @@ for _, mod_and_blocks in pairs(mods_and_blocks) do
 
 	register_oxidation_and_scraping(mod, oxidize_and_scrap, decay_chain)
 	register_waxing_and_scraping(mod, wax_and_scrap, decay_chain)
+=======
+for i = 1, #oxidized_slabs do
+	def = "mcl_stairs:slab_copper_" .. oxidized_slabs[i]
+	def_variant_waxed = "mcl_stairs:slab_waxed_copper_" .. oxidized_slabs[i]
+	minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed })
+end
+
+local oxidized_stairs = {
+	"oxidized_cut",
+	"oxidized_cut_inner",
+	"oxidized_cut_outer"
+}
+
+for i = 1, #oxidized_stairs do
+	def = "mcl_stairs:stair_copper_" .. oxidized_stairs[i]
+	def_variant_waxed = "mcl_stairs:stair_waxed_copper_" .. oxidized_stairs[i]
+	minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed })
+>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
 end

mods/ITEMS/mcl_copper/init.lua

@@ -1,14 +1,9 @@
-local path = minetest.get_modpath("mcl_copper") -- Getting mcl_copper mod path
+local path = minetest.get_modpath("mcl_copper")
 
-mcl_copper = {} -- Initializing global variable mcl_copper.
+mcl_copper = {} -- initialize global variable.
 
--- Loading the file containing the descriptions and longdescs of each block
-dofile(path .. "/descriptions.lua")
--- Loading the file that registers all blocks provided by this mod
 dofile(path .. "/nodes.lua")
--- Loading the file that registers craftitems
 dofile(path .. "/items.lua")
--- Loading the file that registers the blocks crafting recipes
 dofile(path .. "/crafting.lua")
 -- Loading the file that handles oxidized, waxed and stripped variants for blocks that are registered
 -- in other mods and normally do not have these variants.

mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr

@@ -1,47 +1,4 @@
 # textdomain: mcl_copper
-Block of Copper=Kupferblock
-Waxed Block of Copper=
-Exposed Copper=Angelaufener Kupferblock
-Waxed Exposed Copper=
-Weathered Copper=Verwitterter Kupferblock
-Waxed Weathered Copper=
-Oxidized Copper=Oxidierter Kupferblock
-Waxed Oxidized Copper=
-Cut Copper=Geschnittener Kupferblock
-Waxed Cut Copper=
-Exposed Cut Copper=Angelaufener geschnittener Kupferblock
-Waxed Exposed Cut Copper=
-Weathered Cut Copper=Verwitterter geschnittener Kupferblock
-Waxed Weathered Cut Copper=
-Oxidized Cut Copper=Oxidierter geschnittener Kupferblock
-Waxed Oxidized Cut Copper=
-Copper Grate=
-Waxed Copper Grate=
-Exposed Copper Grate=
-Waxed Exposed Copper Grate=
-Weathered Copper Grate=
-Waxed Weathered Copper Grate=
-Oxidized Copper Grate=
-Waxed Oxidized Copper Grate=
-Chiseled Copper=
-Waxed Chiseled Copper=
-Exposed Chiseled Copper=
-Waxed Exposed Chiseled Copper=
-Weathered Chiseled Copper=
-Waxed Weathered Chiseled Copper=
-Oxidized Chiseled Copper=
-Waxed Oxidized Chiseled Copper=
-Copper Bulb=
-Waxed Copper Bulb=
-Exposed Copper Bulb=
-Waxed Exposed Copper Bulb=
-Weathered Copper Bulb=
-Waxed Weathered Copper Bulb=
-Oxidized Copper Bulb=
-Waxed Oxidized Copper Bulb=
-(Lit)=
-(Powered)=
-(Lit and Powered)=
 A block of copper is mostly a decorative block.=Ein Kupferblock wird meistens als dekorativer Block verwendet.
 Exposed copper is a decorative block.=Ein Angelaufener Kupferblock ist ein dekorativer Block.
 Weathered copper is a decorative block.=Ein Verwitterter Kupferblock ist ein dekorativer Block.
@@ -131,10 +88,44 @@ Waxed Weathered Copper Bars=
 Oxidized Copper Bars=
 Waxed Oxidized Copper Bars=
 Copper Ingot=Kupfer Barren
-Molten Raw Copper. It is used to craft blocks.=Geschmolzenes Rohkupfer. Es wird verwendet, um Blöcke herzustellen. 
+Molten Raw Copper. It is used to craft blocks.=Geschmolzenes Rohkupfer. Es wird verwendet, um Blöcke herzustellen.
 Raw Copper=Rohkupfer
 Raw Copper. Mine a Copper Ore to get it.=Bauen sie ein Kupfererz ab, um es zu erhalten.
 Copper Ore=Kupfererz
 Some copper contained in stone, it is pretty common and can be found below sea level.=Stein, in dem etwas Kupfer enthalten ist. Es ist ziemlich häufig und kann unter dem Meeresspiegel gefunden werden.
 Block of Raw Copper=Rohkupferblock
 A block used for compact raw copper storage.=Ein Block für die kompakte Lagerung von Rohkupfer.
+Block of Copper=Kupferblock
+Block of Raw Copper=Rohkupferblock
+Copper Ingot=Kupfer Barren
+Copper Ore=Kupfererz
+Cut copper is a decorative block.=Ein Geschnittener Kupferblock ist ein dekorativer Block.
+Cut Copper=Geschnittener Kupferblock
+Double Slab of Cut Copper=Doppelte Geschnittene Kupferstufe
+Double Slab of Exposed Cut Copper=Doppelte Angelaufene Geschnittene Kupferstufe
+Double Slab of Oxidized Cut Copper=Doppelte Oxidierte Geschnittene Kupferstufe
+Double Slab of Weathered Cut Copper=Doppelte Verwitterte Geschnittene Kupferstufe
+Exposed copper is a decorative block.=Ein Angelaufener Kupferblock ist ein dekorativer Block.
+Exposed Copper=Angelaufener Kupferblock
+Exposed cut copper is a decorative block.=Ein Angelaufener geschnittener Kupferblock ist ein dekorativer Block.
+Exposed Cut Copper=Angelaufener geschnittener Kupferblock
+Molten Raw Copper. It is used to craft blocks.=Geschmolzenes Rohkupfer. Es wird verwendet, um Blöcke herzustellen.
+Oxidized copper is a decorative block.=Ein Oxidierter Kupferblockist ist ein dekorativer Block.
+Oxidized Copper=Oxidierter Kupferblock
+Oxidized cut copper is a decorative block.=Ein Oxidierter geschnittener Kupferblock ist ein dekorativer Block.
+Oxidized Cut Copper=Oxidierter geschnittener Kupferblock
+Raw Copper. Mine a Copper Ore to get it.=Bauen sie ein Kupfererz ab, um es zu erhalten.
+Raw Copper=Rohkupfer
+Slab of Cut Copper=Geschnittene Kupferstufe
+Slab of Exposed Cut Copper=Angelaufene Geschnittene Kupferstufe
+Slab of Oxidized Cut Copper=Oxidierte Geschnittene Kupferstufe
+Slab of Weathered Cut Copper=Verwitterte Geschnittene Kupferstufe
+Some copper contained in stone, it is pretty common and can be found below sea level.=Stein, in dem etwas Kupfer enthalten ist. Es ist ziemlich häufig und kann unter dem Meeresspiegel gefunden werden.
+Stairs of Cut Copper=Geschnittene Kupfertreppe
+Stairs of Exposed Cut Copper=Angelaufene Geschnittene Kupfertreppe
+Stairs of Oxidized Cut Copper=Oxidierte Geschnittene Kupfertreppe
+Stairs of Weathered Cut Copper=Verwitterte Geschnittene Kupfertreppe
+Weathered copper is a decorative block.=Ein Verwitterter Kupferblock ist ein dekorativer Block.
+Weathered Copper=Verwitterter Kupferblock
+Weathered cut copper is a decorative block.=Ein Verwitterter geschnittener Kupferblock ist ein dekorativer Block.
+Weathered Cut Copper=Verwitterter geschnittener Kupferblock

mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr

@@ -1,18 +1,33 @@
 # textdomain: mcl_copper
+A block of copper is mostly a decorative block.=Le bloc de cuivre est surtout un bloc décoratif.
+A block used for compact raw copper storage.=Un bloc utilisé pour le stockage compact de cuivre brut.
 Block of Copper=Bloc de cuivre
 Waxed Block of Copper=Bloc de cuivre ciré
-Exposed Copper=Cuivre exposé
+Block of Raw Copper=Bloc de cuivre brut
-Waxed Exposed Copper=Cuivre exposé ciré
+Copper Ingot=Lingot de cuivre
-Weathered Copper=Cuivre érodé
+Copper Ore=Minerai de cuivre
-Waxed Weathered Copper=Cuivre érodé ciré
+Cut copper is a decorative block.=Le cuivre taillé est un bloc décoratif.
-Oxidized Copper=Cuivre oxydé
-Waxed Oxidized Copper=Cuivre oxydé ciré
 Cut Copper=Cuivre taillé
 Waxed Cut Copper=Cuivre taillé ciré
+Double Slab of Cut Copper=Double dalle de cuivre taillé
+Double Slab of Exposed Cut Copper=Double dalle de cuivre taillé exposé
+Double Slab of Oxidized Cut Copper=Double dalle de cuivre taillé oxydé
+Double Slab of Weathered Cut Copper=Double dalle de cuivre taillé érodé
+Waxed Double Slab of Cut Copper=Double dalle de cuivre taillé ciré
+Waxed Double Slab of Exposed Cut Copper=Double dalle de cuivre taillé exposé ciré
+Waxed Double Slab of Oxidized Cut Copper=Double dalle de cuivre taillé oxydé ciré
+Waxed Double Slab of Weathered Cut Copper=Double dalle de cuivre taillé érodé ciré
+Exposed copper is a decorative block.=Le cuivre exposé est un bloc décoratif.
+Exposed Copper=Cuivre exposé
+Waxed Exposed Copper=Cuivre exposé ciré
+Exposed cut copper is a decorative block.=Le cuivre taillé exposé est un bloc décoratif.
 Exposed Cut Copper=Cuivre taillé exposé
 Waxed Exposed Cut Copper=Cuivre taillé exposé ciré
-Weathered Cut Copper=Cuivre taillé érodé
+Molten Raw Copper. It is used to craft blocks.=Cuivre brut fondu. Utilisé pour fabriquer des blocs.
-Waxed Weathered Cut Copper=Cuivre taillé érodé ciré
+Oxidized copper is a decorative block.=Le cuivre oxydé est un bloc décoratif.
+Oxidized Copper=Cuivre oxydé
+Waxed Oxidized Copper=Cuivre oxydé ciré
+Oxidized cut copper is a decorative block.=Le cuivre taillé oxydé est un bloc décoratif.
 Oxidized Cut Copper=Cuivre taillé oxydé
 Waxed Oxidized Cut Copper=Cuivre taillé oxydé ciré
 Copper Grate=
@@ -86,7 +101,7 @@ Waxed Double Slab of Weathered Cut Copper=Double dalle de cuivre taillé érodé
 Waxed Stairs of Weathered Cut Copper=Escalier de cuivre taillé érodé ciré
 Slab of Oxidized Cut Copper=Dalle de cuivre taillé oxydé
 Double Slab of Oxidized Cut Copper=Double dalle de cuivre taillé oxydé
-Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé 
+Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé
 Waxed Slab of Oxidized Cut Copper=Dalle de cuivre taillé oxydé ciré
 Waxed Double Slab of Oxidized Cut Copper=Double dalle de cuivre taillé oxydé ciré
 Waxed Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé ciré
@@ -134,7 +149,27 @@ Copper Ingot=Lingot de cuivre
 Molten Raw Copper. It is used to craft blocks.=Cuivre brut fondu. Utilisé pour fabriquer des blocs.
 Raw Copper=Cuivre brut
 Raw Copper. Mine a Copper Ore to get it.=Cuivre brut. Creuser dans du minerai de cuivre pour l'obtenir.
-Copper Ore=Minerai de cuivre
+Raw Copper=Cuivre brut
+Slab of Cut Copper=Dalle de cuivre taillé
+Slab of Exposed Cut Copper=Dalle de cuivre taillé exposé
+Slab of Oxidized Cut Copper=Dalle de cuivre taillé oxydé
+Slab of Weathered Cut Copper=Dalle de cuivre taillé érodé
+Waxed Slab of Cut Copper=Dalle de cuivre taillé ciré
+Waxed Slab of Exposed Cut Copper=Dalle de cuivre taillé exposé ciré
+Waxed Slab of Oxidized Cut Copper=Dalle de cuivre taillé oxydé ciré
+Waxed Slab of Weathered Cut Copper=Dalle de cuivre taillé érodé ciré
 Some copper contained in stone, it is pretty common and can be found below sea level.=Un peu de cuivre se trouve dans la pierre, il est plutôt répandu et peut être trouvé sous le niveau de la mer.
-Block of Raw Copper=Bloc de cuivre brut
+Stairs of Cut Copper=Escalier de cuivre taillé
-A block used for compact raw copper storage.=Un bloc utilisé pour le stockage compact de cuivre brut.
+Stairs of Exposed Cut Copper=Escalier de cuivre taillé exposé
+Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé
+Stairs of Weathered Cut Copper=Escalier de cuivre taillé érodé
+Waxed Stairs of Cut Copper=Escalier de cuivre taillé ciré
+Waxed Stairs of Exposed Cut Copper=Escalier de cuivre taillé exposé ciré
+Waxed Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé ciré
+Waxed Stairs of Weathered Cut Copper=Escalier de cuivre taillé érodé ciré
+Weathered copper is a decorative block.=Le cuivre érodé est un bloc décoratif.
+Weathered Copper=Cuivre érodé
+Waxed Weathered Copper=Cuivre érodé ciré
+Weathered cut copper is a decorative block.=Le cuivre taillé érodé est un bloc décoratif.
+Weathered Cut Copper=Cuivre taillé érodé
+Waxed Weathered Cut Copper=Cuivre taillé érodé ciré

mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr

@@ -1,18 +1,33 @@
 # textdomain: mcl_copper
+A block of copper is mostly a decorative block.=銅ブロックは、そのほとんどが装飾ブロックです。
+A block used for compact raw copper storage.=銅の粗鉱をコンパクトに保管するのに使えるブロックです。
 Block of Copper=銅ブロック
 Waxed Block of Copper=錆止め済み銅ブロック
-Exposed Copper=少し酸化した銅
+Block of Raw Copper=銅の粗鉱ブロック
-Waxed Exposed Copper=少し酸化した錆止め済み銅
+Copper Ingot=銅インゴット
-Weathered Copper=半ば酸化した銅
+Copper Ore=銅鉱石
-Waxed Weathered Copper=半ば酸化した錆止め済み銅
+Cut copper is a decorative block.=溝入り銅は、装飾ブロックです。
-Oxidized Copper=殆ど酸化した銅
-Waxed Oxidized Copper=殆ど酸化した錆止め済み銅
 Cut Copper=溝入り銅
 Waxed Cut Copper=錆止め済み溝入り銅
+Double Slab of Cut Copper=溝入り銅の２重スラブ
+Double Slab of Exposed Cut Copper=少し酸化した溝入り銅の２重スラブ
+Double Slab of Oxidized Cut Copper=殆ど酸化した溝入り銅の２重スラブ
+Double Slab of Weathered Cut Copper=半ば酸化した溝入り銅の２重スラブ
+Waxed Double Slab of Cut Copper=錆止め済み溝入り銅の２重スラブ
+Waxed Double Slab of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅の２重スラブ
+Waxed Double Slab of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅の２重スラブ
+Waxed Double Slab of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅の２重スラブ
+Exposed copper is a decorative block.=少し酸化した銅は、装飾ブロックです。
+Exposed Copper=少し酸化した銅
+Waxed Exposed Copper=少し酸化した錆止め済み銅
+Exposed cut copper is a decorative block.=少し酸化した溝入り銅は、装飾ブロックです。
 Exposed Cut Copper=少し酸化した溝入り銅
 Waxed Exposed Cut Copper=少し酸化した錆止め済み溝入り銅
-Weathered Cut Copper=半ば酸化した溝入り銅
+Molten Raw Copper. It is used to craft blocks.=溶けた未処理の銅。ブロックのクラフトに使われます。
-Waxed Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅
+Oxidized copper is a decorative block.=殆ど酸化した銅は、装飾ブロックです。
+Oxidized Copper=殆ど酸化した銅
+Waxed Oxidized Copper=殆ど酸化した錆止め済み銅
+Oxidized cut copper is a decorative block.=殆ど酸化した溝入り銅は、装飾ブロックです。
 Oxidized Cut Copper=殆ど酸化した溝入り銅
 Waxed Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅
 Copper Grate=
@@ -134,7 +149,27 @@ Copper Ingot=銅インゴット
 Molten Raw Copper. It is used to craft blocks.=溶けた未処理の銅。ブロックのクラフトに使われます。
 Raw Copper=銅の粗鉱
 Raw Copper. Mine a Copper Ore to get it.=未処理の銅。銅鉱石を採掘すると手に入ります。
-Copper Ore=銅鉱石
+Raw Copper=銅の粗鉱
+Slab of Cut Copper=溝入り銅のスラブ
+Slab of Exposed Cut Copper=少し酸化した溝入り銅のスラブ
+Slab of Oxidized Cut Copper=殆ど酸化した溝入り銅のスラブ
+Slab of Weathered Cut Copper=半ば酸化した溝入り銅のスラブ
+Waxed Slab of Cut Copper=錆止め済み溝入り銅のスラブ
+Waxed Slab of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅のスラブ
+Waxed Slab of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅のスラブ
+Waxed Slab of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅のスラブ
 Some copper contained in stone, it is pretty common and can be found below sea level.=石に含まれる銅は ごく一般的で、海面下の高さで見られます。
-Block of Raw Copper=銅の粗鉱ブロック
+Stairs of Cut Copper=溝入り銅の階段
-A block used for compact raw copper storage.=銅の粗鉱をコンパクトに保管するのに使えるブロックです。
+Stairs of Exposed Cut Copper=少し酸化した溝入り銅の階段
+Stairs of Oxidized Cut Copper=殆ど酸化した溝入り銅の階段
+Stairs of Weathered Cut Copper=半ば酸化した溝入り銅の階段
+Waxed Stairs of Cut Copper=錆止め済み溝入り銅の階段
+Waxed Stairs of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅の階段
+Waxed Stairs of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅の階段
+Waxed Stairs of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅の階段
+Weathered copper is a decorative block.=半ば酸化した銅は、装飾ブロックです。
+Weathered Copper=半ば酸化した銅
+Waxed Weathered Copper=半ば酸化した錆止め済み銅
+Weathered cut copper is a decorative block.=半ば酸化した溝入り銅は、装飾ブロックです。
+Weathered Cut Copper=半ば酸化した溝入り銅
+Waxed Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅

mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr

@@ -1,18 +1,33 @@
 # textdomain: mcl_copper
+A block of copper is mostly a decorative block.=Um bloco de cobre é principalmente um bloco decorativo.
+A block used for compact raw copper storage.=Um bloco usado para armazenar minério de cobre compactado.
 Block of Copper=Bloco de Cobre
 Waxed Block of Copper=Bloco de Cobre Encerado
-Exposed Copper=Cobre Exposto
+Block of Raw Copper=Bloco de Cobre Crú
-Waxed Exposed Copper=Cobre Exposto Encerado
+Copper Ingot=Lingote de Cobre
-Weathered Copper=Cobre Desgastado
+Copper Ore=Minério de Cobre
-Waxed Weathered Copper=Cobre Desgastado Encerado
+Cut copper is a decorative block.=Cobre lapidado é um bloco decorativo
-Oxidized Copper=Cobre Oxidado
-Waxed Oxidized Copper=Cobre Oxidado Encerado
 Cut Copper=Cobre Lapidado
 Waxed Cut Copper=Cobre Lapidado Encerado
+Double Slab of Cut Copper=Laje Dupla de Cobre Lapidado
+Double Slab of Exposed Cut Copper=Laje Dupla de Cobre Lapidado Exposto
+Double Slab of Oxidized Cut Copper=Laje Dupla de Cobre Lapidado Oxidado
+Double Slab of Weathered Cut Copper=Laje Dupla de Cobre Lapidado Desgastado
+Waxed Double Slab of Cut Copper=Laje Dupla de Cobre Lapidado Encerado
+Waxed Double Slab of Exposed Cut Copper=Laje Dupla de Cobre Lapidado Exposto Encerado
+Waxed Double Slab of Oxidized Cut Copper=Laje Dupla de Cobre Lapidado Oxidado Encerado
+Waxed Double Slab of Weathered Cut Copper=Laje Dupla de Cobre Lapidado Desgastado Encerado
+Exposed copper is a decorative block.=Cobre exposto é um bloco decorativo.
+Exposed Copper=Cobre Exposto
+Waxed Exposed Copper=Cobre Exposto Encerado
+Exposed cut copper is a decorative block.=Cobre lapidado encerado é um bloco decorativo.
 Exposed Cut Copper=Cobre Lapidado Exposto
 Waxed Exposed Cut Copper=Cobre Lapidado Exposto Encerado
-Weathered Cut Copper=Cobre Lapidado Desgastado
+Molten Raw Copper. It is used to craft blocks.=Minério de Cobre Fundido. É utilizado para fabricar blocos.
-Waxed Weathered Cut Copper=Cobre Lapidado Desgastado Encerado
+Oxidized copper is a decorative block.=Cobre oxidado é um bloco decorativo.
+Oxidized Copper=Cobre Oxidado
+Waxed Oxidized Copper=Cobre Oxidado Encerado
+Oxidized cut copper is a decorative block.=Cobre lapidado oxidado é um bloco decorativo.
 Oxidized Cut Copper=Cobre Lapidado Oxidado
 Waxed Oxidized Cut Copper=Cobre Lapidado Oxidado Encerado
 Copper Grate=Grade de Cobre
@@ -134,7 +149,27 @@ Copper Ingot=Lingote de Cobre
 Molten Raw Copper. It is used to craft blocks.=Minério de Cobre Fundido. É utilizado para fabricar blocos.
 Raw Copper=Cobre Crú
 Raw Copper. Mine a Copper Ore to get it.=Cobre Crú. Minere um minério de cobre para obtê-lo.
-Copper Ore=Minério de Cobre
+Raw Copper=Cobre Crú
+Slab of Cut Copper=Laje de Cobre Lapidado
+Slab of Exposed Cut Copper=Laje de Cobre Lapidado Exposto
+Slab of Oxidized Cut Copper=Laje de Cobre Lapidado Oxidado
+Slab of Weathered Cut Copper=Laje de Cobre Lapidado Desgastado
+Waxed Slab of Cut Copper=Laje de Cobre Lapidado Encerado
+Waxed Slab of Exposed Cut Copper=Laje de Cobre Lapidado Exposto Encerado
+Waxed Slab of Oxidized Cut Copper=Laje de Cobre Lapidado Oxidado Encerado
+Waxed Slab of Weathered Cut Copper=Laje de Cobre Lapidado Desgastado Encerado
 Some copper contained in stone, it is pretty common and can be found below sea level.=Um pouco de cobre contido em rocha, é bem comum e pode ser encontrado abaixo do nível do mar.
-Block of Raw Copper=Bloco de Cobre Crú
+Stairs of Cut Copper=Escadas de Cobre Lapidado
-A block used for compact raw copper storage.=Um bloco usado para armazenar minério de cobre compactado.
+Stairs of Exposed Cut Copper=Escadas de Cobre Lapidado Exposto
+Stairs of Oxidized Cut Copper=Escadas de Cobre Lapidado Oxidado
+Stairs of Weathered Cut Copper=Escadas de Cobre Lapidado Desgastado
+Waxed Stairs of Cut Copper=Escadas de Cobre Lapidado Encerado
+Waxed Stairs of Exposed Cut Copper=Escadas de Cobre Lapidado Exposto Encerado
+Waxed Stairs of Oxidized Cut Copper=Escadas de Cobre Lapidado Oxidado Encerado
+Waxed Stairs of Weathered Cut Copper=Escadas de Cobre Lapidado Desgastado Encerado
+Weathered copper is a decorative block.=Cobre desgastado é um bloco decorativo.
+Weathered Copper=Cobre Desgastado
+Waxed Weathered Copper=Cobre Desgastado Encerado
+Weathered cut copper is a decorative block.=Cobre lapidado desgastado é um bloco decorativo.
+Weathered Cut Copper=Cobre Lapidado Desgastado
+Waxed Weathered Cut Copper=Cobre Lapidado Desgastado Encerado

mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr

@@ -1,18 +1,33 @@
 # textdomain: mcl_copper
+A block of copper is mostly a decorative block.=Медный блок — это декоративный блок.
+A block used for compact raw copper storage.=Блок используется для компактного хранения необработанной меди.
 Block of Copper=Медный блок
 Waxed Block of Copper=Вощёный медный блок
-Exposed Copper=Потемневший медный блок
+Block of Raw Copper=Блок необработанной меди
-Waxed Exposed Copper=Вощёный потемневший медный блок
+Copper Ingot=Медный слиток
-Weathered Copper=Состаренный медный блок
+Copper Ore=Медная руда
-Waxed Weathered Copper=Вощёный состаренный медный блок
+Cut copper is a decorative block.=Резной медный блок это декоративный блок.
-Oxidized Copper=Окисленный медный блок
-Waxed Oxidized Copper=Вощёный окисленный медный блок
 Cut Copper=Резной медный блок
 Waxed Cut Copper=Вощёный резной медный блок
+Double Slab of Cut Copper=Двойная плита из резного медного блока
+Double Slab of Exposed Cut Copper=Двойная плита из потемневшего резного медного блока
+Double Slab of Oxidized Cut Copper=Двойная плита из окисленного резного медного блока
+Double Slab of Weathered Cut Copper=Двойная плита из состаренного резного медного блока
+Waxed Double Slab of Cut Copper=Вощёная двойная плита из резного медного блока
+Waxed Double Slab of Exposed Cut Copper=Вощёная двойная плита из потемневшего резного медного блока
+Waxed Double Slab of Oxidized Cut Copper=Вощёная двойная плита из окисленного резного медного блока
+Waxed Double Slab of Weathered Cut Copper=Вощёная двойная плита из состаренного резного медного блока
+Exposed copper is a decorative block.=Потемневший медный блок это декоративный блок.
+Exposed Copper=Потемневший медный блок
+Waxed Exposed Copper=Вощёный потемневший медный блок
+Exposed cut copper is a decorative block.=Потемневший резной медный блок это декоративный блок.
 Exposed Cut Copper=Потемневший резной медный блок
 Waxed Exposed Cut Copper=Вощёный потемневший резной медный блок
-Weathered Cut Copper=Состаренный резной медный блок
+Molten Raw Copper. It is used to craft blocks.=Медный слиток. Используется для крафта блоков.
-Waxed Weathered Cut Copper=Вощёный состаренный резной медный блок
+Oxidized copper is a decorative block.=Окисленный медный блок это декоративный блок.
+Oxidized Copper=Окисленный медный блок
+Waxed Oxidized Copper=Вощёный окисленный медный блок
+Oxidized cut copper is a decorative block.=Окисленный резной медный блок это декоративный блок.
 Oxidized Cut Copper=Окисленный резной медный блок
 Waxed Oxidized Cut Copper=Вощёный окисленный резной медный блок
 Copper Grate=
@@ -134,7 +149,27 @@ Copper Ingot=Медный слиток
 Molten Raw Copper. It is used to craft blocks.=Медный слиток. Используется для крафта блоков.
 Raw Copper=Необработанная медь
 Raw Copper. Mine a Copper Ore to get it.=Необработанная медь. Добудьте медную руду, чтобы получить её.
-Copper Ore=Медная руда
+Raw Copper=Необработанная медь
+Slab of Cut Copper=Плита из резного медного блока
+Slab of Exposed Cut Copper=Плита из потемневшего резного медного блока
+Slab of Oxidized Cut Copper=Плита из окисленного резного медного блока
+Slab of Weathered Cut Copper=Плита из состаренного резного медного блока
+Waxed Slab of Cut Copper=Вощёная плита из резного медного блока
+Waxed Slab of Exposed Cut Copper=Вощёная плита из потемневшего резного медного блока
+Waxed Slab of Oxidized Cut Copper=Вощёная плита из окисленного резного медного блока
+Waxed Slab of Weathered Cut Copper=Вощёная плита из состаренного резного медного блока
 Some copper contained in stone, it is pretty common and can be found below sea level.=Залежи медной руды находятся в камне, медь довольно распространена и может быть найдена ниже уровня моря.
-Block of Raw Copper=Блок необработанной меди
+Stairs of Cut Copper=Ступени из резного медного блока
-A block used for compact raw copper storage.=Блок используется для компактного хранения необработанной меди.
+Stairs of Exposed Cut Copper=Ступени из потемневшего резного медного блока
+Stairs of Oxidized Cut Copper=Ступени из окисленного резного медного блока
+Stairs of Weathered Cut Copper=Ступени из состаренного резного медного блока
+Waxed Stairs of Cut Copper=Вощёные ступени из резного медного блока
+Waxed Stairs of Exposed Cut Copper=Вощёные ступени из потемневшего резного медного блока
+Waxed Stairs of Oxidized Cut Copper=Вощёные ступени из окисленного резного медного блока
+Waxed Stairs of Weathered Cut Copper=Вощёные ступени из состаренного резного медного блока
+Weathered copper is a decorative block.=Состаренный медный блок это декоративный блок.
+Weathered Copper=Состаренный медный блок
+Waxed Weathered Copper=Вощёный состаренный медный блок
+Weathered cut copper is a decorative block.=Состаренный резной медный блок это декоративный блок.
+Weathered Cut Copper=Состаренный резной медный блок
+Waxed Weathered Cut Copper=Вощёный состаренный резной медный блок

mods/ITEMS/mcl_copper/locale/template.txt

@@ -1,18 +1,33 @@
 # textdomain: mcl_copper
+A block of copper is mostly a decorative block.=
+A block used for compact raw copper storage.=
 Block of Copper=
 Waxed Block of Copper=
-Exposed Copper=
+Block of Raw Copper=
-Waxed Exposed Copper=
+Copper Ingot=
-Weathered Copper=
+Copper Ore=
-Waxed Weathered Copper=
+Cut copper is a decorative block.=
-Oxidized Copper=
-Waxed Oxidized Copper=
 Cut Copper=
 Waxed Cut Copper=
+Double Slab of Cut Copper=
+Double Slab of Exposed Cut Copper=
+Double Slab of Oxidized Cut Copper=
+Double Slab of Weathered Cut Copper=
+Waxed Double Slab of Cut Copper=
+Waxed Double Slab of Exposed Cut Copper=
+Waxed Double Slab of Oxidized Cut Copper=
+Waxed Double Slab of Weathered Cut Copper=
+Exposed copper is a decorative block.=
+Exposed Copper=
+Waxed Exposed Copper=
+Exposed cut copper is a decorative block.=
 Exposed Cut Copper=
 Waxed Exposed Cut Copper=
-Weathered Cut Copper=
+Molten Raw Copper. It is used to craft blocks.=
-Waxed Weathered Cut Copper=
+Oxidized copper is a decorative block.=
+Oxidized Copper=
+Waxed Oxidized Copper=
+Oxidized cut copper is a decorative block.=
 Oxidized Cut Copper=
 Waxed Oxidized Cut Copper=
 Copper Grate=
@@ -134,7 +149,27 @@ Copper Ingot=
 Molten Raw Copper. It is used to craft blocks.=
 Raw Copper=
 Raw Copper. Mine a Copper Ore to get it.=
-Copper Ore=
+Raw Copper=
+Slab of Cut Copper=
+Slab of Exposed Cut Copper=
+Slab of Oxidized Cut Copper=
+Slab of Weathered Cut Copper=
+Waxed Slab of Cut Copper=
+Waxed Slab of Exposed Cut Copper=
+Waxed Slab of Oxidized Cut Copper=
+Waxed Slab of Weathered Cut Copper=
 Some copper contained in stone, it is pretty common and can be found below sea level.=
-Block of Raw Copper=
+Stairs of Cut Copper=
-A block used for compact raw copper storage.=
+Stairs of Exposed Cut Copper=
+Stairs of Oxidized Cut Copper=
+Stairs of Weathered Cut Copper=
+Waxed Stairs of Cut Copper=
+Waxed Stairs of Exposed Cut Copper=
+Waxed Stairs of Oxidized Cut Copper=
+Waxed Stairs of Weathered Cut Copper=
+Weathered copper is a decorative block.=
+Weathered Copper=
+Waxed Weathered Copper=
+Weathered cut copper is a decorative block.=
+Weathered Cut Copper=
+Waxed Weathered Cut Copper=

mods/ITEMS/mcl_copper/nodes.lua

@@ -293,8 +293,13 @@ register_copper_variants("block", {
 -- Using the function above to register the cut copper blocks.
 register_copper_variants("cut", {
 	groups = {pickaxey = 2, building_block = 1},
-	_mcl_stairs = true,
+	sounds = mcl_sounds.node_sound_metal_defaults(),
+	_mcl_blast_resistance = 6,
+	_mcl_hardness = 5,
+	_mcl_stripped_variant = "mcl_copper:block_weathered_cut",
+	_mcl_waxed_variant = "mcl_copper:waxed_block_oxidized_cut",
 })
+<<<<<<< HEAD
 -- Using the function above to register the copper grates.
 register_copper_variants("grate", {
 	drawtype = "allfaces",
@@ -305,45 +310,43 @@ register_copper_variants("grate", {
 --[[
 register_copper_variants("chiseled", {
 	groups = {pickaxey = 2, building_block = 1}
+=======
+
+minetest.register_node("mcl_copper:waxed_block_oxidized_cut", {
+	description = S("Waxed Oxidized Cut Copper"),
+	_doc_items_longdesc = S("Oxidized cut copper is a decorative block."),
+	tiles = {"mcl_copper_oxidized_cut.png"},
+	is_ground_content = false,
+	groups = {pickaxey = 2, building_block = 1, waxed = 1},
+	sounds = mcl_sounds.node_sound_metal_defaults(),
+	_mcl_blast_resistance = 6,
+	_mcl_hardness = 5,
+	_mcl_stripped_variant = "mcl_copper:block_oxidized_cut",
+>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
 })
 
-register_copper_variants("bulb_off", {
+mcl_stairs.register_slab("copper_cut", "mcl_copper:block_cut",
-	groups = {pickaxey = 2, building_block = 1},
+	{pickaxey = 2, oxidizable = 1},
-	mesecons = {
+	{"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"},
-		effector = {
+	S("Slab of Cut Copper"),
-			action_on = function (pos, node)
+	nil, nil, nil,
-				minetest.swap_node(pos, {name = node.name:gsub("bulb_off", "bulb_powered_on")})
+	S("Double Slab of Cut Copper"))
-			end
-		},
-	},
-})
 
-register_copper_variants("bulb_on", {
+mcl_stairs.register_slab("waxed_copper_cut", "mcl_copper:waxed_block_cut",
-	drop = "bulb_off",
+	{pickaxey = 2, waxed = 1},
-	groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1},
+	{"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"},
-	light_source = 14,
+	S("Waxed Slab of Cut Copper"),
-	mesecons = {
+	nil, nil, nil,
-		effector = {
+	S("Waxed Double Slab of Cut Copper"))
-			action_on = function (pos, node)
-				minetest.swap_node(pos, {name = node.name:gsub("bulb_on", "bulb_powered_off")})
-			end
-		},
-	},
-	paramtype = "light"
-})
 
-register_copper_variants("bulb_powered_off", {
+mcl_stairs.register_slab("copper_exposed_cut", "mcl_copper:block_exposed_cut",
-	drop = "bulb_off",
+	{pickaxey = 2, oxidizable = 1},
-	groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1},
+	{"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"},
-	mesecons = {
+	S("Slab of Exposed Cut Copper"),
-		effector = {
+	nil, nil, nil,
-			action_off = function (pos, node)
+	S("Double Slab of Exposed Cut Copper"))
-				minetest.swap_node(pos, {name = node.name:gsub("bulb_powered_off", "bulb_off")})
-			end
-		}
-	}
-})
 
+<<<<<<< HEAD
 register_copper_variants("bulb_powered_on", {
 	drop = "bulb_off",
 	groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1},
@@ -383,3 +386,95 @@ minetest.register_node("mcl_copper:block_raw", {
 	_mcl_blast_resistance = 6,
 	_mcl_hardness = 5,
 })
+=======
+mcl_stairs.register_slab("waxed_copper_exposed_cut", "mcl_copper:waxed_block_exposed_cut",
+	{pickaxey = 2, waxed = 1},
+	{"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"},
+	S("Waxed Slab of Exposed Cut Copper"),
+	nil, nil, nil,
+	S("Waxed Double Slab of Exposed Cut Copper"))
+
+mcl_stairs.register_slab("copper_weathered_cut", "mcl_copper:block_weathered_cut",
+	{pickaxey = 2, oxidizable = 1},
+	{"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"},
+	S("Slab of Weathered Cut Copper"),
+	nil, nil, nil,
+	S("Double Slab of Weathered Cut Copper"))
+
+mcl_stairs.register_slab("waxed_copper_weathered_cut", "mcl_copper:waxed_block_weathered_cut",
+	{pickaxey = 2, waxed = 1},
+	{"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"},
+	S("Waxed Slab of Weathered Cut Copper"),
+	nil, nil, nil,
+	S("Waxed Double Slab of Weathered Cut Copper"))
+
+mcl_stairs.register_slab("copper_oxidized_cut", "mcl_copper:block_oxidized_cut",
+	{pickaxey = 2},
+	{"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"},
+	S("Slab of Oxidized Cut Copper"),
+	nil, nil, nil,
+	S("Double Slab of Oxidized Cut Copper"))
+
+mcl_stairs.register_slab("waxed_copper_oxidized_cut", "mcl_copper:waxed_block_oxidized_cut",
+	{pickaxey = 2, waxed = 1},
+	{"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"},
+	S("Waxed Slab of Oxidized Cut Copper"),
+	nil, nil, nil,
+	S("Waxed Double Slab of Oxidized Cut Copper"))
+
+mcl_stairs.register_stair("copper_cut", "mcl_copper:block_cut",
+	{pickaxey = 2, oxidizable = 1},
+	{"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"},
+	S("Stairs of Cut Copper"),
+	nil, 6, nil,
+	"woodlike")
+
+mcl_stairs.register_stair("waxed_copper_cut", "mcl_copper:waxed_block_cut",
+	{pickaxey = 2, waxed = 1},
+	{"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"},
+	S("Waxed Stairs of Cut Copper"),
+	nil, 6, nil,
+	"woodlike")
+
+mcl_stairs.register_stair("copper_exposed_cut", "mcl_copper:block_exposed_cut",
+	{pickaxey = 2, oxidizable = 1},
+	{"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"},
+	S("Stairs of Exposed Cut Copper"),
+	nil, 6, nil,
+	"woodlike")
+
+mcl_stairs.register_stair("waxed_copper_exposed_cut", "mcl_copper:waxed_block_exposed_cut",
+	{pickaxey = 2, waxed = 1},
+	{"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"},
+	S("Waxed Stairs of Exposed Cut Copper"),
+	nil, 6, nil,
+	"woodlike")
+
+mcl_stairs.register_stair("copper_weathered_cut", "mcl_copper:block_weathered_cut",
+	{pickaxey = 2, oxidizable = 1},
+	{"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"},
+	S("Stairs of Weathered Cut Copper"),
+	nil, 6, nil,
+	"woodlike")
+
+mcl_stairs.register_stair("waxed_copper_weathered_cut", "mcl_copper:waxed_block_weathered_cut",
+	{pickaxey = 2, waxed = 1},
+	{"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"},
+	S("Waxed Stairs of Weathered Cut Copper"),
+	nil, 6, nil,
+	"woodlike")
+
+mcl_stairs.register_stair("copper_oxidized_cut", "mcl_copper:block_oxidized_cut",
+	{pickaxey = 2},
+	{"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"},
+	S("Stairs of Oxidized Cut Copper"),
+	nil, 6, nil,
+	"woodlike")
+
+mcl_stairs.register_stair("waxed_copper_oxidized_cut", "mcl_copper:waxed_block_oxidized_cut",
+	{pickaxey = 2, waxed = 1},
+	{"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"},
+	S("Waxed Stairs of Oxidized Cut Copper"),
+	nil, 6, nil,
+	"woodlike")
+>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66

mods/ITEMS/mcl_stairs/api.lua

@@ -237,30 +237,43 @@ function mcl_stairs.register_slab(subname, recipeitem, groups, images, descripti
 			fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
 		},
 		on_place = function(itemstack, placer, pointed_thing)
-			local under = minetest.get_node(pointed_thing.under)
+			if not placer then return end
+
+			local above = pointed_thing.above
+			local under = pointed_thing.under
+			local anode = minetest.get_node(above)
+			local unode = minetest.get_node(under)
+			local adefs = minetest.registered_nodes[anode.name]
+			local udefs = minetest.registered_nodes[unode.name]
 			local wield_item = itemstack:get_name()
-			local creative_enabled = minetest.is_creative_enabled(placer:get_player_name())
+			local player_name = placer:get_player_name()
+			local creative_enabled = minetest.is_creative_enabled(player_name)
 
 			-- place slab using under node orientation
-			local dir = vector.subtract(pointed_thing.above, pointed_thing.under)
+			local dir = vector.subtract(above, under)
+			local p2 = unode.param2
 
-			local p2 = under.param2
+			if minetest.is_protected(under, player_name) and not
+				minetest.check_player_privs(placer, "protection_bypass") then
+					minetest.record_protection_violation(under, player_name)
+					return
+			end
 
 			-- combine two slabs if possible
 			-- Requirements: Same slab material, must be placed on top of lower slab, or on bottom of upper slab
-			if (wield_item == under.name or (minetest.registered_nodes[under.name] and wield_item == minetest.registered_nodes[under.name]._mcl_other_slab_half)) and
+			if (wield_item == unode.name or (udefs and wield_item == udefs._mcl_other_slab_half)) and
-					not ((dir.y >= 0 and minetest.get_item_group(under.name, "slab_top") == 1) or
+					not ((dir.y >= 0 and minetest.get_item_group(unode.name, "slab_top") == 1) or
-					(dir.y <= 0 and minetest.get_item_group(under.name, "slab_top") == 0)) then
+					(dir.y <= 0 and minetest.get_item_group(unode.name, "slab_top") == 0)) then
 
-				local player_name = placer:get_player_name()
+				minetest.set_node(under, {name = double_slab, param2 = p2})
-				if minetest.is_protected(pointed_thing.under, player_name) and not
+
-						minetest.check_player_privs(placer, "protection_bypass") then
+				if not creative_enabled then
-					minetest.record_protection_violation(pointed_thing.under,
+					itemstack:take_item()
-						player_name)
-					return
 				end
-				local newnode = double_slab
+				return itemstack
-				minetest.set_node(pointed_thing.under, {name = newnode, param2 = p2})
+			elseif (wield_item == anode.name or (adefs and wield_item == adefs._mcl_other_slab_half)) then
+				minetest.set_node(above, {name = double_slab, param2 = p2})
+
 				if not creative_enabled then
 					itemstack:take_item()
 				end