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

11
mods/darkage/stairs.lua
View File

@ -95,7 +95,8 @@ if stairsplus then
sounds = default.node_sound_stone_defaults(),
sunlight_propagates = true,
})
--if not farming:straw
if minetest.get_modpath("farming") == nil then
stairsplus:register_all("darkage", "straw", "darkage:straw", {
description = "Straw",
tiles = {"darkage_straw.png"},
@ -103,6 +104,7 @@ if stairsplus then
sounds = default.node_sound_stone_defaults(),
sunlight_propagates = true,
})
end
stairsplus:register_all("darkage", "straw_bale", "darkage:straw_bale", {
description = "Straw Bale",
@ -267,7 +269,8 @@ elseif stairs then
"Basalt Cobble Slab",
default.node_sound_stone_defaults()
)
--if not farming:straw
if minetest.get_modpath("farming") == nil then
stairs.register_stair_and_slab("straw", "darkage:straw",
{snappy=3, flammable=2},
{"darkage_straw.png"},
@ -275,7 +278,7 @@ elseif stairs then
"Straw Slab",
default.node_sound_stone_defaults()
)
end
stairs.register_stair_and_slab("straw_bale", "darkage:straw_bale",
{snappy=2, flammable=2},
{"darkage_straw_bale.png"},
@ -340,4 +343,4 @@ elseif stairs then
default.node_sound_stone_defaults()
)
end
end