From d7965c1784fd36706335dd46ac54688ade89cf5f Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Sun, 12 Aug 2018 15:09:44 +0100
Subject: add food_berry group

---
 crops/blueberry.lua | 2 +-
 crops/raspberry.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crops')

diff --git a/crops/blueberry.lua b/crops/blueberry.lua
index 500fcde..9581454 100644
--- a/crops/blueberry.lua
+++ b/crops/blueberry.lua
@@ -5,7 +5,7 @@ local S = farming.intllib
 minetest.register_craftitem("farming:blueberries", {
 	description = S("Blueberries"),
 	inventory_image = "farming_blueberries.png",
-	groups = {food_blueberries = 1, flammable = 2},
+	groups = {food_blueberries = 1, food_berry = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:blueberry_1")
 	end,
diff --git a/crops/raspberry.lua b/crops/raspberry.lua
index 931d2ae..08dbd84 100644
--- a/crops/raspberry.lua
+++ b/crops/raspberry.lua
@@ -5,7 +5,7 @@ local S = farming.intllib
 minetest.register_craftitem("farming:raspberries", {
 	description = S("Raspberries"),
 	inventory_image = "farming_raspberries.png",
-	groups = {food_raspberries = 1, flammable = 2},
+	groups = {food_raspberries = 1, food_berry = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1")
 	end,
-- 
cgit v1.2.3


From 43b1a781792f168bb6898515e09223e65f370241 Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Sun, 12 Aug 2018 15:17:06 +0100
Subject: added singular and plural grouping to berries

---
 crops/blueberry.lua | 2 +-
 crops/raspberry.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crops')

diff --git a/crops/blueberry.lua b/crops/blueberry.lua
index 9581454..9a30387 100644
--- a/crops/blueberry.lua
+++ b/crops/blueberry.lua
@@ -5,7 +5,7 @@ local S = farming.intllib
 minetest.register_craftitem("farming:blueberries", {
 	description = S("Blueberries"),
 	inventory_image = "farming_blueberries.png",
-	groups = {food_blueberries = 1, food_berry = 1, flammable = 2},
+	groups = {food_blueberries = 1, food_blueberry = 1, food_berry = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:blueberry_1")
 	end,
diff --git a/crops/raspberry.lua b/crops/raspberry.lua
index 08dbd84..713ea2f 100644
--- a/crops/raspberry.lua
+++ b/crops/raspberry.lua
@@ -5,7 +5,7 @@ local S = farming.intllib
 minetest.register_craftitem("farming:raspberries", {
 	description = S("Raspberries"),
 	inventory_image = "farming_raspberries.png",
-	groups = {food_raspberries = 1, food_berry = 1, flammable = 2},
+	groups = {food_raspberries = 1, food_raspberry = 1, food_berry = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1")
 	end,
-- 
cgit v1.2.3


From 0c7110403cf30b192549c78654f675ccb31bbc21 Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Mon, 13 Aug 2018 21:03:11 +0100
Subject: cocoa pods are no longer walkable

---
 crops/cocoa.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crops')

diff --git a/crops/cocoa.lua b/crops/cocoa.lua
index 19e9c6b..ecefcea 100644
--- a/crops/cocoa.lua
+++ b/crops/cocoa.lua
@@ -113,7 +113,7 @@ local crop_def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cocoa_1.png"},
 	paramtype = "light",
-	walkable = true,
+	walkable = false,
 	drop = {
 		items = {
 			{items = {'farming:cocoa_beans 1'}, rarity = 2},
-- 
cgit v1.2.3


From 8e03d9761a545407703aba56c1d54a6bf69acc7a Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Mon, 13 Aug 2018 21:37:56 +0100
Subject: pumpkins harvest block, use cutting board to chop into slices

---
 crops/pumpkin.lua | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

(limited to 'crops')

diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua
index d8e8ec6..4abbe13 100644
--- a/crops/pumpkin.lua
+++ b/crops/pumpkin.lua
@@ -5,26 +5,6 @@
 
 local S = farming.intllib
 
--- pumpkin
-minetest.register_node("farming:pumpkin", {
-	description = S("Pumpkin"),
-	tiles = {
-		"farming_pumpkin_top.png",
-		"farming_pumpkin_top.png",
-		"farming_pumpkin_side.png"
-	},
-	groups = {
-		food_pumpkin = 1, choppy = 1, oddly_breakable_by_hand = 1,
-		flammable = 2, plant = 1
-	},
-	drop = {
-		items = {
-			{items = {'farming:pumpkin_slice 9'}, rarity = 1},
-		}
-	},
-	sounds = default.node_sound_wood_defaults(),
-})
-
 -- pumpkin slice
 minetest.register_craftitem("farming:pumpkin_slice", {
 	description = S("Pumpkin Slice"),
@@ -46,10 +26,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	type = "shapeless",
 	output = "farming:pumpkin_slice 9",
-	recipe = {
-		{"", "farming:pumpkin", ""},
-	}
+	recipe = {"farming:pumpkin", "farming:cutting_board"},
+	replacements = {{"farming:cutting_board", "farming:cutting_board"}},
 })
 
 -- jack 'o lantern
@@ -201,6 +181,7 @@ crop_def.tiles = {"farming_pumpkin_7.png"}
 minetest.register_node("farming:pumpkin_7", table.copy(crop_def))
 
 -- stage 8 (final)
+--[[
 crop_def.tiles = {"farming_pumpkin_8.png"}
 crop_def.groups.growing = 0
 crop_def.drop = {
@@ -209,3 +190,25 @@ crop_def.drop = {
 	}
 }
 minetest.register_node("farming:pumpkin_8", table.copy(crop_def))
+]]
+
+minetest.register_node("farming:pumpkin_8", {
+	description = S("Pumpkin"),
+	tiles = {
+		"farming_pumpkin_top.png",
+		"farming_pumpkin_top.png",
+		"farming_pumpkin_side.png"
+	},
+	groups = {
+		food_pumpkin = 1, choppy = 1, oddly_breakable_by_hand = 1,
+		flammable = 2, plant = 1
+	},
+--	drop = {
+--		items = {
+--			{items = {'farming:pumpkin_slice 9'}, rarity = 1},
+--		}
+--	},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")
-- 
cgit v1.2.3


From 594b09ee66ef74c3fba2c3168f686d404b8da458 Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Mon, 13 Aug 2018 21:42:54 +0100
Subject: melon blocks need cutting board to chop into slices

---
 crops/melon.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'crops')

diff --git a/crops/melon.lua b/crops/melon.lua
index 2165558..b90a24a 100644
--- a/crops/melon.lua
+++ b/crops/melon.lua
@@ -22,10 +22,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	type = "shapeless",
 	output = "farming:melon_slice 9",
-	recipe = {
-		{"", "farming:melon_8", ""},
-	}
+	recipe = {"farming:melon_8", "farming:cutting_board"},
+	replacements = {{"farming:cutting_board", "farming:cutting_board"}},
 })
 
 -- melon definition
@@ -82,5 +82,5 @@ crop_def.groups = {
 	food_melon = 1, snappy = 1, oddly_breakable_by_hand = 1,
 	flammable = 2, plant = 1
 }
-crop_def.drop = "farming:melon_slice 9"
+--crop_def.drop = "farming:melon_slice 9"
 minetest.register_node("farming:melon_8", table.copy(crop_def))
-- 
cgit v1.2.3


From ede6267694d790e5b5d589dffadc7e1f8e9434ae Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Mon, 13 Aug 2018 21:52:46 +0100
Subject: fix melon drop

---
 crops/melon.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'crops')

diff --git a/crops/melon.lua b/crops/melon.lua
index b90a24a..1791fdf 100644
--- a/crops/melon.lua
+++ b/crops/melon.lua
@@ -83,4 +83,5 @@ crop_def.groups = {
 	flammable = 2, plant = 1
 }
 --crop_def.drop = "farming:melon_slice 9"
+crop_def.drop = "farming:melon_8"
 minetest.register_node("farming:melon_8", table.copy(crop_def))
-- 
cgit v1.2.3