Default and flowers: only run on-generated functions in mgv6. Remove indev ore defini...

[oweals/minetest_game.git] / mods / default / crafting.lua

diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 868623f7aa86248df030058af3d79bc1f9b993ac..eb1500445657ed08d29b6a407c85263ee5904bbb 100644 (file)
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -24,8 +24,8 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:fence_wood 2',
        recipe = {
-               {'default:stick', 'default:stick', 'default:stick'},
-               {'default:stick', 'default:stick', 'default:stick'},
+               {'group:stick', 'group:stick', 'group:stick'},
+               {'group:stick', 'group:stick', 'group:stick'},
        }
 })
 
@@ -34,7 +34,7 @@ minetest.register_craft({
        recipe = {
                {'group:wood', 'group:wood', 'group:wood'},
                {'group:wood', 'group:wood', 'group:wood'},
-               {'', 'default:stick', ''},
+               {'', 'group:stick', ''},
        }
 })
 
@@ -42,7 +42,7 @@ minetest.register_craft({
        output = 'default:torch 4',
        recipe = {
                {'default:coal_lump'},
-               {'default:stick'},
+               {'group:stick'},
        }
 })
 
@@ -50,8 +50,8 @@ minetest.register_craft({
        output = 'default:pick_wood',
        recipe = {
                {'group:wood', 'group:wood', 'group:wood'},
-               {'', 'default:stick', ''},
-               {'', 'default:stick', ''},
+               {'', 'group:stick', ''},
+               {'', 'group:stick', ''},
        }
 })
 
@@ -59,8 +59,8 @@ minetest.register_craft({
        output = 'default:pick_stone',
        recipe = {
                {'group:stone', 'group:stone', 'group:stone'},
-               {'', 'default:stick', ''},
-               {'', 'default:stick', ''},
+               {'', 'group:stick', ''},
+               {'', 'group:stick', ''},
        }
 })
 
