nalc
/
server-nalc
mirror of https://github.com/sys4-fr/server-nalc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove fake_fire:flint_and_steel and add aliases 

Now fire:flint_and_steel from the default "fire" mod replace the "fake_fire:flint_and_steel"
This commit is contained in:
Quentin BUISSON-DEBON 2016-06-18 15:21:09 +02:00
parent 5977a4962f
commit e96e52f358
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mods/_misc/aliases.lua
View File

@ -59,3 +59,6 @@ end
-- Remove "xmas_tree" from snow mod
alias("snow:xmas_tree", "default:dirt")
-- remove "fake_fire:flint_and_steel" from homedecor_modpack mod
alias("fake_fire:flint_and_steel", "fire:flint_and_steel")

21
mods/christmas_craft/init.lua
View File

@ -332,7 +332,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 75,},
{items = {'default:axe_diamond'}, rarity = 75,},
{items = {'default:diamondblock'}, rarity = 75},
{items = {'fake_fire:flint_and_steel'}, rarity = 90,},
{items = {'fire:flint_and_steel'}, rarity = 90,},
{items = {'default:chest_locked'}, rarity = 80,},
{items = {'default:brick'}, rarity = 80,},
{items = {'default:dirt_with_grass'}, rarity = 80,},
@ -364,7 +364,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 30,},
{items = {'default:axe_diamond'}, rarity = 30,},
{items = {'default:diamondblock'}, rarity = 30,},
{items = {'fake_fire:flint_and_steel'}, rarity = 15,},
{items = {'fire:flint_and_steel'}, rarity = 15,},
{items = {'default:chest_locked'}, rarity = 20,},
{items = {'default:brick'}, rarity = 25,},
{items = {'default:dirt_with_grass'}, rarity = 30,},
@ -396,7 +396,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 30,},
{items = {'default:axe_diamond'}, rarity = 30,},
{items = {'default:diamondblock'}, rarity = 30,},
{items = {'fake_fire:flint_and_steel'}, rarity = 15,},
{items = {'fire:flint_and_steel'}, rarity = 15,},
{items = {'default:chest_locked'}, rarity = 20,},
{items = {'default:brick'}, rarity = 25,},
{items = {'default:dirt_with_grass'}, rarity = 30,},
@ -428,7 +428,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 30,},
{items = {'default:axe_diamond'}, rarity = 30,},
{items = {'default:diamondblock'}, rarity = 30,},
{items = {'fake_fire:flint_and_steel'}, rarity = 15,},
{items = {'fire:flint_and_steel'}, rarity = 15,},
{items = {'default:chest_locked'}, rarity = 20,},
{items = {'default:brick'}, rarity = 25,},
{items = {'default:dirt_with_grass'}, rarity = 30,},
@ -460,7 +460,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 30,},
{items = {'default:axe_diamond'}, rarity = 30,},
{items = {'default:diamondblock'}, rarity = 30,},
{items = {'fake_fire:flint_and_steel'}, rarity = 15,},
{items = {'fire:flint_and_steel'}, rarity = 15,},
{items = {'default:chest_locked'}, rarity = 20,},
{items = {'default:brick'}, rarity = 25,},
{items = {'default:dirt_with_grass'}, rarity = 30,},
@ -492,7 +492,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 30,},
{items = {'default:axe_diamond'}, rarity = 30,},
{items = {'default:diamondblock'}, rarity = 30,},
{items = {'fake_fire:flint_and_steel'}, rarity = 15,},
{items = {'fire:flint_and_steel'}, rarity = 15,},
{items = {'default:chest_locked'}, rarity = 20,},
{items = {'default:brick'}, rarity = 25,},
{items = {'default:dirt_with_grass'}, rarity = 30,},
@ -524,7 +524,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 30,},
{items = {'default:axe_diamond'}, rarity = 30,},
{items = {'default:diamondblock'}, rarity = 30,},
{items = {'fake_fire:flint_and_steel'}, rarity = 15,},
{items = {'fire:flint_and_steel'}, rarity = 15,},
{items = {'default:chest_locked'}, rarity = 20,},
{items = {'default:brick'}, rarity = 25,},
{items = {'default:dirt_with_grass'}, rarity = 30,},
@ -556,7 +556,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 30,},
{items = {'default:axe_diamond'}, rarity = 30,},
{items = {'default:diamondblock'}, rarity = 30,},
{items = {'fake_fire:flint_and_steel'}, rarity = 15,},
{items = {'fire:flint_and_steel'}, rarity = 15,},
{items = {'default:chest_locked'}, rarity = 20,},
{items = {'default:brick'}, rarity = 25,},
{items = {'default:dirt_with_grass'}, rarity = 30,},
@ -588,7 +588,7 @@ minetest.register_node("christmas_craft:silver_baubles", {
{items = {'default:shovel_diamond'}, rarity = 30,},
{items = {'default:axe_diamond'}, rarity = 30,},
{items = {'default:diamondblock'}, rarity = 30,},
{items = {'fake_fire:flint_and_steel'}, rarity = 15,},
{items = {'fire:flint_and_steel'}, rarity = 15,},
{items = {'default:chest_locked'}, rarity = 20,},
{items = {'default:brick'}, rarity = 25,},
{items = {'default:dirt_with_grass'}, rarity = 30,},
@ -812,6 +812,3 @@ minetest.register_node("christmas_craft:snow", {
footstep = {name="default_gravel_footstep", gain=0.45},
}),
})

7
mods/homedecor_modpack/fake_fire/init.lua
View File

@ -177,6 +177,7 @@ for _, m in ipairs(materials) do
})
end
--[[ --MFF|Darcidride(18/06/2016) Commented because "Flint and Steel" is now on the default "fire" mod
-- FLINT and STEEL
minetest.register_tool("fake_fire:flint_and_steel", {
description = "Flint and steel",
@ -218,9 +219,9 @@ minetest.register_craft({
"default:coal_lump",
"group:wool"
}
-- /MFF (Mg|06/24/2015)
})
}) --]] --MFF|Darcidride(18/06/2016) Commented because "Flint and Steel" is now on the default "fire" mod
-- /MFF (Mg|06/24/2015)
minetest.register_craft({
type = "shapeless",
output = 'fake_fire:embers',
@ -238,4 +239,4 @@ minetest.register_alias("fake_fire:smokeless_fire", "fake_fire:fake_fire")
minetest.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire")
minetest.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone")
minetest.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone")
minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel")
--minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel") --MFF|Darcidride(18/06/2016) Commented because "Flint and Steel" is now on the default "fire" mod