From 93de17fdc30dcdd498aa20c065a9d068933190d4 Mon Sep 17 00:00:00 2001
From: sys4-fr <sys4@free.fr>
Date: Mon, 3 Apr 2017 01:50:59 +0200
Subject: [PATCH 1/3] Fix intllib boilerplate code

---
 food_basic/depends.txt     | 1 +
 food_basic/ingredients.lua | 5 ++---
 food_basic/init.lua        | 5 ++---
 food_basic/support.lua     | 8 ++++++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/food_basic/depends.txt b/food_basic/depends.txt
index 05df110..222b93e 100644
--- a/food_basic/depends.txt
+++ b/food_basic/depends.txt
@@ -12,6 +12,7 @@ jkanimals?
 jkfarming?
 my_mobs?
 mobs?
+mobs_animal?
 mobfcooking?
 mtfoods?
 plantlib?
diff --git a/food_basic/ingredients.lua b/food_basic/ingredients.lua
index 27c5feb..c1a7283 100644
--- a/food_basic/ingredients.lua
+++ b/food_basic/ingredients.lua
@@ -8,9 +8,8 @@
 
 -- Boilerplate to support localized strings if intllib mod is installed.
 local S = 0
-if rawget(_G, "intllib") then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+if minetest.get_modpath("intllib") then
+	S = intllib.Getter()
 else
 	S = function ( s ) return s end
 end
diff --git a/food_basic/init.lua b/food_basic/init.lua
index f00048d..e240efa 100644
--- a/food_basic/init.lua
+++ b/food_basic/init.lua
@@ -13,9 +13,8 @@ dofile(minetest.get_modpath("food_basic").."/ingredients.lua")
 
 -- Boilerplate to support localized strings if intllib mod is installed.
 local S = 0
-if rawget(_G, "intllib") then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+if minetest.get_modpath("intllib") then
+	S = intllib.Getter()
 else
 	S = function ( s ) return s end
 end
diff --git a/food_basic/support.lua b/food_basic/support.lua
index be7d067..0161259 100644
--- a/food_basic/support.lua
+++ b/food_basic/support.lua
@@ -18,7 +18,7 @@ food.support("cactus", "default:cactus")
 food.support("apple", "default:apple")
 food.support("orange", {
 	"farming_plus:orange_item",
-	"ethereal:orange"
+	"ethereal:orange",
 })
 food.disable_if("ethereal", "orange")
 
@@ -82,5 +82,9 @@ else
 end
 
 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

From ba36be5fe0442903bc301d457fa174e13d6102e0 Mon Sep 17 00:00:00 2001
From: engineer-pearl <engineer.pearl0@gmail.com>
Date: Mon, 24 Jul 2017 05:55:20 -0700
Subject: [PATCH 2/3] Fix buckets being lost when making butter

---
 food_basic/ingredients.lua | 15 +++++++++++++++
 food_basic/support.lua     |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/food_basic/ingredients.lua b/food_basic/ingredients.lua
index c1a7283..0f422cc 100644
--- a/food_basic/ingredients.lua
+++ b/food_basic/ingredients.lua
@@ -260,6 +260,21 @@ food.module("butter", function()
 		inventory_image = "food_butter.png",
 		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({
 		output = "food:butter",
 		recipe = {
diff --git a/food_basic/support.lua b/food_basic/support.lua
index 0161259..655a8e4 100644
--- a/food_basic/support.lua
+++ b/food_basic/support.lua
@@ -40,9 +40,11 @@ food.support("carrot", {
 food.support("milk", {
 	"animalmaterials:milk",
 	"my_mobs:milk_glass_cup",
+	"mtfoods:dandelion_milk"
+})
+food.support("milkbucket", {
 	"jkanimals:bucket_milk",
 	"mobs:bucket_milk",
-	"mtfoods:dandelion_milk"
 })
 food.support("egg", {
 	"animalmaterials:egg",

From 57d0b42892b7d957b83d61b4969b19ec49459951 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Mon, 24 Jul 2017 13:56:45 +0100
Subject: [PATCH 3/3] Fix indentation in previous commit

---
 food_basic/ingredients.lua | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/food_basic/ingredients.lua b/food_basic/ingredients.lua
index 0f422cc..f888c05 100644
--- a/food_basic/ingredients.lua
+++ b/food_basic/ingredients.lua
@@ -264,16 +264,18 @@ food.module("butter", function()
 		output = "food:butter",
 		recipe = {{"group:food_milkbucket","group:food_milkbucket"}},
 		replacements = { 
-		    {"group:food_milkbucket","bucket:bucket_empty"},
-		    {"group:food_milkbucket","bucket:bucket_empty"} 
+			{"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"},
-	},
+		output = "food:butter",
+		recipe = {
+			{"group:food_milk","group:food_milkbucket"}
+		},
+		replacements = { 
+			{"group:food_milkbucket","bucket:bucket_empty"},
+		},
 	})
 	food.craft({
 		output = "food:butter",