@@ -68,8 +68,8 @@ minetest.register_craft({
        output = 'default:pick_steel',
        recipe = {
                {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
-               {'', 'default:stick', ''},
-               {'', 'default:stick', ''},
+               {'', 'group:stick', ''},
+               {'', 'group:stick', ''},
        }
 })
 
@@ -77,8 +77,8 @@ minetest.register_craft({
        output = 'default:pick_bronze',
        recipe = {
                {'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
-               {'', 'default:stick', ''},
-               {'', 'default:stick', ''},
+               {'', 'group:stick', ''},
+               {'', 'group:stick', ''},
        }
 })
 
@@ -86,8 +86,8 @@ minetest.register_craft({
        output = 'default:pick_mese',
        recipe = {
                {'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
-               {'', 'default:stick', ''},
-               {'', 'default:stick', ''},
+               {'', 'group:stick', ''},
+               {'', 'group:stick', ''},
        }
 })
 
@@ -95,8 +95,8 @@ minetest.register_craft({
        output = 'default:pick_diamond',
        recipe = {
                {'default:diamond', 'default:diamond', 'default:diamond'},
-               {'', 'default:stick', ''},
-               {'', 'default:stick', ''},
+               {'', 'group:stick', ''},
+               {'', 'group:stick', ''},
        }
 })
 
@@ -104,8 +104,8 @@ minetest.register_craft({
        output = 'default:shovel_wood',
        recipe = {
                {'group:wood'},
-               {'default:stick'},
-               {'default:stick'},
+               {'group:stick'},
+               {'group:stick'},
        }
 })
 
@@ -113,8 +113,8 @@ minetest.register_craft({
        output = 'default:shovel_stone',
        recipe = {
                {'group:stone'},
-               {'default:stick'},
-               {'default:stick'},
+               {'group:stick'},
+               {'group:stick'},
        }
 })
 
@@ -122,8 +122,8 @@ minetest.register_craft({
        output = 'default:shovel_steel',
        recipe = {
                {'default:steel_ingot'},
-               {'default:stick'},
-               {'default:stick'},
+               {'group:stick'},
+               {'group:stick'},
        }
 })
 
@@ -131,8 +131,8 @@ minetest.register_craft({
        output = 'default:shovel_bronze',
        recipe = {
                {'default:bronze_ingot'},
-               {'default:stick'},
-               {'default:stick'},
+               {'group:stick'},
+               {'group:stick'},
        }
 })
 
@@ -140,8 +140,8 @@ minetest.register_craft({
        output = 'default:shovel_mese',
        recipe = {
                {'default:mese_crystal'},
-               {'default:stick'},
-               {'default:stick'},
+               {'group:stick'},
+               {'group:stick'},
        }
 })
 
@@ -149,8 +149,8 @@ minetest.register_craft({
        output = 'default:shovel_diamond',
        recipe = {
                {'default:diamond'},
-               {'default:stick'},
-               {'default:stick'},
+               {'group:stick'},
+               {'group:stick'},
        }
 })
 
@@ -158,8 +158,8 @@ minetest.register_craft({
        output = 'default:axe_wood',
        recipe = {
                {'group:wood', 'group:wood'},
-               {'group:wood', 'default:stick'},
-               {'', 'default:stick'},
+               {'group:wood', 'group:stick'},
+               {'', 'group:stick'},
        }
 })
 
@@ -167,8 +167,8 @@ minetest.register_craft({
        output = 'default:axe_stone',
        recipe = {
                {'group:stone', 'group:stone'},
-               {'group:stone', 'default:stick'},
-               {'', 'default:stick'},
+               {'group:stone', 'group:stick'},
+               {'', 'group:stick'},
        }
 })
 
@@ -176,8 +176,8 @@ minetest.register_craft({
        output = 'default:axe_steel',
        recipe = {
                {'default:steel_ingot', 'default:steel_ingot'},
-               {'default:steel_ingot', 'default:stick'},
-               {'', 'default:stick'},
+               {'default:steel_ingot', 'group:stick'},
+               {'', 'group:stick'},
        }
 })
 
@@ -185,8 +185,8 @@ minetest.register_craft({
        output = 'default:axe_bronze',
        recipe = {
                {'default:bronze_ingot', 'default:bronze_ingot'},
-               {'default:bronze_ingot', 'default:stick'},
-               {'', 'default:stick'},
+               {'default:bronze_ingot', 'group:stick'},
+               {'', 'group:stick'},
        }
 })
 
@@ -194,8 +194,8 @@ minetest.register_craft({
        output = 'default:axe_mese',
        recipe = {
                {'default:mese_crystal', 'default:mese_crystal'},
-               {'default:mese_crystal', 'default:stick'},
-               {'', 'default:stick'},
+               {'default:mese_crystal', 'group:stick'},
+               {'', 'group:stick'},
        }
 })
 
@@ -203,8 +203,62 @@ minetest.register_craft({
        output = 'default:axe_diamond',
        recipe = {
                {'default:diamond', 'default:diamond'},
-               {'default:diamond', 'default:stick'},
-               {'', 'default:stick'},
+               {'default:diamond', 'group:stick'},
+               {'', 'group:stick'},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:axe_wood',
+       recipe = {
+               {'group:wood', 'group:wood'},
+               {'group:stick', 'group:wood'},
+               {'group:stick',''},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:axe_stone',
+       recipe = {
+               {'group:stone', 'group:stone'},
+               {'group:stick', 'group:stone'},
+               {'group:stick', ''},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:axe_steel',
+       recipe = {
+               {'default:steel_ingot', 'default:steel_ingot'},
+               {'group:stick', 'default:steel_ingot'},
+               {'group:stick', ''},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:axe_bronze',
+       recipe = {
+               {'default:bronze_ingot', 'default:bronze_ingot'},
+               {'group:stick', 'default:bronze_ingot'},
+               {'group:stick', ''},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:axe_mese',
+       recipe = {
+               {'default:mese_crystal', 'default:mese_crystal'},
+               {'group:stick', 'default:mese_crystal'},
+               {'group:stick', ''},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:axe_diamond',
+       recipe = {
+               {'default:diamond', 'default:diamond'},
+               {'group:stick', 'default:diamond'},
+               {'group:stick', ''},
        }
 })
 
@@ -213,7 +267,7 @@ minetest.register_craft({
        recipe = {
                {'group:wood'},
                {'group:wood'},
-               {'default:stick'},
+               {'group:stick'},
        }
 })
 
@@ -222,7 +276,7 @@ minetest.register_craft({
        recipe = {
                {'group:stone'},
                {'group:stone'},
-               {'default:stick'},
+               {'group:stick'},
        }
 })
 
@@ -231,7 +285,7 @@ minetest.register_craft({
        recipe = {
                {'default:steel_ingot'},
                {'default:steel_ingot'},
-               {'default:stick'},
+               {'group:stick'},
        }
 })
 
@@ -240,7 +294,7 @@ minetest.register_craft({
        recipe = {
                {'default:bronze_ingot'},
                {'default:bronze_ingot'},
-               {'default:stick'},
+               {'group:stick'},
        }
 })
 
@@ -249,7 +303,7 @@ minetest.register_craft({
        recipe = {
                {'default:mese_crystal'},
                {'default:mese_crystal'},
-               {'default:stick'},
+               {'group:stick'},
        }
 })
 
@@ -258,7 +312,7 @@ minetest.register_craft({
        recipe = {
                {'default:diamond'},
                {'default:diamond'},
-               {'default:stick'},
+               {'group:stick'},
        }
 })
 
@@ -266,7 +320,7 @@ minetest.register_craft({
        output = 'default:rail 15',
        recipe = {
                {'default:steel_ingot', '', 'default:steel_ingot'},
-               {'default:steel_ingot', 'default:stick', 'default:steel_ingot'},
+               {'default:steel_ingot', 'group:stick', 'default:steel_ingot'},
                {'default:steel_ingot', '', 'default:steel_ingot'},
        }
 })
@@ -416,7 +470,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = 'default:sandstonebrick',
+       output = 'default:sandstonebrick 4',
        recipe = {
                {'default:sandstone', 'default:sandstone'},
                {'default:sandstone', 'default:sandstone'},
@@ -474,9 +528,9 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:ladder',
        recipe = {
-               {'default:stick', '', 'default:stick'},
-               {'default:stick', 'default:stick', 'default:stick'},
-               {'default:stick', '', 'default:stick'},
+               {'group:stick', '', 'group:stick'},
+               {'group:stick', 'group:stick', 'group:stick'},
+               {'group:stick', '', 'group:stick'},
        }
 })
 
@@ -520,7 +574,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = 'default:stonebrick',
+       output = 'default:stonebrick 4',
        recipe = {
                {'default:stone', 'default:stone'},
                {'default:stone', 'default:stone'},
@@ -528,7 +582,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = 'default:desert_stonebrick',
+       output = 'default:desert_stonebrick 4',
        recipe = {
                {'default:desert_stone', 'default:desert_stone'},
                {'default:desert_stone', 'default:desert_stone'},
@@ -581,6 +635,12 @@ minetest.register_craft({
        recipe = "default:cobble",
 })
 
+minetest.register_craft({
+       type = "cooking",
+       output = "default:desert_stone",
+       recipe = "default:desert_cobble",
+})
+
 minetest.register_craft({
        type = "cooking",
        output = "default:steel_ingot",