nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-07-22 09:30: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

37
mods/darkage/nodes.lua
View File

@ -164,20 +164,31 @@ minetest.register_node("darkage:stone_brick", {
})
-- Other Blocks
minetest.register_node("darkage:straw", {
description = "Straw",
tiles = {"darkage_straw.png"},
groups = {snappy=3, flammable=2},
sounds = default.node_sound_leaves_defaults(),
})
--if not farming:straw
if minetest.get_modpath("farming") == nil then
minetest.register_node("darkage:straw", {
description = "Straw",
tiles = {"darkage_straw.png"},
groups = {snappy=3, flammable=2},
sounds = default.node_sound_leaves_defaults(),
})
minetest.register_node("darkage:straw_bale", {
description = "Straw Bale",
tiles = {"darkage_straw_bale.png"},
drop = "darkage:straw 4",
groups = {snappy=2, flammable=2},
sounds = default.node_sound_leaves_defaults(),
})
minetest.register_node("darkage:straw_bale", {
description = "Straw Bale",
tiles = {"darkage_straw_bale.png"},
drop = "darkage:straw 4",
groups = {snappy=2, flammable=2},
sounds = default.node_sound_leaves_defaults(),
})
else
minetest.register_node("darkage:straw_bale", {
description = "Straw Bale",
tiles = {"darkage_straw_bale.png"},
drop = "farming:straw 4",
groups = {snappy=2, flammable=2},
sounds = default.node_sound_leaves_defaults(),
})
end
minetest.register_node("darkage:slate_tile", {
description = "Slate Tile",