mirror of
https://github.com/rubenwardy/food.git
synced 2024-11-15 23:00:33 +01:00
Merge branch 'master' of https://github.com/rubenwardy/food
To correct the problem with buckets being lost while creating butter from milk buckets.
This commit is contained in:
commit
fe801df53e
|
@ -12,6 +12,7 @@ jkanimals?
|
||||||
jkfarming?
|
jkfarming?
|
||||||
my_mobs?
|
my_mobs?
|
||||||
mobs?
|
mobs?
|
||||||
|
mobs_animal?
|
||||||
mobfcooking?
|
mobfcooking?
|
||||||
mtfoods?
|
mtfoods?
|
||||||
plantlib?
|
plantlib?
|
||||||
|
|
|
@ -8,9 +8,8 @@
|
||||||
|
|
||||||
-- Boilerplate to support localized strings if intllib mod is installed.
|
-- Boilerplate to support localized strings if intllib mod is installed.
|
||||||
local S = 0
|
local S = 0
|
||||||
if rawget(_G, "intllib") then
|
if minetest.get_modpath("intllib") then
|
||||||
dofile(minetest.get_modpath("intllib").."/intllib.lua")
|
S = intllib.Getter()
|
||||||
S = intllib.Getter(minetest.get_current_modname())
|
|
||||||
else
|
else
|
||||||
S = function ( s ) return s end
|
S = function ( s ) return s end
|
||||||
end
|
end
|
||||||
|
|
|
@ -13,9 +13,8 @@ dofile(minetest.get_modpath("food_basic").."/ingredients.lua")
|
||||||
|
|
||||||
-- Boilerplate to support localized strings if intllib mod is installed.
|
-- Boilerplate to support localized strings if intllib mod is installed.
|
||||||
local S = 0
|
local S = 0
|
||||||
if rawget(_G, "intllib") then
|
if minetest.get_modpath("intllib") then
|
||||||
dofile(minetest.get_modpath("intllib").."/intllib.lua")
|
S = intllib.Getter()
|
||||||
S = intllib.Getter(minetest.get_current_modname())
|
|
||||||
else
|
else
|
||||||
S = function ( s ) return s end
|
S = function ( s ) return s end
|
||||||
end
|
end
|
||||||
|
|
|
@ -18,7 +18,7 @@ food.support("cactus", "default:cactus")
|
||||||
food.support("apple", "default:apple")
|
food.support("apple", "default:apple")
|
||||||
food.support("orange", {
|
food.support("orange", {
|
||||||
"farming_plus:orange_item",
|
"farming_plus:orange_item",
|
||||||
"ethereal:orange"
|
"ethereal:orange",
|
||||||
})
|
})
|
||||||
food.disable_if("ethereal", "orange")
|
food.disable_if("ethereal", "orange")
|
||||||
|
|
||||||
|
@ -84,5 +84,9 @@ else
|
||||||
end
|
end
|
||||||
|
|
||||||
if minetest.get_modpath("mobs") and mobs.mod == "redo" then
|
if minetest.get_modpath("mobs") and mobs.mod == "redo" then
|
||||||
food.support("chicken", "mobs:chicken_cooked")
|
if minetest.get_modpath("mobs_animal") then
|
||||||
|
food.support("chicken", "mobs:chicken_cooked")
|
||||||
|
else
|
||||||
|
food.support("chicken", "mobs:meat")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user