diff --git a/mods/bobblocks/health.lua b/mods/bobblocks/health.lua index 72380718..f2b97065 100755 --- a/mods/bobblocks/health.lua +++ b/mods/bobblocks/health.lua @@ -83,10 +83,10 @@ minetest.register_abm( --- Health minetest.register_craft({ - output = 'NodeItem "bobblocks:health_off" 1', + output = "bobblocks:health_off", + type = "shapeless", recipe = { - {'node "default:dirt" 1', 'node "default:paper" 1', 'node "default:apple" 2'}, - + "default:dirt", "default:paper", "default:apple", "default:apple" }, }) diff --git a/mods/moreblocks/aliases.lua b/mods/moreblocks/aliases.lua index 15f7b6b2..db50c53d 100755 --- a/mods/moreblocks/aliases.lua +++ b/mods/moreblocks/aliases.lua @@ -59,18 +59,13 @@ minetest.register_alias("moreblocks:allfacestree","moreblocks:all_faces_tree") local horizontal_tree_convert_facedir = {7, 12, 9, 18} minetest.register_abm({ - nodenames = {"moreblocks:horizontal_tree","moreblocks:horizontal_jungle_tree"}, + nodenames = {"moreblocks:horizontal_tree"}, interval = 1, chance = 1, action = function(pos, node) - if node.name == "moreblocks:horizontal_tree" then - node.name = "default:tree" - else - node.name = "default:jungletree" - end node.param2 = node.param2 < 3 and node.param2 or 0 minetest.set_node(pos, { - name = node.name, + name = "default:tree", param2 = horizontal_tree_convert_facedir[node.param2 + 1] }) end, diff --git a/mods/moreblocks/crafting.lua b/mods/moreblocks/crafting.lua index c0972f78..ed635152 100755 --- a/mods/moreblocks/crafting.lua +++ b/mods/moreblocks/crafting.lua @@ -463,3 +463,30 @@ if minetest.setting_getbool("moreblocks.circular_saw_crafting") ~= false then -- } }) end + +-- MODIFICATION MADE FOR MFF //MFF(Mg|08/09/15) + + +minetest.register_craft({ + output = "moreblocks:horizontal_jungle_tree 2", + recipe = { + {"default:jungletree", "", "default:jungletree"}, + } +}) + +minetest.register_craft({ + output = "default:jungletree 2", + recipe = { + {"moreblocks:horizontal_jungle_tree"}, + {"moreblocks:horizontal_jungle_tree"}, + } +}) + +minetest.register_craft({ + output = "default:junglewood 4", + recipe = { + {"moreblocks:horizontal_jungle_tree"}, + } +}) + +-- END OF MODIFICATIONS diff --git a/mods/moreblocks/nodes.lua b/mods/moreblocks/nodes.lua index 3c4524dc..96efdfa7 100755 --- a/mods/moreblocks/nodes.lua +++ b/mods/moreblocks/nodes.lua @@ -268,6 +268,19 @@ local nodes = { sounds = sound_wood, furnace_burntime = 30, }, + ["horizontal_jungle_tree"] = { + description = S("Horizontal Jungle Tree"), + tiles = {"default_jungletree.png", + "default_jungletree.png", + "default_jungletree.png^[transformR90", + "default_jungletree.png^[transformR90", + "default_jungletree_top.png", + "default_jungletree_top.png"}, + paramtype2 = "facedir", + groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2}, + sounds = sound_wood, + furnace_burntime = 30, + }, ["glow_glass"] = { description = S("Glow Glass"), drawtype = "glasslike_framed_optional", diff --git a/mods/moretrees/crafts.lua b/mods/moretrees/crafts.lua index 515a097e..f608e345 100755 --- a/mods/moretrees/crafts.lua +++ b/mods/moretrees/crafts.lua @@ -3,13 +3,23 @@ local S = moretrees.intllib for i in ipairs(moretrees.treelist) do local treename = moretrees.treelist[i][1] - minetest.register_craft({ - output = "moretrees:"..treename.."_trunk 2", - recipe = { - {"moretrees:"..treename.."_trunk_sideways"}, - {"moretrees:"..treename.."_trunk_sideways"} - } - }) + if minetest.registered_items["moretrees:" .. treename .. "_trunk_sideways"] then + minetest.register_craft({ + output = "moretrees:"..treename.."_trunk 2", + recipe = { + {"moretrees:"..treename.."_trunk_sideways"}, + {"moretrees:"..treename.."_trunk_sideways"} + } + }) + + minetest.register_craft({ + type = "shapeless", + output = "moretrees:"..treename.."_planks 4", + recipe = { + "moretrees:"..treename.."_trunk_sideways" + } + }) + end minetest.register_craft({ type = "shapeless", @@ -19,14 +29,6 @@ for i in ipairs(moretrees.treelist) do } }) - minetest.register_craft({ - type = "shapeless", - output = "moretrees:"..treename.."_planks 4", - recipe = { - "moretrees:"..treename.."_trunk_sideways" - } - }) - minetest.register_craft({ type = "fuel", recipe = "moretrees:"..treename.."_sapling", diff --git a/mods/moretrees/init.lua b/mods/moretrees/init.lua index 523d4982..6fe8ee9b 100755 --- a/mods/moretrees/init.lua +++ b/mods/moretrees/init.lua @@ -67,12 +67,13 @@ moretrees.cutting_tools = { "default:axe_diamond", "default:axe_mese", "default:axe_steel", - "glooptest:axe_alatro", - "glooptest:axe_arol", +-- "glooptest:axe_alatro", +-- "glooptest:axe_arol", "moreores:axe_mithril", "moreores:axe_silver", - "titanium:axe", +-- "titanium:axe", } +-- Cutting tools disabled. They are unknown //MFF(Mg|08/09/15) dofile(modpath.."/tree_models.lua") dofile(modpath.."/node_defs.lua") diff --git a/mods/moretrees/node_defs.lua b/mods/moretrees/node_defs.lua index 66951ff8..098b522e 100755 --- a/mods/moretrees/node_defs.lua +++ b/mods/moretrees/node_defs.lua @@ -405,7 +405,7 @@ minetest.register_alias("farming_plus:rubber_sapling", "moretrees:rubber_tree_sa minetest.register_alias("farming:rubber_sapling", "moretrees:rubber_tree_sapling") minetest.register_alias("default:junglesapling","moretrees:jungletree_sapling") -minetest.register_alias("moretrees:jungletree_trunk_sideways", "default:jungletree") -- Item Changed. moreblocks:horizontal_jungle_tree is unknown. //MFF(Mg|08/04/15) +minetest.register_alias("moretrees:jungletree_trunk_sideways", "moreblocks:horizontal_jungle_tree") minetest.register_alias("moretrees:jungletree_trunk", "default:jungletree") minetest.register_alias("moretrees:jungletree_planks", "default:junglewood") diff --git a/mods/plantlife_modpack/trunks/crafting.lua b/mods/plantlife_modpack/trunks/crafting.lua index 02f39913..72f39ba7 100755 --- a/mods/plantlife_modpack/trunks/crafting.lua +++ b/mods/plantlife_modpack/trunks/crafting.lua @@ -35,7 +35,7 @@ minetest.register_craft({ }) minetest.register_craft({ output = "trunks:twig_1 4", - recipe = {{"bushes:bushbranches2a"}} + recipe = {{"bushes:bushbranches2"}} }) minetest.register_craft({ output = "trunks:twig_1 4", @@ -130,4 +130,4 @@ minetest.register_craft({ -- twigs blocks --> twigs_roof_corner_2's {"trunks:twigs", "" ,"trunks:twigs"}, { "" ,"trunks:twigs", "" }, } -}) \ No newline at end of file +}) diff --git a/mods/quartz/init.lua b/mods/quartz/init.lua index 8006e4c1..2728d7f8 100755 --- a/mods/quartz/init.lua +++ b/mods/quartz/init.lua @@ -111,14 +111,14 @@ minetest.register_craft({ }) --Chiseled Quartz(for stairsplus) -minetest.register_craft({ +--[[minetest.register_craft({ output = 'quartz:chiseled 2', recipe = { {'quartz:slab_block', '', ''}, {'quartz:slab_block', '', ''}, {'', '', ''}, } -}) +}) ]]-- Disabled. Item "quartz:slab_block" is unknown //MFF(Mg|08/09/15) --Quartz Pillar minetest.register_craft({