Merge remote-tracking branch 'upstream/master'

README.md

@@ -13,7 +13,8 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 
 ### Changelog:
 
-- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base
+- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock)
+- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy
 options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna
 - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates
 - 1.43 - Scythe works on use instead of right-click, added seed=1 groups to actual seeds and seed=2 group for plantable food items.

compatibility.lua

@@ -12,16 +12,9 @@ end
 
 minetest.override_item("default:apple", {
 	groups = {food_apple = 1, fleshy = 3, dig_immediate = 3, flammable = 2,
-		leafdecay = 3, leafdecay_drop = 1},
+		leafdecay = 3, leafdecay_drop = 1}
 })
 
-if minetest.registered_nodes["flowers:mushroom_brown"] then
-minetest.override_item("flowers:mushroom_brown", {
-	light_source = 1,
-	groups = {food_mushroom = 1, snappy = 3, attached_node = 1, flammable = 2},
-})
-end
-
 --= Aliases
 
 -- Banana
@@ -33,9 +26,9 @@ else
 	minetest.register_node(":ethereal:banana", {
 		description = S("Banana"),
 		drawtype = "torchlike",
-		tiles = {"banana_single.png"},
+		tiles = {"farming_banana_single.png"},
-		inventory_image = "banana_single.png",
+		inventory_image = "farming_banana_single.png",
-		wield_image = "banana_single.png",
+		wield_image = "farming_banana_single.png",
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -45,18 +38,18 @@ else
 		},
 		groups = {food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2},
 		on_use = minetest.item_eat(2),
-		sounds = default.node_sound_leaves_defaults(),
+		sounds = default.node_sound_leaves_defaults()
 	})
 
 	minetest.register_node(":ethereal:bananaleaves", {
 		description = S("Banana Leaves"),
-		tiles = {"banana_leaf.png"},
+		tiles = {"farming_banana_leaf.png"},
-		inventory_image = "banana_leaf.png",
+		inventory_image = "farming_banana_leaf.png",
-		wield_image = "banana_leaf.png",
+		wield_image = "farming_banana_leaf.png",
 		paramtype = "light",
 		waving = 1,
 		groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
-		sounds = default.node_sound_leaves_defaults(),
+		sounds = default.node_sound_leaves_defaults()
 	})
 
 	alias("farming_plus:banana_sapling", "default:sapling")
@@ -103,7 +96,7 @@ else
 		},
 		groups = {food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2},
 		on_use = minetest.item_eat(4),
-		sounds = default.node_sound_leaves_defaults(),
+		sounds = default.node_sound_leaves_defaults()
 	})
 
 	alias("farming_plus:orange_item", "ethereal:orange")
@@ -148,10 +141,10 @@ if eth then
 else
 	minetest.register_craftitem(":ethereal:strawberry", {
 		description = S("Strawberry"),
-		inventory_image = "strawberry.png",
+		inventory_image = "farming_strawberry.png",
-		wield_image = "strawberry.png",
+		wield_image = "farming_strawberry.png",
 		groups = {food_strawberry = 1, flammable = 2},
-		on_use = minetest.item_eat(1),
+		on_use = minetest.item_eat(1)
 	})
 
 	alias("farming_plus:strawberry_item", "ethereal:strawberry")

crops/artichoke.lua

@@ -0,0 +1,64 @@
+local S = farming.intllib
+
+-- item definition
+minetest.register_craftitem("farming:artichoke", {
+	description = S("Artichoke"),
+	inventory_image = "farming_artichoke.png",
+	groups = {seed = 2, food_artichoke = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:artichoke_1")
+	end,
+	on_use = minetest.item_eat(4)
+})
+
+-- crop definition
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_artichoke_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop =  "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:artichoke_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_artichoke_2.png"}
+minetest.register_node("farming:artichoke_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_artichoke_3.png"}
+minetest.register_node("farming:artichoke_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_artichoke_4.png"}
+minetest.register_node("farming:artichoke_4", table.copy(def))
+
+-- stage 5 (final)
+def.tiles = {"farming_artichoke_5.png"}
+def.groups.growing = nil
+def.drop = {
+	items = {
+		{items = {"farming:artichoke 2"}, rarity = 1},
+		{items = {"farming:artichoke"}, rarity = 2}
+	}
+}
+minetest.register_node("farming:artichoke_5", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:artichoke"] = {
+	crop = "farming:artichoke",
+	seed = "farming:artichoke",
+	minlight = 13,
+	maxlight = 15,
+	steps = 5
+}

crops/barley.lua

@@ -16,29 +16,28 @@ minetest.register_node("farming:seed_barley", {
 	selection_box = farming.select,
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:barley_1")
-	end,
+	end
 })
 
 -- harvested barley
 minetest.register_craftitem("farming:barley", {
 	description = S("Barley"),
 	inventory_image = "farming_barley.png",
-	groups = {food_barley = 1, flammable = 2},
+	groups = {food_barley = 1, flammable = 2}
 })
 
 -- flour
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:barley", "farming:barley", "farming:barley",
+		{"farming:barley", "farming:barley", "farming:barley"},
-		"farming:barley", "farming:mortar_pestle"
+		{"farming:barley", "farming:mortar_pestle", ""}
 	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
 -- barley definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_barley_1.png"},
 	paramtype = "light",
@@ -57,66 +56,65 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:barley_1", table.copy(crop_def))
+minetest.register_node("farming:barley_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_barley_2.png"}
+def.tiles = {"farming_barley_2.png"}
-minetest.register_node("farming:barley_2", table.copy(crop_def))
+minetest.register_node("farming:barley_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_barley_3.png"}
+def.tiles = {"farming_barley_3.png"}
-minetest.register_node("farming:barley_3", table.copy(crop_def))
+minetest.register_node("farming:barley_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_barley_4.png"}
+def.tiles = {"farming_barley_4.png"}
-minetest.register_node("farming:barley_4", table.copy(crop_def))
+minetest.register_node("farming:barley_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_barley_5.png"}
+def.tiles = {"farming_barley_5.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:barley"}, rarity = 2},
-		{items = {"farming:seed_barley"}, rarity = 2},
+		{items = {"farming:seed_barley"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:barley_5", table.copy(crop_def))
+minetest.register_node("farming:barley_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_barley_6.png"}
+def.tiles = {"farming_barley_6.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:barley"}, rarity = 2},
-		{items = {"farming:seed_barley"}, rarity = 1},
+		{items = {"farming:seed_barley"}, rarity = 1}
 	}
 }
-minetest.register_node("farming:barley_6", table.copy(crop_def))
+minetest.register_node("farming:barley_6", table.copy(def))
 
 -- stage 7 (final)
-crop_def.tiles = {"farming_barley_7.png"}
+def.tiles = {"farming_barley_7.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:barley"}, rarity = 1},
 		{items = {"farming:barley"}, rarity = 3},
 		{items = {"farming:seed_barley"}, rarity = 1},
-		{items = {"farming:seed_barley"}, rarity = 3},
+		{items = {"farming:seed_barley"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:barley_7", table.copy(crop_def))
+minetest.register_node("farming:barley_7", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:barley"] = {
 	crop = "farming:barley",
 	seed = "farming:seed_barley",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 7
 }
 
 -- Fuel
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:barley",
-	burntime = 1,
+	burntime = 1
 })

crops/beans.lua

@@ -13,7 +13,6 @@ local function place_beans(itemstack, placer, pointed_thing, plantname)
 
 	-- check if pointing at a node
 	if not pt or pt.type ~= "node" then
-
 		return
 	end
 
@@ -74,18 +73,15 @@ minetest.register_craftitem("farming:beans", {
 	inventory_image = "farming_beans.png",
 	groups = {seed = 2, food_beans = 1, flammable = 2},
 	on_use = minetest.item_eat(1),
-
 	on_place = function(itemstack, placer, pointed_thing)
 		return place_beans(itemstack, placer, pointed_thing, "farming:beanpole_1")
-	end,
+	end
 })
 
 -- beans can be used for green dye
 minetest.register_craft({
 	output = "dye:green",
-	recipe = {
+	recipe = {{"farming:beans"}}
-		{"farming:beans"},
-	}
 })
 
 -- beanpole
