forked from VoxeLibre/VoxeLibre
more conflicts solve
This commit is contained in:
parent
1db17d88da
commit
1fde77eee8
|
@ -2,6 +2,7 @@ local path = minetest.get_modpath("mcl_copper")
|
||||||
|
|
||||||
mcl_copper = {} -- initialize global variable.
|
mcl_copper = {} -- initialize global variable.
|
||||||
|
|
||||||
|
dofile(path .. "/descriptions.lua")
|
||||||
dofile(path .. "/nodes.lua")
|
dofile(path .. "/nodes.lua")
|
||||||
dofile(path .. "/items.lua")
|
dofile(path .. "/items.lua")
|
||||||
dofile(path .. "/crafting.lua")
|
dofile(path .. "/crafting.lua")
|
||||||
|
|
|
@ -285,7 +285,7 @@ register_copper_variants("block", {
|
||||||
-- Copper blocks are no longer the manufacturing material for doors but this definition will be
|
-- Copper blocks are no longer the manufacturing material for doors but this definition will be
|
||||||
-- maintained here to avoid individual registration of 16 blocks.
|
-- maintained here to avoid individual registration of 16 blocks.
|
||||||
-- Same for buttons, pressure plates and panes.
|
-- Same for buttons, pressure plates and panes.
|
||||||
_mcl_doors = true,
|
--_mcl_doors = true,
|
||||||
_mesecons_buttons = true,
|
_mesecons_buttons = true,
|
||||||
_mesecons_pp = true,
|
_mesecons_pp = true,
|
||||||
_xpanes = true
|
_xpanes = true
|
||||||
|
@ -293,12 +293,9 @@ register_copper_variants("block", {
|
||||||
-- Using the function above to register the cut copper blocks.
|
-- Using the function above to register the cut copper blocks.
|
||||||
register_copper_variants("cut", {
|
register_copper_variants("cut", {
|
||||||
groups = {pickaxey = 2, building_block = 1},
|
groups = {pickaxey = 2, building_block = 1},
|
||||||
sounds = mcl_sounds.node_sound_metal_defaults(),
|
_mcl_stairs = true,
|
||||||
_mcl_blast_resistance = 6,
|
|
||||||
_mcl_hardness = 5,
|
|
||||||
_mcl_stripped_variant = "mcl_copper:block_weathered_cut",
|
|
||||||
_mcl_waxed_variant = "mcl_copper:waxed_block_oxidized_cut",
|
|
||||||
})
|
})
|
||||||
|
--[[
|
||||||
-- Using the function above to register the copper grates.
|
-- Using the function above to register the copper grates.
|
||||||
register_copper_variants("grate", {
|
register_copper_variants("grate", {
|
||||||
drawtype = "allfaces",
|
drawtype = "allfaces",
|
||||||
|
@ -306,31 +303,47 @@ register_copper_variants("grate", {
|
||||||
paramtype = "light",
|
paramtype = "light",
|
||||||
sunlight_propagates = true,
|
sunlight_propagates = true,
|
||||||
})
|
})
|
||||||
--[[
|
|
||||||
register_copper_variants("chiseled", {
|
register_copper_variants("chiseled", {
|
||||||
groups = {pickaxey = 2, building_block = 1}
|
groups = {pickaxey = 2, building_block = 1}
|
||||||
})
|
})
|
||||||
|
|
||||||
mcl_stairs.register_slab("copper_cut", "mcl_copper:block_cut",
|
register_copper_variants("bulb_off", {
|
||||||
{pickaxey = 2, oxidizable = 1},
|
groups = {pickaxey = 2, building_block = 1},
|
||||||
{"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"},
|
mesecons = {
|
||||||
S("Slab of Cut Copper"),
|
effector = {
|
||||||
nil, nil, nil,
|
action_on = function (pos, node)
|
||||||
S("Double Slab of Cut Copper"))
|
minetest.swap_node(pos, {name = node.name:gsub("bulb_off", "bulb_powered_on")})
|
||||||
|
end
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
mcl_stairs.register_slab("waxed_copper_cut", "mcl_copper:waxed_block_cut",
|
register_copper_variants("bulb_on", {
|
||||||
{pickaxey = 2, waxed = 1},
|
drop = "bulb_off",
|
||||||
{"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"},
|
groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1},
|
||||||
S("Waxed Slab of Cut Copper"),
|
light_source = 14,
|
||||||
nil, nil, nil,
|
mesecons = {
|
||||||
S("Waxed Double Slab of Cut Copper"))
|
effector = {
|
||||||
|
action_on = function (pos, node)
|
||||||
|
minetest.swap_node(pos, {name = node.name:gsub("bulb_on", "bulb_powered_off")})
|
||||||
|
end
|
||||||
|
},
|
||||||
|
},
|
||||||
|
paramtype = "light"
|
||||||
|
})
|
||||||
|
|
||||||
mcl_stairs.register_slab("copper_exposed_cut", "mcl_copper:block_exposed_cut",
|
register_copper_variants("bulb_powered_off", {
|
||||||
{pickaxey = 2, oxidizable = 1},
|
drop = "bulb_off",
|
||||||
{"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"},
|
groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1},
|
||||||
S("Slab of Exposed Cut Copper"),
|
mesecons = {
|
||||||
nil, nil, nil,
|
effector = {
|
||||||
S("Double Slab of Exposed Cut Copper"))
|
action_off = function (pos, node)
|
||||||
|
minetest.swap_node(pos, {name = node.name:gsub("bulb_powered_off", "bulb_off")})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
register_copper_variants("bulb_powered_on", {
|
register_copper_variants("bulb_powered_on", {
|
||||||
drop = "bulb_off",
|
drop = "bulb_off",
|
||||||
|
|
Loading…
Reference in New Issue