diff --git a/mods/animalia/craftitems.lua b/mods/animalia/craftitems.lua index 725a7ff6..4c43067e 100644 --- a/mods/animalia/craftitems.lua +++ b/mods/animalia/craftitems.lua @@ -276,6 +276,16 @@ minetest.register_craft({ output = "animalia:poultry_cooked", }) +if minetest.get_modpath("cucina_vegana") then +minetest.register_craft({ + type = "cooking", + recipe = "cucina_vegana:imitation_poultry", + output = "animalia:poultry_cooked", +}) +end + + + minetest.register_craftitem("animalia:venison_raw", { description = "Raw Venison", inventory_image = "animalia_venison_raw.png", diff --git a/mods/cucina_vegana/aliases.lua b/mods/cucina_vegana/aliases.lua index 86b0138a..ed9d535f 100644 --- a/mods/cucina_vegana/aliases.lua +++ b/mods/cucina_vegana/aliases.lua @@ -1,2 +1,4 @@ minetest.register_alias("cucina_vegana:corn_cob", "cucina_vegana:corn") +minetest.register_alias("cucina_vegana:soy", "farming:soy_pod") +minetest.register_alias("cucina_vegana:soy", "x_farming:soybean") diff --git a/mods/cucina_vegana/items.lua b/mods/cucina_vegana/items.lua index 8a84d37b..f68a8af3 100644 --- a/mods/cucina_vegana/items.lua +++ b/mods/cucina_vegana/items.lua @@ -124,7 +124,7 @@ minetest.register_craftitem("cucina_vegana:imitation_cheese", { minetest.register_craftitem("cucina_vegana:imitation_fish", { description = S("Imitation Fish"), - groups = {food = 1, food_fish = 1, food_vegan = 1, eatable = 1}, + groups = {food = 1, food_fish = 1, food_vegan = 1, eatable = 1, food_fish_raw = 1, fish = 1}, inventory_image = "cucina_vegana_imitation_fish.png", on_use = minetest.item_eat(3), }) @@ -138,7 +138,7 @@ minetest.register_craftitem("cucina_vegana:imitation_meat", { minetest.register_craftitem("cucina_vegana:imitation_poultry", { description = S("Imitation poultry"), - groups = {food = 1, food_bird = 1, food_vegan = 1}, + groups = {food = 1, food_bird = 1, food_vegan = 1, food_chicken_raw = 1}, inventory_image = "cucina_vegana_imitation_poultry.png", }) diff --git a/mods/cucina_vegana/recipes.lua b/mods/cucina_vegana/recipes.lua index a862d2c5..5be7b45c 100644 --- a/mods/cucina_vegana/recipes.lua +++ b/mods/cucina_vegana/recipes.lua @@ -174,7 +174,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:pizza_vegana_raw", recipe = { {"", "cucina_vegana:sauce_hollandaise", ""}, - {"cucina_vegana:asparagus", "cucina_vegana:lettuce", "cucina_vegana:rosemary"}, + {"cucina_vegana:asparagus", "group:food_lettuce", "cucina_vegana:rosemary"}, {"", "group:pizza_dough", ""} }, replacements = { @@ -415,8 +415,8 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:soy_milk", recipe = { - {"cucina_vegana:soy", "cucina_vegana:soy", "cucina_vegana:soy"}, - {"", "cucina_vegana:soy", ""}, + {"group:food_soy", "group:food_soy", "group:food_soy"}, + {"", "group:food_soy", ""}, {"", "vessels:drinking_glass", ""}, }, }) @@ -424,9 +424,9 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:tofu", recipe = { - {"cucina_vegana:soy", "cucina_vegana:soy", "cucina_vegana:soy"}, - {"cucina_vegana:soy", "cucina_vegana:soy", "cucina_vegana:soy"}, - {"cucina_vegana:soy", "cucina_vegana:soy", "cucina_vegana:soy"}, + {"group:food_soy", "group:food_soy", "group:food_soy"}, + {"group:food_soy", "group:food_soy", "group:food_soy"}, + {"group:food_soy", "group:food_soy", "group:food_soy"}, }, }) @@ -457,7 +457,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:bowl_rice", recipe = { - {"cucina_vegana:rice"}, + {"group:food_rice"}, {"bucket:bucket_water"}, {"group:food_bowl"}, }, @@ -469,7 +469,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:bowl_rice", recipe = { - {"cucina_vegana:rice"}, + {"group:food_rice"}, {"bucket:bucket_river_water"}, {"group:food_bowl"}, }, @@ -492,7 +492,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:edamame", - recipe = { {"cucina_vegana:rosemary", "group:seed_soy", "cucina_vegana:peanut"}, + recipe = { {"cucina_vegana:rosemary", "group:seed_soy", "group:food_peanut"}, {"group:seed_soy", "group:seed_soy", "group:seed_soy"}, {"", "group:food_plate", ""} } @@ -500,7 +500,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:sauce_hollandaise", - recipe = { {"cucina_vegana:parsley", "group:food_butter", "cucina_vegana:rosemary"}, + recipe = { {"group:food_parsley", "group:food_butter", "cucina_vegana:rosemary"}, {"", "cucina_vegana:soy_milk", ""}, {"", "vessels:glass_bottle", ""} }, @@ -546,8 +546,8 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:peanut_butter", recipe = { - {"cucina_vegana:peanut", "default:stick", "cucina_vegana:peanut"}, - {"cucina_vegana:peanut", "group:food_butter", "cucina_vegana:peanut"}, + {"group:food_peanut", "default:stick", "group:food_peanut"}, + {"group:food_peanut", "group:food_butter", "group:food_peanut"}, {"", "vessels:glass_bottle", ""}, }, replacements = { @@ -584,7 +584,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:asparagus_hollandaise", - recipe = { {"cucina_vegana:asparagus", "cucina_vegana:sauce_hollandaise", "cucina_vegana:parsley"}, + recipe = { {"cucina_vegana:asparagus", "cucina_vegana:sauce_hollandaise", "group:food_parsley"}, {"", "group:food_plate", ""} }, replacements = { {"group:food_sauce", "vessels:glass_bottle"}, @@ -616,7 +616,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:fish_parsley_rosemary", recipe = { - {"cucina_vegana:parsley","group:food_oil", "cucina_vegana:rosemary"}, + {"group:food_parsley","group:food_oil", "cucina_vegana:rosemary"}, {"","group:food_fish", ""}, {"","group:food_plate", ""}, }, @@ -629,8 +629,8 @@ minetest.register_craft({ output = "cucina_vegana:fryer_raw", recipe = { {"default:paper","", "default:paper"}, - {"cucina_vegana:parsley","cucina_vegana:molasses", "cucina_vegana:rosemary"}, - {"","cucina_vegana:imitation_poultry", ""}, + {"group:food_parsley","cucina_vegana:molasses", "cucina_vegana:rosemary"}, + {"","group:food_chicken_raw", ""}, }, replacements = { {"cucina_vegana:molasses", "vessels:drinking_glass"}, @@ -641,14 +641,14 @@ minetest.register_craft({ output = "cucina_vegana:fryer_raw", recipe = { {"default:paper","", "default:paper"}, - {"cucina_vegana:potato","cucina_vegana:parsley", "cucina_vegana:potato"}, - {"cucina_vegana:carrot","cucina_vegana:imitation_poultry", "cucina_vegana:carrot"}, + {"group:food_potato","group:food_parsley", "group:food_potato"}, + {"group:food_carrot","group:food_chicken_raw", "group:food_carrot"}, }, }) minetest.register_craft({ output = "cucina_vegana:kohlrabi_soup", - recipe = { {"cucina_vegana:kohlrabi", "group:food_oil", "cucina_vegana:parsley"}, + recipe = { {"cucina_vegana:kohlrabi", "group:food_oil", "group:food_parsley"}, {"", "bucket:bucket_water", ""}, {"", "group:food_plate", ""} }, @@ -659,7 +659,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:kohlrabi_soup", - recipe = { {"cucina_vegana:kohlrabi", "group:food_oil", "cucina_vegana:parsley"}, + recipe = { {"cucina_vegana:kohlrabi", "group:food_oil", "group:food_parsley"}, {"", "bucket:bucket_river_water", ""}, {"", "group:food_plate", ""} }, @@ -670,7 +670,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:salad_bowl", - recipe = { {"cucina_vegana:parsley", "cucina_vegana:lettuce", "cucina_vegana:chives"}, + recipe = { {"group:food_parsley", "group:food_lettuce", "cucina_vegana:chives"}, {"", "group:food_oil", ""}, {"", "group:food_bowl", ""} }, @@ -691,7 +691,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:salad_hollandaise", - recipe = { {"cucina_vegana:parsley", "cucina_vegana:lettuce", "cucina_vegana:chives"}, + recipe = { {"group:food_parsley", "group:food_lettuce", "cucina_vegana:chives"}, {"cucina_vegana:sauce_hollandaise", "group:food_oil", ""}, {"", "group:food_bowl", ""} }, @@ -704,7 +704,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:sea_salad", - recipe = { {"default:jungleleaves", "cucina_vegana:parsley", "cucina_vegana:lettuce"}, + recipe = { {"default:jungleleaves", "group:food_parsley", "group:food_lettuce"}, {"cucina_vegana:chives", "bucket:bucket_water", "cucina_vegana:asparagus"}, {"", "group:food_bowl", ""} }, @@ -716,7 +716,7 @@ minetest.register_craft({ minetest.register_craft({ output = "cucina_vegana:soy_soup", - recipe = { {"cucina_vegana:chives", "group:food_oil", "cucina_vegana:parsley"}, + recipe = { {"cucina_vegana:chives", "group:food_oil", "group:food_parsley"}, {"", "cucina_vegana:soy_milk", ""}, {"", "group:food_plate", ""} }, diff --git a/mods/cucina_vegana/recipes_support.lua b/mods/cucina_vegana/recipes_support.lua index e2609abd..efe47803 100644 --- a/mods/cucina_vegana/recipes_support.lua +++ b/mods/cucina_vegana/recipes_support.lua @@ -629,7 +629,7 @@ if minetest.get_modpath("aqua_farming") then minetest.register_craft({ output = "cucina_vegana:sea_salad", recipe = { - {"aqua_farming:sea_cucumber_item","cucina_vegana:parsley", "cucina_vegana:lettuce"}, + {"aqua_farming:sea_cucumber_item","group:food_parsley", "group:food_lettuce"}, {"cucina_vegana:chives","aqua_farming:sea_anemone_item", "cucina_vegana:asparagus"}, {"","cucina_vegana:bowl", ""}, @@ -638,5 +638,31 @@ if minetest.get_modpath("aqua_farming") then end +--[[ + ************************************************** + *** Support for farming redo *** + ************************************************** +]]-- + +if minetest.get_modpath("farming") then + +minetest.register_craft({ + output = "cucina_vegana:ciabatta_dough", + recipe = { {"group:food_milk", "group;food_oil", ""}, + {"group:food_flour", "cucina_vegana:rosemary", ""} + }, + replacements = { + {"group:food_milk", "vessels:drinking_glass"}, + {"group:food_oil", "vessels:glass_bottle"}, + } +}) + + + + + +end + + cucina_vegana.add_group("default:blueberries", {food_blueberry = 1, food_blueberries = 1}) cucina_vegana.add_group("bushes:blueberry", {food_blueberries = 1}) diff --git a/mods/cucina_vegana/settingtypes.txt b/mods/cucina_vegana/settingtypes.txt index 59226b1b..1b77d9b2 100644 --- a/mods/cucina_vegana/settingtypes.txt +++ b/mods/cucina_vegana/settingtypes.txt @@ -15,7 +15,7 @@ cucina_vegana.plant_settings.banana_scale (Spreadvalue) float 0.0005 cucina_vegana.plant_settings.banana_light (Min. Light) int 12 #Carrot -cucina_vegana.plant_settings.carrot (Enable Carrot) bool true +cucina_vegana.plant_settings.carrot (Enable Carrot) bool false cucina_vegana.plant_settings.carrot_scale (Spreadvalue) float 0.0005 cucina_vegana.plant_settings.carrot_light (Min. Light) int 11 @@ -75,7 +75,7 @@ cucina_vegana.plant_settings.soy_scale (Spreadvalue) float 0.0007 cucina_vegana.plant_settings.soy_light (Min. Light) int 12 #Sunflower -cucina_vegana.plant_settings.sunflower (Enable Sunflower) bool true +cucina_vegana.plant_settings.sunflower (Enable Sunflower) bool false cucina_vegana.plant_settings.sunflower_scale (Spreadvalue) float 0.0007 cucina_vegana.plant_settings.sunflower_light (Min. Light) int 13 @@ -90,12 +90,12 @@ cucina_vegana.plant_settings.potato_scale (Spreadvalue) float 0.0005 cucina_vegana.plant_settings.potato_light (Min. Light) int 11 #Garlic -cucina_vegana.plant_settings.garlic (Enable Garlic) bool true +cucina_vegana.plant_settings.garlic (Enable Garlic) bool false cucina_vegana.plant_settings.garlic_scale (Spreadvalue) float 0.0006 cucina_vegana.plant_settings.garlic_light (Min. Light) int 12 #Chili -cucina_vegana.plant_settings.chili (Enable Chili) bool true +cucina_vegana.plant_settings.chili (Enable Chili) bool false cucina_vegana.plant_settings.chili_scale (Spreadvalue) float 0.0002 cucina_vegana.plant_settings.chili_light (Min. Light) int 13 @@ -118,7 +118,7 @@ cucina_vegana.shrub_settings.vine_light (Min. Light) int 12 cucina_vegana.shrub_settings.vine_duration (Duration in Seconds) int 120 #Coffee -cucina_vegana.shrub_settings.coffee (Enable coffee) bool true +cucina_vegana.shrub_settings.coffee (Enable coffee) bool false cucina_vegana.shrub_settings.coffee_scale (Spreadvalue) float 0.005 cucina_vegana.shrub_settings.coffee_light (Min. Light) int 11 cucina_vegana.shrub_settings.coffee_duration (Duration in Seconds) int 180 diff --git a/mods/ethereal/fishing.lua b/mods/ethereal/fishing.lua index 3639bd62..f18c6e31 100644 --- a/mods/ethereal/fishing.lua +++ b/mods/ethereal/fishing.lua @@ -553,7 +553,7 @@ for n = 1, #fish do if fish[n][3] ~= 0 then usage = minetest.item_eat(fish[n][3]) - groups = {food_fish_raw = 1, ethereal_fish = 1} + groups = {food_fish_raw = 1, ethereal_fish = 1, fish = 1} end minetest.register_craftitem("ethereal:fish_" .. fish[n][2], { diff --git a/mods/ethereal/food.lua b/mods/ethereal/food.lua index 956cd077..9ad9349c 100644 --- a/mods/ethereal/food.lua +++ b/mods/ethereal/food.lua @@ -690,7 +690,15 @@ ethereal.add_eatable("ethereal:fish_n_chips", 6) minetest.register_craft({ output = "ethereal:fish_n_chips", recipe = { - {"farming:baking_tray", "group:ethereal_fish", "group:food_potato"} + {"farming:baking_tray", "group:food_fish_raw", "group:food_potato"} + }, + replacements = {{"farming:baking_tray", "farming:baking_tray"}} +}) + +minetest.register_craft({ + output = "ethereal:fish_n_chips", + recipe = { + {"farming:baking_tray", "group:fish", "group:food_potato"} }, replacements = {{"farming:baking_tray", "farming:baking_tray"}} }) @@ -710,7 +718,7 @@ ethereal.add_eatable("ethereal:fish_cooked", 5) minetest.register_craft({ type = "cooking", output = "ethereal:fish_cooked", - recipe = "group:ethereal_fish", + recipe = "group:food_fish_raw", cooktime = 8 }) diff --git a/mods/farming/item_food.lua b/mods/farming/item_food.lua index 36ae280e..33ad97ea 100644 --- a/mods/farming/item_food.lua +++ b/mods/farming/item_food.lua @@ -857,7 +857,7 @@ minetest.register_node("farming:soy_milk", { }, on_use = minetest.item_eat(2, "vessels:drinking_glass"), groups = { - vessel = 1, food_milk_glass = 1, dig_immediate = 3, handy = 1, + vessel = 1, food_milk_glass = 1, food_soy_milk = 1, dig_immediate = 3, handy = 1, attached_node = 1, drink = 1, compostability = 65 }, is_ground_content = false, diff --git a/mods/skinsdb/textures/character_nora_half.png b/mods/skinsdb/textures/character_nora_half.png deleted file mode 100644 index 9433d585..00000000 Binary files a/mods/skinsdb/textures/character_nora_half.png and /dev/null differ diff --git a/mods/x_farming/soybean.lua b/mods/x_farming/soybean.lua index 2488fa98..dcf125d8 100644 --- a/mods/x_farming/soybean.lua +++ b/mods/x_farming/soybean.lua @@ -51,7 +51,7 @@ minetest.register_craftitem('x_farming:bottle_soymilk', { tiles = { 'x_farming_bottle_soymilk.png' }, inventory_image = 'x_farming_bottle_soymilk.png', wield_image = 'x_farming_bottle_soymilk.png', - groups = { vessel = 1 , food_milk = 1}, + groups = { vessel = 1 , food_milk = 1, food_soy_milk = 1}, sounds = x_farming.node_sound_thin_glass_defaults(), })