Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-04-17 13:51:50 +02:00
commit eba1ac7f10
3 changed files with 15 additions and 15 deletions

View File

@ -172,9 +172,9 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = "mobs:leather", output = "mobs:leather",
type = "shapeless", -- type = "shapeless",
recipe = { recipe = {
"mobs:rabbit_hide", "mobs:rabbit_hide", {"mobs:rabbit_hide", "mobs:rabbit_hide"},
"mobs:rabbit_hide", "mobs:rabbit_hide" {"mobs:rabbit_hide", "mobs:rabbit_hide"}
} }
}) })

20
cow.lua
View File

@ -175,26 +175,26 @@ minetest.register_craftitem(":mobs:glass_milk", {
}) })
minetest.register_craft({ minetest.register_craft({
type = "shapeless", -- type = "shapeless",
output = "mobs:glass_milk 4", output = "mobs:glass_milk 4",
recipe = { recipe = {
"vessels:drinking_glass", "vessels:drinking_glass", {"vessels:drinking_glass", "vessels:drinking_glass"},
"vessels:drinking_glass", "vessels:drinking_glass", {"vessels:drinking_glass", "vessels:drinking_glass"},
"mobs:bucket_milk" {"mobs:bucket_milk", ""}
}, },
replacements = { {"mobs:bucket_milk", "bucket:bucket_empty"} } replacements = { {"mobs:bucket_milk", "bucket:bucket_empty"} }
}) })
minetest.register_craft({ minetest.register_craft({
type = "shapeless", -- type = "shapeless",
output = "mobs:bucket_milk", output = "mobs:bucket_milk",
recipe = { recipe = {
"group:food_milk_glass", "group:food_milk_glass", {"group:food_milk_glass", "group:food_milk_glass"},
"group:food_milk_glass", "group:food_milk_glass", {"group:food_milk_glass", "group:food_milk_glass"},
"bucket:bucket_empty" {"bucket:bucket_empty", ""}
}, },
replacements = { replacements = {
{"group:food_milk_glass", "vessels:drinking_glass 4"}, {"group:food_milk_glass", "vessels:drinking_glass 4"}
} }
}) })
@ -204,7 +204,7 @@ minetest.register_craftitem(":mobs:butter", {
description = S("Butter"), description = S("Butter"),
inventory_image = "mobs_butter.png", inventory_image = "mobs_butter.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = {food_butter = 1, flammable = 2}, groups = {food_butter = 1, flammable = 2}
}) })
if minetest.get_modpath("farming") and farming and farming.mod then if minetest.get_modpath("farming") and farming and farming.mod then

View File

@ -92,12 +92,12 @@ minetest.register_craftitem(":mobs:rat_cooked", {
description = S("Cooked Rat"), description = S("Cooked Rat"),
inventory_image = "mobs_cooked_rat.png", inventory_image = "mobs_cooked_rat.png",
on_use = minetest.item_eat(3), on_use = minetest.item_eat(3),
groups = {food_rat = 1, flammable = 2}, groups = {food_rat = 1, flammable = 2}
}) })
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = "mobs:rat_cooked", output = "mobs:rat_cooked",
recipe = "mobs_animal:rat", recipe = "mobs_animal:rat",
cooktime = 5, cooktime = 5
}) })