Merge remote-tracking branch 'upstream/master'

This commit is contained in:
sys4-fr 2017-11-11 18:44:34 +01:00
commit 9838eb56c9
2 changed files with 20 additions and 1 deletions

View File

@ -260,6 +260,23 @@ food.module("butter", function()
inventory_image = "food_butter.png", inventory_image = "food_butter.png",
groups = {food_butter=1} groups = {food_butter=1}
}) })
food.craft({
output = "food:butter",
recipe = {{"group:food_milkbucket","group:food_milkbucket"}},
replacements = {
{"group:food_milkbucket","bucket:bucket_empty"},
{"group:food_milkbucket","bucket:bucket_empty"}
},
})
food.craft({
output = "food:butter",
recipe = {
{"group:food_milk","group:food_milkbucket"}
},
replacements = {
{"group:food_milkbucket","bucket:bucket_empty"},
},
})
food.craft({ food.craft({
output = "food:butter", output = "food:butter",
recipe = { recipe = {

View File

@ -40,9 +40,11 @@ food.support("carrot", {
food.support("milk", { food.support("milk", {
"animalmaterials:milk", "animalmaterials:milk",
"my_mobs:milk_glass_cup", "my_mobs:milk_glass_cup",
"mtfoods:dandelion_milk"
})
food.support("milkbucket", {
"jkanimals:bucket_milk", "jkanimals:bucket_milk",
"mobs:bucket_milk", "mobs:bucket_milk",
"mtfoods:dandelion_milk"
}) })
food.support("egg", { food.support("egg", {
"animalmaterials:egg", "animalmaterials:egg",