@@ -94,7 +90,7 @@ minetest.register_node("farming:beanpole", {
 	drawtype = "plantlike",
 	tiles = {"farming_beanpole.png"},
 	inventory_image = "farming_beanpole.png",
-	visual_scale = 1.90, -- 1.45,
+	visual_scale = 1.90,
 	paramtype = "light",
 	walkable = false,
 	buildable_to = true,
@@ -164,28 +160,28 @@ minetest.register_craft({
 	recipe = {
 		{"", "", ""},
 		{"default:stick", "", "default:stick"},
-		{"default:stick", "", "default:stick"},
+		{"default:stick", "", "default:stick"}
 	}
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:beanpole",
-	burntime = 10,
+	burntime = 10
 })
 
 -- green bean definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_beanpole_1.png"},
-	visual_scale = 1.90, -- 1.45,
+	visual_scale = 1.90,
 	paramtype = "light",
 	walkable = false,
 	buildable_to = true,
 	sunlight_propagates = true,
 	drop = {
 		items = {
-			{items = {"farming:beanpole"}, rarity = 1},
+			{items = {"farming:beanpole"}, rarity = 1}
 		}
 	},
 	selection_box = farming.select,
@@ -197,39 +193,39 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:beanpole_1", table.copy(crop_def))
+minetest.register_node("farming:beanpole_1", table.copy(def))
 
 -- stage2
-crop_def.tiles = {"farming_beanpole_2.png"}
+def.tiles = {"farming_beanpole_2.png"}
-minetest.register_node("farming:beanpole_2", table.copy(crop_def))
+minetest.register_node("farming:beanpole_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_beanpole_3.png"}
+def.tiles = {"farming_beanpole_3.png"}
-minetest.register_node("farming:beanpole_3", table.copy(crop_def))
+minetest.register_node("farming:beanpole_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_beanpole_4.png"}
+def.tiles = {"farming_beanpole_4.png"}
-minetest.register_node("farming:beanpole_4", table.copy(crop_def))
+minetest.register_node("farming:beanpole_4", table.copy(def))
 
 -- stage 5 (final)
-crop_def.tiles = {"farming_beanpole_5.png"}
+def.tiles = {"farming_beanpole_5.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:beanpole"}, rarity = 1},
 		{items = {"farming:beans 3"}, rarity = 1},
 		{items = {"farming:beans 2"}, rarity = 2},
-		{items = {"farming:beans 2"}, rarity = 3},
+		{items = {"farming:beans 2"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:beanpole_5", table.copy(crop_def))
+minetest.register_node("farming:beanpole_5", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:beans"] = {
 	crop = "farming:beanpole",
 	seed = "farming:beans",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 5
 }
 
@@ -246,7 +242,7 @@ minetest.register_node("farming:beanbush", {
 		items = {
 			{items = {"farming:beans 1"}, rarity = 1},
 			{items = {"farming:beans 1"}, rarity = 2},
-			{items = {"farming:beans 1"}, rarity = 3},
+			{items = {"farming:beans 1"}, rarity = 3}
 		}
 	},
 	selection_box = farming.select,
@@ -254,5 +250,5 @@ minetest.register_node("farming:beanbush", {
 		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
 		not_in_creative_inventory = 1
 	},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })

crops/beetroot.lua

@@ -9,7 +9,7 @@ minetest.register_craftitem("farming:beetroot", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:beetroot_1")
 	end,
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- beetroot soup
@@ -17,32 +17,27 @@ minetest.register_craftitem("farming:beetroot_soup", {
 	description = S("Beetroot Soup"),
 	inventory_image = "farming_beetroot_soup.png",
 	groups = {flammable = 2},
-	on_use = minetest.item_eat(6, "farming:bowl"),
+	on_use = minetest.item_eat(6, "farming:bowl")
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:beetroot_soup",
 	recipe = {
-		"group:food_beetroot", "group:food_beetroot",
+		{"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"},
-		"group:food_beetroot", "group:food_beetroot",
+		{"group:food_beetroot", "group:food_bowl", "group:food_beetroot"}
-		"group:food_beetroot", "group:food_beetroot","group:food_bowl"
 	}
 })
 
 -- red dye
 minetest.register_craft({
-	type = "shapeless",
 	output = "dye:red",
-	recipe = {"group:food_beetroot"},
+	recipe = {{"group:food_beetroot"}}
 })
 
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_beetroot_1.png"},
 	paramtype = "light",
---	paramtype2 = "meshoptions",
---	place_param2 = 3,
 	sunlight_propagates = true,
 	waving = 1,
 	walkable = false,
@@ -57,38 +52,38 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:beetroot_1", table.copy(crop_def))
+minetest.register_node("farming:beetroot_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_beetroot_2.png"}
+def.tiles = {"farming_beetroot_2.png"}
-minetest.register_node("farming:beetroot_2", table.copy(crop_def))
+minetest.register_node("farming:beetroot_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_beetroot_3.png"}
+def.tiles = {"farming_beetroot_3.png"}
-minetest.register_node("farming:beetroot_3", table.copy(crop_def))
+minetest.register_node("farming:beetroot_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_beetroot_4.png"}
+def.tiles = {"farming_beetroot_4.png"}
-minetest.register_node("farming:beetroot_4", table.copy(crop_def))
+minetest.register_node("farming:beetroot_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_beetroot_5.png"}
+def.tiles = {"farming_beetroot_5.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	max_items = 4, items = {
 		{items = {"farming:beetroot"}, rarity = 1},
 		{items = {"farming:beetroot"}, rarity = 2},
 		{items = {"farming:beetroot"}, rarity = 3},
-		{items = {"farming:beetroot"}, rarity = 4},
+		{items = {"farming:beetroot"}, rarity = 4}
 	}
 }
-minetest.register_node("farming:beetroot_5", table.copy(crop_def))
+minetest.register_node("farming:beetroot_5", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:beetroot"] = {
 	crop = "farming:beetroot",
 	seed = "farming:beetroot",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 5
 }

crops/blackberry.lua

@@ -0,0 +1,62 @@
+
+local S = farming.intllib
+
+-- blackberries
+minetest.register_craftitem("farming:blackberry", {
+	description = S("Blackberries"),
+	inventory_image = "farming_blackberry.png",
+	groups = {seed = 2, food_blackberries = 1, food_blackberry = 1,
+			food_berry = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:blackberry_1")
+	end,
+	on_use = minetest.item_eat(1),
+})
+
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_blackberry_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop = "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:blackberry_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_blackberry_2.png"}
+minetest.register_node("farming:blackberry_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_blackberry_3.png"}
+minetest.register_node("farming:blackberry_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_blackberry_4.png"}
+def.groups.growing = nil
+def.drop = {
+	items = {
+		{items = {'farming:blackberry 2'}, rarity = 1},
+		{items = {'farming:blackberry'}, rarity = 2},
+		{items = {'farming:blackberry'}, rarity = 3},
+	}
+}
+minetest.register_node("farming:blackberry_4", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:blackberry"] = {
+	crop = "farming:blackberry",
+	seed = "farming:blackberry",
+	minlight = farming.min_light,
+	maxlight = farming.max_light,
+	steps = 4
+}

crops/blueberry.lua

@@ -3,51 +3,48 @@ local S = farming.intllib
 
 -- blueberries
 minetest.register_craftitem("farming:blueberries", {
-	description = S("Blueberries"),
+	description = S("Wild Blueberries"),
 	inventory_image = "farming_blueberries.png",
 	groups = {seed = 2, 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,
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- blueberry muffin (thanks to sosogirl123 @ deviantart.com for muffin image)
-
 minetest.register_craftitem("farming:muffin_blueberry", {
 	description = S("Blueberry Muffin"),
 	inventory_image = "farming_blueberry_muffin.png",
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 minetest.register_craft({
 	output = "farming:muffin_blueberry 2",
 	recipe = {
-		{"group:food_blueberries", "group:food_bread", "group:food_blueberries"},
+		{"group:food_blueberries", "group:food_bread", "group:food_blueberries"}
 	}
 })
 
 -- Blueberry Pie
-
 minetest.register_craftitem("farming:blueberry_pie", {
 	description = S("Blueberry Pie"),
 	inventory_image = "farming_blueberry_pie.png",
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(6)
 })
 
 minetest.register_craft({
 	output = "farming:blueberry_pie",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_sugar",
+		{"group:food_flour", "group:food_sugar", "group:food_blueberries"},
-		"group:food_blueberries", "group:food_baking_tray"
+		{"group:food_baking_tray", "", ""}
 	},
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
 
 -- blueberry definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_blueberry_1.png"},
 	paramtype = "light",
@@ -64,33 +61,33 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:blueberry_1", table.copy(crop_def))
+minetest.register_node("farming:blueberry_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_blueberry_2.png"}
+def.tiles = {"farming_blueberry_2.png"}
-minetest.register_node("farming:blueberry_2", table.copy(crop_def))
+minetest.register_node("farming:blueberry_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_blueberry_3.png"}
+def.tiles = {"farming_blueberry_3.png"}
-minetest.register_node("farming:blueberry_3", table.copy(crop_def))
+minetest.register_node("farming:blueberry_3", table.copy(def))
 
 -- stage 4 (final)
-crop_def.tiles = {"farming_blueberry_4.png"}
+def.tiles = {"farming_blueberry_4.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:blueberries 2"}, rarity = 1},
 		{items = {"farming:blueberries"}, rarity = 2},
-		{items = {"farming:blueberries"}, rarity = 3},
+		{items = {"farming:blueberries"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:blueberry_4", table.copy(crop_def))
+minetest.register_node("farming:blueberry_4", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:blueberries"] = {
 	crop = "farming:blueberry",
 	seed = "farming:blueberries",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 4
 }

crops/cabbage.lua

@@ -0,0 +1,69 @@
+
+local S = farming.intllib
+
+-- cabbage
+minetest.register_craftitem("farming:cabbage", {
+	description = S("Cabbage"),
+	inventory_image = "farming_cabbage.png",
+	groups = {seed = 2, food_cabbage = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:cabbage_1")
+	end,
+	on_use = minetest.item_eat(1)
+})
+
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_cabbage_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	waving = 1,
+	walkable = false,
+	buildable_to = true,
+	drop = "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:cabbage_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_cabbage_2.png"}
+minetest.register_node("farming:cabbage_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_cabbage_3.png"}
+minetest.register_node("farming:cabbage_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_cabbage_4.png"}
+minetest.register_node("farming:cabbage_4", table.copy(def))
+
+-- stage 5
+def.tiles = {"farming_cabbage_5.png"}
+minetest.register_node("farming:cabbage_5", table.copy(def))
+
+-- stage 6
+def.tiles = {"farming_cabbage_6.png"}
+def.groups.growing = nil
+def.drop = {
+	max_items = 2, items = {
+		{items = {"farming:cabbage 2"}, rarity = 1},
+		{items = {"farming:cabbage 1"}, rarity = 2}
+	}
+}
+minetest.register_node("farming:cabbage_6", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:cabbage"] = {
+	crop = "farming:cabbage",
+	seed = "farming:cabbage",
+	minlight = farming.min_light,
+	maxlight = farming.max_light,
+	steps = 6
+}

crops/carrot.lua

@@ -14,7 +14,7 @@ minetest.register_craftitem("farming:carrot", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:carrot_1")
 	end,
-	on_use = minetest.item_eat(4),
+	on_use = minetest.item_eat(4)
 })
 
 -- carrot juice
@@ -22,25 +22,26 @@ minetest.register_craftitem("farming:carrot_juice", {
 	description = S("Carrot Juice"),
 	inventory_image = "farming_carrot_juice.png",
 	on_use = minetest.item_eat(4, "vessels:drinking_glass"),
-	groups = {vessel = 1},
+	groups = {vessel = 1, drink = 1}
 })
 
 minetest.register_craft({
 	output = "farming:carrot_juice",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_carrot", "farming:juicer"
+		{"group:food_carrot"},
+		{"farming:juicer"},
+		{"vessels:drinking_glass"}
 	},
 	replacements = {
-		{"group:food_juicer", "farming:juicer"},
+		{"group:food_juicer", "farming:juicer"}
-	},
+	}
 })
 
 -- golden carrot
 minetest.register_craftitem("farming:carrot_gold", {
 	description = S("Golden Carrot"),
 	inventory_image = "farming_carrot_gold.png",
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(10)
 })
 
 minetest.register_craft({
@@ -48,12 +49,12 @@ minetest.register_craft({
 	recipe = {
 		{"", "default:gold_lump", ""},
 		{"default:gold_lump", "group:food_carrot", "default:gold_lump"},
-		{"", "default:gold_lump", ""},
+		{"", "default:gold_lump", ""}
 	}
 })
 
 -- carrot definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_carrot_1.png"},
 	paramtype = "light",
@@ -71,54 +72,54 @@ local crop_def = {
 
 
 -- stage 1
-minetest.register_node("farming:carrot_1", table.copy(crop_def))
+minetest.register_node("farming:carrot_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_carrot_2.png"}
+def.tiles = {"farming_carrot_2.png"}
-minetest.register_node("farming:carrot_2", table.copy(crop_def))
+minetest.register_node("farming:carrot_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_carrot_3.png"}
+def.tiles = {"farming_carrot_3.png"}
-minetest.register_node("farming:carrot_3", table.copy(crop_def))
+minetest.register_node("farming:carrot_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_carrot_4.png"}
+def.tiles = {"farming_carrot_4.png"}
-minetest.register_node("farming:carrot_4", table.copy(crop_def))
+minetest.register_node("farming:carrot_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_carrot_5.png"}
+def.tiles = {"farming_carrot_5.png"}
-minetest.register_node("farming:carrot_5", table.copy(crop_def))
+minetest.register_node("farming:carrot_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_carrot_6.png"}
+def.tiles = {"farming_carrot_6.png"}
-minetest.register_node("farming:carrot_6", table.copy(crop_def))
+minetest.register_node("farming:carrot_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_carrot_7.png"}
+def.tiles = {"farming_carrot_7.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:carrot"}, rarity = 1},
-		{items = {"farming:carrot 2"}, rarity = 3},
+		{items = {"farming:carrot 2"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:carrot_7", table.copy(crop_def))
+minetest.register_node("farming:carrot_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_carrot_8.png"}
+def.tiles = {"farming_carrot_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:carrot 2"}, rarity = 1},
-		{items = {"farming:carrot 3"}, rarity = 2},
+		{items = {"farming:carrot 3"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:carrot_8", table.copy(crop_def))
+minetest.register_node("farming:carrot_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:carrot"] = {
 	crop = "farming:carrot",
 	seed = "farming:carrot",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }

crops/chili.lua

@@ -9,35 +9,32 @@ minetest.register_craftitem("farming:chili_pepper", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:chili_1")
 	end,
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 -- bowl of chili
 minetest.register_craftitem("farming:chili_bowl", {
 	description = S("Bowl of Chili"),
 	inventory_image = "farming_chili_bowl.png",
-	on_use = minetest.item_eat(8, "farming:bowl"),
+	on_use = minetest.item_eat(8, "farming:bowl")
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:chili_bowl",
 	recipe = {
-		"group:food_chili_pepper", "group:food_barley",
+		{"group:food_chili_pepper", "group:food_rice", "group:food_tomato"},
-		"group:food_tomato", "group:food_beans", "group:food_bowl"
+		{"group:food_beans", "group:food_bowl", ""}
-	},
+	}
 })
 
 -- chili can be used for red dye
 minetest.register_craft({
 	output = "dye:red",
-	recipe = {
+	recipe = {{"farming:chili_pepper"}}
-		{"farming:chili_pepper"},
-	}
 })
 
 -- chili definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_chili_1.png"},
 	paramtype = "light",
@@ -54,48 +51,48 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:chili_1", table.copy(crop_def))
+minetest.register_node("farming:chili_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_chili_2.png"}
+def.tiles = {"farming_chili_2.png"}
-minetest.register_node("farming:chili_2", table.copy(crop_def))
+minetest.register_node("farming:chili_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_chili_3.png"}
+def.tiles = {"farming_chili_3.png"}
-minetest.register_node("farming:chili_3", table.copy(crop_def))
+minetest.register_node("farming:chili_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_chili_4.png"}
+def.tiles = {"farming_chili_4.png"}
-minetest.register_node("farming:chili_4", table.copy(crop_def))
+minetest.register_node("farming:chili_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_chili_5.png"}
+def.tiles = {"farming_chili_5.png"}
-minetest.register_node("farming:chili_5", table.copy(crop_def))
+minetest.register_node("farming:chili_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_chili_6.png"}
+def.tiles = {"farming_chili_6.png"}
-minetest.register_node("farming:chili_6", table.copy(crop_def))
+minetest.register_node("farming:chili_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_chili_7.png"}
+def.tiles = {"farming_chili_7.png"}
-minetest.register_node("farming:chili_7", table.copy(crop_def))
+minetest.register_node("farming:chili_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_chili_8.png"}
+def.tiles = {"farming_chili_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:chili_pepper 3"}, rarity = 1},
-		{items = {"farming:chili_pepper 2"}, rarity = 2},
+		{items = {"farming:chili_pepper 2"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:chili_8", table.copy(crop_def))
+minetest.register_node("farming:chili_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:chili_pepper"] = {
 	crop = "farming:chili",
 	seed = "farming:chili_pepper",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }

crops/cocoa.lua

@@ -70,27 +70,25 @@ minetest.register_craftitem("farming:cocoa_beans", {
 	groups = {seed = 2, food_cocoa = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1")
-	end,
+	end
 })
 
 minetest.register_craft( {
 	output = "dye:brown 2",
-	recipe = {
+	recipe = {{"farming:cocoa_beans"}}
-		{ "farming:cocoa_beans" },
-	}
 })
 
 -- chocolate cookie
 minetest.register_craftitem("farming:cookie", {
 	description = S("Cookie"),
 	inventory_image = "farming_cookie.png",
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 minetest.register_craft( {
 	output = "farming:cookie 8",
 	recipe = {
-		{"group:food_wheat", "group:food_cocoa", "group:food_wheat" },
+		{"group:food_wheat", "group:food_cocoa", "group:food_wheat" }
 	}
 })
 
@@ -98,13 +96,13 @@ minetest.register_craft( {
 minetest.register_craftitem("farming:chocolate_dark", {
 	description = S("Bar of Dark Chocolate"),
 	inventory_image = "farming_chocolate_dark.png",
-	on_use = minetest.item_eat(3),
+	on_use = minetest.item_eat(3)
 })
 
 minetest.register_craft( {
 	output = "farming:chocolate_dark",
 	recipe = {
-		{"group:food_cocoa", "group:food_cocoa", "group:food_cocoa"},
+		{"group:food_cocoa", "group:food_cocoa", "group:food_cocoa"}
 	}
 })
 
@@ -114,7 +112,7 @@ minetest.register_node("farming:chocolate_block", {
 	tiles = {"farming_chocolate_block.png"},
 	is_ground_content = false,
 	groups = {cracky = 2, oddly_breakable_by_hand = 2},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_craft({
@@ -122,32 +120,26 @@ minetest.register_craft({
 	recipe = {
 		{"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"},
 		{"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"},
-		{"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"},
+		{"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"}
 	}
 })
 
 minetest.register_craft({
 	output = "farming:chocolate_dark 9",
-	recipe = {
+	recipe = {{"farming:chocolate_block"}}
-		{"farming:chocolate_block"},
-	}
 })
 
 -- cocoa definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cocoa_1.png"},
 	paramtype = "light",
 	walkable = false,
-	drop = {
-		items = {
-			{items = {"farming:cocoa_beans 1"}, rarity = 2},
-		}
-	},
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
 	},
+	drop = {},
 	groups = {
 		snappy = 3, flammable = 2, plant = 1, growing = 1,
 		not_in_creative_inventory = 1, leafdecay = 1, leafdecay_drop = 1
@@ -158,44 +150,44 @@ local crop_def = {
 			return false
 		end
 		return true
-	end,
+	end
 }
 
 -- stage 1
-minetest.register_node("farming:cocoa_1", table.copy(crop_def))
+minetest.register_node("farming:cocoa_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_cocoa_2.png"}
+def.tiles = {"farming_cocoa_2.png"}
-minetest.register_node("farming:cocoa_2", table.copy(crop_def))
+minetest.register_node("farming:cocoa_2", table.copy(def))
 
 -- stage3
-crop_def.tiles = {"farming_cocoa_3.png"}
+def.tiles = {"farming_cocoa_3.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
-		{items = {"farming:cocoa_beans 1"}, rarity = 1},
+		{items = {"farming:cocoa_beans 1"}, rarity = 1}
 	}
 }
-minetest.register_node("farming:cocoa_3", table.copy(crop_def))
+minetest.register_node("farming:cocoa_3", table.copy(def))
 
 -- stage 4 (final)
-crop_def.tiles = {"farming_cocoa_4.png"}
+def.tiles = {"farming_cocoa_4.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.growth_check = nil
+def.growth_check = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:cocoa_beans 2"}, rarity = 1},
 		{items = {"farming:cocoa_beans 1"}, rarity = 2},
-		{items = {"farming:cocoa_beans 1"}, rarity = 4},
+		{items = {"farming:cocoa_beans 1"}, rarity = 4}
 	}
 }
-minetest.register_node("farming:cocoa_4", table.copy(crop_def))
+minetest.register_node("farming:cocoa_4", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:cocoa_beans"] = {
 	crop = "farming:cocoa",
 	seed = "farming:cocoa_beans",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 4
 }
 
@@ -218,14 +210,10 @@ minetest.register_on_generated(function(minp, maxp)
 
 			dir = math.random(1, 80)
 
-			if dir == 1 then
+			    if dir == 1 then pos.x = pos.x + 1
-				pos.x = pos.x + 1
+			elseif dir == 2 then pos.x = pos.x - 1
-			elseif dir == 2 then
+			elseif dir == 3 then pos.z = pos.z + 1
-				pos.x = pos.x - 1
+			elseif dir == 4 then pos.z = pos.z -1
-			elseif dir == 3 then
-				pos.z = pos.z + 1
-			elseif dir == 4 then
-				pos.z = pos.z -1
 			end
 
 			if dir < 5
@@ -235,10 +223,9 @@ minetest.register_on_generated(function(minp, maxp)
 --print ("Cocoa Pod added at " .. minetest.pos_to_string(pos))
 
 				minetest.swap_node(pos, {
-					name = "farming:cocoa_" .. tostring(math.random(1, 4))
+					name = "farming:cocoa_" .. tostring(math.random(4))
 				})
 			end
-
 		end
 	end
 end)

crops/coffee.lua

@@ -8,13 +8,13 @@ minetest.register_craftitem("farming:coffee_beans", {
 	groups = {seed = 2, food_coffee = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:coffee_1")
-	end,
+	end
 })
 
--- cold cup of coffee
+-- cup of coffee
 minetest.register_node("farming:coffee_cup", {
 	description = S("Cup of Coffee"),
-	drawtype = "torchlike", --"plantlike",
+	drawtype = "torchlike",
 	tiles = {"farming_coffee_cup.png"},
 	inventory_image = "farming_coffee_cup.png",
 	wield_image = "farming_coffee_cup.png",
@@ -24,9 +24,9 @@ minetest.register_node("farming:coffee_cup", {
 		type = "fixed",
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25}
 	},
-	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
+	groups = {vessel = 1, dig_immediate = 3, attached_node = 1, drink = 1},
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
-	sounds = default.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup")
@@ -34,17 +34,32 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass")
 
 minetest.register_craft( {
 	output = "farming:coffee_cup",
-	type = "shapeless",
+	recipe = {
-	recipe = {"vessels:drinking_glass", "group:food_coffee",
+		{"group:food_saucepan", "group:food_coffee", "group:water_bucket"},
-		"bucket:bucket_water", "group:food_saucepan"},
+		{"", "vessels:drinking_glass", ""}
+	},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"group:water_bucket", "bucket:bucket_empty"},
-		{"group:food_saucepan", "farming:saucepan"},
+		{"group:food_saucepan", "farming:saucepan"}
 	}
 })
 
+if minetest.get_modpath("bucket_wooden") then
+	minetest.register_craft( {
+		output = "farming:coffee_cup",
+		recipe = {
+			{"group:food_saucepan", "group:food_coffee", "group:water_bucket_wooden"},
+			{"", "vessels:drinking_glass", ""}
+		},
+		replacements = {
+			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"},
+			{"group:food_saucepan", "farming:saucepan"}
+		}
+	})
+end
+
 -- coffee definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_coffee_1.png"},
 	paramtype = "light",
@@ -61,37 +76,37 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:coffee_1", table.copy(crop_def))
+minetest.register_node("farming:coffee_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_coffee_2.png"}
+def.tiles = {"farming_coffee_2.png"}
-minetest.register_node("farming:coffee_2", table.copy(crop_def))
+minetest.register_node("farming:coffee_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_coffee_3.png"}
+def.tiles = {"farming_coffee_3.png"}
-minetest.register_node("farming:coffee_3", table.copy(crop_def))
+minetest.register_node("farming:coffee_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_coffee_4.png"}
+def.tiles = {"farming_coffee_4.png"}
-minetest.register_node("farming:coffee_4", table.copy(crop_def))
+minetest.register_node("farming:coffee_4", table.copy(def))
 
 -- stage 5 (final)
-crop_def.tiles = {"farming_coffee_5.png"}
+def.tiles = {"farming_coffee_5.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:coffee_beans 2"}, rarity = 1},
 		{items = {"farming:coffee_beans 2"}, rarity = 2},
-		{items = {"farming:coffee_beans 2"}, rarity = 3},
+		{items = {"farming:coffee_beans 2"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:coffee_5", table.copy(crop_def))
+minetest.register_node("farming:coffee_5", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:coffee"] = {
 	crop = "farming:coffee",
 	seed = "farming:coffee_beans",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 5
 }

crops/corn.lua

@@ -14,7 +14,7 @@ minetest.register_craftitem("farming:corn", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:corn_1")
 	end,
-	on_use = minetest.item_eat(3),
+	on_use = minetest.item_eat(3)
 })
 
 -- corn on the cob (texture by TenPlus1)
@@ -22,7 +22,7 @@ minetest.register_craftitem("farming:corn_cob", {
 	description = S("Corn on the Cob"),
 	inventory_image = "farming_corn_cob.png",
 	groups = {food_corn_cooked = 1, flammable = 2},
-	on_use = minetest.item_eat(5),
+	on_use = minetest.item_eat(5)
 })
 
 minetest.register_craft({
@@ -32,11 +32,30 @@ minetest.register_craft({
 	recipe = "group:food_corn"
 })
 
+-- popcorn
+minetest.register_craftitem("farming:popcorn", {
+	description = S("Popcorn"),
+	inventory_image = "farming_popcorn.png",
+	groups = {food_popcorn = 1, flammable = 2},
+	on_use = minetest.item_eat(4)
+})
+
+minetest.register_craft({
+	output = "farming:popcorn",
+	recipe = {
+		{"group:food_pot", "group:food_oil", "group:food_corn"}
+	},
+	replacements = {
+		{"group:food_pot", "farming:pot"},
+		{"group:food_oil", "vessels:glass_bottle"}
+	}
+})
+
 -- cornstarch
 minetest.register_craftitem("farming:cornstarch", {
 	description = S("Cornstarch"),
 	inventory_image = "farming_cornstarch.png",
-	groups = {food_cornstarch = 1, flammable = 2},
+	groups = {food_cornstarch = 1, food_gelatin = 1, food_flammable = 2}
 })
 
 minetest.register_craft({
@@ -47,7 +66,7 @@ minetest.register_craft({
 	},
 	replacements = {
 		{"group:food_mortar_pestle", "farming:mortar_pestle"},
-		{"group:food_baking_tray", "farming:baking_tray"},
+		{"group:food_baking_tray", "farming:baking_tray"}
 	}
 })
 
@@ -66,27 +85,27 @@ minetest.register_node("farming:bottle_ethanol", {
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
 	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_craft( {
 	output = "farming:bottle_ethanol",
 	recipe = {
-		{ "vessels:glass_bottle", "group:food_corn", "group:food_corn"},
-		{ "group:food_corn", "group:food_corn", "group:food_corn"},
 		{"group:food_corn", "group:food_corn", "group:food_corn"},
+		{"group:food_corn", "vessels:glass_bottle", "group:food_corn"},
+		{"group:food_corn", "group:food_corn", "group:food_corn"}
 	}
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:bottle_ethanol",
-	burntime = 80, --240,
+	burntime = 80,
 	replacements = {{"farming:bottle_ethanol", "vessels:glass_bottle"}}
 })
 
 -- corn definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_corn_1.png"},
 	paramtype = "light",
@@ -103,57 +122,57 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:corn_1", table.copy(crop_def))
+minetest.register_node("farming:corn_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_corn_2.png"}
+def.tiles = {"farming_corn_2.png"}
-minetest.register_node("farming:corn_2", table.copy(crop_def))
+minetest.register_node("farming:corn_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_corn_3.png"}
+def.tiles = {"farming_corn_3.png"}
-minetest.register_node("farming:corn_3", table.copy(crop_def))
+minetest.register_node("farming:corn_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_corn_4.png"}
+def.tiles = {"farming_corn_4.png"}
-minetest.register_node("farming:corn_4", table.copy(crop_def))
+minetest.register_node("farming:corn_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_corn_5.png"}
+def.tiles = {"farming_corn_5.png"}
-minetest.register_node("farming:corn_5", table.copy(crop_def))
+minetest.register_node("farming:corn_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_corn_6.png"}
+def.tiles = {"farming_corn_6.png"}
-crop_def.visual_scale = 1.9 -- 1.45
+def.visual_scale = 1.9
-minetest.register_node("farming:corn_6", table.copy(crop_def))
+minetest.register_node("farming:corn_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_corn_7.png"}
+def.tiles = {"farming_corn_7.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:corn"}, rarity = 1},
 		{items = {"farming:corn"}, rarity = 2},
-		{items = {"farming:corn"}, rarity = 3},
+		{items = {"farming:corn"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:corn_7", table.copy(crop_def))
+minetest.register_node("farming:corn_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_corn_8.png"}
+def.tiles = {"farming_corn_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:corn 2"}, rarity = 1},
 		{items = {"farming:corn 2"}, rarity = 2},
-		{items = {"farming:corn 2"}, rarity = 2},
+		{items = {"farming:corn 2"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:corn_8", table.copy(crop_def))
+minetest.register_node("farming:corn_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:corn"] = {
 	crop = "farming:corn",
 	seed = "farming:corn",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }

crops/cotton.lua

@@ -1,7 +1,7 @@
 
 local S = farming.intllib
 
--- wild cotton as a source of cotton seed
+-- wild cotton as a source of cotton seed and a chance of cotton itself
 minetest.register_node("farming:cotton_wild", {
 	description = S("Wild Cotton"),
 	drawtype = "plantlike",
@@ -14,12 +14,17 @@ minetest.register_node("farming:cotton_wild", {
 	walkable = false,
 	buildable_to = true,
 	groups = {snappy = 3, attached_node = 1, flammable = 4},
-	drop = "farming:seed_cotton",
+	drop = {
+		items = {
+			{items = {"farming:cotton"}, rarity = 2},
+			{items = {"farming:seed_cotton"}, rarity = 1}
+		}
+	},
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-6 / 16, -8 / 16, -6 / 16, 6 / 16, 5 / 16, 6 / 16},
+		fixed = {-6 / 16, -8 / 16, -6 / 16, 6 / 16, 5 / 16, 6 / 16}
-	},
+	}
 })
 
 -- cotton seeds
@@ -37,21 +42,21 @@ minetest.register_node("farming:seed_cotton", {
 	selection_box = farming.select,
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:cotton_1")
-	end,
+	end
 })
 
--- cotton / string
+-- cotton
-
 minetest.register_craftitem("farming:cotton", {
 	description = S("Cotton"),
 	inventory_image = "farming_cotton.png",
-	groups = {flammable = 4},
+	groups = {flammable = 4}
 })
 
+-- string
 minetest.register_craftitem("farming:string", {
 	description = S("String"),
 	inventory_image = "farming_string.png",
-	groups = {flammable = 2},
+	groups = {flammable = 2}
 })
 
 -- cotton to wool
@@ -59,7 +64,7 @@ minetest.register_craft({
 	output = "wool:white",
 	recipe = {
 		{"farming:cotton", "farming:cotton"},
-		{"farming:cotton", "farming:cotton"},
+		{"farming:cotton", "farming:cotton"}
 	}
 })
 
@@ -68,7 +73,7 @@ minetest.register_craft({
 	output = "farming:string 2",
 	recipe = {
 		{"farming:cotton"},
-		{"farming:cotton"},
+		{"farming:cotton"}
 	}
 })
 
@@ -76,17 +81,17 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:string",
-	burntime = 1,
+	burntime = 1
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:cotton",
-	burntime = 1,
+	burntime = 1
 })
 
 -- cotton definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cotton_1.png"},
 	paramtype = "light",
@@ -103,76 +108,76 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:cotton_1", table.copy(crop_def))
+minetest.register_node("farming:cotton_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_cotton_2.png"}
+def.tiles = {"farming_cotton_2.png"}
-minetest.register_node("farming:cotton_2", table.copy(crop_def))
+minetest.register_node("farming:cotton_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_cotton_3.png"}
+def.tiles = {"farming_cotton_3.png"}
-minetest.register_node("farming:cotton_3", table.copy(crop_def))
+minetest.register_node("farming:cotton_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_cotton_4.png"}
+def.tiles = {"farming_cotton_4.png"}
-minetest.register_node("farming:cotton_4", table.copy(crop_def))
+minetest.register_node("farming:cotton_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_cotton_5.png"}
+def.tiles = {"farming_cotton_5.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
-		{items = {"farming:seed_cotton"}, rarity = 1},
+		{items = {"farming:seed_cotton"}, rarity = 1}
 	}
 }
-minetest.register_node("farming:cotton_5", table.copy(crop_def))
+minetest.register_node("farming:cotton_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_cotton_6.png"}
+def.tiles = {"farming_cotton_6.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:cotton"}, rarity = 1},
-		{items = {"farming:cotton"}, rarity = 2},
+		{items = {"farming:cotton"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:cotton_6", table.copy(crop_def))
+minetest.register_node("farming:cotton_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_cotton_7.png"}
+def.tiles = {"farming_cotton_7.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:cotton"}, rarity = 1},
 		{items = {"farming:cotton"}, rarity = 2},
 		{items = {"farming:seed_cotton"}, rarity = 1},
-		{items = {"farming:seed_cotton"}, rarity = 2},
+		{items = {"farming:seed_cotton"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:cotton_7", table.copy(crop_def))
+minetest.register_node("farming:cotton_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_cotton_8.png"}
+def.tiles = {"farming_cotton_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:cotton"}, rarity = 1},
 		{items = {"farming:cotton"}, rarity = 2},
 		{items = {"farming:cotton"}, rarity = 3},
 		{items = {"farming:seed_cotton"}, rarity = 1},
 		{items = {"farming:seed_cotton"}, rarity = 2},
-		{items = {"farming:seed_cotton"}, rarity = 3},
+		{items = {"farming:seed_cotton"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:cotton_8", table.copy(crop_def))
+minetest.register_node("farming:cotton_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:cotton"] = {
 	crop = "farming:cotton",
 	seed = "farming:seed_cotton",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }
 
---[[ Cotton (example, is already registered in cotton.lua)
+--[[ Cotton using api
 farming.register_plant("farming:cotton", {
 	description = "Cotton seed",
 	inventory_image = "farming_cotton_seed.png",

crops/cucumber.lua

@@ -14,11 +14,11 @@ minetest.register_craftitem("farming:cucumber", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:cucumber_1")
 	end,
-	on_use = minetest.item_eat(4),
+	on_use = minetest.item_eat(4)
 })
 
 -- cucumber definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cucumber_1.png"},
 	paramtype = "light",
@@ -34,32 +34,32 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:cucumber_1", table.copy(crop_def))
+minetest.register_node("farming:cucumber_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_cucumber_2.png"}
+def.tiles = {"farming_cucumber_2.png"}
-minetest.register_node("farming:cucumber_2", table.copy(crop_def))
+minetest.register_node("farming:cucumber_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_cucumber_3.png"}
+def.tiles = {"farming_cucumber_3.png"}
-minetest.register_node("farming:cucumber_3", table.copy(crop_def))
+minetest.register_node("farming:cucumber_3", table.copy(def))
 
 -- stage 4 (final)
-crop_def.tiles = {"farming_cucumber_4.png"}
+def.tiles = {"farming_cucumber_4.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:cucumber 2"}, rarity = 1},
-		{items = {"farming:cucumber 2"}, rarity = 2},
+		{items = {"farming:cucumber 2"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:cucumber_4", table.copy(crop_def))
+minetest.register_node("farming:cucumber_4", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:cucumber"] = {
 	crop = "farming:cucumber",
 	seed = "farming:cucumber",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 4
 }

crops/garlic.lua

@@ -14,7 +14,7 @@ minetest.register_craftitem("farming:garlic_clove", {
 	groups = {seed = 2, food_garlic_clove = 1, flammable = 3},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:garlic_1")
-	end,
+	end
 })
 
 -- garlic bulb
@@ -22,7 +22,7 @@ minetest.register_craftitem("farming:garlic", {
 	description = S("Garlic"),
 	inventory_image = "crops_garlic.png",
 	on_use = minetest.item_eat(1),
-	groups = {food_garlic = 1, flammable = 3},
+	groups = {food_garlic = 1, flammable = 3}
 })
 
 minetest.register_craft({
@@ -46,6 +46,7 @@ minetest.register_node("farming:garlic_braid", {
 	inventory_image = "crops_garlic_braid.png",
 	wield_image = "crops_garlic_braid.png",
 	drawtype = "nodebox",
+	use_texture_alpha = "clip",
 	paramtype = "light",
 	paramtype2 = "facedir",
 	tiles = {
@@ -58,8 +59,8 @@ minetest.register_node("farming:garlic_braid", {
 	node_box = {
 		type = "fixed",
 		fixed = {
-				{-0.13, -0.45, 0.5, 0.13, 0.45, 0.24},
+				{-0.13, -0.45, 0.5, 0.13, 0.45, 0.24}
-		},
+		}
 	}
 })
 
@@ -79,7 +80,7 @@ minetest.register_craft({
 })
 
 -- crop definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"crops_garlic_plant_1.png"},
 	paramtype = "light",
@@ -99,39 +100,37 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:garlic_1", table.copy(crop_def))
+minetest.register_node("farming:garlic_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"crops_garlic_plant_2.png"}
+def.tiles = {"crops_garlic_plant_2.png"}
-minetest.register_node("farming:garlic_2", table.copy(crop_def))
+minetest.register_node("farming:garlic_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"crops_garlic_plant_3.png"}
+def.tiles = {"crops_garlic_plant_3.png"}
-minetest.register_node("farming:garlic_3", table.copy(crop_def))
+minetest.register_node("farming:garlic_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"crops_garlic_plant_4.png"}
+def.tiles = {"crops_garlic_plant_4.png"}
-minetest.register_node("farming:garlic_4", table.copy(crop_def))
+minetest.register_node("farming:garlic_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"crops_garlic_plant_5.png"}
+def.tiles = {"crops_garlic_plant_5.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
-	max_items = 5, items = {
+	items = {
-		{items = {"farming:garlic"}, rarity = 1},
+		{items = {"farming:garlic 3"}, rarity = 1},
-		{items = {"farming:garlic"}, rarity = 1},
-		{items = {"farming:garlic"}, rarity = 1},
 		{items = {"farming:garlic"}, rarity = 2},
-		{items = {"farming:garlic"}, rarity = 5},
+		{items = {"farming:garlic"}, rarity = 5}
 	}
 }
-minetest.register_node("farming:garlic_5", table.copy(crop_def))
+minetest.register_node("farming:garlic_5", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:garlic"] = {
 	crop = "farming:garlic",
 	seed = "farming:garlic_clove",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 5
 }

crops/grapes.lua

@@ -8,7 +8,6 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname)
 
 	-- check if pointing at a node
 	if not pt or pt.type ~= "node" then
-
 		return
 	end
 
@@ -69,18 +68,15 @@ minetest.register_craftitem("farming:grapes", {
 	inventory_image = "farming_grapes.png",
 	on_use = minetest.item_eat(2),
 	groups = {seed = 2, food_grapes = 1, flammable = 3},
-
 	on_place = function(itemstack, placer, pointed_thing)
 		return place_grapes(itemstack, placer, pointed_thing, "farming:grapes_1")
-	end,
+	end
 })
 
 -- grapes can be used for violet dye
 minetest.register_craft({
 	output = "dye:violet",
-	recipe = {
+	recipe = {{"farming:grapes"}}
-		{"farming:grapes"},
-	}
 })
 
 -- trellis
@@ -89,7 +85,7 @@ minetest.register_node("farming:trellis", {
 	drawtype = "plantlike",
 	tiles = {"farming_trellis.png"},
 	inventory_image = "farming_trellis.png",
-	visual_scale = 1.9, -- 1.45,
+	visual_scale = 1.9,
 	paramtype = "light",
 	walkable = false,
 	buildable_to = true,
@@ -159,21 +155,21 @@ minetest.register_craft({
 	recipe = {
 		{"default:stick", "default:stick", "default:stick"},
 		{"default:stick", "default:stick", "default:stick"},
-		{"default:stick", "default:stick", "default:stick"},
+		{"default:stick", "default:stick", "default:stick"}
 	}
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:trellis",
-	burntime = 15,
+	burntime = 15
 })
 
 -- grapes definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_grapes_1.png"},
-	visual_scale = 1.9, -- 1.45,
+	visual_scale = 1.9,
 	paramtype = "light",
 	walkable = false,
 	buildable_to = true,
@@ -192,51 +188,51 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:grapes_1", table.copy(crop_def))
+minetest.register_node("farming:grapes_1", table.copy(def))
 
 -- stage2
-crop_def.tiles = {"farming_grapes_2.png"}
+def.tiles = {"farming_grapes_2.png"}
-minetest.register_node("farming:grapes_2", table.copy(crop_def))
+minetest.register_node("farming:grapes_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_grapes_3.png"}
+def.tiles = {"farming_grapes_3.png"}
-minetest.register_node("farming:grapes_3", table.copy(crop_def))
+minetest.register_node("farming:grapes_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_grapes_4.png"}
+def.tiles = {"farming_grapes_4.png"}
-minetest.register_node("farming:grapes_4", table.copy(crop_def))
+minetest.register_node("farming:grapes_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_grapes_5.png"}
+def.tiles = {"farming_grapes_5.png"}
-minetest.register_node("farming:grapes_5", table.copy(crop_def))
+minetest.register_node("farming:grapes_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_grapes_6.png"}
+def.tiles = {"farming_grapes_6.png"}
-minetest.register_node("farming:grapes_6", table.copy(crop_def))
+minetest.register_node("farming:grapes_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_grapes_7.png"}
+def.tiles = {"farming_grapes_7.png"}
-minetest.register_node("farming:grapes_7", table.copy(crop_def))
+minetest.register_node("farming:grapes_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_grapes_8.png"}
+def.tiles = {"farming_grapes_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:trellis"}, rarity = 1},
 		{items = {"farming:grapes 3"}, rarity = 1},
 		{items = {"farming:grapes 1"}, rarity = 2},
-		{items = {"farming:grapes 1"}, rarity = 3},
+		{items = {"farming:grapes 1"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:grapes_8", table.copy(crop_def))
+minetest.register_node("farming:grapes_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:grapes"] = {
 	crop = "farming:grapes",
 	seed = "farming:grapes",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }
 
@@ -253,7 +249,7 @@ minetest.register_node("farming:grapebush", {
 		items = {
 			{items = {"farming:grapes 1"}, rarity = 1},
 			{items = {"farming:grapes 1"}, rarity = 2},
-			{items = {"farming:grapes 1"}, rarity = 3},
+			{items = {"farming:grapes 1"}, rarity = 3}
 		}
 	},
 	selection_box = farming.select,
@@ -261,5 +257,5 @@ minetest.register_node("farming:grapebush", {
 		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
 		not_in_creative_inventory = 1
 	},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })

crops/hemp.lua

@@ -16,13 +16,13 @@ minetest.register_node("farming:seed_hemp", {
 	selection_box = farming.select,
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:hemp_1")
-	end,
+	end
 })
 
 -- harvested hemp
 minetest.register_craftitem("farming:hemp_leaf", {
 	description = S("Hemp Leaf"),
-	inventory_image = "farming_hemp_leaf.png",
+	inventory_image = "farming_hemp_leaf.png"
 })
 
 -- hemp oil
@@ -40,7 +40,7 @@ minetest.register_node("farming:hemp_oil", {
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
 	groups = {food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_craft( {
@@ -71,28 +71,30 @@ minetest.register_craft({
 -- hemp fibre
 minetest.register_craftitem("farming:hemp_fibre", {
 	description = S("Hemp Fibre"),
-	inventory_image = "farming_hemp_fibre.png",
+	inventory_image = "farming_hemp_fibre.png"
 })
 
 minetest.register_craft( {
 	output = "farming:hemp_fibre 8",
 	recipe = {
 		{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"},
-		{"farming:hemp_leaf", "bucket:bucket_water", "farming:hemp_leaf"},
+		{"farming:hemp_leaf", "group:water_bucket", "farming:hemp_leaf"},
 		{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}
 	},
-	replacements = {{ "bucket:bucket_water", "bucket:bucket_empty"}}
+	replacements = {{"group:water_bucket", "bucket:bucket_empty"}}
 })
 
+if minetest.get_modpath("bucket_wooden") then
 	minetest.register_craft( {
 		output = "farming:hemp_fibre 8",
 		recipe = {
 			{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"},
-		{"farming:hemp_leaf", "bucket:bucket_river_water", "farming:hemp_leaf"},
+			{"farming:hemp_leaf", "group:water_bucket_wooden", "farming:hemp_leaf"},
 			{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}
 		},
-	replacements = {{ "bucket:bucket_river_water", "bucket:bucket_empty"}}
+		replacements = {{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}}
 	})
+end
 
 -- hemp block
 minetest.register_node("farming:hemp_block", {
@@ -108,7 +110,7 @@ minetest.register_craft( {
 		{"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"},
 		{"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"},
 		{"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}
-	},
+	}
 })
 
 -- check and register stairs
@@ -136,7 +138,7 @@ end
 minetest.register_craft( {
 	output = "default:paper 3",
 	recipe = {
-		{"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"},
+		{"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}
 	}
 })
 
@@ -146,7 +148,7 @@ minetest.register_craft( {
 	recipe = {
 		{"farming:hemp_fibre"},
 		{"farming:hemp_fibre"},
-		{"farming:hemp_fibre"},
+		{"farming:hemp_fibre"}
 	}
 })
 
@@ -165,8 +167,8 @@ minetest.register_node("farming:hemp_rope", {
 	sounds =  default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
+		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}
-	},
+	}
 })
 
 -- string
@@ -175,12 +177,12 @@ minetest.register_craft( {
 	recipe = {
 		{"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"},
 		{"farming:cotton", "farming:cotton", "farming:cotton"},
-		{"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"},
+		{"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}
 	}
 })
 
 -- hemp definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_hemp_1.png"},
 	paramtype = "light",
@@ -197,64 +199,64 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:hemp_1", table.copy(crop_def))
+minetest.register_node("farming:hemp_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_hemp_2.png"}
+def.tiles = {"farming_hemp_2.png"}
-minetest.register_node("farming:hemp_2", table.copy(crop_def))
+minetest.register_node("farming:hemp_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_hemp_3.png"}
+def.tiles = {"farming_hemp_3.png"}
-minetest.register_node("farming:hemp_3", table.copy(crop_def))
+minetest.register_node("farming:hemp_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_hemp_4.png"}
+def.tiles = {"farming_hemp_4.png"}
-minetest.register_node("farming:hemp_4", table.copy(crop_def))
+minetest.register_node("farming:hemp_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_hemp_5.png"}
+def.tiles = {"farming_hemp_5.png"}
-minetest.register_node("farming:hemp_5", table.copy(crop_def))
+minetest.register_node("farming:hemp_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_hemp_6.png"}
+def.tiles = {"farming_hemp_6.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:hemp_leaf"}, rarity = 2},
-		{items = {"farming:seed_hemp"}, rarity = 1},
+		{items = {"farming:seed_hemp"}, rarity = 1}
 	}
 }
-minetest.register_node("farming:hemp_6", table.copy(crop_def))
+minetest.register_node("farming:hemp_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_hemp_7.png"}
+def.tiles = {"farming_hemp_7.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:hemp_leaf"}, rarity = 1},
 		{items = {"farming:hemp_leaf"}, rarity = 3},
 		{items = {"farming:seed_hemp"}, rarity = 1},
-		{items = {"farming:seed_hemp"}, rarity = 3},
+		{items = {"farming:seed_hemp"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:hemp_7", table.copy(crop_def))
+minetest.register_node("farming:hemp_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_hemp_8.png"}
+def.tiles = {"farming_hemp_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:hemp_leaf 2"}, rarity = 1},
 		{items = {"farming:hemp_leaf"}, rarity = 2},
 		{items = {"farming:seed_hemp"}, rarity = 1},
-		{items = {"farming:seed_hemp"}, rarity = 2},
+		{items = {"farming:seed_hemp"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:hemp_8", table.copy(crop_def))
+minetest.register_node("farming:hemp_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:hemp"] = {
 	crop = "farming:hemp",
 	seed = "farming:seed_hemp",
-	minlight = 13,
+	mminlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }

crops/lettuce.lua

@@ -0,0 +1,63 @@
+local S = farming.intllib
+
+-- lettuce
+minetest.register_craftitem("farming:lettuce", {
+	description = S("Lettuce"),
+	inventory_image = "farming_lettuce.png",
+	groups = {seed = 2, food_lettuce = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:lettuce_1")
+	end,
+	on_use = minetest.item_eat(2),
+})
+
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_lettuce_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop =  "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:lettuce_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_lettuce_2.png"}
+minetest.register_node("farming:lettuce_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_lettuce_3.png"}
+minetest.register_node("farming:lettuce_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_lettuce_4.png"}
+minetest.register_node("farming:lettuce_4", table.copy(def))
+
+-- stage 5
+def.tiles = {"farming_lettuce_5.png"}
+def.groups.growing = nil
+def.drop = {
+	items = {
+		{items = {'farming:lettuce 2'}, rarity = 1},
+		{items = {'farming:lettuce 1'}, rarity = 2}
+	}
+}
+minetest.register_node("farming:lettuce_5", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:lettuce"] = {
+	crop = "farming:lettuce",
+	seed = "farming:lettuce",
+	minlight = farming.min_light,
+	maxlight = farming.max_light,
+	steps = 5
+}

crops/melon.lua

@@ -9,26 +9,25 @@ minetest.register_craftitem("farming:melon_slice", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:melon_1")
 	end,
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 minetest.register_craft({
 	output = "farming:melon_8",
 	recipe = {
 		{"farming:melon_slice", "farming:melon_slice"},
-		{"farming:melon_slice", "farming:melon_slice"},
+		{"farming:melon_slice", "farming:melon_slice"}
 	}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:melon_slice 4",
-	recipe = {"farming:melon_8", "farming:cutting_board"},
+	recipe = {{"farming:cutting_board", "farming:melon_8"}},
-	replacements = {{"farming:cutting_board", "farming:cutting_board"}},
+	replacements = {{"farming:cutting_board", "farming:cutting_board"}}
 })
 
 -- melon definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_melon_1.png"},
 	paramtype = "light",
@@ -45,51 +44,55 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:melon_1", table.copy(crop_def))
+minetest.register_node("farming:melon_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_melon_2.png"}
+def.tiles = {"farming_melon_2.png"}
-minetest.register_node("farming:melon_2", table.copy(crop_def))
+minetest.register_node("farming:melon_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_melon_3.png"}
+def.tiles = {"farming_melon_3.png"}
-minetest.register_node("farming:melon_3", table.copy(crop_def))
+minetest.register_node("farming:melon_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_melon_4.png"}
+def.tiles = {"farming_melon_4.png"}
-minetest.register_node("farming:melon_4", table.copy(crop_def))
+minetest.register_node("farming:melon_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_melon_5.png"}
+def.tiles = {"farming_melon_5.png"}
-minetest.register_node("farming:melon_5", table.copy(crop_def))
+minetest.register_node("farming:melon_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_melon_6.png"}
+def.tiles = {"farming_melon_6.png"}
-minetest.register_node("farming:melon_6", table.copy(crop_def))
+minetest.register_node("farming:melon_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_melon_7.png"}
+def.tiles = {"farming_melon_7.png"}
-minetest.register_node("farming:melon_7", table.copy(crop_def))
+minetest.register_node("farming:melon_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.drawtype = "nodebox"
+minetest.register_node("farming:melon_8", {
-crop_def.description = S("Melon")
+	description = S("Melon"),
-crop_def.tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png"}
+	tiles = {
-crop_def.selection_box = {-.5, -.5, -.5, .5, .5, .5}
+		"farming_melon_top.png",
-crop_def.walkable = true
+		"farming_melon_bottom.png",
-crop_def.groups = {
+		"farming_melon_side.png"
+	},
+	groups = {
 		food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1,
 		flammable = 2, plant = 1
-}
+	},
---crop_def.drop = "farming:melon_slice 9"
+	drop = "farming:melon_8",
-crop_def.drop = "farming:melon_8"
+	sounds = default.node_sound_wood_defaults(),
-minetest.register_node("farming:melon_8", table.copy(crop_def))
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
+})
 
 -- add to registered_plants
 farming.registered_plants["farming:melon"] = {
 	crop = "farming:melon",
 	seed = "farming:melon_slice",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }

crops/mint.lua

@@ -16,7 +16,7 @@ minetest.register_craftitem("farming:seed_mint", {
 minetest.register_craftitem("farming:mint_leaf", {
 	description = S("Mint Leaf"),
 	inventory_image = "farming_mint_leaf.png",
-	groups = {food_mint = 1, flammable = 4},
+	groups = {food_mint = 1, flammable = 4}
 })
 
 -- mint tea
@@ -24,25 +24,37 @@ minetest.register_craftitem("farming:mint_tea", {
 	description = S("Mint Tea"),
 	inventory_image = "farming_mint_tea.png",
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
-	groups = {flammable = 4},
+	groups = {flammable = 4}
 })
 
 minetest.register_craft({
 	output = "farming:mint_tea",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_mint",
+		{"group:food_mint", "group:food_mint", "group:food_mint"},
-		"group:food_mint", "group:food_mint",
+		{"group:water_bucket", "farming:juicer", "vessels:drinking_glass"}
-		"farming:juicer", "bucket:bucket_water"
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"},
-		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"group:water_bucket", "bucket:bucket_empty"}
-	},
+	}
 })
 
+if minetest.get_modpath("bucket_wooden") then
+	minetest.register_craft({
+		output = "farming:mint_tea",
+		recipe = {
+			{"group:food_mint", "group:food_mint", "group:food_mint"},
+			{"group:water_bucket_wooden", "farming:juicer", "vessels:drinking_glass"}
+		},
+		replacements = {
+			{"group:food_juicer", "farming:juicer"},
+			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}
+		}
+	})
+end
+
 -- mint definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_mint_1.png"},
 	paramtype = "light",
@@ -58,34 +70,34 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:mint_1", table.copy(crop_def))
+minetest.register_node("farming:mint_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_mint_2.png"}
+def.tiles = {"farming_mint_2.png"}
-minetest.register_node("farming:mint_2", table.copy(crop_def))
+minetest.register_node("farming:mint_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_mint_3.png"}
+def.tiles = {"farming_mint_3.png"}
-minetest.register_node("farming:mint_3", table.copy(crop_def))
+minetest.register_node("farming:mint_3", table.copy(def))
 
 -- stage 4 (final)
-crop_def.tiles = {"farming_mint_4.png"}
+def.tiles = {"farming_mint_4.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:mint_leaf 2"}, rarity = 1},
 		{items = {"farming:mint_leaf 2"}, rarity = 2},
 		{items = {"farming:seed_mint 1"}, rarity = 1},
-		{items = {"farming:seed_mint 2"}, rarity = 2},
+		{items = {"farming:seed_mint 2"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:mint_4", table.copy(crop_def))
+minetest.register_node("farming:mint_4", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:mint"] = {
 	crop = "farming:mint",
 	seed = "farming:seed_mint",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 4
 }

crops/onion.lua

@@ -15,7 +15,7 @@ minetest.register_craftitem("farming:onion", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:onion_1")
 	end,
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- onion soup
@@ -23,22 +23,21 @@ minetest.register_craftitem("farming:onion_soup", {
 	description = S("Onion Soup"),
 	inventory_image = "farming_onion_soup.png",
 	groups = {flammable = 2},
-	on_use = minetest.item_eat(6, "farming:bowl"),
+	on_use = minetest.item_eat(6, "farming:bowl")
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:onion_soup",
 	recipe = {
-		"group:food_onion", "group:food_onion", "group:food_pot",
+		{"group:food_onion", "group:food_onion", "group:food_onion"},
-		"group:food_onion", "group:food_onion",
+		{"group:food_onion", "group:food_pot", "group:food_onion"},
-		"group:food_onion", "group:food_onion", "group:food_bowl"
+		{"", "group:food_bowl", ""}
 	},
 	replacements = {{"farming:pot", "farming:pot"}}
 })
 
 -- crop definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"crops_onion_plant_1.png"},
 	paramtype = "light",
@@ -58,39 +57,39 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:onion_1", table.copy(crop_def))
+minetest.register_node("farming:onion_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"crops_onion_plant_2.png"}
+def.tiles = {"crops_onion_plant_2.png"}
-minetest.register_node("farming:onion_2", table.copy(crop_def))
+minetest.register_node("farming:onion_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"crops_onion_plant_3.png"}
+def.tiles = {"crops_onion_plant_3.png"}
-minetest.register_node("farming:onion_3", table.copy(crop_def))
+minetest.register_node("farming:onion_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"crops_onion_plant_4.png"}
+def.tiles = {"crops_onion_plant_4.png"}
-minetest.register_node("farming:onion_4", table.copy(crop_def))
+minetest.register_node("farming:onion_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"crops_onion_plant_5.png"}
+def.tiles = {"crops_onion_plant_5.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	max_items = 5, items = {
 		{items = {"farming:onion"}, rarity = 1},
 		{items = {"farming:onion"}, rarity = 1},
 		{items = {"farming:onion"}, rarity = 2},
 		{items = {"farming:onion"}, rarity = 2},
-		{items = {"farming:onion"}, rarity = 5},
+		{items = {"farming:onion"}, rarity = 5}
 	}
 }
-minetest.register_node("farming:onion_5", table.copy(crop_def))
+minetest.register_node("farming:onion_5", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:onion"] = {
 	crop = "farming:onion",
 	seed = "farming:onion",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 5
 }

crops/parsley.lua

@@ -0,0 +1,56 @@
+local S = farming.intllib
+
+-- item definition
+minetest.register_craftitem("farming:parsley", {
+	description = S("Parsley"),
+	inventory_image = "farming_parsley.png",
+	groups = {seed = 2, food_parsley = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:parsley_1")
+	end
+})
+
+-- crop definition
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_parsley_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop =  "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:parsley_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_parsley_2.png"}
+minetest.register_node("farming:parsley_2", table.copy(def))
+
+-- stage 3 (final)
+def.tiles = {"farming_parsley_3.png"}
+def.groups.growing = nil
+def.drop = {
+	items = {
+		{items = {"farming:parsley 2"}, rarity = 1},
+		{items = {"farming:parsley"}, rarity = 2},
+		{items = {"farming:parsley"}, rarity = 3}
+	}
+}
+minetest.register_node("farming:parsley_3", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:parsley"] = {
+	crop = "farming:parsley",
+	seed = "farming:parsley",
+	minlight = 13,
+	maxlight = 15,
+	steps = 3
+}

crops/peas.lua

@@ -21,9 +21,8 @@ minetest.register_craftitem("farming:peas", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:peas",
-	recipe = {"farming:pea_pod"}
+	recipe = {{"farming:pea_pod"}}
 })
 
 -- pea soup
@@ -31,16 +30,19 @@ minetest.register_craftitem("farming:pea_soup", {
 	description = S("Pea Soup"),
 	inventory_image = "farming_pea_soup.png",
 	groups = {flammable = 2},
-	on_use = minetest.item_eat(4, "farming:bowl"),
+	on_use = minetest.item_eat(4, "farming:bowl")
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:pea_soup",
-	recipe = {"group:food_peas", "group:food_peas", "group:food_bowl"}
+	recipe = {
+		{"group:food_peas"},
+		{"group:food_peas"},
+		{"group:food_bowl"}
+	}
 })
 
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_pea_1.png"},
 	paramtype = "light",
@@ -60,38 +62,38 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:pea_1", table.copy(crop_def))
+minetest.register_node("farming:pea_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_pea_2.png"}
+def.tiles = {"farming_pea_2.png"}
-minetest.register_node("farming:pea_2", table.copy(crop_def))
+minetest.register_node("farming:pea_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_pea_3.png"}
+def.tiles = {"farming_pea_3.png"}
-minetest.register_node("farming:pea_3", table.copy(crop_def))
+minetest.register_node("farming:pea_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_pea_4.png"}
+def.tiles = {"farming_pea_4.png"}
-minetest.register_node("farming:pea_4", table.copy(crop_def))
+minetest.register_node("farming:pea_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_pea_5.png"}
+def.tiles = {"farming_pea_5.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	max_items = 5, items = {
 		{items = {"farming:pea_pod"}, rarity = 1},
 		{items = {"farming:pea_pod"}, rarity = 2},
 		{items = {"farming:pea_pod"}, rarity = 3},
-		{items = {"farming:pea_pod"}, rarity = 5},
+		{items = {"farming:pea_pod"}, rarity = 5}
 	}
 }
-minetest.register_node("farming:pea_5", table.copy(crop_def))
+minetest.register_node("farming:pea_5", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:pea_pod"] = {
 	crop = "farming:pea",
 	seed = "farming:pea_pod",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 5
 }

crops/pepper.lua

@@ -14,21 +14,36 @@ minetest.register_craftitem("farming:peppercorn", {
 	groups = {seed = 1, food_peppercorn = 1, flammable = 3},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:pepper_1")
-	end,
+	end
 })
 
 -- green pepper
 minetest.register_craftitem("farming:pepper", {
-	description = S("Pepper"),
+	description = S("Green Pepper"),
 	inventory_image = "crops_pepper.png",
 	on_use = minetest.item_eat(2),
-	groups = {food_pepper = 1, flammable = 3},
+	groups = {food_pepper = 1, flammable = 3}
+})
+
+-- yellow pepper
+minetest.register_craftitem("farming:pepper_yellow", {
+	description = S("Yellow Pepper"),
+	inventory_image = "crops_pepper_yellow.png",
+	on_use = minetest.item_eat(3),
+	groups = {food_pepper = 1, flammable = 3}
+})
+
+-- red pepper
+minetest.register_craftitem("farming:pepper_red", {
+	description = S("Red Pepper"),
+	inventory_image = "crops_pepper_red.png",
+	on_use = minetest.item_eat(4),
+	groups = {food_pepper = 1, flammable = 3}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:peppercorn",
-	recipe = {"farming:pepper"}
+	recipe = {{"group:food_pepper"}}
 })
 
 -- ground pepper
@@ -48,18 +63,21 @@ minetest.register_node("farming:pepper_ground", {
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
-	},
+	}
 })
 
 minetest.register_craft( {
 	output = "farming:pepper_ground",
-	type = "shapeless",
+	recipe = {
-	recipe = {"group:food_peppercorn", "vessels:glass_bottle", "farming:mortar_pestle"},
+		{"group:food_peppercorn"},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+		{"farming:mortar_pestle"},
+		{"vessels:glass_bottle"}
+	},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
 -- crop definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"crops_pepper_plant_1.png"},
 	paramtype = "light",
@@ -79,37 +97,59 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:pepper_1", table.copy(crop_def))
+minetest.register_node("farming:pepper_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"crops_pepper_plant_2.png"}
+def.tiles = {"crops_pepper_plant_2.png"}
-minetest.register_node("farming:pepper_2", table.copy(crop_def))
+minetest.register_node("farming:pepper_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"crops_pepper_plant_3.png"}
+def.tiles = {"crops_pepper_plant_3.png"}
-minetest.register_node("farming:pepper_3", table.copy(crop_def))
+minetest.register_node("farming:pepper_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"crops_pepper_plant_4.png"}
+def.tiles = {"crops_pepper_plant_4.png"}
-minetest.register_node("farming:pepper_4", table.copy(crop_def))
+minetest.register_node("farming:pepper_4", table.copy(def))
 
--- stage 5
+-- stage 5 (green pepper)
-crop_def.tiles = {"crops_pepper_plant_5.png"}
+def.tiles = {"crops_pepper_plant_5.png"}
-crop_def.groups.growing = 0
+def.drop = {
-crop_def.drop = {
 	max_items = 2, items = {
 		{items = {"farming:pepper 2"}, rarity = 1},
 		{items = {"farming:pepper"}, rarity = 2},
-		{items = {"farming:pepper"}, rarity = 3},
+		{items = {"farming:pepper"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:pepper_5", table.copy(crop_def))
+minetest.register_node("farming:pepper_5", table.copy(def))
+
+-- stage 6 (yellow pepper)
+def.tiles = {"crops_pepper_plant_6.png"}
+def.drop = {
+	max_items = 2, items = {
+		{items = {"farming:pepper_yellow 2"}, rarity = 1},
+		{items = {"farming:pepper_yellow"}, rarity = 2},
+		{items = {"farming:pepper_yellow"}, rarity = 3}
+	}
+}
+minetest.register_node("farming:pepper_6", table.copy(def))
+
+-- stage 7 (red pepper)
+def.tiles = {"crops_pepper_plant_7.png"}
+def.groups.growing = nil
+def.drop = {
+	max_items = 2, items = {
+		{items = {"farming:pepper_red 2"}, rarity = 1},
+		{items = {"farming:pepper_red"}, rarity = 2},
+		{items = {"farming:pepper_red"}, rarity = 3}
+	}
+}
+minetest.register_node("farming:pepper_7", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:pepper"] = {
 	crop = "farming:pepper",
 	seed = "farming:peppercorn",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 5
 }

crops/pineapple.lua

@@ -8,7 +8,7 @@ minetest.register_craftitem("farming:pineapple_top", {
 	groups = {seed = 2, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:pineapple_1")
-	end,
+	end
 })
 
 -- pineapple
@@ -25,7 +25,7 @@ minetest.register_node("farming:pineapple", {
 		type = "fixed",
 		fixed = {-0.27, -0.37, -0.27, 0.27, 0.44, 0.27}
 	},
-	groups = {food_pineapple = 1, fleshy = 3, dig_immediate = 3, flammable = 2},
+	groups = {food_pineapple = 1, fleshy = 3, dig_immediate = 3, flammable = 2}
 })
 
 -- pineapple
@@ -33,13 +33,12 @@ minetest.register_craftitem("farming:pineapple_ring", {
 	description = S("Pineapple Ring"),
 	inventory_image = "farming_pineapple_ring.png",
 	groups = {food_pineapple_ring = 1, flammable = 2},
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 minetest.register_craft( {
 	output = "farming:pineapple_ring 5",
-	type = "shapeless",
+	recipe = {{"group:food_pineapple"}},
-	recipe = {"group:food_pineapple"},
 	replacements = {{"farming:pineapple", "farming:pineapple_top"}}
 })
 
@@ -48,34 +47,36 @@ minetest.register_craftitem("farming:pineapple_juice", {
 	description = S("Pineapple Juice"),
 	inventory_image = "farming_pineapple_juice.png",
 	on_use = minetest.item_eat(4, "vessels:drinking_glass"),
-	groups = {vessel = 1},
+	groups = {vessel = 1, drink = 1}
 })
 
 minetest.register_craft({
 	output = "farming:pineapple_juice",
-	type = "shapeless",
+	recipe = {
-	recipe = {"vessels:drinking_glass", "group:food_pineapple_ring",
+		{"group:food_pineapple_ring", "group:food_pineapple_ring",
-			"group:food_pineapple_ring", "group:food_pineapple_ring",
+				"group:food_pineapple_ring"},
-			"farming:juicer"},
+		{"", "farming:juicer", ""},
-	replacements = {
+		{"", "vessels:drinking_glass", ""}
-		{"group:food_juicer", "farming:juicer"},
 	},
+	replacements = {
+		{"group:food_juicer", "farming:juicer"}
+	}
 })
 
 minetest.register_craft({
 	output = "farming:pineapple_juice 2",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "vessels:drinking_glass",
+		{"group:food_pineapple", ""},
-		"group:food_pineapple", "farming:juicer"
+		{"farming:juicer", ""},
+		{"vessels:drinking_glass", "vessels:drinking_glass"}
 	},
 	replacements = {
-		{"group:food_juicer", "farming:juicer"},
+		{"group:food_juicer", "farming:juicer"}
-	},
+	}
 })
 
 -- crop definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	visual_scale = 1.5,
 	tiles = {"farming_pineapple_1.png"},
@@ -93,48 +94,48 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:pineapple_1", table.copy(crop_def))
+minetest.register_node("farming:pineapple_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_pineapple_2.png"}
+def.tiles = {"farming_pineapple_2.png"}
-minetest.register_node("farming:pineapple_2", table.copy(crop_def))
+minetest.register_node("farming:pineapple_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_pineapple_3.png"}
+def.tiles = {"farming_pineapple_3.png"}
-minetest.register_node("farming:pineapple_3", table.copy(crop_def))
+minetest.register_node("farming:pineapple_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_pineapple_4.png"}
+def.tiles = {"farming_pineapple_4.png"}
-minetest.register_node("farming:pineapple_4", table.copy(crop_def))
+minetest.register_node("farming:pineapple_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_pineapple_5.png"}
+def.tiles = {"farming_pineapple_5.png"}
-minetest.register_node("farming:pineapple_5", table.copy(crop_def))
+minetest.register_node("farming:pineapple_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_pineapple_6.png"}
+def.tiles = {"farming_pineapple_6.png"}
-minetest.register_node("farming:pineapple_6", table.copy(crop_def))
+minetest.register_node("farming:pineapple_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_pineapple_7.png"}
+def.tiles = {"farming_pineapple_7.png"}
-minetest.register_node("farming:pineapple_7", table.copy(crop_def))
+minetest.register_node("farming:pineapple_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_pineapple_8.png"}
+def.tiles = {"farming_pineapple_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:pineapple"}, rarity = 1},
-		{items = {"farming:pineapple"}, rarity = 15},
+		{items = {"farming:pineapple"}, rarity = 10}
 	}
 }
-minetest.register_node("farming:pineapple_8", table.copy(crop_def))
+minetest.register_node("farming:pineapple_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:pineapple"] = {
 	crop = "farming:pineapple",
 	seed = "farming:pineapple_top",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }

crops/potato.lua

@@ -14,23 +14,23 @@ minetest.register_craftitem("farming:potato", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:potato_1")
 	end,
---	on_use = minetest.item_eat(1),
+	-- 1 in 3 chance of being poisoned
 	on_use = function(itemstack, user, pointed_thing)
 		if user then
-			if math.random(1, 3) == 1 then
+			if math.random(3) == 1 then
 				return minetest.do_item_eat(-1, nil, itemstack, user, pointed_thing)
 			else
 				return minetest.do_item_eat(1, nil, itemstack, user, pointed_thing)
 			end
 		end
-	end,
+	end
 })
 
 -- baked potato
 minetest.register_craftitem("farming:baked_potato", {
 	description = S("Baked Potato"),
 	inventory_image = "farming_baked_potato.png",
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(6)
 })
 
 minetest.register_craft({
@@ -44,7 +44,7 @@ minetest.register_craft({
 minetest.register_craftitem("farming:potato_salad", {
 	description = S("Cucumber and Potato Salad"),
 	inventory_image = "farming_potato_salad.png",
-	on_use = minetest.item_eat(10, "farming:bowl"),
+	on_use = minetest.item_eat(10, "farming:bowl")
 })
 
 minetest.register_craft({
@@ -52,12 +52,12 @@ minetest.register_craft({
 	recipe = {
 		{"group:food_cucumber"},
 		{"farming:baked_potato"},
-		{"group:food_bowl"},
+		{"group:food_bowl"}
 	}
 })
 
 -- potato definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_potato_1.png"},
 	paramtype = "light",
@@ -75,38 +75,38 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:potato_1", table.copy(crop_def))
+minetest.register_node("farming:potato_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_potato_2.png"}
+def.tiles = {"farming_potato_2.png"}
-minetest.register_node("farming:potato_2", table.copy(crop_def))
+minetest.register_node("farming:potato_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_potato_3.png"}
+def.tiles = {"farming_potato_3.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:potato"}, rarity = 1},
-		{items = {"farming:potato"}, rarity = 3},
+		{items = {"farming:potato"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:potato_3", table.copy(crop_def))
+minetest.register_node("farming:potato_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_potato_4.png"}
+def.tiles = {"farming_potato_4.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:potato 2"}, rarity = 1},
-		{items = {"farming:potato 3"}, rarity = 2},
+		{items = {"farming:potato 3"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:potato_4", table.copy(crop_def))
+minetest.register_node("farming:potato_4", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:potato"] = {
 	crop = "farming:potato",
 	seed = "farming:potato",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 4
 }

crops/pumpkin.lua

@@ -13,34 +13,30 @@ minetest.register_craftitem("farming:pumpkin_slice", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:pumpkin_1")
 	end,
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 minetest.register_craft({
 	output = "farming:pumpkin",
 	recipe = {
 		{"farming:pumpkin_slice", "farming:pumpkin_slice"},
-		{"farming:pumpkin_slice", "farming:pumpkin_slice"},
+		{"farming:pumpkin_slice", "farming:pumpkin_slice"}
 	}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:pumpkin_slice 4",
-	recipe = {"farming:pumpkin", "farming:cutting_board"},
+	recipe = {{"farming:cutting_board", "farming:pumpkin"}},
-	replacements = {{"farming:cutting_board", "farming:cutting_board"}},
+	replacements = {{"farming:cutting_board", "farming:cutting_board"}}
 })
 
 -- jack 'o lantern
 minetest.register_node("farming:jackolantern", {
 	description = S("Jack 'O Lantern (punch to turn on and off)"),
 	tiles = {
-		"farming_pumpkin_top.png",
+		"farming_pumpkin_top.png", "farming_pumpkin_top.png",
-		"farming_pumpkin_top.png",
+		"farming_pumpkin_side.png", "farming_pumpkin_side.png",
-		"farming_pumpkin_side.png",
+		"farming_pumpkin_side.png", "farming_pumpkin_face_off.png"
-		"farming_pumpkin_side.png",
-		"farming_pumpkin_side.png",
-		"farming_pumpkin_face_off.png"
 	},
 	paramtype2 = "facedir",
 	groups = {choppy = 1, oddly_breakable_by_hand = 1, flammable = 2},
@@ -50,17 +46,14 @@ minetest.register_node("farming:jackolantern", {
 		if minetest.is_protected(pos, name) then return end
 		node.name = "farming:jackolantern_on"
 		minetest.swap_node(pos, node)
-	end,
+	end
 })
 
 minetest.register_node("farming:jackolantern_on", {
 	tiles = {
-		"farming_pumpkin_top.png",
+		"farming_pumpkin_top.png", "farming_pumpkin_top.png",
-		"farming_pumpkin_top.png",
+		"farming_pumpkin_side.png", "farming_pumpkin_side.png",
-		"farming_pumpkin_side.png",
+		"farming_pumpkin_side.png", "farming_pumpkin_face_on.png"
-		"farming_pumpkin_side.png",
-		"farming_pumpkin_side.png",
-		"farming_pumpkin_face_on.png"
 	},
 	light_source = default.LIGHT_MAX - 1,
 	paramtype2 = "facedir",
@@ -75,14 +68,14 @@ minetest.register_node("farming:jackolantern_on", {
 		if minetest.is_protected(pos, name) then return end
 		node.name = "farming:jackolantern"
 		minetest.swap_node(pos, node)
-	end,
+	end
 })
 
 minetest.register_craft({
 	output = "farming:jackolantern",
 	recipe = {
 		{"default:torch"},
-		{"group:food_pumpkin"},
+		{"group:food_pumpkin"}
 	}
 })
 
@@ -99,17 +92,17 @@ minetest.register_node("farming:scarecrow_bottom", {
 		fixed = {
 			{-1/16, -8/16, -1/16, 1/16, 8/16, 1/16},
 			{-12/16, 4/16, -1/16, 12/16, 2/16, 1/16},
+		}
 	},
-	},
+	groups = {snappy = 3, flammable = 2}
-	groups = {snappy = 3, flammable = 2},
 })
 
 minetest.register_craft({
 	output = "farming:scarecrow_bottom",
 	recipe = {
-		{"", "group:stick", "",},
+		{"", "group:stick", ""},
-		{"group:stick", "group:stick", "group:stick",},
+		{"group:stick", "group:stick", "group:stick"},
-		{"", "group:stick", "",}
+		{"", "group:stick", ""}
 	}
 })
 
@@ -118,18 +111,19 @@ minetest.register_craftitem("farming:pumpkin_bread", {
 	description = S("Pumpkin Bread"),
 	inventory_image = "farming_pumpkin_bread.png",
 	on_use = minetest.item_eat(8),
-	groups = {food_bread = 1, flammable = 2},
+	groups = {food_bread = 1, flammable = 2}
 })
 
 minetest.register_craftitem("farming:pumpkin_dough", {
 	description = S("Pumpkin Dough"),
-	inventory_image = "farming_pumpkin_dough.png",
+	inventory_image = "farming_pumpkin_dough.png"
 })
 
 minetest.register_craft({
 	output = "farming:pumpkin_dough",
-	type = "shapeless",
+	recipe = {
-	recipe = {"group:food_flour", "group:food_pumpkin_slice", "group:food_pumpkin_slice"}
+		{"group:food_pumpkin_slice", "group:food_flour", "group:food_pumpkin_slice"}
+	}
 })
 
 minetest.register_craft({
@@ -140,7 +134,7 @@ minetest.register_craft({
 })
 
 -- pumpkin definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_pumpkin_1.png"},
 	paramtype = "light",
@@ -158,49 +152,38 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:pumpkin_1", table.copy(crop_def))
+minetest.register_node("farming:pumpkin_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_pumpkin_2.png"}
+def.tiles = {"farming_pumpkin_2.png"}
-minetest.register_node("farming:pumpkin_2", table.copy(crop_def))
+minetest.register_node("farming:pumpkin_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_pumpkin_3.png"}
+def.tiles = {"farming_pumpkin_3.png"}
-minetest.register_node("farming:pumpkin_3", table.copy(crop_def))
+minetest.register_node("farming:pumpkin_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_pumpkin_4.png"}
+def.tiles = {"farming_pumpkin_4.png"}
-minetest.register_node("farming:pumpkin_4", table.copy(crop_def))
+minetest.register_node("farming:pumpkin_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_pumpkin_5.png"}
+def.tiles = {"farming_pumpkin_5.png"}
-minetest.register_node("farming:pumpkin_5", table.copy(crop_def))
+minetest.register_node("farming:pumpkin_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_pumpkin_6.png"}
+def.tiles = {"farming_pumpkin_6.png"}
-minetest.register_node("farming:pumpkin_6", table.copy(crop_def))
+minetest.register_node("farming:pumpkin_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_pumpkin_7.png"}
+def.tiles = {"farming_pumpkin_7.png"}
-minetest.register_node("farming:pumpkin_7", table.copy(crop_def))
+minetest.register_node("farming:pumpkin_7", table.copy(def))
 
 -- stage 8 (final)
---[[
-crop_def.tiles = {"farming_pumpkin_8.png"}
-crop_def.groups.growing = 0
-crop_def.drop = {
-	items = {
-		{items = {"farming:pumpkin_slice 9"}, rarity = 1},
-	}
-}
-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_bottom.png",
 		"farming_pumpkin_side.png"
 	},
 	groups = {
@@ -209,6 +192,8 @@ minetest.register_node("farming:pumpkin_8", {
 	},
 	drop = "farming:pumpkin_8",
 	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
 })
 
 minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")
@@ -217,7 +202,7 @@ minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")
 farming.registered_plants["farming:pumpkin"] = {
 	crop = "farming:pumpkin",
 	seed = "farming:pumpkin_slice",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }

crops/raspberry.lua

@@ -10,7 +10,7 @@ minetest.register_craftitem("farming:raspberries", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1")
 	end,
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- raspberry smoothie
@@ -18,7 +18,7 @@ minetest.register_craftitem("farming:smoothie_raspberry", {
 	description = S("Raspberry Smoothie"),
 	inventory_image = "farming_raspberry_smoothie.png",
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
-	groups = {vessel = 1},
+	groups = {vessel = 1, drink = 1}
 })
 
 minetest.register_craft({
@@ -26,12 +26,12 @@ minetest.register_craft({
 	recipe = {
 		{"default:snow"},
 		{"group:food_raspberries"},
-		{"vessels:drinking_glass"},
+		{"vessels:drinking_glass"}
 	}
 })
 
 -- raspberries definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_raspberry_1.png"},
 	paramtype = "light",
@@ -48,33 +48,33 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:raspberry_1", table.copy(crop_def))
+minetest.register_node("farming:raspberry_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_raspberry_2.png"}
+def.tiles = {"farming_raspberry_2.png"}
-minetest.register_node("farming:raspberry_2", table.copy(crop_def))
+minetest.register_node("farming:raspberry_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_raspberry_3.png"}
+def.tiles = {"farming_raspberry_3.png"}
-minetest.register_node("farming:raspberry_3", table.copy(crop_def))
+minetest.register_node("farming:raspberry_3", table.copy(def))
 
 -- stage 4 (final)
-crop_def.tiles = {"farming_raspberry_4.png"}
+def.tiles = {"farming_raspberry_4.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:raspberries 2"}, rarity = 1},
 		{items = {"farming:raspberries"}, rarity = 2},
-		{items = {"farming:raspberries"}, rarity = 3},
+		{items = {"farming:raspberries"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:raspberry_4", table.copy(crop_def))
+minetest.register_node("farming:raspberry_4", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:raspberries"] = {
 	crop = "farming:raspberry",
 	seed = "farming:raspberries",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 4
 }

crops/rhubarb.lua

@@ -9,14 +9,14 @@ minetest.register_craftitem("farming:rhubarb", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:rhubarb_1")
 	end,
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- rhubarb pie
 minetest.register_craftitem("farming:rhubarb_pie", {
 	description = S("Rhubarb Pie"),
 	inventory_image = "farming_rhubarb_pie.png",
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(6)
 })
 
 minetest.register_craft({
@@ -24,13 +24,13 @@ minetest.register_craft({
 	recipe = {
 		{"farming:baking_tray", "group:food_sugar", ""},
 		{"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"},
-		{"group:food_wheat", "group:food_wheat", "group:food_wheat"},
+		{"group:food_wheat", "group:food_wheat", "group:food_wheat"}
 	},
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
 
 -- rhubarb definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_rhubarb_1.png"},
 	paramtype = "light",
@@ -43,33 +43,35 @@ local crop_def = {
 		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
 		not_in_creative_inventory = 1, growing = 1
 	},
-	sounds = default.node_sound_leaves_defaults()
+	sounds = default.node_sound_leaves_defaults(),
+	minlight = 10,
+	maxlight = 12
 }
 
 -- stage 1
-minetest.register_node("farming:rhubarb_1", table.copy(crop_def))
+minetest.register_node("farming:rhubarb_1", table.copy(def))
 
 -- stage2
-crop_def.tiles = {"farming_rhubarb_2.png"}
+def.tiles = {"farming_rhubarb_2.png"}
-minetest.register_node("farming:rhubarb_2", table.copy(crop_def))
+minetest.register_node("farming:rhubarb_2", table.copy(def))
 
 -- stage 3 (final)
-crop_def.tiles = {"farming_rhubarb_3.png"}
+def.tiles = {"farming_rhubarb_3.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 	{items = {"farming:rhubarb 2"}, rarity = 1},
 		{items = {"farming:rhubarb"}, rarity = 2},
-		{items = {"farming:rhubarb"}, rarity = 3},
+		{items = {"farming:rhubarb"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:rhubarb_3", table.copy(crop_def))
+minetest.register_node("farming:rhubarb_3", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:rhubarb"] = {
 	crop = "farming:rhubarb",
 	seed = "farming:rhubarb",
-	minlight = 13,
+	minlight = 10,
-	maxlight = 15,
+	maxlight = 12,
 	steps = 3
 }

crops/ryeoatrice.lua

@@ -10,7 +10,7 @@ farming.register_plant("farming:rye", {
 	paramtype2 = "meshoptions",
 	inventory_image = "farming_rye_seed.png",
 	steps = 8,
-	place_param2 = 3,
+	place_param2 = 3
 })
 
 minetest.override_item("farming:rye", {
@@ -18,14 +18,17 @@ minetest.override_item("farming:rye", {
 	groups = {food_rye = 1, flammable = 4}
 })
 
+minetest.override_item("farming:rye_1", {drop = {}})
+minetest.override_item("farming:rye_2", {drop = {}})
+minetest.override_item("farming:rye_3", {drop = {}})
+
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:rye", "farming:rye", "farming:rye", "farming:rye",
+		{"farming:rye", "farming:rye", "farming:rye"},
-		"farming:mortar_pestle"
+		{"farming:rye", "farming:mortar_pestle", ""}
 	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
 -- Oats
@@ -35,7 +38,7 @@ farming.register_plant("farming:oat", {
 	paramtype2 = "meshoptions",
 	inventory_image = "farming_oat_seed.png",
 	steps = 8,
-	place_param2 = 3,
+	place_param2 = 3
 })
 
 minetest.override_item("farming:oat", {
@@ -43,14 +46,17 @@ minetest.override_item("farming:oat", {
 	groups = {food_oats = 1, flammable = 4}
 })
 
+minetest.override_item("farming:oat_1", {drop = {}})
+minetest.override_item("farming:oat_2", {drop = {}})
+minetest.override_item("farming:oat_3", {drop = {}})
+
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:oat", "farming:oat", "farming:oat", "farming:oat",
+		{"farming:oat", "farming:oat", "farming:oat"},
-		"farming:mortar_pestle"
+		{"farming:oat", "farming:mortar_pestle", ""}
 	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
 -- Rice
@@ -60,7 +66,7 @@ farming.register_plant("farming:rice", {
 	paramtype2 = "meshoptions",
 	inventory_image = "farming_rice_seed.png",
 	steps = 8,
-	place_param2 = 3,
+	place_param2 = 3
 })
 
 minetest.override_item("farming:rice", {
@@ -68,27 +74,30 @@ minetest.override_item("farming:rice", {
 	groups = {food_rice = 1, flammable = 4}
 })
 
+minetest.override_item("farming:rice_1", {drop = {}})
+minetest.override_item("farming:rice_2", {drop = {}})
+minetest.override_item("farming:rice_3", {drop = {}})
+
 minetest.register_craftitem("farming:rice_bread", {
 	description = S("Rice Bread"),
 	inventory_image = "farming_rice_bread.png",
 	on_use = minetest.item_eat(5),
-	groups = {food_rice_bread = 1, flammable = 2},
+	groups = {food_rice_bread = 1, flammable = 2}
 })
 
 minetest.register_craftitem("farming:rice_flour", {
 	description = S("Rice Flour"),
 	inventory_image = "farming_rice_flour.png",
-	groups = {food_rice_flour = 1, flammable = 1},
+	groups = {food_rice_flour = 1, flammable = 1}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:rice_flour",
 	recipe = {
-		"farming:rice", "farming:rice", "farming:rice", "farming:rice",
+		{"farming:rice", "farming:rice", "farming:rice"},
-		"farming:mortar_pestle"
+		{"farming:rice", "farming:mortar_pestle", ""}
 	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
 minetest.register_craft({
@@ -113,7 +122,7 @@ minetest.register_craft({
 		"farming:wheat", "farming:barley", "farming:oat",
 		"farming:rye", "farming:mortar_pestle"
 	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
 -- Multigrain bread
@@ -122,7 +131,7 @@ minetest.register_craftitem("farming:bread_multigrain", {
 	description = S("Multigrain Bread"),
 	inventory_image = "farming_bread_multigrain.png",
 	on_use = minetest.item_eat(7),
-	groups = {food_bread = 1, flammable = 2},
+	groups = {food_bread = 1, flammable = 2}
 })
 
 minetest.register_craft({
@@ -137,29 +146,29 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:rice_bread",
-	burntime = 1,
+	burntime = 1
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:bread_multigrain",
-	burntime = 1,
+	burntime = 1
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:rye",
-	burntime = 1,
+	burntime = 1
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:oat",
-	burntime = 1,
+	burntime = 1
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:rice",
-	burntime = 1,
+	burntime = 1
 })

crops/soy.lua

@@ -0,0 +1,202 @@
+
+local S = farming.intllib
+
+-- soy pod
+minetest.register_craftitem("farming:soy_pod", {
+	description = S("Soy Pod"),
+	inventory_image = "farming_soy_pod.png",
+	groups = {seed = 2, food_soy_pod = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:soy_1")
+	end
+})
+
+minetest.register_craftitem("farming:soy_beans", {
+	description = S("Soy Beans"),
+	inventory_image = "farming_soy_beans.png",
+	groups = {food_soy = 1, flammable = 2},
+	on_use = minetest.item_eat(1)
+})
+
+minetest.register_craft({
+	output = "farming:soy_beans",
+	recipe = {{"farming:soy_pod"}}
+})
+
+-- soy sauce
+minetest.register_node("farming:soy_sauce", {
+	description = S("Soy Sauce"),
+	drawtype = "plantlike",
+	tiles = {"farming_soy_sauce.png"},
+	inventory_image = "farming_soy_sauce.png",
+	wield_image = "farming_soy_sauce.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
+	},
+	groups = {
+		vessel = 1, food_soy_sauce = 1, dig_immediate = 3, attached_node = 1
+	},
+	sounds = default.node_sound_glass_defaults()
+})
+
+
+-- soy sauce recipe
+minetest.register_craft( {
+	output = "farming:soy_sauce",
+	recipe = {
+		{"group:food_soy", "group:food_salt", "group:food_soy"},
+		{"", "group:food_juicer", ""},
+		{"", "bucket:bucket_water", "vessels:glass_bottle"}
+	},
+	replacements = {
+		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"group:food_juicer", "farming:juicer"}
+	}
+})
+
+-- soy milk
+minetest.register_node("farming:soy_milk", {
+	description = S("Soy Milk"),
+	drawtype = "plantlike",
+	tiles = {"farming_soy_milk_glass.png"},
+	inventory_image = "farming_soy_milk_glass.png",
+	wield_image = "farming_soy_milk_glass.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
+	},
+	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
+	groups = {
+		vessel = 1, food_milk_glass = 1, dig_immediate = 3,
+		attached_node = 1, drink = 1
+	},
+	sounds = default.node_sound_glass_defaults()
+})
+
+minetest.register_craft( {
+	output = "farming:soy_milk",
+	recipe = {
+		{"group:food_soy", "group:food_soy", "group:food_soy"},
+		{"farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass"}
+	},
+	replacements = {
+		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"farming:vanilla_extract", "vessels:glass_bottle"}
+	}
+})
+
+-- tofu
+minetest.register_craftitem("farming:tofu", {
+	description = S("Tofu"),
+	inventory_image = "farming_tofu.png",
+	groups = {food_tofu = 1, food_meat_raw = 1, flammable = 2},
+	on_use = minetest.item_eat(3)
+})
+
+minetest.register_craft({
+	output = "farming:tofu",
+	recipe = {
+		{"farming:baking_tray", "group:food_soy", "group:food_soy"},
+		{"group:food_soy", "group:food_soy", "group:food_soy"}
+	},
+	replacements = {{"farming:baking_tray", "farming:baking_tray"}}
+})
+
+-- cooked tofu
+minetest.register_craftitem("farming:tofu_cooked", {
+	description = S("Cooked Tofu"),
+	inventory_image = "farming_tofu_cooked.png",
+	groups = {food_meat = 1, flammable = 2},
+	on_use = minetest.item_eat(6)
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "farming:tofu_cooked",
+	recipe = "farming:tofu",
+	cooktime = 5
+})
+
+-- crop definition
+
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_soy_1.png"},
+	paramtype = "light",
+	paramtype2 = "meshoptions",
+	place_param2 = 3,
+	sunlight_propagates = true,
+	waving = 1,
+	walkable = false,
+	buildable_to = true,
+	drop = "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:soy_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_soy_2.png"}
+minetest.register_node("farming:soy_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_soy_3.png"}
+minetest.register_node("farming:soy_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_soy_4.png"}
+minetest.register_node("farming:soy_4", table.copy(def))
+
+-- stage 5
+def.tiles = {"farming_soy_5.png"}
+def.drop = {
+	max_items = 1, items = {
+		{items = {"farming:soy_pod"}, rarity = 1},
+	}
+}
+minetest.register_node("farming:soy_5", table.copy(def))
+
+-- stage 6
+def.tiles = {"farming_soy_6.png"}
+def.drop = {
+	max_items = 3, items = {
+		{items = {"farming:soy_pod"}, rarity = 1},
+		{items = {"farming:soy_pod"}, rarity = 2},
+		{items = {"farming:soy_pod"}, rarity = 3},
+	}
+}
+minetest.register_node("farming:soy_6", table.copy(def))
+
+-- stage 7
+def.tiles = {"farming_soy_7.png"}
+def.groups.growing = nil
+def.drop = {
+	max_items = 5, items = {
+		{items = {"farming:soy_pod"}, rarity = 1},
+		{items = {"farming:soy_pod"}, rarity = 2},
+		{items = {"farming:soy_pod"}, rarity = 3},
+		{items = {"farming:soy_pod"}, rarity = 4},
+		{items = {"farming:soy_pod"}, rarity = 5}
+	}
+}
+minetest.register_node("farming:soy_7", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:soy_pod"] = {
+	crop = "farming:soy",
+	seed = "farming:soy_pod",
+	minlight = farming.min_light,
+	maxlight = farming.max_light,
+	steps = 7
+}

crops/sunflower.lua

@@ -0,0 +1,160 @@
+local S = farming.intllib
+
+-- sunflower
+minetest.register_craftitem("farming:sunflower", {
+	description = S("Sunflower"),
+	inventory_image = "farming_sunflower.png",
+	groups = {flammable = 2}
+})
+
+-- sunflower seeds
+minetest.register_craftitem("farming:seed_sunflower", {
+	description = S("Sunflower Seeds"),
+	inventory_image = "farming_sunflower_seeds.png",
+	groups = {seed = 2, food_sunflower_seeds = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:sunflower_1")
+	end
+})
+
+minetest.register_alias("farming:sunflower_seeds", "farming:seed_sunflower")
+
+minetest.register_craft({
+	output = "farming:seed_sunflower 5",
+	recipe = {{"farming:sunflower"}}
+})
+
+-- sunflower seeds (toasted)
+minetest.register_craftitem("farming:sunflower_seeds_toasted", {
+	description = S("Toasted Sunflower Seeds"),
+	inventory_image = "farming_sunflower_seeds_toasted.png",
+	groups = {food_sunflower_seeds_toasted = 1, flammable = 2},
+	on_use = minetest.item_eat(1)
+})
+
+minetest.register_craft({
+	type = "cooking",
+	cooktime = 10,
+	output = "farming:sunflower_seeds_toasted",
+	recipe = "farming:seed_sunflower"
+})
+
+-- sunflower oil
+minetest.register_node("farming:sunflower_oil", {
+	description = S("Bottle of Sunflower Oil"),
+	drawtype = "plantlike",
+	tiles = {"farming_sunflower_oil.png"},
+	inventory_image = "farming_sunflower_oil.png",
+	wield_image = "farming_sunflower_oil.png",
+	paramtype = "light",
+	is_ground_content = false,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
+	},
+	groups = {
+		food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1,
+		flammable = 2
+	},
+	sounds = default.node_sound_glass_defaults()
+})
+
+minetest.register_craft( {
+	output = "farming:sunflower_oil",
+	recipe = {
+		{"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"},
+		{"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"},
+		{"group:food_sunflower_seeds", "vessels:glass_bottle", "group:food_sunflower_seeds"}
+	}
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:sunflower_oil",
+	burntime = 30,
+	replacements = {{"farming:sunflower_oil", "vessels:glass_bottle"}}
+})
+
+-- sunflower seed bread
+minetest.register_craftitem("farming:sunflower_bread", {
+	description = S("Sunflower Seed Bread"),
+	inventory_image = "farming_sunflower_bread.png",
+	on_use = minetest.item_eat(8),
+	groups = {food_bread = 1, flammable = 2}
+})
+
+minetest.register_craftitem("farming:sunflower_bread", {
+	description = S("Sunflower Bread"),
+	inventory_image = "farming_sunflower_bread.png"
+})
+
+minetest.register_craft({
+	output = "farming:sunflower_bread",
+	recipe = {{"group:food_sunflower_seeds_toasted", "group:food_bread", "group:food_sunflower_seeds_toasted"}}
+})
+
+-- sunflower definition
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_sunflower_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop = "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:sunflower_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_sunflower_2.png"}
+minetest.register_node("farming:sunflower_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_sunflower_3.png"}
+minetest.register_node("farming:sunflower_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_sunflower_4.png"}
+minetest.register_node("farming:sunflower_4", table.copy(def))
+
+-- stage 5
+def.tiles = {"farming_sunflower_5.png"}
+minetest.register_node("farming:sunflower_5", table.copy(def))
+
+-- stage 6
+def.tiles = {"farming_sunflower_6.png"}
+def.visual_scale = 1.9
+minetest.register_node("farming:sunflower_6", table.copy(def))
+
+-- stage 7
+def.tiles = {"farming_sunflower_7.png"}
+minetest.register_node("farming:sunflower_7", table.copy(def))
+
+-- stage 8 (final)
+def.tiles = {"farming_sunflower_8.png"}
+def.groups.growing = nil
+def.drop = {
+	items = {
+		{items = {"farming:sunflower"}, rarity = 1},
+		{items = {"farming:sunflower"}, rarity = 6}
+	}
+}
+minetest.register_node("farming:sunflower_8", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:sunflower"] = {
+	crop = "farming:sunflower",
+	seed = "farming:seed_sunflower",
+	minlight = 14,
+	maxlight = farming.max_light,
+	steps = 8
+}

crops/tomato.lua

@@ -14,11 +14,28 @@ minetest.register_craftitem("farming:tomato", {
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:tomato_1")
 	end,
-	on_use = minetest.item_eat(4),
+	on_use = minetest.item_eat(4)
+})
+
+-- tomato soup
+minetest.register_craftitem("farming:tomato_soup", {
+	description = S("Tomato Soup"),
+	inventory_image = "farming_tomato_soup.png",
+	groups = {flammable = 2},
+	on_use = minetest.item_eat(8, "farming:bowl")
+})
+
+minetest.register_craft({
+	output = "farming:tomato_soup",
+	recipe = {
+		{"group:food_tomato"},
+		{"group:food_tomato"},
+		{"group:food_bowl"}
+	}
 })
 
 -- tomato definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_tomato_1.png"},
 	paramtype = "light",
@@ -35,54 +52,55 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:tomato_1", table.copy(crop_def))
+minetest.register_node("farming:tomato_1", table.copy(def))
 
 -- stage2
-crop_def.tiles = {"farming_tomato_2.png"}
+def.tiles = {"farming_tomato_2.png"}
-minetest.register_node("farming:tomato_2", table.copy(crop_def))
+minetest.register_node("farming:tomato_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_tomato_3.png"}
+def.tiles = {"farming_tomato_3.png"}
-minetest.register_node("farming:tomato_3", table.copy(crop_def))
+minetest.register_node("farming:tomato_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_tomato_4.png"}
+def.tiles = {"farming_tomato_4.png"}
-minetest.register_node("farming:tomato_4", table.copy(crop_def))
+minetest.register_node("farming:tomato_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_tomato_5.png"}
+def.tiles = {"farming_tomato_5.png"}
-minetest.register_node("farming:tomato_5", table.copy(crop_def))
+minetest.register_node("farming:tomato_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_tomato_6.png"}
+def.tiles = {"farming_tomato_6.png"}
-minetest.register_node("farming:tomato_6", table.copy(crop_def))
+minetest.register_node("farming:tomato_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_tomato_7.png"}
+def.tiles = {"farming_tomato_7.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:tomato"}, rarity = 1},
-		{items = {"farming:tomato"}, rarity = 3},
+		{items = {"farming:tomato"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:tomato_7", table.copy(crop_def))
+minetest.register_node("farming:tomato_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_tomato_8.png"}
+def.tiles = {"farming_tomato_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:tomato 3"}, rarity = 1},
-		{items = {"farming:tomato 3"}, rarity = 2},
+		{items = {"farming:tomato 2"}, rarity = 2},
+		{items = {"farming:tomato 1"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:tomato_8", table.copy(crop_def))
+minetest.register_node("farming:tomato_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:tomato"] = {
 	crop = "farming:tomato",
 	seed = "farming:tomato",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }

crops/vanilla.lua

@@ -0,0 +1,122 @@
+local S = farming.intllib
+
+-- vanilla
+minetest.register_craftitem("farming:vanilla", {
+	description = S("Vanilla"),
+	inventory_image = "farming_vanilla.png",
+	groups = {seed = 2, food_vanilla = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:vanilla_1")
+	end,
+	on_use = minetest.item_eat(1)
+})
+
+-- crop definition
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_vanilla_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop = "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- vanilla extract
+minetest.register_node("farming:vanilla_extract", {
+	description = S("Vanilla Extract"),
+	drawtype = "plantlike",
+	tiles = {"farming_vanilla_extract.png"},
+	inventory_image = "farming_vanilla_extract.png",
+	wield_image = "farming_vanilla_extract.png",
+	paramtype = "light",
+	is_ground_content = false,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
+	},
+	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
+	sounds = default.node_sound_glass_defaults(),
+})
+
+minetest.register_craft( {
+	output = "farming:vanilla_extract",
+	recipe = {
+		{"group:food_vanilla", "group:food_vanilla", "group:food_vanilla"},
+		{"group:food_vanilla", "farming:bottle_ethanol", "bucket:bucket_water"},
+	},
+	replacements = {
+		{"bucket:bucket_water", "bucket:bucket_empty"},
+	}
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:vanilla_extract",
+	burntime = 25,
+	replacements = {{"farming:vanilla_extract", "vessels:glass_bottle"}}
+})
+
+-- stage 1
+minetest.register_node("farming:vanilla_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_vanilla_2.png"}
+minetest.register_node("farming:vanilla_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_vanilla_3.png"}
+minetest.register_node("farming:vanilla_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_vanilla_4.png"}
+minetest.register_node("farming:vanilla_4", table.copy(def))
+
+-- stage 5
+def.tiles = {"farming_vanilla_5.png"}
+minetest.register_node("farming:vanilla_5", table.copy(def))
+
+-- stage 6
+def.tiles = {"farming_vanilla_6.png"}
+def.visual_scale = 1.9
+minetest.register_node("farming:vanilla_6", table.copy(def))
+
+-- stage 7
+def.tiles = {"farming_vanilla_7.png"}
+def.drop = {
+	items = {
+		{items = {"farming:vanilla"}, rarity = 1},
+		{items = {"farming:vanilla"}, rarity = 2},
+		{items = {"farming:vanilla"}, rarity = 3}
+	}
+}
+minetest.register_node("farming:vanilla_7", table.copy(def))
+
+-- stage 8 (final)
+def.tiles = {"farming_vanilla_8.png"}
+def.groups.growing = nil
+def.drop = {
+	items = {
+		{items = {"farming:vanilla 2"}, rarity = 1},
+		{items = {"farming:vanilla 2"}, rarity = 2},
+		{items = {"farming:vanilla 2"}, rarity = 2},
+		{items = {"farming:vanilla 2"}, rarity = 3}
+	}
+}
+minetest.register_node("farming:vanilla_8", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:vanilla"] = {
+	crop = "farming:vanilla",
+	seed = "farming:vanilla",
+	minlight = farming.min_light,
+	maxlight = farming.max_light,
+	steps = 8
+}

crops/wheat.lua

@@ -16,14 +16,14 @@ minetest.register_node("farming:seed_wheat", {
 	selection_box = farming.select,
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:wheat_1")
-	end,
+	end
 })
 
 -- harvested wheat
 minetest.register_craftitem("farming:wheat", {
 	description = S("Wheat"),
 	inventory_image = "farming_wheat.png",
-	groups = {food_wheat = 1, flammable = 4},
+	groups = {food_wheat = 1, flammable = 4}
 })
 
 -- straw
@@ -32,7 +32,7 @@ minetest.register_node("farming:straw", {
 	tiles = {"farming_straw.png"},
 	is_ground_content = false,
 	groups = {snappy = 3, flammable = 4, fall_damage_add_percent = -30},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft({
@@ -40,15 +40,13 @@ minetest.register_craft({
 	recipe = {
 		{"farming:wheat", "farming:wheat", "farming:wheat"},
 		{"farming:wheat", "farming:wheat", "farming:wheat"},
-		{"farming:wheat", "farming:wheat", "farming:wheat"},
+		{"farming:wheat", "farming:wheat", "farming:wheat"}
 	}
 })
 
 minetest.register_craft({
 	output = "farming:wheat 3",
-	recipe = {
+	recipe = {{"farming:straw"}}
-		{"farming:straw"},
-	}
 })
 
 -- check and register stairs
@@ -76,17 +74,16 @@ end
 minetest.register_craftitem("farming:flour", {
 	description = S("Flour"),
 	inventory_image = "farming_flour.png",
-	groups = {food_flour = 1, flammable = 1},
+	groups = {food_flour = 1, flammable = 1}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:wheat", "farming:wheat", "farming:wheat",
+		{"farming:wheat", "farming:wheat", "farming:wheat"},
-		"farming:wheat", "farming:mortar_pestle"
+		{"farming:wheat", "farming:mortar_pestle", ""}
 	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
 -- bread
@@ -94,7 +91,7 @@ minetest.register_craftitem("farming:bread", {
 	description = S("Bread"),
 	inventory_image = "farming_bread.png",
 	on_use = minetest.item_eat(5),
-	groups = {food_bread = 1, flammable = 2},
+	groups = {food_bread = 1, flammable = 2}
 })
 
 minetest.register_craft({
@@ -109,14 +106,13 @@ minetest.register_craftitem("farming:bread_slice", {
 	description = S("Sliced Bread"),
 	inventory_image = "farming_bread_slice.png",
 	on_use = minetest.item_eat(1),
-	groups = {food_bread_slice = 1, flammable = 2},
+	groups = {food_bread_slice = 1, flammable = 2}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:bread_slice 5",
-	recipe = {"farming:bread", "group:food_cutting_board"},
+	recipe = {{"group:food_cutting_board", "farming:bread"}},
-	replacements = {{"group:food_cutting_board", "farming:cutting_board"}},
+	replacements = {{"group:food_cutting_board", "farming:cutting_board"}}
 })
 
 -- toast
@@ -124,7 +120,7 @@ minetest.register_craftitem("farming:toast", {
 	description = S("Toast"),
 	inventory_image = "farming_toast.png",
 	on_use = minetest.item_eat(1),
-	groups = {food_toast = 1, flammable = 2},
+	groups = {food_toast = 1, flammable = 2}
 })
 
 minetest.register_craft({
@@ -139,7 +135,7 @@ minetest.register_craftitem("farming:toast_sandwich", {
 	description = S("Toast Sandwich"),
 	inventory_image = "farming_toast_sandwich.png",
 	on_use = minetest.item_eat(4),
-	groups = {flammable = 2},
+	groups = {flammable = 2}
 })
 
 minetest.register_craft({
@@ -147,12 +143,12 @@ minetest.register_craft({
 	recipe = {
 		{"farming:bread_slice"},
 		{"farming:toast"},
-		{"farming:bread_slice"},
+		{"farming:bread_slice"}
 	}
 })
 
 -- wheat definition
-local crop_def = {
+local def = {
 	drawtype = "plantlike",
 	tiles = {"farming_wheat_1.png"},
 	paramtype = "light",
@@ -171,71 +167,71 @@ local crop_def = {
 }
 
 -- stage 1
-minetest.register_node("farming:wheat_1", table.copy(crop_def))
+minetest.register_node("farming:wheat_1", table.copy(def))
 
 -- stage 2
-crop_def.tiles = {"farming_wheat_2.png"}
+def.tiles = {"farming_wheat_2.png"}
-minetest.register_node("farming:wheat_2", table.copy(crop_def))
+minetest.register_node("farming:wheat_2", table.copy(def))
 
 -- stage 3
-crop_def.tiles = {"farming_wheat_3.png"}
+def.tiles = {"farming_wheat_3.png"}
-minetest.register_node("farming:wheat_3", table.copy(crop_def))
+minetest.register_node("farming:wheat_3", table.copy(def))
 
 -- stage 4
-crop_def.tiles = {"farming_wheat_4.png"}
+def.tiles = {"farming_wheat_4.png"}
-minetest.register_node("farming:wheat_4", table.copy(crop_def))
+minetest.register_node("farming:wheat_4", table.copy(def))
 
 -- stage 5
-crop_def.tiles = {"farming_wheat_5.png"}
+def.tiles = {"farming_wheat_5.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:wheat"}, rarity = 2},
-		{items = {"farming:seed_wheat"}, rarity = 2},
+		{items = {"farming:seed_wheat"}, rarity = 2}
 	}
 }
-minetest.register_node("farming:wheat_5", table.copy(crop_def))
+minetest.register_node("farming:wheat_5", table.copy(def))
 
 -- stage 6
-crop_def.tiles = {"farming_wheat_6.png"}
+def.tiles = {"farming_wheat_6.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:wheat"}, rarity = 2},
-		{items = {"farming:seed_wheat"}, rarity = 1},
+		{items = {"farming:seed_wheat"}, rarity = 1}
 	}
 }
-minetest.register_node("farming:wheat_6", table.copy(crop_def))
+minetest.register_node("farming:wheat_6", table.copy(def))
 
 -- stage 7
-crop_def.tiles = {"farming_wheat_7.png"}
+def.tiles = {"farming_wheat_7.png"}
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:wheat"}, rarity = 1},
 		{items = {"farming:wheat"}, rarity = 3},
 		{items = {"farming:seed_wheat"}, rarity = 1},
-		{items = {"farming:seed_wheat"}, rarity = 3},
+		{items = {"farming:seed_wheat"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:wheat_7", table.copy(crop_def))
+minetest.register_node("farming:wheat_7", table.copy(def))
 
 -- stage 8 (final)
-crop_def.tiles = {"farming_wheat_8.png"}
+def.tiles = {"farming_wheat_8.png"}
-crop_def.groups.growing = 0
+def.groups.growing = nil
-crop_def.drop = {
+def.drop = {
 	items = {
 		{items = {"farming:wheat"}, rarity = 1},
 		{items = {"farming:wheat"}, rarity = 3},
 		{items = {"farming:seed_wheat"}, rarity = 1},
-		{items = {"farming:seed_wheat"}, rarity = 3},
+		{items = {"farming:seed_wheat"}, rarity = 3}
 	}
 }
-minetest.register_node("farming:wheat_8", table.copy(crop_def))
+minetest.register_node("farming:wheat_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:wheat"] = {
 	crop = "farming:wheat",
 	seed = "farming:seed_wheat",
-	minlight = 13,
+	minlight = farming.min_light,
-	maxlight = 15,
+	maxlight = farming.max_light,
 	steps = 8
 }
 
@@ -243,11 +239,11 @@ farming.registered_plants["farming:wheat"] = {
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:straw",
-	burntime = 3,
+	burntime = 3
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:wheat",
-	burntime = 1,
+	burntime = 1
 })

farming.conf_example

@@ -30,7 +30,19 @@ farming.pineapple = 0.001
 farming.peas = 0.001
 farming.beetroot = 0.001
 farming.mint = 0.005
+farming.cabbage = 0.001
+farming.blackberry = 0.002
+farming.lettuce = 0.001
+farming.soy = 0.001
+farming.vanilla = 0.001
+farming.artichoke = 0.001
+farming.parsley = 0.002
+farming.sunflower = 0.001
 farming.grains = true -- true or false only
 
 -- default rarety of crops on map (higher number = more crops)
 farming.rarety = 0.002
+
+-- default minimum and maximum light levels crops need to grow
+farming.min_light = 12
+farming.max_light = 15

food.lua

@@ -1,21 +1,72 @@
 
 local S = farming.intllib
 
+--= filter sea water into river water
+minetest.register_craft({
+	output = "bucket:bucket_river_water",
+	recipe = {
+		{"farming:hemp_fibre"},
+		{"farming:hemp_fibre"},
+		{"bucket:bucket_water"}
+	}
+})
+
+--= glass of water
+
+minetest.register_craftitem("farming:glass_water", {
+	description = S("Glass of Water"),
+	inventory_image = "farming_water_glass.png",
+	groups = {food_water_glass = 1, flammable = 3, vessel = 1}
+})
+
+minetest.register_craft({
+	output = "farming:glass_water 4",
+	recipe = {
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"bucket:bucket_river_water", ""}
+	},
+	replacements = {{"bucket:bucket_river_water", "bucket:bucket_empty"}}
+})
+
+minetest.register_craft({
+	output = "farming:glass_water 4",
+	recipe = {
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"bucket:bucket_water", "farming:hemp_fibre"}
+	},
+	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
+})
+
 --= Sugar
 
 minetest.register_craftitem("farming:sugar", {
 	description = S("Sugar"),
 	inventory_image = "farming_sugar.png",
-	groups = {food_sugar = 1, flammable = 3},
+	groups = {food_sugar = 1, flammable = 3}
 })
 
 minetest.register_craft({
 	type = "cooking",
 	cooktime = 3,
 	output = "farming:sugar 2",
-	recipe = "default:papyrus",
+	recipe = "default:papyrus"
 })
 
+--= Sugar caramel
+
+minetest.register_craftitem("farming:caramel", {
+	description = S("Caramel"),
+	inventory_image = "farming_caramel.png",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	cooktime = 6,
+	output = "farming:caramel",
+	recipe = "group:food_sugar",
+})
 
 --= Salt
 
@@ -34,6 +85,47 @@ minetest.register_node("farming:salt", {
 		type = "fixed",
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
+	-- special function to make salt crystals form inside water
+	dropped_step = function(self, pos, dtime)
+
+		self.ctimer = (self.ctimer or 0) + dtime
+		if self.ctimer < 15.0 then return end
+		self.ctimer = 0
+
+		local needed
+
+		if self.node_inside
+		and self.node_inside.name == "default:water_source" then
+			needed = 8
+
+		elseif self.node_inside
+		and self.node_inside.name == "default:river_water_source" then
+			needed = 9
+		end
+
+		if not needed then return end
+
+		local objs = core.get_objects_inside_radius(pos, 0.5)
+
+		if not objs or #objs ~= 1 then return end
+
+		local salt, ent = nil, nil
+
+		for k, obj in pairs(objs) do
+
+			ent = obj:get_luaentity()
+
+			if ent and ent.name == "__builtin:item"
+			and ent.itemstring == "farming:salt " .. needed then
+
+				obj:remove()
+
+				core.add_item(pos, "farming:salt_crystal")
+
+				return false -- return with no further action
+			end
+		end
+	end
 })
 
 minetest.register_craft({
@@ -44,6 +136,42 @@ minetest.register_craft({
 	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
 })
 
+--= Salt Crystal
+
+minetest.register_node("farming:salt_crystal", {
+	description = ("Salt crystal"),
+	inventory_image = "farming_salt_crystal.png",
+	wield_image = "farming_salt_crystal.png",
+	drawtype = "plantlike",
+	visual_scale = 0.8,
+	paramtype = "light",
+	light_source = 1,
+	tiles = {"farming_salt_crystal.png"},
+	groups = { dig_immediate = 3, attached_node = 1},
+	sounds = default.node_sound_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
+	},
+})
+minetest.register_craft({
+--	type = "shapeless",
+	output = "farming:salt 9",
+	recipe = {
+		{"farming:salt_crystal", "farming:mortar_pestle"}
+	},
+	replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}
+})
+
+minetest.register_craft({
+	output = "farming:salt_crystal",
+	recipe = {
+		{"farming:salt", "farming:salt", "farming:salt"},
+		{"farming:salt", "farming:salt", "farming:salt"},
+		{"farming:salt", "farming:salt", "farming:salt"}
+	}
+})
+
 --= Rose Water
 
 minetest.register_node("farming:rose_water", {
@@ -60,7 +188,7 @@ minetest.register_node("farming:rose_water", {
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
-	},
+	}
 })
 
 minetest.register_craft({
@@ -68,21 +196,36 @@ minetest.register_craft({
 	recipe = {
 		{"flowers:rose", "flowers:rose", "flowers:rose"},
 		{"flowers:rose", "flowers:rose", "flowers:rose"},
-		{"bucket:bucket_water", "group:food_pot", "vessels:glass_bottle"},
+		{"group:water_bucket", "group:food_pot", "vessels:glass_bottle"}
 	},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"group:water_bucket", "bucket:bucket_empty"},
-		{"group:food_pot", "farming:pot"},
+		{"group:food_pot", "farming:pot"}
 	}
 })
 
+if minetest.get_modpath("bucket_wooden") then
+	minetest.register_craft({
+		output = "farming:rose_water",
+		recipe = {
+			{"flowers:rose", "flowers:rose", "flowers:rose"},
+			{"flowers:rose", "flowers:rose", "flowers:rose"},
+			{"group:water_bucket_wooden", "group:food_pot", "vessels:glass_bottle"}
+		},
+		replacements = {
+			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"},
+			{"group:food_pot", "farming:pot"}
+		}
+	})
+end
+
 --= Turkish Delight
 
 minetest.register_craftitem("farming:turkish_delight", {
 	description = S("Turkish Delight"),
 	inventory_image = "farming_turkish_delight.png",
 	groups = {flammable = 3},
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 minetest.register_craft({
@@ -90,12 +233,12 @@ minetest.register_craft({
 	recipe = {
 		{"group:food_gelatin", "group:food_sugar", "group:food_gelatin"},
 		{"group:food_sugar", "group:food_rose_water", "group:food_sugar"},
-		{"group:food_cornstarch", "group:food_sugar", "dye:pink"},
+		{"group:food_sugar", "dye:pink", "group:food_sugar"}
 	},
 	replacements = {
 		{"group:food_cornstarch", "farming:bowl"},
-		{"group:food_rose_water", "vessels:glass_bottle"},
+		{"group:food_rose_water", "vessels:glass_bottle"}
-	},
+	}
 })
 
 --= Garlic Bread
@@ -104,13 +247,15 @@ minetest.register_craftitem("farming:garlic_bread", {
 	description = S("Garlic Bread"),
 	inventory_image = "farming_garlic_bread.png",
 	groups = {flammable = 3},
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 minetest.register_craft({
-	type = "shapeless",
+--	type = "shapeless",
 	output = "farming:garlic_bread",
-	recipe = {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"},
+	recipe = {
+		{"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"}
+	}
 })
 
 --= Donuts (thanks to Bockwurst for making the donut images)
@@ -118,7 +263,7 @@ minetest.register_craft({
 minetest.register_craftitem("farming:donut", {
 	description = S("Donut"),
 	inventory_image = "farming_donut.png",
-	on_use = minetest.item_eat(4),
+	on_use = minetest.item_eat(4)
 })
 
 minetest.register_craft({
@@ -126,35 +271,35 @@ minetest.register_craft({
 	recipe = {
 		{"", "group:food_wheat", ""},
 		{"group:food_wheat", "group:food_sugar", "group:food_wheat"},
-		{"", "group:food_wheat", ""},
+		{"", "group:food_wheat", ""}
 	}
 })
 
 minetest.register_craftitem("farming:donut_chocolate", {
 	description = S("Chocolate Donut"),
 	inventory_image = "farming_donut_chocolate.png",
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(6)
 })
 
 minetest.register_craft({
 	output = "farming:donut_chocolate",
 	recipe = {
 		{"group:food_cocoa"},
-		{"farming:donut"},
+		{"farming:donut"}
 	}
 })
 
 minetest.register_craftitem("farming:donut_apple", {
 	description = S("Apple Donut"),
 	inventory_image = "farming_donut_apple.png",
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(6)
 })
 
 minetest.register_craft({
 	output = "farming:donut_apple",
 	recipe = {
 		{"default:apple"},
-		{"farming:donut"},
+		{"farming:donut"}
 	}
 })
 
@@ -163,55 +308,37 @@ minetest.register_craft({
 minetest.register_craftitem("farming:porridge", {
 	description = S("Porridge"),
 	inventory_image = "farming_porridge.png",
-	on_use = minetest.item_eat(6, "farming:bowl"),
+	on_use = minetest.item_eat(6, "farming:bowl")
-})
-
-minetest.after(0, function()
-
-	local fluid = "bucket:bucket_water"
-	local fluid_return = "bucket:bucket_water"
-
-	if minetest.get_modpath("mobs") and mobs and mobs.mod == "redo" then
-		fluid = "group:food_milk"
-		fluid_return = "mobs:bucket_milk"
-	end
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = "farming:porridge",
-		recipe = {
-			"group:food_barley", "group:food_barley", "group:food_wheat",
-			"group:food_wheat", "group:food_bowl", fluid
-		},
-		replacements = {{fluid_return, "bucket:bucket_empty"}}
 })
 
 minetest.register_craft({
-		type = "shapeless",
+--	type = "shapeless",
 	output = "farming:porridge",
 	recipe = {
-			"group:food_oats", "group:food_oats", "group:food_oats",
+		{"group:food_oats", "group:food_oats", "group:food_oats"},
-			"group:food_oats", "group:food_bowl", fluid
+		{"group:food_oats", "group:food_bowl", "group:food_milk_glass"}
 	},
-		replacements = {{fluid_return, "bucket:bucket_empty"}}
+	replacements = {
+		{"mobs:glass_milk", "vessels:drinking_glass"},
+		{"farming:soy_milk", "vessels:drinking_glass"}
+	}
 })
-end)
 
 --= Jaffa Cake
 
 minetest.register_craftitem("farming:jaffa_cake", {
 	description = S("Jaffa Cake"),
 	inventory_image = "farming_jaffa_cake.png",
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(6)
 })
 
 minetest.register_craft({
-	type = "shapeless",
+--	type = "shapeless",
 	output = "farming:jaffa_cake",
 	recipe = {
-		"farming:baking_tray", "group:food_egg", "group:food_sugar",
+		{"farming:baking_tray", "group:food_egg", "group:food_sugar"},
-		"group:food_flour", "group:food_cocoa", "group:food_orange",
+		{"group:food_flour", "group:food_cocoa", "group:food_orange"},
-		"group:food_milk"
+		{"group:food_milk", "", ""}
 	},
 	replacements = {
 		{"farming:baking_tray", "farming:baking_tray"},
@@ -224,15 +351,344 @@ minetest.register_craft({
 minetest.register_craftitem("farming:apple_pie", {
 	description = S("Apple Pie"),
 	inventory_image = "farming_apple_pie.png",
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(6)
 })
 
 minetest.register_craft({
 	output = "farming:apple_pie",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_sugar",
+		{"group:food_flour", "group:food_sugar", "group:food_apple"},
-		"group:food_apple", "group:food_baking_tray"
+		{"", "group:food_baking_tray", ""}
 	},
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
+
+-- Cactus Juice
+
+minetest.register_craftitem("farming:cactus_juice", {
+	description = S("Cactus Juice"),
+	inventory_image = "farming_cactus_juice.png",
+	groups = {vessel = 1, drink = 1},
+	on_use = function(itemstack, user, pointed_thing)
+		if user then
+			if math.random(5) == 1 then
+				return minetest.do_item_eat(-1, "vessels:drinking_glass",
+						itemstack, user, pointed_thing)
+			else
+				return minetest.do_item_eat(2, "vessels:drinking_glass",
+						itemstack, user, pointed_thing)
+			end
+		end
+	end
+})
+
+minetest.register_craft({
+	output = "farming:cactus_juice",
+	recipe = {
+		{"default:cactus"},
+		{"farming:juicer"},
+		{"vessels:drinking_glass"}
+	},
+	replacements = {
+		{"group:food_juicer", "farming:juicer"}
+	}
+})
+
+-- Pasta
+
+minetest.register_craftitem("farming:pasta", {
+	description = S("Pasta"),
+	inventory_image = "farming_pasta.png",
+	groups = {food_pasta = 1}
+})
+
+minetest.register_craft({
+	output = "farming:pasta",
+	recipe = {
+		{"group:food_flour", "group:food_butter", "group:food_mixing_bowl"}
+	},
+	replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}}
+})
+
+minetest.register_craft({
+	output = "farming:pasta",
+	recipe = {
+		{"group:food_flour", "group:food_oil", "group:food_mixing_bowl"}
+	},
+	replacements = {
+		{"group:food_mixing_bowl", "farming:mixing_bowl"},
+		{"group:food_oil", "vessels:glass_bottle"}
+	}
+})
+
+-- Spaghetti
+
+minetest.register_craftitem("farming:spaghetti", {
+	description = S("Spaghetti"),
+	inventory_image = "farming_spaghetti.png",
+	on_use = minetest.item_eat(8)
+})
+
+minetest.register_craft({
+	output = "farming:spaghetti",
+	recipe = {
+		{"group:food_pasta", "group:food_saucepan", "group:food_tomato"},
+		{"group:food_garlic_clove", "group:food_garlic_clove", ""}
+	},
+	replacements = {{"group:food_saucepan", "farming:saucepan"}}
+})
+
+-- Korean Bibimbap
+
+minetest.register_craftitem("farming:bibimbap", {
+	description = S("Bibimbap"),
+	inventory_image = "farming_bibimbap.png",
+	on_use = minetest.item_eat(8, "farming:bowl")
+})
+
+minetest.register_craft({
+	output = "farming:bibimbap",
+	recipe = {
+		{"group:food_skillet", "group:food_bowl", "group:food_egg"},
+		{"group:food_rice", "group:food_chicken_raw", "group:food_cabbage"},
+		{"group:food_carrot", "group:food_chili_pepper", ""}
+	},
+	replacements = {{"group:food_skillet", "farming:skillet"}}
+})
+
+minetest.register_craft({
+	output = "farming:bibimbap",
+	type = "shapeless",
+	recipe = {
+		"group:food_skillet", "group:food_bowl", "group:food_mushroom",
+		"group:food_rice", "group:food_cabbage", "group:food_carrot",
+		"group:food_mushroom", "group:food_chili_pepper"
+	},
+	replacements = {{"group:food_skillet", "farming:skillet"}}
+})
+
+-- Burger
+
+minetest.register_craftitem("farming:burger", {
+	description = S("Burger"),
+	inventory_image = "farming_burger.png",
+	on_use = minetest.item_eat(16),
+})
+
+minetest.register_craft({
+	output = "farming:burger",
+	recipe = {
+		{"farming:bread", "group:food_meat", "group:food_cheese"},
+		{"group:food_tomato", "group:food_cucumber", "group:food_onion"},
+		{"group:food_lettuce", "", ""}
+	}
+})
+
+-- Salad
+
+minetest.register_craftitem("farming:salad", {
+	description = S("Salad"),
+	inventory_image = "farming_salad.png",
+	on_use = minetest.item_eat(8, "farming:bowl")
+})
+
+minetest.register_craft({
+	output = "farming:salad",
+	type = "shapeless",
+	recipe = {
+		"group:food_bowl", "group:food_tomato", "group:food_cucumber",
+		"group:food_lettuce", "group:food_oil"
+	}
+})
+
+-- Triple Berry Smoothie
+
+minetest.register_craftitem("farming:smoothie_berry", {
+	description = S("Triple Berry Smoothie"),
+	inventory_image = "farming_berry_smoothie.png",
+	on_use = minetest.item_eat(6, "vessels:drinking_glass"),
+	groups = {vessel = 1, drink = 1}
+})
+
+minetest.register_craft({
+	output = "farming:smoothie_berry",
+	type = "shapeless",
+	recipe = {
+		"group:food_raspberries", "group:food_blackberries",
+		"group:food_strawberry", "group:food_banana",
+		"vessels:drinking_glass"
+	}
+})
+
+-- Patatas a la importancia
+
+minetest.register_craftitem("farming:spanish_potatoes", {
+	description = S("Spanish Potatoes"),
+	inventory_image = "farming_spanish_potatoes.png",
+	on_use = minetest.item_eat(8, "farming:bowl"),
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:spanish_potatoes",
+	recipe = {
+		"farming:potato", "group:food_parsley", "farming:potato",
+		"group:food_egg", "group:food_flour", "farming:onion",
+		"farming:garlic_clove", "group:food_bowl", "group:food_skillet"
+	},
+	replacements = {{"group:food_skillet", "farming:skillet"}}
+})
+
+-- Potato omelet
+
+minetest.register_craftitem("farming:potato_omelet", {
+	description = S("Potato omelet"),
+	inventory_image = "farming_potato_omelet.png",
+	on_use = minetest.item_eat(6, "farming:bowl")
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:potato_omelet",
+	recipe = {
+		"group:food_egg", "farming:potato", "group:food_onion",
+		"group:food_skillet", "group:food_bowl"},
+	replacements = {{"group:food_skillet", "farming:skillet"}}
+})
+
+-- Paella
+
+minetest.register_craftitem("farming:paella", {
+	description = S("Paella"),
+	inventory_image = "farming_paella.png",
+	on_use = minetest.item_eat(8, "farming:bowl")
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:paella",
+	recipe = {
+		"group:food_rice", "dye:orange", "farming:pepper_red",
+		"group:food_peas", "group:food_chicken", "group:food_bowl", "group:food_skillet"
+	},
+	replacements = {{"group:food_skillet", "farming:skillet"}}
+})
+
+-- Flan
+
+minetest.register_craftitem("farming:flan", {
+	description = S("Vanilla Flan"),
+	inventory_image = "farming_vanilla_flan.png",
+	on_use = minetest.item_eat(6)
+})
+
+minetest.register_craft({
+	output = "farming:flan",
+	recipe = {
+		{"group:food_sugar", "group:food_milk", "farming:caramel"},
+		{"group:food_egg", "group:food_egg", "farming:vanilla_extract"}
+	},
+	replacements = {
+		{"cucina_vegana:soy_milk", "vessels:drinking_glass"},
+		{"group:food_milk", "bucket:bucket_empty"},
+		{"farming:vanilla_extract", "vessels:glass_bottle"}
+	}
+})
+
+-- Vegan Cheese
+
+minetest.register_craftitem("farming:cheese_vegan", {
+	description = S("Vegan Cheese"),
+	inventory_image = "farming_cheese_vegan.png",
+	on_use = minetest.item_eat(2),
+	groups = {food_cheese = 1, flammable = 2}
+})
+
+
+minetest.register_craft({
+	output = "farming:cheese_vegan",
+	recipe = {
+		{"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"},
+		{"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol"},
+		{"group:food_gelatin", "group:food_pot", ""}
+	},
+	replacements = {
+		{"farming:soy_milk", "vessels:drinking_glass 3"},
+		{"farming:pot", "farming:pot"},
+		{"farming:bottle_ethanol", "vessels:glass_bottle"}
+	}
+})
+
+minetest.register_craft({
+	output = "farming:cheese_vegan",
+	recipe = {
+		{"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"},
+		{"group:food_salt", "group:food_peppercorn", "group:food_lemon"},
+		{"group:food_gelatin", "group:food_pot", ""}
+	},
+	replacements = {
+		{"farming:soy_milk", "vessels:drinking_glass 3"},
+		{"farming:pot", "farming:pot"}
+	}
+})
+
+-- Onigiri
+
+minetest.register_craftitem("farming:onigiri", {
+	description = S("Onirigi"),
+	inventory_image = "farming_onigiri.png",
+	on_use = minetest.item_eat(2),
+	groups = {flammable = 2}
+})
+
+minetest.register_craft({
+	output = "farming:onigiri",
+	recipe = {
+		{"group:food_rice", "group:food_salt", "group:food_rice"},
+		{"", "group:food_seaweed", ""}
+	}
+})
+
+-- Gyoza
+
+minetest.register_craftitem("farming:gyoza", {
+	description = S("Gyoza"),
+	inventory_image = "farming_gyoza.png",
+	on_use = minetest.item_eat(4),
+	groups = {flammable = 2}
+})
+
+minetest.register_craft({
+	output = "farming:gyoza 4",
+	recipe = {
+		{"group:food_cabbage", "group:food_garlic_clove", "group:food_onion"},
+		{"group:food_meat_raw", "group:food_salt", "group:food_flour"},
+		{"", "group:food_skillet", ""}
+
+	},
+	replacements = {
+		{"group:food_skillet", "farming:skillet"}
+	}
+})
+
+-- Mochi
+
+minetest.register_craftitem("farming:mochi", {
+	description = S("Mochi"),
+	inventory_image = "farming_mochi.png",
+	on_use = minetest.item_eat(3),
+	groups = {flammable = 2}
+})
+
+minetest.register_craft({
+	output = "farming:mochi",
+	recipe = {
+		{"group:food_rice", "group:food_sugar", "group:food_rice"},
+		{"", "group:food_mortar_pestle", ""},
+		{"", "farming:glass_water", ""}
+	},
+	replacements = {
+		{"group:food_mortar_pestle", "farming:mortar_pestle"},
+		{"farming:glass_water", "vessels:drinking_glass"}
+	}
+})

grass.lua

@@ -1,7 +1,7 @@
 
 for i = 4, 5 do
 
-	-- Override default grass and have it drop Wheat Seeds
+	-- Override default grass and have it drop Wheat and Oat Seeds
 
 	minetest.override_item("default:grass_" .. i, {
 		drop = {
@@ -9,12 +9,12 @@ for i = 4, 5 do
 			items = {
 				{items = {"farming:seed_wheat"}, rarity = 5},
 				{items = {"farming:seed_oat"},rarity = 5},
-				{items = {"default:grass_1"}},
+				{items = {"default:grass_1"}}
+			}
 		}
-		},
 	})
 
-	-- Override default dry grass and have it drop Barley Seeds
+	-- Override default dry grass and have it drop Barley and Rye Seeds
 
 	if minetest.registered_nodes["default:dry_grass_1"] then
 
@@ -24,15 +24,15 @@ for i = 4, 5 do
 				items = {
 					{items = {"farming:seed_barley"}, rarity = 5},
 					{items = {"farming:seed_rye"},rarity = 5},
-					{items = {"default:dry_grass_1"}},
+					{items = {"default:dry_grass_1"}}
+				}
 			}
-			},
 		})
 	end
 
 end
 
--- Override default Jungle Grass and have it drop Cotton Seeds
+-- Override default Jungle Grass and have it drop Cotton and Rice Seeds
 
 minetest.override_item("default:junglegrass", {
 	drop = {
@@ -40,7 +40,7 @@ minetest.override_item("default:junglegrass", {
 		items = {
 			{items = {"farming:seed_cotton"}, rarity = 8},
 			{items = {"farming:seed_rice"},rarity = 8},
-			{items = {"default:junglegrass"}},
+			{items = {"default:junglegrass"}}
+		}
 	}
-	},
 })

hoes.lua

@@ -36,7 +36,7 @@ farming.register_hoe = function(name, def)
 			return farming.hoe_on_use(itemstack, user, pointed_thing, def.max_uses)
 		end,
 		groups = def.groups,
-		sound = {breaks = "default_tool_breaks"},
+		sound = {breaks = "default_tool_breaks"}
 	})
 
 	-- Register its recipe
@@ -149,7 +149,7 @@ farming.register_hoe(":farming:hoe_wood", {
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:hoe_wood",
-	burntime = 5,
+	burntime = 5
 })
 
 farming.register_hoe(":farming:hoe_stone", {
@@ -170,7 +170,7 @@ farming.register_hoe(":farming:hoe_bronze", {
 	description = S("Bronze Hoe"),
 	inventory_image = "farming_tool_bronzehoe.png",
 	max_uses = 500,
-	groups = {not_in_creative_inventory = 1},
+	groups = {not_in_creative_inventory = 1}
 })
 
 farming.register_hoe(":farming:hoe_mese", {
@@ -184,7 +184,7 @@ farming.register_hoe(":farming:hoe_diamond", {
 	description = S("Diamond Hoe"),
 	inventory_image = "farming_tool_diamondhoe.png",
 	max_uses = 500,
-	groups = {not_in_creative_inventory = 1},
+	groups = {not_in_creative_inventory = 1}
 })
 
 -- Toolranks support
@@ -361,7 +361,7 @@ farming.add_to_scythe_not_drops = function(item)
 end
 
 minetest.register_tool("farming:scythe_mithril", {
-	description = S("Mithril Scythe (Right-click to harvest and replant crops)"),
+	description = S("Mithril Scythe (Use to harvest and replant crops)"),
 	inventory_image = "farming_scythe_mithril.png",
 	sound = {breaks = "default_tool_breaks"},
 
@@ -437,7 +437,7 @@ minetest.register_tool("farming:scythe_mithril", {
 					obj:set_velocity({
 						x = math.random(-10, 10) / 9,
 						y = 3,
-						z = math.random(-10, 10) / 9,
+						z = math.random(-10, 10) / 9
 					})
 				end
 			end
@@ -481,30 +481,34 @@ if minetest.get_modpath("moreores") then
 			{"", "", "group:stick"}
 		}
 	})
-
+--[[
 	farming.register_hoe(":moreores:hoe_silver", {
 		description = S("%s Hoe"):format(S("Silver")),
 		inventory_image = "moreores_tool_silverhoe.png",
 		max_uses = 300,
-		material = "moreores:silver_ingot",
+		material = "moreores:silver_ingot"
 	})
 
 	farming.register_hoe(":moreores:hoe_mithril", {
 		description = S("%s Hoe"):format(S("Mithril")),
 		inventory_image = "moreores_tool_mithrilhoe.png",
 		max_uses = 1000,
-		material = "moreores:mithril_ingot",
+		material = "moreores:mithril_ingot"
 	})
 
 	-- Toolranks support
 	if tr then
 
+		local desc = S("%s Hoe"):format(S("Silver"))
+
 		minetest.override_item("moreores:hoe_silver", {
-			original_description = S("%s Hoe"):format(S("Silver")),
+			original_description = desc,
-			description = toolranks.create_description("Silver Hoe")})
+			description = toolranks.create_description(desc)})
+
+		desc = S("%s Hoe"):format(S("Mithril"))
 
 		minetest.override_item("moreores:hoe_mithril", {
-			original_description = S("%s Hoe"):format(S("Mithril")),
+			original_description = desc,
-			description = toolranks.create_description("Mithril Hoe")})
+			description = toolranks.create_description(desc)})
-	end
+	end]]
 end

init.lua

@@ -7,13 +7,15 @@
 
 farming = {
 	mod = "redo",
-	version = "20200527",
+	version = "20210928",
 	path = minetest.get_modpath("farming"),
 	select = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}
 	},
-	registered_plants = {}
+	registered_plants = {},
+	min_light = 12,
+	max_light = 15
 }
 
 
@@ -27,7 +29,9 @@ end
 local statistics = dofile(farming.path .. "/statistics.lua")
 
 -- Intllib
-local S = dofile(farming.path .. "/intllib.lua")
+local S = minetest.get_translator and minetest.get_translator("farming") or
+		dofile(farming.path .. "/intllib.lua")
+
 farming.intllib = S
 
 
@@ -80,7 +84,7 @@ end
 
 -- Growth Logic
 local STAGE_LENGTH_AVG = tonumber(
-		minetest.settings:get("farming_stage_length")) or 160
+		minetest.settings:get("farming_stage_length")) or 200 -- 160
 local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6
 
 
@@ -330,9 +334,8 @@ function farming.plant_growth_timer(pos, elapsed, node_name)
 		return true
 	end
 
-	local MIN_LIGHT = minetest.registered_nodes[node_name].minlight or 12
+	local MIN_LIGHT = minetest.registered_nodes[node_name].minlight or farming.min_light
-	local MAX_LIGHT = minetest.registered_nodes[node_name].maxlight or 15
+	local MAX_LIGHT = minetest.registered_nodes[node_name].maxlight or farming.max_light
-	--print ("---", MIN_LIGHT, MAX_LIGHT)
 
 	if max_growth == 1 or lambda < 2.0 then
 
@@ -582,7 +585,7 @@ farming.register_plant = function(name, def)
 			sounds = default.node_sound_leaves_defaults(),
 			minlight = def.minlight,
 			maxlight = def.maxlight,
-			next_plant = next_plant,
+			next_plant = next_plant
 		})
 	end
 
@@ -625,6 +628,14 @@ farming.pineapple = 0.001
 farming.peas = 0.001
 farming.beetroot = 0.001
 farming.mint = 0.005
+farming.cabbage = 0.001
+farming.blackberry = 0.002
+farming.soy = 0.001
+farming.vanilla = 0.001
+farming.lettuce = 0.001
+farming.artichoke = 0.001
+farming.parsley = 0.002
+farming.sunflower = 0.001
 farming.grains = true
 farming.rarety = 0.002
 
@@ -690,6 +701,14 @@ ddoo("beetroot.lua", farming.beetroot)
 ddoo("chili.lua", farming.chili)
 ddoo("ryeoatrice.lua", farming.grains)
 ddoo("mint.lua", farming.mint)
+ddoo("cabbage.lua", farming.cabbage)
+ddoo("blackberry.lua", farming.blackberry)
+ddoo("soy.lua", farming.soy)
+ddoo("vanilla.lua", farming.vanilla)
+ddoo("lettuce.lua", farming.lettuce)
+ddoo("artichoke.lua", farming.artichoke)
+ddoo("parsley.lua", farming.parsley)
+ddoo("sunflower.lua", farming.sunflower)
 
 dofile(farming.path .. "/food.lua")
 dofile(farming.path .. "/mapgen.lua")

license.txt

@@ -63,6 +63,11 @@ Created by VanessaE (License: CC BY 3.0):
   farming_cotton_7.png
   farming_cotton_8.png
 
+Created by 7eventy7 (https://www.planetminecraft.com/member/7eventy7/)
+  farming_melon_top.png
+  farming_melon_side.png
+  farming_melon_bottom.png
+
 Created by Doc (License: CC BY 3.0):
   farming_cucumber.png
   farming_cucumber_1.png
@@ -128,6 +133,7 @@ Created by TenPlus1 (CC BY 3.0)
   farming_rhubarb.png
   farming_rhubarb_pie.png
   farming_hemp*.png
+  farming_tofu*.png
 
 Created by ademant (CC-BY-3.0)
   farming_rye*.png
@@ -142,3 +148,35 @@ Created by VanessaE and edited by SpaghettiToastBook (CC0):
 
 Created by mDiyo (Natura), modified by TenPlus1 (License: CC BY-SA 3.0):
   farming_barley.png
+
+Created by OgelGames (CC BY-SA 4.0)
+  farming_berry_smoothie.png
+  farming_cactus_juice.png
+  farming_salad.png
+
+Created by Felfa (CC0)
+  farming_blackberry*.png
+  farming_lettuce*.png
+  farming_burger.png
+  farming_soy*.png
+  farming_vanilla*.png
+  farming_artichoke*.png
+  farming_parsley*.png
+  farming_paella.png
+  farming_potato_omelette.png
+  farming_spanish_potatoes.png
+  farming_vanilla_flan.png
+  farming_sunflower*.png
+
+Created by gorlock (CC0)
+  farming_salt_crystal.png
+
+Created by sirrobzeroone (CC0)
+  farming_gyoza.png
+  farming_pineapple_ring.png
+
+Created by TechM8 (https://www.deviantart.com/techm8)
+  farming_popcorn.png
+
+Created by RZR0 (CC-BY-NC-SA)
+  farming_blueberry_pie.png

locale/farming.de.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+%s Hoe=%s Hacke
+Apple Donut=Apfeldonut
+Apple Pie=Apfelkuchen
+Baked Potato=Ofenkartoffel
+Baking Tray=Kuchenblech
+Banana=Banane
+Banana Leaves=Bananenblatt
+Bar of Dark Chocolate=Tafel Zartbitterschokolade
+Barley=Gerste
+Barley Seed=Gerstenkörner
+Bean Pole (place on soil before planting beans)=Bohnenstange (vor dem Pflanzen der Bohnen auf den\nAckerboden stellen)
+Beetroot=Rote Beete
+Beetroot Soup=Rote Beete Suppe
+Bibimbap=Bibimbap
+Wild Blueberries=Wilde Blaubeeren
+Blueberry Muffin=Blaubeermuffin
+Blueberry Pie=Blaubeerkuchen
+Bottle of Ethanol=Flasche Ethanol
+Bottle of Hemp Oil=Flasche mit Hanföl
+Bowl of Chili=Chili Schale
+Bread=Brot
+Bronze Hoe=Bronzehacke
+Cabbage=Weißkohl
+Cactus Juice=Kaktussaft
+Carrot=Möhre
+Carrot Juice=Möhrensaft
+Chili Pepper=Chili
+Chocolate Block=Schokoladenstück
+Chocolate Donut=Schokodonut
+Cocoa Beans=Kakaobohne
+Coffee Beans=Kaffeebohnen
+Cookie=Keks
+Cooking Pot=Kochtopf
+Corn=Mais
+Corn on the Cob=Maiskolben
+Cornstarch=Speisestärke
+Cotton=Baumwolle
+Cotton Seed=Baumwollsamen
+Cucumber=Gurke
+Cucumber and Potato Salad=Gurken und Tomatensalat
+Cup of Coffee=Tasse Kaffee
+Cutting Board=Schneidebrett
+Diamond Hoe=Diamanthacke
+Donut=Donut
+Flour=Mehl
+Garlic=Knoblauch
+Garlic Braid=Knoblauchzopf
+Garlic Bread=Knoblauchbrot
+Garlic clove=Knoblauchzehe
+Glass Mixing Bowl=Glasschlüssel
+Golden Carrot=Goldene Möhre
+Grapes=Weintrauben
+Green Beans=Grüne Bohnen
+Ground Pepper=Gemahlener Pfeffer
+Hemp Block=Hanfblock
+Hemp Fibre=Hanffaser
+Hemp Leaf=Hanfblatt
+Hemp Rope=Hanfseil
+Hemp Seed=Hanfsamen
+Hoe=Hacke
+Hoe Bomb (use or throw on grassy areas to hoe land)=Hackbombe (Auf Grasland werfen oder benutzen)
+Jack 'O Lantern (punch to turn on and off)=Kürbislaterne (Punch zum Ein- und Ausschalten)
+Jaffa Cake=Jaffakeks
+Juicer=Entsafter
+Melon=Melone
+Melon Slice=Melonenscheibe
+Mese Hoe=Mesehacke
+Mint Leaf=Minzblatt
+Mint Seeds=Minzsamen
+Mint Tea=Minztee
+Mithril Scythe (Right-click to harvest and replant crops)=Mithril-Sense (Rechts-Klick zum Ernten und Wiedereinpflanzen)
+Mortar and Pestle=Mörser und Stößel
+Multigrain Bread=Mehrkornbrot
+Multigrain Flour=Mehrkornmehl
+Oat seed=Hafersamen
+Oats=Hafer
+Onion=Zwiebel
+Onion Soup=Zwiebelsuppe
+Orange=Apfelsine
+Pasta=Pasta
+Pea Pod=Erbsenschote
+Pea Soup=Erbsensuppe
+Peas=Erbsen
+Pepper=Pfeffer
+Peppercorn=Pfefferkorn
+Pineapple=Ananas
+Pineapple Juice=Ananassaft
+Pineapple Ring=Ananasscheibe
+Pineapple Top=Ananasdeckel
+Porridge=Haferbrei
+Potato=Kartoffel
+Pumpkin=Kürbis
+Pumpkin Bread=Kürbisbrot
+Pumpkin Dough=Kürbisteig
+Pumpkin Slice=Kürbisscheibe
+Raspberries=Himbeeren
+Raspberry Smoothie=Himbeersmoothie
+Rhubarb=Rhabarber
+Rhubarb Pie=Rhabarberkuchen
+Rice=Reis
+Rice Bread=Reiswaffel
+Rice Flour=Reismehl
+Rice grains=Reissaat
+Rose Water=Rosenwasser
+Rye=Roggen
+Rye seed=Roggensaat
+Salt=Salz
+Saucepan=Kasserolle
+Savanna Soil=Savannaerde
+Scarecrow Bottom=Vogelscheuchengestell
+Seed=Saatgut
+Skillet=Bratpfanne
+Sliced Bread=Geschnittenes Brot
+Soil=Ackerboden
+Spaghetti=Spaghetti
+Steel Hoe=Stahlhacke
+Stone Hoe=Steinhacke
+Straw=Stroh
+Strawberry=Erdbeere
+String=Faden
+Sugar=Zucker
+Toast=Toast
+Toast Sandwich=Toast Sandwich
+Tomato=Tomate
+Trellis (place on soil before planting grapes)=Spalier (vor dem Pflanzen der Weintrauben auf den\nAckerboden stellen)
+Turkish Delight=Lokum
+Wet Savanna Soil=Feuchte Savannaerde
+Wet Soil=Bewässerter Ackerboden
+Wheat=Weizen
+Wheat Seed=Weizenkörner
+Wild Cotton=Wilde Baumwolle
+Wooden Bowl=Holzschale
+Wooden Hoe=Holzhacke

locale/farming.en.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+#%s Hoe=
+#Apple Donut=
+#Apple Pie=
+#Baked Potato=
+#Baking Tray=
+#Banana=
+#Banana Leaves=
+#Bar of Dark Chocolate=
+#Barley=
+#Barley Seed=
+#Bean Pole (place on soil before planting beans)=
+#Beetroot=
+#Beetroot Soup=
+#Bibimbap=
+#Wild Blueberries=
+#Blueberry Muffin=
+#Blueberry Pie=
+#Bottle of Ethanol=
+#Bottle of Hemp Oil=
+#Bowl of Chili=
+#Bread=
+#Bronze Hoe=
+#Cabbage=
+#Cactus Juice=
+#Carrot=
+#Carrot Juice=
+#Chili Pepper=
+#Chocolate Block=
+#Chocolate Donut=
+#Cocoa Beans=
+#Coffee Beans=
+#Cookie=
+#Cooking Pot=
+#Corn=
+#Corn on the Cob=
+#Cornstarch=
+#Cotton=
+#Cotton Seed=
+#Cucumber=
+#Cucumber and Potato Salad=
+#Cup of Coffee=
+#Cutting Board=
+#Diamond Hoe=
+#Donut=
+#Flour=
+#Garlic=
+#Garlic Braid=
+#Garlic Bread=
+#Garlic clove=
+#Glass Mixing Bowl=
+#Golden Carrot=
+#Grapes=
+#Green Beans=
+#Ground Pepper=
+#Hemp Block=
+#Hemp Fibre=
+#Hemp Leaf=
+#Hemp Rope=
+#Hemp Seed=
+#Hoe=
+#Hoe Bomb (use or throw on grassy areas to hoe land)=
+#Jack 'O Lantern (punch to turn on and off)=
+#Jaffa Cake=
+#Juicer=
+#Melon=
+#Melon Slice=
+#Mese Hoe=
+#Mint Leaf=
+#Mint Seeds=
+#Mint Tea=
+#Mithril Scythe (Right-click to harvest and replant crops)=
+#Mortar and Pestle=
+#Multigrain Bread=
+#Multigrain Flour=
+#Oat seed=
+#Oats=
+#Onion=
+#Onion Soup=
+#Orange=
+#Pasta=
+#Pea Pod=
+#Pea Soup=
+#Peas=
+#Pepper=
+#Peppercorn=
+#Pineapple=
+#Pineapple Juice=
+#Pineapple Ring=
+#Pineapple Top=
+#Porridge=
+#Potato=
+#Pumpkin=
+#Pumpkin Bread=
+#Pumpkin Dough=
+#Pumpkin Slice=
+#Raspberries=
+#Raspberry Smoothie=
+#Rhubarb=
+#Rhubarb Pie=
+#Rice=
+#Rice Bread=
+#Rice Flour=
+#Rice grains=
+#Rose Water=
+#Rye=
+#Rye seed=
+#Salt=
+#Saucepan=
+#Savanna Soil=
+#Scarecrow Bottom=
+#Seed=
+#Skillet=
+#Sliced Bread=
+#Soil=
+#Spaghetti=
+#Steel Hoe=
+#Stone Hoe=
+#Straw=
+#Strawberry=
+#String=
+#Sugar=
+#Toast=
+#Toast Sandwich=
+#Tomato=
+#Trellis (place on soil before planting grapes)=
+#Turkish Delight=
+#Wet Savanna Soil=
+#Wet Soil=
+#Wheat=
+#Wheat Seed=
+#Wild Cotton=
+#Wooden Bowl=
+#Wooden Hoe=

locale/farming.fr.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+%s Hoe=Binette de %s
+Apple Donut=Beignet aux pommes
+Apple Pie=Tarte aux pommes
+Baked Potato=Pomme de terre cuite
+Baking Tray=Lèche-frite
+Banana=Banane
+Banana Leaves=Feuilles de banane
+Bar of Dark Chocolate=Tablette de chocolat noir
+Barley=Orge
+Barley Seed=Graine d'orge
+Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur le sol avant de planter des haricots)
+Beetroot=Betterave
+Beetroot Soup=Soupe de betterave
+Bibimbap=Bibimbap
+Wild Blueberries=Myrtilles Sauvages
+Blueberry Muffin=Muffin aux myrtilles
+Blueberry Pie=Tarte aux myrtilles
+Bottle of Ethanol=Bouteille d'éthanol
+Bottle of Hemp Oil=Bouteille d'huile de chanvre
+Bowl of Chili=Bol de chilli
+Bread=Pain
+Bronze Hoe=Binette en bronze
+Cabbage=Chou
+Cactus Juice=Jus de cactus
+Carrot=Carotte
+Carrot Juice=Jus de carotte
+Chili Pepper=Piment fort
+Chocolate Block=Bloc de chocolat
+Chocolate Donut=Beignet au chocolat
+Cocoa Beans=Fèves de cacao
+Coffee Beans=Grains de café
+Cookie=Biscuit
+Cooking Pot=Marmitte
+Corn=Maïs
+Corn on the Cob=Maïs cuit
+Cornstarch=Fécule de maïs
+Cotton=Coton
+Cotton Seed=Graines de coton
+Cucumber=Concombre
+Cucumber and Potato Salad=Salade de pomme de terre et concombre
+Cup of Coffee=Tasse de café
+Cutting Board=Planche à découper
+Diamond Hoe=Binette en diamant
+Donut=Beignet
+Flour=Farine
+Garlic=Tête d'ail
+Garlic Braid=Ail tressé
+Garlic Bread=Pain à l'ail
+Garlic clove=Gousse d'ail
+Glass Mixing Bowl=Terrine en verre
+Golden Carrot=Carotte dorée
+Grapes=Raisins
+Green Beans=Haricots verts
+Ground Pepper=Poivre moulu
+Hemp Block=Bloc de chanvre
+Hemp Fibre=Fibre de chanvre
+Hemp Leaf=Feuille de chanvre
+Hemp Rope=Corde de chanvre
+Hemp Seed=Graines de chanvre
+Hoe=Binette
+Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner)
+Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Frapper pour allumer et éteindre)
+Jaffa Cake=Petit gâteau à l'orange "Jaffa"
+Juicer=Presse-agrumes
+Melon=Melon
+Melon Slice=Tranche de melon
+Mese Hoe=Binette en mese
+Mint Leaf=Feuille de menthe
+Mint Seeds=Graine de menthe
+Mint Tea=Thé à la menthe
+Mithril Scythe (Right-click to harvest and replant crops)=Faux en mithril (Récolte et replante des graines)
+Mortar and Pestle=Mortier et pilon
+Multigrain Bread=Pain aux céréales
+Multigrain Flour=Farine multi-céréales
+Oat seed=Grains d'orge
+Oats=Avoine
+Onion=Oignon
+Onion Soup=Soupe à l'oignon
+Orange=Orange
+Pasta=Pâtes
+Pea Pod=Cosse de petit-pois
+Pea Soup=Soupe de petit-pois
+Peas=Petit-pois
+Pepper=Poivron
+Peppercorn=Grain de poivre
+Pineapple=Ananas
+Pineapple Juice=Jus d'ananas
+Pineapple Ring=Tranche d'ananas
+Pineapple Top=Pousse d'ananas
+Porridge=Gruau de céréales
+Potato=Pomme de terre
+Pumpkin=Citrouille
+Pumpkin Bread=Pain à la citrouille
+Pumpkin Dough=Pâton de pain à la citrouille
+Pumpkin Slice=Tranche de citrouille
+Raspberries=Framboises
+Raspberry Smoothie=Smoothie aux framboises
+Rhubarb=Rhubarbe
+Rhubarb Pie=Tarte à la rhubarbe
+Rice=Riz
+Rice Bread=Pain de riz
+Rice Flour=Farine de riz
+Rice grains=Grain de riz
+Rose Water=Eau de rose
+Rye=Seigle
+Rye seed=Grains de seigle
+Salt=Sel
+Saucepan=Casserole
+Savanna Soil=Terre de la savane binnée
+Scarecrow Bottom=Base d'épouventail
+Seed=Graine
+Skillet=Poêle
+Sliced Bread=Tranche de Pain
+Soil=Terre binnée
+Spaghetti=Spaghetti
+Steel Hoe=Binette en acier
+Stone Hoe=Binette en pierre
+Straw=Paille
+Strawberry=Fraise
+String=Ficelle
+Sugar=Sucre
+Toast=Pain grillé
+Toast Sandwich=Sandwich au pain grillé
+Tomato=Tomate
+Trellis (place on soil before planting grapes)=Treillis (placer sur le sol avant de planter la vigne)
+Turkish Delight=Douceur turque
+Wet Savanna Soil=Terre humide et binnée de la savane
+Wet Soil=Terre humide et binnée
+Wheat=Blé
+Wheat Seed=Grain de blé
+Wild Cotton=Coton sauvage
+Wooden Bowl=Bol en bois
+Wooden Hoe=Binette en bois

locale/farming.it.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+#%s Hoe=
+Apple Donut=Ciambella alla mela
+#Apple Pie=
+Baked Potato=Patata arrostita
+Baking Tray=Teglia da forno
+Banana=Banana
+Banana Leaves=Foglie di banano
+Bar of Dark Chocolate=Barra di cioccolato fondente
+Barley=Orzo
+Barley Seed=Seme d'orzo
+Bean Pole (place on soil before planting beans)=Palina per fagiolini (mettila sul terreno coltivabile prima di piantare i fagiolini)
+Beetroot=Barbabietola
+Beetroot Soup=Zuppa di barbabietola
+#Bibimbap=
+Wild Blueberries=Mirtilli Selvatici
+Blueberry Muffin=Focaccina di mirtilli
+Blueberry Pie=Tortino di mirtilli
+Bottle of Ethanol=Bottiglia di alcol etilico
+Bottle of Hemp Oil=Bottiglia d'olio di canapa
+Bowl of Chili=Ciotola di peperoncino
+Bread=Pane
+Bronze Hoe=Zappa di bronzo
+#Cabbage=
+#Cactus Juice=
+Carrot=Carota
+Carrot Juice=Succo di carota
+Chili Pepper=Peperoncino
+Chocolate Block=Blocco di cioccolato
+Chocolate Donut=Ciambella al cioccolato
+Cocoa Beans=Chicchi di cacao
+Coffee Beans=Chicchi di caffè
+Cookie=Biscotto
+Cooking Pot=Pentola da cottura
+Corn=Mais
+Corn on the Cob=Pannocchia arrostita
+Cornstarch=Amido di mais
+Cotton=Cotone
+Cotton Seed=Seme di cotone
+Cucumber=Cetriolo
+Cucumber and Potato Salad=Insalata di patate e cetrioli
+Cup of Coffee=Tazza di caffè
+Cutting Board=Tagliere
+Diamond Hoe=Zappa di diamante
+Donut=Ciambella
+Flour=Farina
+Garlic=Aglio
+Garlic Braid=Treccia d'aglio
+Garlic Bread=Pane all'aglio
+Garlic clove=Spicchio d'aglio
+Glass Mixing Bowl=Terrina di vetro
+Golden Carrot=Carota d'oro
+Grapes=Chicchi d'uva
+Green Beans=Fagiolini
+Ground Pepper=Pepe macinato
+Hemp Block=Blocco di canapa
+Hemp Fibre=Fibra di canapa
+Hemp Leaf=Foglia di canapa
+Hemp Rope=Corda di canapa
+Hemp Seed=Seme di canapa
+Hoe=Zappa
+Hoe Bomb (use or throw on grassy areas to hoe land)=Bomba zappa (usala o lanciala sulle aree erbose per zappare il terreno)
+Jack 'O Lantern (punch to turn on and off)=Jack Lanterna (colpirlo per accenderlo e spegnerlo)
+Jaffa Cake=Torta di jaffa
+Juicer=Spremiagrumi
+Melon=Anguria
+Melon Slice=Fetta d'anguria
+Mese Hoe=Zappa di mese
+#Mint Leaf=
+#Mint Seeds=
+#Mint Tea=
+Mithril Scythe (Right-click to harvest and replant crops)=Falce di mithril (clicca col destro per raccogliere e ripiantare le prose)
+Mortar and Pestle=Mortaio e pestello
+Multigrain Bread=Pane multicereale
+Multigrain Flour=Farina multicereale
+Oat seed=Seme d'avena
+#Oats=
+Onion=Cipolla
+#Onion Soup=
+Orange=Arancia
+#Pasta=
+Pea Pod=Baccello di piselli
+Pea Soup=Zuppa di piselli
+Peas=Piselli
+Pepper=Pepe
+Peppercorn=Grano di pepe
+Pineapple=Ananas
+Pineapple Juice=Succo d'ananas
+Pineapple Ring=Anello d'ananas
+Pineapple Top=Cima d'ananas
+Porridge=Porridge
+Potato=Patata
+Pumpkin=Zucca
+Pumpkin Bread=Pane alla zucca
+Pumpkin Dough=Pasta di zucca
+Pumpkin Slice=Fetta di zucca
+Raspberries=Lamponi
+Raspberry Smoothie=Purea di lamponi
+Rhubarb=Rabarbaro
+Rhubarb Pie=Tortino al rabarbaro
+Rice=Riso
+Rice Bread=Pane di riso
+Rice Flour=Farina di riso
+Rice grains=Chicchi di riso
+Rose Water=Acqua di rose
+Rye=Segale
+Rye seed=Seme di segale
+Salt=Sale
+Saucepan=Casseruola
+#Savanna Soil=
+Scarecrow Bottom=Fondo dello spaventapasseri
+Seed=Seme
+Skillet=Padella
+Sliced Bread=Pane a fette
+Soil=Terreno coltivabile
+#Spaghetti=
+Steel Hoe=Zappa d'acciaio
+Stone Hoe=Zappa di pietra
+Straw=Paglia
+Strawberry=Fragola
+String=Filo
+Sugar=Zucchero
+Toast=Pane tostato
+Toast Sandwich=Panino di pane tostato
+Tomato=Pomodoro
+Trellis (place on soil before planting grapes)=Graticcio (mettilo sul terreno coltivabile prima di piantare i chicchi d'uva)
+Turkish Delight=Lokum
+#Wet Savanna Soil=
+Wet Soil=Terreno coltivabile bagnato
+Wheat=Grano
+Wheat Seed=Seme di grano
+#Wild Cotton=
+Wooden Bowl=Ciotola di legno
+Wooden Hoe=Zappa di legno

locale/farming.pt.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+#%s Hoe=
+Apple Donut=Donut de Maça
+#Apple Pie=
+Baked Potato=Batata Cozida
+#Baking Tray=
+#Banana=
+#Banana Leaves=
+Bar of Dark Chocolate=Barra de Chocolate Preto
+Barley=Cevada
+Barley Seed=Sementes de Cevada
+Bean Pole (place on soil before planting beans)=Apoio de feijao (coloque no solo antes de plantar feijao)
+#Beetroot=
+#Beetroot Soup=
+#Bibimbap=
+Wild Blueberries=Mirtilos Selvagens
+Blueberry Muffin=Muffin de Mirtilos
+#Blueberry Pie=
+Bottle of Ethanol=Garrafa de Etanol
+Bottle of Hemp Oil=Garrafa de Oleo de Canhamo
+#Bowl of Chili=
+Bread=Pao
+Bronze Hoe=Enxada de Bronze
+#Cabbage=
+#Cactus Juice=
+Carrot=Cenoura
+#Carrot Juice=
+#Chili Pepper=
+#Chocolate Block=
+Chocolate Donut=Donut de Chocolate
+Cocoa Beans=Amendoas de Cacau
+Coffee Beans=Grao de Cafe
+Cookie=Cookie
+#Cooking Pot=
+Corn=Milho
+Corn on the Cob=Espiga de Milho
+#Cornstarch=
+Cotton=Algodao
+Cotton Seed=Sementes de Algodao
+Cucumber=Pepino
+#Cucumber and Potato Salad=
+Cup of Coffee=Xicara de Cafe
+#Cutting Board=
+Diamond Hoe=Enxada de Diamante
+Donut=Donut
+Flour=Farinha
+#Garlic=
+#Garlic Braid=
+#Garlic Bread=
+#Garlic clove=
+#Glass Mixing Bowl=
+Golden Carrot=Cenoura Dourada
+Grapes=Uvas
+Green Beans=Feijoes Verdes
+#Ground Pepper=
+#Hemp Block=
+Hemp Fibre=Fibra de Canhamo
+Hemp Leaf=Folha de Canhamo
+Hemp Rope=Corda de Canhamo
+Hemp Seed=Sementes de Canhamo
+Hoe=Enxada
+#Hoe Bomb (use or throw on grassy areas to hoe land)=
+Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Socos para ligar e desligar)
+#Jaffa Cake=
+#Juicer=
+Melon=Melancia
+Melon Slice=Sementes de Melancia
+Mese Hoe=Enxada de Mese
+#Mint Leaf=
+#Mint Seeds=
+#Mint Tea=
+#Mithril Scythe (Right-click to harvest and replant crops)=
+#Mortar and Pestle=
+#Multigrain Bread=
+#Multigrain Flour=
+#Oat seed=
+#Oats=
+#Onion=
+#Onion Soup=
+#Orange=
+#Pasta=
+#Pea Pod=
+#Pea Soup=
+#Peas=
+#Pepper=
+#Peppercorn=
+#Pineapple=
+#Pineapple Juice=
+#Pineapple Ring=
+#Pineapple Top=
+#Porridge=
+Potato=Batata
+Pumpkin=Abobora
+Pumpkin Bread=Pao de Abobora
+Pumpkin Dough=Massa de Abobora
+Pumpkin Slice=Pedaço de Abobora
+Raspberries=Framboesa
+Raspberry Smoothie=Batida de Framboesa
+Rhubarb=Ruibarbo
+Rhubarb Pie=Torta de Ruibarbo
+#Rice=
+#Rice Bread=
+#Rice Flour=
+#Rice grains=
+#Rose Water=
+#Rye=
+#Rye seed=
+#Salt=
+#Saucepan=
+#Savanna Soil=
+#Scarecrow Bottom=
+Seed=Sementes
+#Skillet=
+#Sliced Bread=
+Soil=Solo
+#Spaghetti=
+Steel Hoe=Enxada de Aço
+Stone Hoe=Enxada de Pedra
+Straw=Palha
+#Strawberry=
+#String=
+Sugar=Açucar
+#Toast=
+#Toast Sandwich=
+Tomato=Tomate
+Trellis (place on soil before planting grapes)=Grade de Ripas (colocar no solo antes de plantar uvas)
+#Turkish Delight=
+#Wet Savanna Soil=
+Wet Soil=Solo Seco
+Wheat=Trigo
+Wheat Seed=Sementes de Trigo
+#Wild Cotton=
+#Wooden Bowl=
+Wooden Hoe=Enxada de Madeira

locale/farming.ru.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+%s Hoe=%s мотыга
+Apple Donut=Яблочный пончик
+Apple Pie=Яблочный пирог
+Baked Potato=Печеный картофель
+Baking Tray=Противень
+Banana=Банан
+Banana Leaves=Листья банана
+Bar of Dark Chocolate=Плитка темного шоколада
+Barley=Ячмень
+Barley Seed=Семена ячменя
+Bean Pole (place on soil before planting beans)=Жердь для бобовых (установите на почву перед посадкой бобовых)
+Beetroot=Свекла
+Beetroot Soup=Борщ
+#Bibimbap=
+Wild Blueberries=Голубика
+Blueberry Muffin=Кекс с голубикой
+Blueberry Pie=Пирог с голубикой
+Bottle of Ethanol=Бутылка спирта
+Bottle of Hemp Oil=Бутылка конопляного масла
+Bowl of Chili=Миска чили
+Bread=Хлеб
+Bronze Hoe=Бронзовая мотыга
+#Cabbage=
+Cactus Juice=Кактусовый сок
+Carrot=Морковь
+Carrot Juice=Морковный сок
+Chili Pepper=Перец чили
+Chocolate Block=Шоколадный блок
+Chocolate Donut=Шоколадный пончик
+Cocoa Beans=Какао-бобы
+Coffee Beans=Кофейные зерна
+Cookie=Печенье
+Cooking Pot=Котел
+Corn=Кукуруза
+Corn on the Cob=Початок кукурузы
+Cornstarch=Кукурузный крахмал
+Cotton=Хлопок
+Cotton Seed=Семена хлопка
+Cucumber=Огурец
+Cucumber and Potato Salad=Салат из огурцов и картофеля
+Cup of Coffee=Чашка кофе
+Cutting Board=Разделочная доска
+Diamond Hoe=Алмазная мотыга
+Donut=Пончик
+Flour=Мука
+Garlic=Чеснок
+Garlic Braid=Связка чеснока
+Garlic Bread=Чесночный хлеб
+Garlic clove=Зубчик чеснока
+Glass Mixing Bowl=Стеклянная чаша
+Golden Carrot=Золотая морковь
+Grapes=Виноград
+Green Beans=Зеленая фасоль
+Ground Pepper=Молотый перец
+Hemp Block=Блок конопли
+Hemp Fibre=Конопляное волокно
+Hemp Leaf=Лист конопли
+Hemp Rope=Пеньковая веревка
+Hemp Seed=Семена конопли
+Hoe=Мотыга
+Hoe Bomb (use or throw on grassy areas to hoe land)=Мотыгобомба (используйте или бросьте на траву для ее обработки)
+Jack 'O Lantern (punch to turn on and off)=Светильник джека (удар для включения и выключения)
+Jaffa Cake=Яффский пирог
+Juicer=Соковыжималка
+Melon=Арбуз
+Melon Slice=Долька арбуза
+Mese Hoe=Магическая мотыга
+Mint Leaf=Лист мяты
+Mint Seeds=Семена мяты
+Mint Tea=Чай с мятой
+Mithril Scythe (Right-click to harvest and replant crops)=Мифриловая коса (Щелкните правой кнопкой мыши для сбора и пересадки растений)
+Mortar and Pestle=Ступка и пестик
+Multigrain Bread=Мультизерновой хлеб
+Multigrain Flour=Мультизерновая мука
+Oat seed=Семена овса
+#Oats=
+Onion=Лук
+Onion Soup=Луковый суп
+Orange=Апельсин
+#Pasta=
+Pea Pod=Стручок гороха
+Pea Soup=Гороховый суп
+Peas=Горох
+Pepper=Перец
+Peppercorn=Перчинка
+Pineapple=Ананас
+Pineapple Juice=Ананасовый сок
+Pineapple Ring=Кольцо ананаса
+Pineapple Top=Верхушка ананаса
+Porridge=Каша
+Potato=Картофель
+Pumpkin=Тыква
+Pumpkin Bread=Тыквенный хлеб
+Pumpkin Dough=Тыквенное тесто
+Pumpkin Slice=Ломтик тыквы
+Raspberries=Малина
+Raspberry Smoothie=Малиновый смузи
+Rhubarb=Ревень
+Rhubarb Pie=Пирог с ревенем
+Rice=Рис
+Rice Bread=Рисовый хлеб
+Rice Flour=Рисовая мука
+Rice grains=Зёрна риса
+Rose Water=Розовая вода
+Rye=Рожь
+Rye seed=Зёрна ржи
+Salt=Соль
+Saucepan=Кастрюля
+Savanna Soil=Земля саванны
+Scarecrow Bottom=Основание пугала
+Seed=Семена
+Skillet=Сковорода
+Sliced Bread=Нарезанный хлеб
+Soil=Земля
+#Spaghetti=
+Steel Hoe=Стальная мотыга
+Stone Hoe=Каменная мотыга
+Straw=Солома
+Strawberry=Земляника
+String=Нить
+Sugar=Сахар
+Toast=Тост
+Toast Sandwich=Сэндвич
+Tomato=Помидор
+Trellis (place on soil before planting grapes)=Решетка (поставьте на почву перед посадкой винограда)
+Turkish Delight=Рахат-лукум
+Wet Savanna Soil=Увлажненная земля саванны
+Wet Soil=Увлажненная земля
+Wheat=Пшеница
+Wheat Seed=Зёрна пшеницы
+Wild Cotton=Дикорастущий хлопок
+Wooden Bowl=Деревянная миска
+Wooden Hoe=Деревянная мотыга

locale/farming.zh_CN.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+#%s Hoe=
+Apple Donut=苹果甜甜圈
+#Apple Pie=
+Baked Potato=焗马铃薯
+Baking Tray=烤盘
+Banana=香蕉
+Banana Leaves=香蕉叶
+Bar of Dark Chocolate=黑巧克力条
+Barley=大麦
+Barley Seed=大麦种子
+Bean Pole (place on soil before planting beans)=豆杆（种豆前先放在土上）
+Beetroot=甜菜根
+Beetroot Soup=甜菜根汤
+#Bibimbap=
+Wild Blueberries=蓝莓
+Blueberry Muffin=蓝莓松糕
+Blueberry Pie=蓝莓派
+Bottle of Ethanol=一瓶乙醇
+Bottle of Hemp Oil=一瓶大麻油
+Bowl of Chili=一碗辣椒
+Bread=面包
+Bronze Hoe=青铜锄头
+#Cabbage=
+#Cactus Juice=
+Carrot=胡萝卜
+Carrot Juice=胡萝卜汁
+Chili Pepper=辣椒
+Chocolate Block=巧克力块
+Chocolate Donut=巧克力甜甜圈
+Cocoa Beans=可可豆
+Coffee Beans=咖啡豆
+Cookie=曲奇
+Cooking Pot=锅
+Corn=玉米
+Corn on the Cob=玉米棒
+Cornstarch=玉米淀粉
+Cotton=棉花
+Cotton Seed=棉籽
+Cucumber=黄瓜
+Cucumber and Potato Salad=黄瓜土豆沙拉
+Cup of Coffee=一杯咖啡
+Cutting Board=砧板
+Diamond Hoe=钻石锄
+Donut=甜甜圈
+Flour=面粉
+Garlic=大蒜
+Garlic Braid=蒜辫
+Garlic Bread=蒜香面包
+Garlic clove=蒜瓣
+Glass Mixing Bowl=搅拌杯
+Golden Carrot=金萝卜
+Grapes=葡萄
+Green Beans=青豆
+Ground Pepper=胡椒粉
+Hemp Block=麻块
+Hemp Fibre=大麻纤维
+Hemp Leaf=大麻叶
+Hemp Rope=麻绳
+Hemp Seed=大麻籽
+Hoe=锄头
+Hoe Bomb (use or throw on grassy areas to hoe land)=锄弹（在草地上使用或扔在锄地上）
+Jack 'O Lantern (punch to turn on and off)=南瓜灯（按一下开关）
+Jaffa Cake=佳发饼
+Juicer=榨汁机
+Melon=甜瓜
+Melon Slice=西瓜片
+Mese Hoe=黄石锄头
+#Mint Leaf=
+#Mint Seeds=
+#Mint Tea=
+Mithril Scythe (Right-click to harvest and replant crops)=秘银镰刀（右击可收获并重新种植作物）
+Mortar and Pestle=研钵
+Multigrain Bread=杂粮面包
+Multigrain Flour=多粒面粉
+Oat seed=燕麦籽
+#Oats=
+Onion=洋葱
+#Onion Soup=
+Orange=橙色
+#Pasta=
+Pea Pod=豌豆荚
+Pea Soup=豌豆汤
+Peas=豌豆
+Pepper=胡椒粉
+Peppercorn=胡椒粉
+Pineapple=菠萝
+Pineapple Juice=菠萝汁
+Pineapple Ring=菠萝圈
+Pineapple Top=菠萝上衣
+Porridge=粥
+Potato=土豆
+Pumpkin=南瓜
+Pumpkin Bread=南瓜面包
+Pumpkin Dough=南瓜面团
+Pumpkin Slice=南瓜片
+Raspberries=覆盆子
+Raspberry Smoothie=覆盆子冰沙
+Rhubarb=大黄
+Rhubarb Pie=大黄派
+Rice=大米
+Rice Bread=米饭面包
+Rice Flour=米粉
+Rice grains=稻谷
+Rose Water=玫瑰汁
+Rye=黑麦
+Rye seed=黑麦种子
+Salt=盐
+Saucepan=平底锅
+#Savanna Soil=
+Scarecrow Bottom=稻草人屁股
+Seed=种子
+Skillet=平底锅
+Sliced Bread=切片面包
+Soil=土壤
+#Spaghetti=
+Steel Hoe=钢锄头
+Stone Hoe=石锄
+Straw=稻草
+Strawberry=草莓
+String=线
+Sugar=糖
+Toast=烤面包片
+Toast Sandwich=三明治面包
+Tomato=番茄
+Trellis (place on soil before planting grapes)=棚架（种植葡萄前先放在土壤上）
+Turkish Delight=土耳其软糖
+#Wet Savanna Soil=
+Wet Soil=湿土
+Wheat=小麦
+Wheat Seed=小麦种子
+#Wild Cotton=
+Wooden Bowl=木碗
+Wooden Hoe=木锄

locale/farming.zh_TW.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+#%s Hoe=
+Apple Donut=蘋果甜甜圈
+#Apple Pie=
+Baked Potato=焗馬鈴薯
+Baking Tray=烤盤
+Banana=香蕉
+Banana Leaves=香蕉葉
+Bar of Dark Chocolate=黑巧克力條
+Barley=大麥
+Barley Seed=大麥種子
+Bean Pole (place on soil before planting beans)=豆杆（種豆前先放在土上）
+Beetroot=甜菜根
+Beetroot Soup=甜菜根湯
+#Bibimbap=
+Wild Blueberries=藍莓
+Blueberry Muffin=藍莓鬆糕
+Blueberry Pie=藍莓派
+Bottle of Ethanol=一瓶乙醇
+Bottle of Hemp Oil=一瓶大麻油
+Bowl of Chili=一碗辣椒
+Bread=麵包
+Bronze Hoe=青銅鋤頭
+#Cabbage=
+#Cactus Juice=
+Carrot=胡蘿蔔
+Carrot Juice=胡蘿蔔汁
+Chili Pepper=辣椒
+Chocolate Block=巧克力塊
+Chocolate Donut=巧克力甜甜圈
+Cocoa Beans=可可豆
+Coffee Beans=咖啡豆
+Cookie=曲奇
+Cooking Pot=鍋
+Corn=玉米
+Corn on the Cob=玉米棒
+Cornstarch=玉米澱粉
+Cotton=棉花
+Cotton Seed=棉籽
+Cucumber=黃瓜
+Cucumber and Potato Salad=黃瓜土豆沙拉
+Cup of Coffee=一杯咖啡
+Cutting Board=砧板
+Diamond Hoe=鑽石鋤
+Donut=甜甜圈
+Flour=麵粉
+Garlic=大蒜
+Garlic Braid=蒜辮
+Garlic Bread=蒜香麵包
+Garlic clove=蒜瓣
+Glass Mixing Bowl=攪拌杯
+Golden Carrot=金蘿蔔
+Grapes=葡萄
+Green Beans=青豆
+Ground Pepper=胡椒粉
+Hemp Block=麻塊
+Hemp Fibre=大麻纖維
+Hemp Leaf=大麻葉
+Hemp Rope=麻繩
+Hemp Seed=大麻籽
+Hoe=鋤頭
+Hoe Bomb (use or throw on grassy areas to hoe land)=鋤彈（在草地上使用或扔在鋤地上）
+Jack 'O Lantern (punch to turn on and off)=南瓜燈（按一下開關）
+Jaffa Cake=佳發餅
+Juicer=榨汁機
+Melon=甜瓜
+Melon Slice=西瓜片
+Mese Hoe=黃石鋤頭
+#Mint Leaf=
+#Mint Seeds=
+#Mint Tea=
+Mithril Scythe (Right-click to harvest and replant crops)=祕銀鐮刀（右擊可收穫並重新種植作物）
+Mortar and Pestle=研缽
+Multigrain Bread=雜糧麵包
+Multigrain Flour=多粒麵粉
+Oat seed=燕麥籽
+#Oats=
+Onion=洋蔥
+#Onion Soup=
+Orange=橙色
+#Pasta=
+Pea Pod=豌豆莢
+Pea Soup=豌豆湯
+Peas=豌豆
+Pepper=胡椒粉
+Peppercorn=胡椒粉
+Pineapple=菠蘿
+Pineapple Juice=菠蘿汁
+Pineapple Ring=菠蘿圈
+Pineapple Top=菠蘿上衣
+Porridge=粥
+Potato=土豆
+Pumpkin=南瓜
+Pumpkin Bread=南瓜麵包
+Pumpkin Dough=南瓜麵糰
+Pumpkin Slice=南瓜片
+Raspberries=覆盆子
+Raspberry Smoothie=覆盆子冰沙
+Rhubarb=大黃
+Rhubarb Pie=大黃派
+Rice=大米
+Rice Bread=米飯麵包
+Rice Flour=米粉
+Rice grains=稻穀
+Rose Water=玫瑰汁
+Rye=黑麥
+Rye seed=黑麥種子
+Salt=鹽
+Saucepan=平底鍋
+#Savanna Soil=
+Scarecrow Bottom=稻草人屁股
+Seed=種子
+Skillet=平底鍋
+Sliced Bread=切片面包
+Soil=土壤
+#Spaghetti=
+Steel Hoe=鋼鋤頭
+Stone Hoe=石鋤
+Straw=稻草
+Strawberry=草莓
+String=線
+Sugar=糖
+Toast=烤麵包片
+Toast Sandwich=三明治麵包
+Tomato=番茄
+Trellis (place on soil before planting grapes)=棚架（種植葡萄前先放在土壤上）
+Turkish Delight=土耳其軟糖
+#Wet Savanna Soil=
+Wet Soil=溼土
+Wheat=小麥
+Wheat Seed=小麥種子
+#Wild Cotton=
+Wooden Bowl=木碗
+Wooden Hoe=木鋤

locale/ru.txt

@@ -2,194 +2,211 @@
 # textdomain: farming
 # author: codexp <codexp@gmx.net>
 # author: TheDarkTiger
-# last update: 2020/Apr/26
+# author: YELLOW <pikayellow35@gmail.com>
+# last update: 2020/Jun/20
 
 ###### folder . ######
 
 ### init.lua ###
-Seed=семена
+Seed=Семена
 
 ### compatibility.lua ###
-Banana=
+Banana=Банан
-Banana Leaves=
+Banana Leaves=Листья банана
-Orange=
+Orange=Апельсин
-Strawberry=
+Strawberry=Земляника
 
 ### food.lua ###
-Sugar=сахар
+Sugar=Сахар
-Salt=
+Salt=Соль
-Rose Water=
+Rose Water=Розовая вода
-Turkish Delight=
+Turkish Delight=Рахат-лукум
-Garlic Bread=
+Garlic Bread=Чесночный хлеб
-Donut=пончик
+Donut=Пончик
-Chocolate Donut=шоколадный пончик
+Chocolate Donut=Шоколадный пончик
-Apple Donut=яблочный пончик
+Apple Donut=Яблочный пончик
-Porridge=
+Porridge=Каша
-Jaffa Cake=
+Jaffa Cake=Яффский пирог
+Apple Pie=Яблочный пирог
+Cactus Juice=Кактусовый сок
 
 ### hoes.lua ###
-Hoe=мотыга
+Hoe=Мотыга
-Wooden Hoe=деревянная мотыга
+Wooden Hoe=Деревянная мотыга
-Stone Hoe=каменная мотыга
+Stone Hoe=Каменная мотыга
-Steel Hoe=стальная мотыга
+Steel Hoe=Стальная мотыга
-Bronze Hoe=бронзовая мотыга
+Bronze Hoe=Бронзовая мотыга
-Mese Hoe=магическая мотыга
+Mese Hoe=Магическая мотыга
-Diamond Hoe=алмазная мотыга
+Diamond Hoe=Алмазная мотыга
 # Surcharge du mod [Toolranks] à faire #
-Hoe Bomb (use or throw on grassy areas to hoe land)=
+Hoe Bomb (use or throw on grassy areas to hoe land)=Мотыгобомба (используйте или бросьте на траву для ее обработки)
-Mithril Scythe (Right-click to harvest and replant crops)=
+Mithril Scythe (Right-click to harvest and replant crops)=Мифриловая коса (Щелкните правой кнопкой мыши для сбора и пересадки растений)
 # Surcharge du mod [Toolranks] à faire #
+%s Hoe=%s мотыга
+Silver=Серебряная
+Mithril=Мифриловая
+Silver Hoe=Серебряная
+Mithril Hoe=Мифриловая
 
 ### soil.lua ###
-Soil=земля
+Soil=Земля
-Wet Soil=мокрая земля
+Wet Soil=Увлажненная земля
+Savanna Soil=Земля саванны
+Wet Savanna Soil=Увлажненная земля саванны
 
 ### utensils.lua ###
-Wooden Bowl=
+Wooden Bowl=Деревянная миска
-Saucepan=
+Saucepan=Кастрюля
-Cooking Pot=
+Cooking Pot=Котел
-Baking Tray=
+Baking Tray=Противень
-Skillet=
+Skillet=Сковорода
-Mortar and Pestle=
+Mortar and Pestle=Ступка и пестик
-Cutting Board=
+Cutting Board=Разделочная доска
-Juicer=
+Juicer=Соковыжималка
-Glass Mixing Bowl=
+Glass Mixing Bowl=Стеклянная чаша
 
 
 ###### folder ./crops ######
 
 ### barley.lua ###
-Barley Seed=семена ячменя
+Barley Seed=Семена ячменя
-Barley=ячмень
+Barley=Ячмень
 
 ### beans.lua ###
-Green Beans=зеленая фасоль
+Green Beans=Зеленая фасоль
-Bean Pole (place on soil before planting beans)=жердь для бобовых (установите на почву перед посадкой бобовых)
+Bean Pole (place on soil before planting beans)=Жердь для бобовых (установите на почву перед посадкой бобовых)
 
 ### beetroot.lua ###
-Beetroot=
+Beetroot=Свекла
-Beetroot Soup=
+Beetroot Soup=Борщ
 
 ### blueberry.lua ###
-Blueberries=голубика
+Blueberries=Голубика
-Blueberry Muffin=кекс из голубики
+Blueberry Muffin=Кекс с голубикой
-Blueberry Pie=
+Blueberry Pie=Пирог с голубикой
 
 ### carrot.lua ##
-Carrot=морковь
+Carrot=Морковь
-Carrot Juice=
+Carrot Juice=Морковный сок
-Golden Carrot=золотая морковь
+Golden Carrot=Золотая морковь
 
 ### chili.lua ###
-Chili Pepper=
+Chili Pepper=Перец чили
-Bowl of Chili=
+Bowl of Chili=Миска чили
 
 ### cocoa.lua ###
-Cocoa Beans=бобы какао
+Cocoa Beans=Какао-бобы
-Cookie=печенье
+Cookie=Печенье
-Bar of Dark Chocolate=плитка темного шоколада
+Bar of Dark Chocolate=Плитка темного шоколада
-Chocolate Block=
+Chocolate Block=Шоколадный блок
 
 ### coffee.lua ###
-Coffee Beans=кофе в зернах
+Coffee Beans=Кофейные зерна
-Cup of Coffee=чашка кофе
+Cup of Coffee=Чашка кофе
 
 ### corn.lua ###
-Corn=кукуруза
+Corn=Кукуруза
-Corn on the Cob=початок кукурузы
+Corn on the Cob=Початок кукурузы
-Cornstarch=
+Cornstarch=Кукурузный крахмал
-Bottle of Ethanol=бутылка этилового спирта
+Bottle of Ethanol=Бутылка спирта
 
 ### cotton.lua ###
-Cotton Seed=семена хлопка
+Wild Cotton=Дикорастущий хлопок
-Cotton=хлопок
+Cotton Seed=Семена хлопка
-String=
+Cotton=Хлопок
+String=Нить
 
 ### cucumber.lua ###
-Cucumber=огурец
+Cucumber=Огурец
 
 ### garlic.lua ###
-Garlic clove=
+Garlic clove=Зубчик чеснока
-Garlic=
+Garlic=Чеснок
-Garlic Braid=
+Garlic Braid=Связка чеснока
 
 ### grapes.lua ###
-Grapes=виноград
+Grapes=Виноград
-Trellis (place on soil before planting grapes)=решетка (поставьте на почву для посадки винограда)
+Trellis (place on soil before planting grapes)=Решетка (поставьте на почву перед посадкой винограда)
 
 ### hemp.lua ###
-Hemp Seed=семена конопли
+Hemp Seed=Семена конопли
-Hemp Leaf=листья конопли
+Hemp Leaf=Лист конопли
-Bottle of Hemp Oil=бутылка конопляного масла
+Bottle of Hemp Oil=Бутылка конопляного масла
-Hemp Fibre=
+Hemp Fibre=Конопляное волокно
-Hemp Block=
+Hemp Block=Блок конопли
-Hemp Rope=Пенька
+Hemp Rope=Пеньковая веревка
 
 ### melon.lua ###
-Melon Slice=ломтик арбуза
+Melon Slice=Долька арбуза
-Melon=арбуз
+Melon=Арбуз
+
+### mint.lua ###
+Mint Seeds=Семена мяты
+Mint Leaf=Лист мяты
+Mint Tea=Чай с мятой
 
 ### onion.lua ###
-Onion=
+Onion=Лук
+Onion Soup=Луковый суп
 
 ### peas.lua ###
-Pea Pod=
+Pea Pod=Стручок гороха
-Peas=
+Peas=Горох
-Pea Soup=
+Pea Soup=Гороховый суп
 
 ### pepper.lua ###
-Peppercorn=
+Peppercorn=Перчинка
-Pepper=
+Pepper=Перец
-Ground Pepper=
+Ground Pepper=Молотый перец
 
 ### pinapple.lua ###
-Pineapple Top=
+Pineapple Top=Верхушка ананаса
-Pineapple=
+Pineapple=Ананас
-Pineapple Ring=
+Pineapple Ring=Кольцо ананаса
-Pineapple Juice=
+Pineapple Juice=Ананасовый сок
 
 ### potato.lua ###
-Potato=картофель
+Potato=Картофель
-Baked Potato=запеченный картофель
+Baked Potato=Печеный картофель
-Cucumber and Potato Salad=
+Cucumber and Potato Salad=Салат из огурцов и картофеля
 
 ### pumpkin.lua ###
-Pumpkin Slice=ломтик тыквы
+Pumpkin Slice=Ломтик тыквы
-Jack 'O Lantern (punch to turn on and off)=светильник джека (удар для включения и отключения)
+Jack 'O Lantern (punch to turn on and off)=Светильник джека (удар для включения и выключения)
-Scarecrow Bottom=
+Scarecrow Bottom=Основание пугала
-Pumpkin Bread=тыквенный хлеб
+Pumpkin Bread=Тыквенный хлеб
-Pumpkin Dough=тыквенное тесто
+Pumpkin Dough=Тыквенное тесто
-Pumpkin=тыква
+Pumpkin=Тыква
 
 ### raspberry.lua ###
-Raspberries=малина
+Raspberries=Малина
-Raspberry Smoothie=малиновый коктейль
+Raspberry Smoothie=Малиновый смузи
 
 ### rhubarb.lua ###
-Rhubarb=ревень
+Rhubarb=Ревень
-Rhubarb Pie=пирог из ревеня
+Rhubarb Pie=Пирог с ревенем
 
 ### ryeoatrice.lua ###
-Rye=
+Rye=Рожь
-Rye seed=
+Rye seed=Зёрна ржи
-Oat=
+Oat=Овес
-Oat seed=
+Oat seed=Семена овса
-Rice=
+Rice grains=Зёрна риса
-Rice grains=
+Rice=Рис
-Rice Bread=
+Rice Bread=Рисовый хлеб
-Rice Flour=
+Rice Flour=Рисовая мука
-Multigrain Flour=
+Multigrain Flour=Мультизерновая мука
-Multigrain Bread=
+Multigrain Bread=Мультизерновой хлеб
 
 ### tomato.lua ###
-Tomato=помидор
+Tomato=Помидор
 
 ### wheat.lua ###
-Wheat Seed=
+Wheat Seed=Зёрна пшеницы
-Wheat=семена пшеницы
+Wheat=Пшеница
-Straw=солома
+Straw=Солома
-Flour=мука
+Flour=Мука
-Bread=хлеб
+Bread=Хлеб
-Sliced Bread=
+Sliced Bread=Нарезанный хлеб
-Toast=
+Toast=Тост
-Toast Sandwich=
+Toast Sandwich=Сэндвич

locale/zh_CN.txt

@@ -0,0 +1,119 @@
+Seed=种子
+Banana=香蕉
+Banana Leaves=香蕉叶
+Orange=橙色
+Strawberry=草莓
+Sugar=糖
+Salt=盐
+Rose Water=玫瑰汁
+Turkish Delight=土耳其软糖
+Garlic Bread=蒜香面包
+Donut=甜甜圈
+Chocolate Donut=巧克力甜甜圈
+Apple Donut=苹果甜甜圈
+Porridge=粥
+Jaffa Cake=佳发饼
+Hoe=锄头
+Wooden Hoe=木锄
+Stone Hoe=石锄
+Steel Hoe=钢锄头
+Bronze Hoe=青铜锄头
+Mese Hoe=黄石锄头
+Diamond Hoe=钻石锄
+Hoe Bomb (use or throw on grassy areas to hoe land)=锄弹（在草地上使用或扔在锄地上）
+Mithril Scythe (Right-click to harvest and replant crops)=秘银镰刀（右击可收获并重新种植作物）
+Soil=土壤
+Wet Soil=湿土
+Wooden Bowl=木碗
+Saucepan=平底锅
+Cooking Pot=锅
+Baking Tray=烤盘
+Skillet=平底锅
+Mortar and Pestle=研钵
+Cutting Board=砧板
+Juicer=榨汁机
+Glass Mixing Bowl=搅拌杯
+Barley Seed=大麦种子
+Barley=大麦
+Green Beans=青豆
+Bean Pole (place on soil before planting beans)=豆杆（种豆前先放在土上）
+Beetroot=甜菜根
+Beetroot Soup=甜菜根汤
+Blueberries=蓝莓
+Blueberry Muffin=蓝莓松糕
+Blueberry Pie=蓝莓派
+Carrot=胡萝卜
+Carrot Juice=胡萝卜汁
+Golden Carrot=金萝卜
+Chili Pepper=辣椒
+Bowl of Chili=一碗辣椒
+Cocoa Beans=可可豆
+Cookie=曲奇
+Bar of Dark Chocolate=黑巧克力条
+Chocolate Block=巧克力块
+Coffee Beans=咖啡豆
+Cup of Coffee=一杯咖啡
+Corn=玉米
+Corn on the Cob=玉米棒
+Cornstarch=玉米淀粉
+Bottle of Ethanol=一瓶乙醇
+Cotton Seed=棉籽
+Cotton=棉花
+String=线
+Cucumber=黄瓜
+Garlic clove=蒜瓣
+Garlic=大蒜
+Garlic Braid=蒜辫
+Grapes=葡萄
+Trellis (place on soil before planting grapes)=棚架（种植葡萄前先放在土壤上）
+Hemp Seed=大麻籽
+Hemp Leaf=大麻叶
+Bottle of Hemp Oil=一瓶大麻油
+Hemp Fibre=大麻纤维
+Hemp Block=麻块
+Hemp Rope=麻绳
+Melon Slice=西瓜片
+Melon=甜瓜
+Onion=洋葱
+Pea Pod=豌豆荚
+Peas=豌豆
+Pea Soup=豌豆汤
+Peppercorn=胡椒粉
+Pepper=胡椒粉
+Ground Pepper=胡椒粉
+Pineapple Top=菠萝上衣
+Pineapple=菠萝
+Pineapple Ring=菠萝圈
+Pineapple Juice=菠萝汁
+Potato=土豆
+Baked Potato=焗马铃薯
+Cucumber and Potato Salad=黄瓜土豆沙拉
+Pumpkin Slice=南瓜片
+Jack 'O Lantern (punch to turn on and off)=杰克灯（按一下开关）
+Scarecrow Bottom=稻草人屁股
+Pumpkin Bread=南瓜面包
+Pumpkin Dough=南瓜面团
+Pumpkin=南瓜
+Raspberries=覆盆子
+Raspberry Smoothie=覆盆子冰沙
+Rhubarb=大黄
+Rhubarb Pie=大黄派
+Rye=黑麦
+Rye seed=黑麦种子
+Oat=燕麦
+Oat seed=燕麦籽
+Rice=大米
+Rice grains=稻谷
+Rice Bread=米饭面包
+Rice Flour=米粉
+Multigrain Flour=多粒面粉
+Multigrain Bread=杂粮面包
+Tomato=番茄
+Wheat Seed=小麦种子
+Wheat=小麦
+Straw=稻草
+Flour=面粉
+Bread=面包
+Sliced Bread=切片面包
+Toast=烤面包片
+Toast Sandwich=三明治面包

locale/zh_TW.txt

@@ -0,0 +1,119 @@
+Seed=種子
+Banana=香蕉
+Banana Leaves=香蕉葉
+Orange=橙色
+Strawberry=草莓
+Sugar=糖
+Salt=鹽
+Rose Water=玫瑰汁
+Turkish Delight=土耳其軟糖
+Garlic Bread=蒜香麵包
+Donut=甜甜圈
+Chocolate Donut=巧克力甜甜圈
+Apple Donut=蘋果甜甜圈
+Porridge=粥
+Jaffa Cake=佳發餅
+Hoe=鋤頭
+Wooden Hoe=木鋤
+Stone Hoe=石鋤
+Steel Hoe=鋼鋤頭
+Bronze Hoe=青銅鋤頭
+Mese Hoe=黃石鋤頭
+Diamond Hoe=鑽石鋤
+Hoe Bomb (use or throw on grassy areas to hoe land)=鋤彈（在草地上使用或扔在鋤地上）
+Mithril Scythe (Right-click to harvest and replant crops)=祕銀鐮刀（右擊可收穫並重新種植作物）
+Soil=土壤
+Wet Soil=溼土
+Wooden Bowl=木碗
+Saucepan=平底鍋
+Cooking Pot=鍋
+Baking Tray=烤盤
+Skillet=平底鍋
+Mortar and Pestle=研缽
+Cutting Board=砧板
+Juicer=榨汁機
+Glass Mixing Bowl=攪拌杯
+Barley Seed=大麥種子
+Barley=大麥
+Green Beans=青豆
+Bean Pole (place on soil before planting beans)=豆杆（種豆前先放在土上）
+Beetroot=甜菜根
+Beetroot Soup=甜菜根湯
+Blueberries=藍莓
+Blueberry Muffin=藍莓鬆糕
+Blueberry Pie=藍莓派
+Carrot=胡蘿蔔
+Carrot Juice=胡蘿蔔汁
+Golden Carrot=金蘿蔔
+Chili Pepper=辣椒
+Bowl of Chili=一碗辣椒
+Cocoa Beans=可可豆
+Cookie=曲奇
+Bar of Dark Chocolate=黑巧克力條
+Chocolate Block=巧克力塊
+Coffee Beans=咖啡豆
+Cup of Coffee=一杯咖啡
+Corn=玉米
+Corn on the Cob=玉米棒
+Cornstarch=玉米澱粉
+Bottle of Ethanol=一瓶乙醇
+Cotton Seed=棉籽
+Cotton=棉花
+String=字符串
+Cucumber=黃瓜
+Garlic clove=蒜瓣
+Garlic=大蒜
+Garlic Braid=蒜辮
+Grapes=葡萄
+Trellis (place on soil before planting grapes)=棚架（種植葡萄前先放在土壤上）
+Hemp Seed=大麻籽
+Hemp Leaf=大麻葉
+Bottle of Hemp Oil=一瓶大麻油
+Hemp Fibre=大麻纖維
+Hemp Block=麻塊
+Hemp Rope=麻繩
+Melon Slice=西瓜片
+Melon=甜瓜
+Onion=洋蔥
+Pea Pod=豌豆莢
+Peas=豌豆
+Pea Soup=豌豆湯
+Peppercorn=胡椒粉
+Pepper=胡椒粉
+Ground Pepper=胡椒粉
+Pineapple Top=菠蘿上衣
+Pineapple=菠蘿
+Pineapple Ring=菠蘿圈
+Pineapple Juice=菠蘿汁
+Potato=土豆
+Baked Potato=焗馬鈴薯
+Cucumber and Potato Salad=黃瓜土豆沙拉
+Pumpkin Slice=南瓜片
+Jack 'O Lantern (punch to turn on and off)=傑克燈（按一下開關）
+Scarecrow Bottom=稻草人屁股
+Pumpkin Bread=南瓜麵包
+Pumpkin Dough=南瓜麵糰
+Pumpkin=南瓜
+Raspberries=覆盆子
+Raspberry Smoothie=覆盆子冰沙
+Rhubarb=大黃
+Rhubarb Pie=大黃派
+Rye=黑麥
+Rye seed=黑麥種子
+Oat=燕麥
+Oat seed=燕麥籽
+Rice=大米
+Rice grains=稻穀
+Rice Bread=米飯麵包
+Rice Flour=米粉
+Multigrain Flour=多粒麵粉
+Multigrain Bread=雜糧麵包
+Tomato=番茄
+Wheat Seed=小麥種子
+Wheat=小麥
+Straw=稻草
+Flour=麵粉
+Bread=麵包
+Sliced Bread=切片面包
+Toast=烤麵包片
+Toast Sandwich=三明治麵包

lucky_block.lua

@@ -72,6 +72,8 @@ if minetest.get_modpath("lucky_block") then
 			{name = "farming:seed_rice", max = 15},
 			{name = "farming:seed_oat", max = 15},
 			{name = "farming:soil_wet", max = 10},
+			{name = "farming:cotton_wild", max = 5},
+			{name = "farming:grapebush", max = 5},
 		}},
 	})
 end

mapgen.lua

@@ -1,3 +1,8 @@
+-- what mapgen are we using
+local mg_name = minetest.get_mapgen_setting("mg_name")
+
+-- temp vars
+local tmp1, tmp2, tmp3
 
 -- decoration function
 local function register_plant(name, min, max, spawnon, spawnby, num, rarety)
@@ -26,7 +31,7 @@ local function register_plant(name, min, max, spawnon, spawnby, num, rarety)
 		y_max = max,
 		decoration = "farming:" .. name,
 		spawn_by = spawnby,
-		num_spawn_by = num,
+		num_spawn_by = num
 	})
 end
 
@@ -35,9 +40,6 @@ end
 register_plant("potato_3", 15, 40, nil, "", -1, farming.potato)
 register_plant("tomato_7", 5, 20, nil, "", -1, farming.tomato)
 register_plant("corn_7", 12, 22, nil, "", -1, nil)
-register_plant("coffee_5", 20, 45, {"default:dirt_with_dry_grass",
-	"default:dirt_with_rainforest_litter",
-	"default:dry_dirt_with_dry_grass"}, "", -1, farming.coffee)
 register_plant("raspberry_4", 3, 10, nil, "", -1, farming.raspberry)
 register_plant("rhubarb_3", 3, 15, nil, "", -1, farming.rhubarb)
 register_plant("blueberry_4", 3, 10, nil, "", -1, farming.blueberry)
@@ -47,16 +49,26 @@ register_plant("onion_5", 5, 22, nil, "", -1, farming.onion)
 register_plant("garlic_5", 3, 30, nil, "group:tree", 1, farming.garlic)
 register_plant("pea_5", 25, 50, nil, "", -1, farming.peas)
 register_plant("beetroot_5", 1, 15, nil, "", -1, farming.beetroot)
-register_plant("mint_4", 1, 75, {"default:dirt_with_grass",
+register_plant("cabbage_6", 2, 10, nil, "", -1, farming.cabbage)
-"default:dirt_with_coniferous_litter"}, "group:water", 1, farming.mint)
+register_plant("lettuce_5", 5, 30, nil, "", -1, farming.lettuce)
+register_plant("blackberry_4", 3, 10, nil, "", -1, farming.blackberry)
+register_plant("vanilla_7", 5, 35, nil, "", -1, farming.vanilla)
+register_plant("parsley_3", 10, 40, nil, "", -1, farming.parsley)
+register_plant("sunflower_8", 10, 40, nil, "", -1, farming.sunflower)
+register_plant("mint_4", 1, 75, {
+	"default:dirt_with_grass", "default:dirt_with_coniferous_litter"},
+	"group:water", 1, farming.mint)
 
 
-if minetest.get_mapgen_setting("mg_name") == "v6" then
+-- v6 mapgen compatibility for specific crops
+if mg_name == "v6" then
 
 	register_plant("carrot_8", 1, 30, nil, "group:water", 1, farming.carrot)
 	register_plant("cucumber_4", 1, 20, nil, "group:water", 1, farming.cucumber)
 	register_plant("melon_8", 1, 20, nil, "group:water", 1, farming.melon)
 	register_plant("pumpkin_8", 1, 20, nil, "group:water", 1, farming.pumpkin)
+	register_plant("coffee_5", 20, 45, nil, "", -1, farming.coffee)
+	register_plant("soy_6", 20, 50, nil, "", -1, farming.soy)
 else
 	-- v7 maps have a beach so plants growing near water is limited to 6 high
 	register_plant("carrot_8", 1, 15, nil, "", -1, nil)
@@ -64,8 +76,15 @@ else
 	register_plant("melon_8", 1, 6, {"default:dirt_with_dry_grass",
 		"default:dirt_with_rainforest_litter"}, "", -1, farming.melon)
 	register_plant("pumpkin_8", 1, 6, nil, "", -1, farming.pumpkin)
+	register_plant("coffee_5", 20, 45, {"default:dirt_with_dry_grass",
+		"default:dirt_with_rainforest_litter",
+		"default:dry_dirt_with_dry_grass"}, "", -1, farming.coffee)
+	register_plant("soy_6", 20, 50, {"default:dirt_with_dry_grass",
+		"default:dirt_with_rainforest_litter",
+		"default:dry_dirt_with_dry_grass"}, "", -1, farming.soy)
 end
 
+
 if farming.hemp then
 minetest.register_decoration({
 	deco_type = "simple",
@@ -83,10 +102,11 @@ minetest.register_decoration({
 	y_max = 45,
 	decoration = "farming:hemp_7",
 	spawn_by = "group:tree",
-	num_spawn_by = 1,
+	num_spawn_by = 1
 })
 end
 
+
 if farming.chili then
 minetest.register_decoration({
 	deco_type = "simple",
@@ -104,14 +124,44 @@ minetest.register_decoration({
 	y_max = 35,
 	decoration = {"farming:chili_8"},
 	spawn_by = "group:tree",
+	num_spawn_by = 1
+})
+end
+
+
+if farming.artichoke then
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_grass"},
+	sidelen = 16,
+	noise_params = {
+		offset = 0,
+		scale = tonumber(farming.artichoke) or farming.rarety,
+		spread = {x = 100, y = 100, z = 100},
+		seed = 448,
+		octaves = 3,
+		persist = 0.6
+	},
+	y_min = 1,
+	y_max = 13,
+	decoration = {"farming:artichoke_5"},
+	spawn_by = "group:tree",
 	num_spawn_by = 1,
 })
 end
 
+
 if farming.pepper then
+
+local tmp1 = {"default:dirt_with_rainforest_litter"} -- v7
+
+if mg_name == "v6" then
+	tmp1 = {"default:dirt_with_grass"} -- v6
+end
+
 minetest.register_decoration({
 	deco_type = "simple",
-	place_on = {"default:dirt_with_rainforest_litter"},
+	place_on = tmp1,
 	sidelen = 16,
 	noise_params = {
 		offset = 0,
@@ -123,16 +173,28 @@ minetest.register_decoration({
 	},
 	y_min = 5,
 	y_max = 35,
-	decoration = {"farming:pepper_5"},
+	decoration = {"farming:pepper_5", "farming:pepper_6", "farming:pepper_7"},
 	spawn_by = "group:tree",
-	num_spawn_by = 1,
+	num_spawn_by = 1
 })
 end
 
+
 if farming.pineapple then
+
+tmp1 = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"}
+tmp2 = nil
+tmp3 = -1
+
+if mg_name == "v6" then
+	tmp1 = {"default:dirt_with_grass"}
+	tmp2 = "default:desert_sand"
+	tmp3 = 1
+end
+
 minetest.register_decoration({
 	deco_type = "simple",
-	place_on = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"},
+	place_on = tmp1,
 	sidelen = 16,
 	noise_params = {
 		offset = 0,
@@ -145,13 +207,23 @@ minetest.register_decoration({
 	y_min = 18,
 	y_max = 30,
 	decoration = {"farming:pineapple_8"},
+	spawn_by = tmp2,
+	num_spawn_by = tmp3
 })
 end
 
+tmp1 = {"default:dry_dirt_with_dry_grass"}
+tmp2 = {"savanna"}
+
+if mg_name == "v6" then
+	tmp1 = {"default:dirt_with_grass"}
+	tmp2 = {"jungle"}
+end
+
 minetest.register_decoration({
 	name = "farming:cotton_wild",
 	deco_type = "simple",
-	place_on = {"default:dry_dirt_with_dry_grass"},
+	place_on = tmp1,
 	sidelen = 16,
 	noise_params = {
 		offset = -0.1,
@@ -161,8 +233,8 @@ minetest.register_decoration({
 		octaves = 3,
 		persist = 0.7
 	},
-	biomes = {"savanna"},
+	biomes = tmp2,
 	y_max = 31000,
 	y_min = 1,
-	decoration = "farming:cotton_wild",
+	decoration = "farming:cotton_wild"
 })

mod.conf

@@ -1 +1,4 @@
 name = farming
+depends = default
+optional_depends = stairs, intllib, lucky_block, toolranks
+description = Adds many plants and food to Minetest

soil.lua

@@ -148,7 +148,7 @@ minetest.register_abm({
 		if minetest.registered_nodes[nn]
 		and minetest.registered_nodes[nn].walkable
 		and minetest.get_item_group(nn, "plant") == 0 then
-			minetest.set_node(pos, {name = "default:dirt"})
+			minetest.set_node(pos, {name = ndef.soil.base})
 			return
 		end
 
@@ -172,5 +172,5 @@ minetest.register_abm({
 		and minetest.get_item_group(nn, "plant") == 0 then
 			minetest.set_node(pos, {name = ndef.soil.base})
 		end
-	end,
+	end
 })

statistics.lua

@@ -12,6 +12,7 @@ local B = 4.0 / math.pi
 local C = 2.0/(math.pi * A)
 local D = 1.0 / A
 
+
 erf = function(x)
 
 	if x == 0 then return 0; end
@@ -23,6 +24,7 @@ erf = function(x)
 	return (x > 0 and v) or -v
 end
 
+
 erf_inv = function(x)
 
 	if x == 0 then return 0; end
@@ -36,13 +38,16 @@ erf_inv = function(x)
 	return (x > 0 and v) or -v
 end
 
+
 local function std_normal(u)
 	return ROOT_2 * erf_inv(2.0 * u - 1.0)
 end
 
+
 local poisson
 local cdf_table = {}
 
+
 local function generate_cdf(lambda_index, lambda)
 
 	local max = math.ceil(4 * lambda)
@@ -59,10 +64,12 @@ local function generate_cdf(lambda_index, lambda)
 	return t
 end
 
+
 for li = 1, 100 do
 	cdf_table[li] = generate_cdf(li, 0.25 * li)
 end
 
+
 poisson = function(lambda, max)
 
 	if max < 2 then
@@ -107,6 +114,7 @@ poisson = function(lambda, max)
 	end
 end
 
+
 -- Error function.
 statistics.erf = erf
 
@@ -131,6 +139,7 @@ statistics.std_normal = function()
 	return std_normal(u)
 end
 
+
 --- Standard normal distribution function (mean 0, standard deviation 1).
  --
  -- @param mu
@@ -153,6 +162,7 @@ statistics.normal = function(mu, sigma)
 	return mu + sigma * std_normal(u)
 end
 
+
 --- Poisson distribution function.
  --
  -- @param lambda
@@ -171,4 +181,5 @@ statistics.poisson = function(lambda, max)
 	return poisson(lambda, max)
 end
 
+
 return statistics