Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2022-06-25 16:46:39 +02:00
commit 19d5001f46
2 changed files with 8 additions and 3 deletions

View File

@ -328,7 +328,7 @@ minetest.register_craftitem("farming:jaffa_cake", {
}) })
minetest.register_craft({ minetest.register_craft({
output = "farming:jaffa_cake", output = "farming:jaffa_cake 3",
recipe = { recipe = {
{"farming:baking_tray", "group:food_egg", "group:food_sugar"}, {"farming:baking_tray", "group:food_egg", "group:food_sugar"},
{"group:food_flour", "group:food_cocoa", "group:food_orange"}, {"group:food_flour", "group:food_cocoa", "group:food_orange"},
@ -337,6 +337,7 @@ minetest.register_craft({
replacements = { replacements = {
{"farming:baking_tray", "farming:baking_tray"}, {"farming:baking_tray", "farming:baking_tray"},
{"mobs:bucket_milk", "bucket:bucket_empty"}, {"mobs:bucket_milk", "bucket:bucket_empty"},
{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"},
{"farming:soy_milk", "vessels:drining_glass"} {"farming:soy_milk", "vessels:drining_glass"}
} }
}) })
@ -585,7 +586,8 @@ minetest.register_craft({
}, },
replacements = { replacements = {
{"cucina_vegana:soy_milk", "vessels:drinking_glass"}, {"cucina_vegana:soy_milk", "vessels:drinking_glass"},
{"group:food_milk", "bucket:bucket_empty"}, {"mobs:bucket_milk", "bucket:bucket_empty"},
{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"},
{"farming:vanilla_extract", "vessels:glass_bottle"} {"farming:vanilla_extract", "vessels:glass_bottle"}
} }
}) })

View File

@ -7,7 +7,7 @@
farming = { farming = {
mod = "redo", mod = "redo",
version = "20220309", version = "20220603",
path = minetest.get_modpath("farming"), path = minetest.get_modpath("farming"),
select = { select = {
type = "fixed", type = "fixed",
@ -410,6 +410,9 @@ function farming.refill_plant(player, plantname, index)
if not player then return end if not player then return end
local inv = player:get_inventory() local inv = player:get_inventory()
if not inv then return end
local old_stack = inv:get_stack("main", index) local old_stack = inv:get_stack("main", index)
if old_stack:get_name() ~= "" then if old_stack:get_name() ~= "" then