nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-07-22 01:20:24 +02:00
Code Issues Releases Wiki Activity

resolve conflict straw

Browse Source 
resolve conflict darkage:straw and farming:straw Use darkage:straw if not mod farming else use farming:straw
This commit is contained in:
crabman77
2015-03-03 21:18:02 +01:00
parent a85c16af47
commit 7a102d8a32
3 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
mods/darkage/crafts.lua
View File

@ -90,30 +90,56 @@ minetest.register_craft({
-- Cobble
-- Other Blocks
--if not farming:straw
if minetest.get_modpath("farming") == nil then
minetest.register_craft({
output = "darkage:straw 2",
recipe = {
{"default:dry_shrub","default:dry_shrub"},
minetest.register_craft({
output = "darkage:straw 2",
recipe = {
{"default:dry_shrub","default:dry_shrub"},
}
})
{"default:dry_shrub","default:dry_shrub"},
}
})
minetest.register_craft({
output = "darkage:straw 2",
recipe = {
{"darkage:dry_leaves","darkage:dry_leaves"},
{"darkage:dry_leaves","darkage:dry_leaves"},
}
})
minetest.register_craft({
output = "darkage:straw 2",
recipe = {
{"darkage:dry_leaves","darkage:dry_leaves"},
{"darkage:dry_leaves","darkage:dry_leaves"},
}
})
minetest.register_craft({
output = "darkage:straw_bale",
recipe = {
{"darkage:straw","darkage:straw"},
{"darkage:straw","darkage:straw"},
}
})
minetest.register_craft({
output = "darkage:straw_bale",
recipe = {
{"darkage:straw","darkage:straw"},
{"darkage:straw","darkage:straw"},
}
})
minetest.register_craft({
output = "darkage:adobe 4",
recipe = {
{"default:sand","default:sand"},
{"default:clay_lump","darkage:straw"},
}
})
else
minetest.register_craft({
output = "darkage:straw_bale",
recipe = {
{"farming:straw","farming:straw"},
{"farming:straw","farming:straw"},
}
})
minetest.register_craft({
output = "darkage:adobe 4",
recipe = {
{"default:sand","default:sand"},
{"default:clay_lump","farming:straw"},
}
})
end
minetest.register_craft({
output = "darkage:slate_tile 4",
@ -151,14 +177,6 @@ minetest.register_craft({
}
})
minetest.register_craft({
output = "darkage:adobe 4",
recipe = {
{"default:sand","default:sand"},
{"default:clay_lump","darkage:straw"},
}
})
minetest.register_craft({
output = "darkage:lamp",
recipe = {