Merge remote-tracking branch 'upstream/master'

README.md

@@ -1,19 +1,170 @@
-# Farming Redo Mod
-### by TenPlus1
+minetest mod Farming Redo
+=========================
 
-https://forum.minetest.net/viewtopic.php?id=9019
+This mod improves all food and farming related content
+
+Information
+-----------
+
+This mod must be named `farming` a simplified but improved version of the built-in farming
+mod in minetest but with more foods, it comes with wheat, cotton, carrot, cucumber,
+potato, melon, cotton, cocoa, corn, better pumpkin and tomato to start out with which
+spawn throughout the map...
+
+It also features that foods can be planted on tilled soil so for those then no seeds are required,
+original wheat and cotton will require seeds which are found inside normal and jungle grass...
+
+![screenshot.png](screenshot.png)
+
+Tech information
+----------------
 
 Farming Redo is a simplified version of the built-in farming mod in minetest and comes with wheat, cotton, carrot, cucumber, potato and tomato to start out with which spawn throughout the map... new foods need only be planted on tilled soil so no seeds are required, original wheat and cotton will require seeds which are found inside normal and jungle grass...
 
 This mod works by adding your new plant to the {growing=1} group and numbering the stages from _1 to as many stages as you like, but the underscore MUST be used only once in the node name to separate plant from stage number e.g.
 
-"farming:cotton_1"      through to   "farming:cotton_8"
-"farming:wheat_1"       through to   "farming:wheat_8"
-"farming:cucumber_4"    through to   "farming:cucumber_4"
+* "farming:cotton_1"      through to   "farming:cotton_8"
+* "farming:wheat_1"       through to   "farming:wheat_8"
+* "farming:cucumber_1"    through to   "farming:cucumber_4"
+
+https://forum.minetest.net/viewtopic.php?id=9019
+
+Farming Redo also works with Bonemeal mod for quick growing crops and saplings which can
+be found at https://notabug.org/TenPlus1/bonemeal
+
+#### Dependencies
+
+* default
+
+Optional dependences:
+
+* stairs
+* intllib (only for older engines)
+* lucky_block (adds 47 lucky blocks)
+* toolranks
+
+#### Configuration
+
+It reads the configuration values from two places, `minetest.conf` and `farming.conf`, this last
+must be at world path, if you have older place at mod path will be read but must be deprecated.
+
+
+| Configuration        | type  | default | place file   |  Notes about                             |
+| -------------------- | ----- | ------- | ------------ | ----------------------------------------- |
+| time_speed           | float |    73   | minetest.conf | Speed to grow up the plants on engine (used as base for seed) |
+| farming_stage_length | float |  160.0  | minetest.conf | Contains a value used for speed of crop growth in seconds |
+| farming.rarety       | float |  0.002  | farming.conf | default rarety of crops on map (higher number = more crops) |
+| farming.min_light    |  int  |    12   | farming.conf | default minimum and maximum light levels crops need to grow |
+| farming.max_light    |  int  |    15   | farming.conf | default minimum and maximum light levels crops need to grow |
+| farming.carrot       | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.potato       | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.tomato       | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.cucumber     | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.corn         | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.coffee       | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.melon        | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.pumpkin      | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.cocoa        |  bool |  true   | farming.conf | true or false only |
+| farming.raspberry    | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.blueberry    | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.rhubarb      | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.beans        | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.grapes       | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.barley       |  bool |  true   | farming.conf | true or false only |
+| farming.chili        | float |  0.003  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.hemp         | float |  0.003  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.garlic       | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.onion        | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.pepper       | float |  0.002  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.pineapple    | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.peas         | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.beetroot     | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.mint         | float |  0.005  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.cabbage      | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.blackberry   | float |  0.002  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.lettuce      | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.soy          | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.vanilla      | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.artichoke    | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.parsley      | float |  0.002  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.sunflower    | float |  0.001  | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+| farming.grains       |  bool |  true   | farming.conf | true or false only |
+| farming.rice         |  bool |  true   | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety |
+
+#### Nodes and food
+
+This farming mod provides a large featured basic foods production of farming:
+
+| Node name               | Description name      |
+| ----------------------- | --------------------- |
+| farming:salt            | Salt                  |
+| farming:salt_crystal    | Salt crystal          |
+| farming:rose_water      | Rose Water            |
+| farming:glass_water     | Glass of Water        |
+| farming:sugar           | Sugar                 |
+| farming:caramel         | Caramel               |
+| farming:turkish_delight | Turkish Delight       |
+| farming:garlic_bread    | Garlic Bread          |
+| farming:donut           | Donut                 |
+| farming:donut_chocolate | Chocolate Donut       |
+| farming:donut_apple     | Apple Donut           |
+| farming:porridge        | Porridge              |
+| farming:jaffa_cake      | Jaffa Cake            |
+| farming:apple_pie       | Apple Pie             |
+| farming:cactus_juice    | Cactus Juice          |
+| farming:pasta           | Pasta                 |
+| farming:spaghetti       | Spaghetti             |
+| farming:bibimbap        | Bibimbap              |
+| farming:burger          | Burger                |
+| farming:salad           | Salad                 |
+| farming:smoothie_berry  | Triple Berry Smoothie |
+| farming:spanish_potatoes | Spanish Potatoes     |
+| farming:potato_omelet   | Potato omelet         |
+| farming:paella          | Paella                |
+| farming:flan            | Vanilla Flan          |
+| farming:cheese_vegan    | Vegan Cheese          |
+| farming:onigiri         | Onirigi               |
+| farming:gyoza           | Gyoza                 |
+| farming:mochi           | Mochi                 |
+
+#### Items tools
+
+| node name               | Description           |
+| ----------------------- | --------------------- |
+| farming:scythe_mithril  | Mithril Scythe (Use to harvest and replant crops)        |
+| farming:hoe_bomb        | Hoe Bomb (use or throw on grassy areas to hoe land) |
+| farming:hoe_wood        | Wooden Hoe            |
+| farming:hoe_stone       | Stone Hoe             |
+| farming:hoe_steel       | Steel Hoe             |
+| farming:hoe_bronze      | Bronze Hoe            |
+| farming:hoe_mese        | Mese Hoe              |
+| farming:hoe_diamond     | Diamond Hoe           |
+| farming:bowl            | Wooden Bowl           |
+| farming:saucepan        | Saucepan              |
+| farming:pot             | Cooking Pot           |
+| farming:baking_tray     | Baking Tray           |
+| farming:skillet         | Skillet               |
+| farming:mortar_pestle   | Mortar and Pestle     |
+| farming:cutting_board   | Cutting Board         |
+| farming:juicer          | Juicer                |
+| farming:mixing_bowl     | Glass Mixing Bowl     |
+| moreores:hoe_silver     | Silver Hoe            |
+| moreores:hoe_mithril    | Mitril Hoe            |
+
+#### Nodes and Aliasing
+
+This mod is a direct replacement for the old Farming Plus mod and
+replaces all of it's nodes and items with one's found within
+Farming Redo.
+
+#### AMB
+
+There is one abm for new group `group:growing`.
 
 ### Changelog:
 
-- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya and vanilla (thanks Felfa), added tofu
+- NEXT - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus)
+- 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

api.txt

@@ -16,6 +16,7 @@ The farming API allows you to easily register plants and hoes.
     'minlight' min light level needed to grow
     'maxlight' max light level needed to grow
     'steps' number of steps crop has in growth cycle
+    'trellis' name of trellis node (e.g. "farming:trellis"), default: nil
 
 ### Hoe Definition
 

compatibility.lua

@@ -15,13 +15,6 @@ minetest.override_item("default:apple", {
 		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"},
-		inventory_image = "banana_single.png",
-		wield_image = "banana_single.png",
+		tiles = {"farming_banana_single.png"},
+		inventory_image = "farming_banana_single.png",
+		wield_image = "farming_banana_single.png",
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -50,9 +43,9 @@ else
 
 	minetest.register_node(":ethereal:bananaleaves", {
 		description = S("Banana Leaves"),
-		tiles = {"banana_leaf.png"},
-		inventory_image = "banana_leaf.png",
-		wield_image = "banana_leaf.png",
+		tiles = {"farming_banana_leaf.png"},
+		inventory_image = "farming_banana_leaf.png",
+		wield_image = "farming_banana_leaf.png",
 		paramtype = "light",
 		waving = 1,
 		groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
@@ -148,8 +141,8 @@ if eth then
 else
 	minetest.register_craftitem(":ethereal:strawberry", {
 		description = S("Strawberry"),
-		inventory_image = "strawberry.png",
-		wield_image = "strawberry.png",
+		inventory_image = "farming_strawberry.png",
+		wield_image = "farming_strawberry.png",
 		groups = {food_strawberry = 1, flammable = 2},
 		on_use = minetest.item_eat(1)
 	})

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

@@ -28,11 +28,10 @@ minetest.register_craftitem("farming:barley", {
 
 -- flour
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:barley", "farming:barley", "farming:barley",
-		"farming:barley", "farming:mortar_pestle"
+		{"farming:barley", "farming:barley", "farming:barley"},
+		{"farming:barley", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })

crops/beans.lua

@@ -27,7 +27,7 @@ local function place_beans(itemstack, placer, pointed_thing, plantname)
 	-- thanks to Krock for helping with this issue :)
 	local def = minetest.registered_nodes[under.name]
 	if placer and itemstack and def and def.on_rightclick then
-		return def.on_rightclick(pt.under, under, placer, itemstack)
+		return def.on_rightclick(pt.under, under, placer, itemstack, pt)
 	end
 
 	-- is player planting crop?
@@ -81,9 +81,7 @@ minetest.register_craftitem("farming:beans", {
 -- beans can be used for green dye
 minetest.register_craft({
 	output = "dye:green",
-	recipe = {
-		{"farming:beans"}
-	}
+	recipe = {{"farming:beans"}}
 })
 
 -- beanpole
@@ -122,7 +120,7 @@ minetest.register_node("farming:beanpole", {
 		-- thanks to Krock for helping with this issue :)
 		local def = minetest.registered_nodes[under.name]
 		if def and def.on_rightclick then
-			return def.on_rightclick(pt.under, under, placer, itemstack)
+			return def.on_rightclick(pt.under, under, placer, itemstack, pt)
 		end
 
 		if minetest.is_protected(pt.above, placer:get_player_name()) then
@@ -224,6 +222,7 @@ minetest.register_node("farming:beanpole_5", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:beans"] = {
+	trellis = "farming:beanpole",
 	crop = "farming:beanpole",
 	seed = "farming:beans",
 	minlight = farming.min_light,

crops/beetroot.lua

@@ -21,20 +21,17 @@ minetest.register_craftitem("farming:beetroot_soup", {
 })
 
 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_bowl"
+		{"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"},
+		{"group:food_beetroot", "group:food_bowl", "group:food_beetroot"}
 	}
 })
 
 -- red dye
 minetest.register_craft({
-	type = "shapeless",
 	output = "dye:red",
-	recipe = {"group:food_beetroot"}
+	recipe = {{"group:food_beetroot"}}
 })
 
 local def = {

crops/blueberry.lua

@@ -36,14 +36,19 @@ minetest.register_craftitem("farming:blueberry_pie", {
 
 minetest.register_craft({
 	output = "farming:blueberry_pie",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_sugar",
-		"group:food_blueberries", "group:food_baking_tray"
+		{"group:food_flour", "group:food_sugar", "group:food_blueberries"},
+		{"group:food_baking_tray", "", ""}
 	},
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
 
+-- Blue Dye
+minetest.register_craft({
+	output = "dye:blue",
+	recipe = {{"farming:blueberries"}}
+})
+
 -- blueberry definition
 local def = {
 	drawtype = "plantlike",
@@ -79,7 +84,7 @@ 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(def))

crops/carrot.lua

@@ -27,9 +27,10 @@ minetest.register_craftitem("farming:carrot_juice", {
 
 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"}

crops/chili.lua

@@ -20,20 +20,17 @@ minetest.register_craftitem("farming:chili_bowl", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:chili_bowl",
 	recipe = {
-		"group:food_chili_pepper", "group:food_barley",
-		"group:food_tomato", "group:food_beans", "group:food_bowl"
+		{"group:food_chili_pepper", "group:food_rice", "group:food_tomato"},
+		{"group:food_beans", "group:food_bowl", ""}
 	}
 })
 
 -- chili can be used for red dye
 minetest.register_craft({
 	output = "dye:red",
-	recipe = {
-		{"farming:chili_pepper"}
-	}
+	recipe = {{"farming:chili_pepper"}}
 })
 
 -- chili definition

crops/cocoa.lua

@@ -22,7 +22,7 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
 	-- thanks to Krock for helping with this issue :)
 	local def = minetest.registered_nodes[under.name]
 	if placer and itemstack and def and def.on_rightclick then
-		return def.on_rightclick(pt.under, under, placer, itemstack)
+		return def.on_rightclick(pt.under, under, placer, itemstack, pt)
 	end
 
 	-- check if pointing at jungletree
@@ -54,7 +54,7 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
 			minetest.after(0.20,
 				farming.refill_plant,
 				placer,
-				"farming:cocoa_beans",
+				"farming:cocoa_beans_raw",
 				placer:get_wield_index()
 			)
 		end
@@ -64,20 +64,31 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
 end
 
 -- cocoa beans
-minetest.register_craftitem("farming:cocoa_beans", {
-	description = S("Cocoa Beans"),
-	inventory_image = "farming_cocoa_beans.png",
-	groups = {seed = 2, food_cocoa = 1, flammable = 2},
+minetest.register_craftitem("farming:cocoa_beans_raw", {
+	description = S("Raw Cocoa Beans"),
+	inventory_image = "farming_cocoa_beans.png^[brighten",
+	groups = {seed = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1")
 	end
 })
 
+minetest.register_craftitem("farming:cocoa_beans", {
+	description = S("Cocoa Beans"),
+	inventory_image = "farming_cocoa_beans.png",
+	groups = {food_cocoa = 1, flammable = 2}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	cooktime = 5,
+	output = "farming:cocoa_beans",
+	recipe = "farming:cocoa_beans_raw"
+})
+
 minetest.register_craft( {
 	output = "dye:brown 2",
-	recipe = {
-		{ "farming:cocoa_beans" }
-	}
+	recipe = {{"farming:cocoa_beans"}}
 })
 
 -- chocolate cookie
@@ -128,9 +139,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	output = "farming:chocolate_dark 9",
-	recipe = {
-		{"farming:chocolate_block"}
-	}
+	recipe = {{"farming:chocolate_block"}}
 })
 
 -- cocoa definition
@@ -139,25 +148,23 @@ local def = {
 	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
 	},
 	sounds = default.node_sound_leaves_defaults(),
 	growth_check = function(pos, node_name)
+
 		if minetest.find_node_near(pos, 1, {"default:jungletree"}) then
-			return false
+			return false -- can grow
 		end
-		return true
+
+		return true -- cannot grow
 	end
 }
 
@@ -172,7 +179,7 @@ minetest.register_node("farming:cocoa_2", table.copy(def))
 def.tiles = {"farming_cocoa_3.png"}
 def.drop = {
 	items = {
-		{items = {"farming:cocoa_beans 1"}, rarity = 1}
+		{items = {"farming:cocoa_beans_raw 1"}, rarity = 1}
 	}
 }
 minetest.register_node("farming:cocoa_3", table.copy(def))
@@ -183,17 +190,18 @@ def.groups.growing = nil
 def.growth_check = nil
 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_raw 2"}, rarity = 1},
+		{items = {"farming:cocoa_beans_raw 1"}, rarity = 2},
+		{items = {"farming:cocoa_beans_raw 1"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:cocoa_4", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:cocoa_beans"] = {
+	trellis = "default:jungletree",
 	crop = "farming:cocoa",
-	seed = "farming:cocoa_beans",
+	seed = "farming:cocoa_beans_raw",
 	minlight = farming.min_light,
 	maxlight = farming.max_light,
 	steps = 4

crops/coffee.lua

@@ -34,29 +34,14 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass")
 
 minetest.register_craft( {
 	output = "farming:coffee_cup",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_coffee",
-		"group:water_bucket", "group:food_saucepan"},
+		{"group:food_saucepan", "group:food_coffee", "group:food_water_glass"}
+	},
 	replacements = {
-		{"group:water_bucket", "bucket:bucket_empty"},
 		{"group:food_saucepan", "farming:saucepan"}
 	}
 })
 
-if minetest.get_modpath("bucket_wooden") then
-	minetest.register_craft( {
-		output = "farming:coffee_cup",
-		type = "shapeless",
-		recipe = {
-			"vessels:drinking_glass", "group:food_coffee",
-			"group:water_bucket_wooden", "group:food_saucepan"},
-		replacements = {
-			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"},
-			{"group:food_saucepan", "farming:saucepan"}
-		}
-	})
-end
 
 -- coffee definition
 local def = {

crops/corn.lua

@@ -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, 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"}
 	}
 })
 
@@ -72,9 +91,9 @@ minetest.register_node("farming:bottle_ethanol", {
 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", "group:food_corn", "group:food_corn"},
+		{"group:food_corn", "vessels:glass_bottle", "group:food_corn"},
+		{"group:food_corn", "group:food_corn", "group:food_corn"}
 	}
 })
 
@@ -82,7 +101,7 @@ minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:bottle_ethanol",
 	burntime = 80,
-	replacements = {{ "farming:bottle_ethanol", "vessels:glass_bottle"}}
+	replacements = {{"farming:bottle_ethanol", "vessels:glass_bottle"}}
 })
 
 -- corn definition

crops/garlic.lua

@@ -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 = {

crops/grapes.lua

@@ -22,7 +22,7 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname)
 	-- thanks to Krock for helping with this issue :)
 	local def = minetest.registered_nodes[under.name]
 	if placer and itemstack and def and def.on_rightclick then
-		return def.on_rightclick(pt.under, under, placer, itemstack)
+		return def.on_rightclick(pt.under, under, placer, itemstack, pt)
 	end
 
 	-- is player planting seed?
@@ -76,9 +76,7 @@ minetest.register_craftitem("farming:grapes", {
 -- grapes can be used for violet dye
 minetest.register_craft({
 	output = "dye:violet",
-	recipe = {
-		{"farming:grapes"}
-	}
+	recipe = {{"farming:grapes"}}
 })
 
 -- trellis
@@ -117,7 +115,7 @@ minetest.register_node("farming:trellis", {
 		-- thanks to Krock for helping with this issue :)
 		local def = minetest.registered_nodes[under.name]
 		if def and def.on_rightclick then
-			return def.on_rightclick(pt.under, under, placer, itemstack)
+			return def.on_rightclick(pt.under, under, placer, itemstack, pt)
 		end
 
 		if minetest.is_protected(pt.above, placer:get_player_name()) then
@@ -231,6 +229,7 @@ minetest.register_node("farming:grapes_8", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:grapes"] = {
+	trellis = "farming:trellis",
 	crop = "farming:grapes",
 	seed = "farming:grapes",
 	minlight = farming.min_light,

crops/hemp.lua

@@ -65,7 +65,7 @@ minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:hemp_oil",
 	burntime = 20,
-	replacements = {{ "farming:hemp_oil", "vessels:glass_bottle"}}
+	replacements = {{"farming:hemp_oil", "vessels:glass_bottle"}}
 })
 
 -- hemp fibre
@@ -101,7 +101,8 @@ minetest.register_node("farming:hemp_block", {
 	description = S("Hemp Block"),
 	tiles = {"farming_hemp_block.png"},
 	paramtype = "light",
-	groups = {snappy = 1, oddly_breakable_by_hand = 1, flammable = 2}
+	groups = {snappy = 1, oddly_breakable_by_hand = 1, flammable = 2},
+	sounds =  default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft( {

crops/lettuce.lua

@@ -48,7 +48,7 @@ def.groups.growing = nil
 def.drop = {
 	items = {
 		{items = {'farming:lettuce 2'}, rarity = 1},
-		{items = {'farming:lettuce 1'}, rarity = 2},
+		{items = {'farming:lettuce 1'}, rarity = 2}
 	}
 }
 minetest.register_node("farming:lettuce_5", table.copy(def))

crops/melon.lua

@@ -21,9 +21,8 @@ minetest.register_craft({
 })
 
 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"}}
 })
 
@@ -72,17 +71,22 @@ def.tiles = {"farming_melon_7.png"}
 minetest.register_node("farming:melon_7", table.copy(def))
 
 -- stage 8 (final)
-def.drawtype = "nodebox"
-def.description = S("Melon")
-def.tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png"}
-def.selection_box = {-.5, -.5, -.5, .5, .5, .5}
-def.walkable = true
-def.groups = {
+minetest.register_node("farming:melon_8", {
+	description = S("Melon"),
+	tiles = {
+		"farming_melon_top.png",
+		"farming_melon_bottom.png",
+		"farming_melon_side.png"
+	},
+	groups = {
 		food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1,
 		flammable = 2, plant = 1
-}
-def.drop = "farming:melon_8"
-minetest.register_node("farming:melon_8", table.copy(def))
+	},
+	drop = "farming:melon_8",
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
+})
 
 -- add to registered_plants
 farming.registered_plants["farming:melon"] = {

crops/mint.lua

@@ -29,33 +29,15 @@ minetest.register_craftitem("farming:mint_tea", {
 
 minetest.register_craft({
 	output = "farming:mint_tea",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_mint",
-		"group:food_mint", "group:food_mint",
-		"farming:juicer", "group:water_bucket"
+		{"group:food_mint", "group:food_mint", "group:food_mint"},
+		{"group:food_water_glass", "farming:juicer", ""}
 	},
 	replacements = {
-		{"group:food_juicer", "farming:juicer"},
-		{"group:water_bucket", "bucket:bucket_empty"}
+		{"group:food_juicer", "farming:juicer"}
 	}
 })
 
-if minetest.get_modpath("bucket_wooden") then
-	minetest.register_craft({
-		output = "farming:mint_tea",
-		type = "shapeless",
-		recipe = {
-			"vessels:drinking_glass", "group:food_mint",
-			"group:food_mint", "group:food_mint",
-			"farming:juicer", "group:water_bucket_wooden"
-		},
-		replacements = {
-			{"group:food_juicer", "farming:juicer"},
-			{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}
-		}
-	})
-end
 
 -- mint definition
 local def = {
@@ -92,7 +74,7 @@ def.drop = {
 		{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(def))

crops/onion.lua

@@ -27,12 +27,11 @@ minetest.register_craftitem("farming:onion_soup", {
 })
 
 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_bowl"
+		{"group:food_onion", "group:food_onion", "group:food_onion"},
+		{"group:food_onion", "group:food_pot", "group:food_onion"},
+		{"", "group:food_bowl", ""}
 	},
 	replacements = {{"farming:pot", "farming:pot"}}
 })
@@ -81,7 +80,7 @@ def.drop = {
 		{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(def))

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

@@ -7,24 +7,15 @@ local S = farming.intllib
 minetest.register_craftitem("farming:pea_pod", {
 	description = S("Pea Pod"),
 	inventory_image = "farming_pea_pod.png",
-	groups = {seed = 2, food_pea_pod = 1, flammable = 2},
+	groups = {seed = 2, food_peas = 1, food_pea_pod = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "farming:pea_1")
-	end
-})
-
-minetest.register_craftitem("farming:peas", {
-	description = S("Peas"),
-	inventory_image = "farming_pea_peas.png",
-	groups = {food_peas = 1, flammable = 2},
+	end,
 	on_use = minetest.item_eat(1)
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "farming:peas",
-	recipe = {"farming:pea_pod"}
-})
+-- replacement for separate peas item that was removed
+minetest.register_alias("farming:peas", "farming:pea_pod")
 
 -- pea soup
 minetest.register_craftitem("farming:pea_soup", {
@@ -35,9 +26,12 @@ minetest.register_craftitem("farming:pea_soup", {
 })
 
 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 def = {

crops/pepper.lua

@@ -30,7 +30,7 @@ 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},
+	groups = {food_pepper = 1, flammable = 3}
 })
 
 -- red pepper
@@ -38,13 +38,12 @@ 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},
+	groups = {food_pepper = 1, flammable = 3}
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:peppercorn",
-	recipe = {"group:food_pepper"}
+	recipe = {{"group:food_pepper"}}
 })
 
 -- ground pepper
@@ -69,8 +68,11 @@ minetest.register_node("farming:pepper_ground", {
 
 minetest.register_craft( {
 	output = "farming:pepper_ground",
-	type = "shapeless",
-	recipe = {"group:food_peppercorn", "vessels:glass_bottle", "farming:mortar_pestle"},
+	recipe = {
+		{"group:food_peppercorn"},
+		{"farming:mortar_pestle"},
+		{"vessels:glass_bottle"}
+	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
@@ -124,9 +126,9 @@ minetest.register_node("farming:pepper_5", table.copy(def))
 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},
+		{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))
@@ -136,9 +138,9 @@ 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},
+		{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))

crops/pineapple.lua

@@ -38,8 +38,7 @@ minetest.register_craftitem("farming:pineapple_ring", {
 
 minetest.register_craft( {
 	output = "farming:pineapple_ring 5",
-	type = "shapeless",
-	recipe = {"group:food_pineapple"},
+	recipe = {{"group:food_pineapple"}},
 	replacements = {{"farming:pineapple", "farming:pineapple_top"}}
 })
 
@@ -53,11 +52,12 @@ minetest.register_craftitem("farming:pineapple_juice", {
 
 minetest.register_craft({
 	output = "farming:pineapple_juice",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "group:food_pineapple_ring",
-		"group:food_pineapple_ring", "group:food_pineapple_ring",
-		"farming:juicer"},
+		{"group:food_pineapple_ring", "group:food_pineapple_ring",
+				"group:food_pineapple_ring"},
+		{"", "farming:juicer", ""},
+		{"", "vessels:drinking_glass", ""}
+	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"}
 	}
@@ -65,10 +65,10 @@ minetest.register_craft({
 
 minetest.register_craft({
 	output = "farming:pineapple_juice 2",
-	type = "shapeless",
 	recipe = {
-		"vessels:drinking_glass", "vessels:drinking_glass",
-		"group:food_pineapple", "farming:juicer"
+		{"group:food_pineapple", ""},
+		{"farming:juicer", ""},
+		{"vessels:drinking_glass", "vessels:drinking_glass"}
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"}

crops/pumpkin.lua

@@ -25,9 +25,8 @@ minetest.register_craft({
 })
 
 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"}}
 })
 
@@ -122,8 +121,9 @@ minetest.register_craftitem("farming:pumpkin_dough", {
 
 minetest.register_craft({
 	output = "farming:pumpkin_dough",
-	type = "shapeless",
-	recipe = {"group:food_flour", "group:food_pumpkin_slice", "group:food_pumpkin_slice"}
+	recipe = {
+		{"group:food_pumpkin_slice", "group:food_flour", "group:food_pumpkin_slice"}
+	}
 })
 
 minetest.register_craft({
@@ -183,7 +183,7 @@ 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 = {
@@ -191,7 +191,9 @@ minetest.register_node("farming:pumpkin_8", {
 		flammable = 2, plant = 1
 	},
 	drop = "farming:pumpkin_8",
-	sounds = default.node_sound_wood_defaults()
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
 })
 
 minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")

crops/rhubarb.lua

@@ -45,7 +45,7 @@ local def = {
 	},
 	sounds = default.node_sound_leaves_defaults(),
 	minlight = 10,
-	maxlight = 12,
+	maxlight = 12
 }
 
 -- stage 1

crops/rice.lua

@@ -0,0 +1,139 @@
+
+local S = farming.intllib
+
+-- rice
+minetest.register_craftitem("farming:rice", {
+	description = S("Rice"),
+	inventory_image = "farming_rice.png",
+	groups = {seed = 2, food_rice = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:rice_1")
+	end
+})
+
+-- replacement for rice seeds that was removed
+minetest.register_alias("farming:seed_rice", "farming:rice")
+
+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}
+})
+
+minetest.register_craftitem("farming:rice_flour", {
+	description = S("Rice Flour"),
+	inventory_image = "farming_rice_flour.png",
+	groups = {food_rice_flour = 1, flammable = 1}
+})
+
+minetest.register_craft({
+	output = "farming:rice_flour",
+	recipe = {
+		{"farming:rice", "farming:rice", "farming:rice"},
+		{"farming:rice", "farming:mortar_pestle", ""}
+	},
+	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	cooktime = 15,
+	output = "farming:rice_bread",
+	recipe = "farming:rice_flour"
+})
+
+-- rice definition
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_rice_1.png"},
+	paramtype = "light",
+	paramtype2 = "meshoptions",
+	place_param2 = 3,
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop = "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 4, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:rice_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_rice_2.png"}
+minetest.register_node("farming:rice_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_rice_3.png"}
+minetest.register_node("farming:rice_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_rice_4.png"}
+minetest.register_node("farming:rice_4", table.copy(def))
+
+-- stage 5
+def.tiles = {"farming_rice_5.png"}
+def.drop = {
+	items = {
+		{items = {"farming:rice"}, rarity = 2}
+	}
+}
+minetest.register_node("farming:rice_5", table.copy(def))
+
+-- stage 6
+def.tiles = {"farming_rice_6.png"}
+def.drop = {
+	items = {
+		{items = {"farming:rice"}, rarity = 2}
+	}
+}
+minetest.register_node("farming:rice_6", table.copy(def))
+
+-- stage 7
+def.tiles = {"farming_rice_7.png"}
+def.drop = {
+	items = {
+		{items = {"farming:rice"}, rarity = 1},
+		{items = {"farming:rice"}, rarity = 3}
+	}
+}
+minetest.register_node("farming:rice_7", table.copy(def))
+
+-- stage 8 (final)
+def.tiles = {"farming_rice_8.png"}
+def.groups.growing = nil
+def.drop = {
+	items = {
+		{items = {"farming:rice 2"}, rarity = 1},
+		{items = {"farming:rice"}, rarity = 2}
+	}
+}
+minetest.register_node("farming:rice_8", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:rice"] = {
+	crop = "farming:rice",
+	seed = "farming:rice",
+	minlight = farming.min_light,
+	maxlight = farming.max_light,
+	steps = 8
+}
+
+-- fuels
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:rice",
+	burntime = 1
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:rice_bread",
+	burntime = 1
+})

crops/ryeoatrice.lua

@@ -18,12 +18,15 @@ 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:mortar_pestle"
+		{"farming:rye", "farming:rye", "farming:rye"},
+		{"farming:rye", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
@@ -43,61 +46,19 @@ 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:mortar_pestle"
+		{"farming:oat", "farming:oat", "farming:oat"},
+		{"farming:oat", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
 
--- Rice
-
-farming.register_plant("farming:rice", {
-	description = S("Rice grains"),
-	paramtype2 = "meshoptions",
-	inventory_image = "farming_rice_seed.png",
-	steps = 8,
-	place_param2 = 3
-})
-
-minetest.override_item("farming:rice", {
-	description = S("Rice"),
-	groups = {food_rice = 1, flammable = 4}
-})
-
-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}
-})
-
-minetest.register_craftitem("farming:rice_flour", {
-	description = S("Rice Flour"),
-	inventory_image = "farming_rice_flour.png",
-	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:mortar_pestle"
-	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
-})
-
-minetest.register_craft({
-	type = "cooking",
-	cooktime = 15,
-	output = "farming:rice_bread",
-	recipe = "farming:rice_flour"
-})
-
 -- Multigrain flour
 
 minetest.register_craftitem("farming:flour_multigrain", {
@@ -134,12 +95,6 @@ minetest.register_craft({
 
 -- Fuels
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "farming:rice_bread",
-	burntime = 1
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:bread_multigrain",
@@ -157,9 +112,3 @@ minetest.register_craft({
 	recipe = "farming:oat",
 	burntime = 1
 })
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "farming:rice",
-	burntime = 1
-})

crops/soy.lua

@@ -5,23 +5,46 @@ local S = farming.intllib
 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},
+	groups = {seed = 2, food_soy = 1, 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)
+-- replacement for soy beans that was removed
+minetest.register_alias("farming:soy_beans", "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()
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "farming:soy_beans",
-	recipe = {"farming:soy_pod"}
+-- 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
@@ -46,11 +69,10 @@ minetest.register_node("farming:soy_milk", {
 })
 
 minetest.register_craft( {
-	type = "shapeless",
 	output = "farming:soy_milk",
 	recipe = {
-		"group:food_soy", "group:food_soy", "group:food_soy",
-		"farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass"
+		{"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"},
@@ -68,10 +90,9 @@ minetest.register_craftitem("farming:tofu", {
 
 minetest.register_craft({
 	output = "farming:tofu",
-	type = "shapeless",
 	recipe = {
-		"farming:baking_tray", "group:food_soy", "group:food_soy",
-		"group:food_soy", "group:food_soy", "group:food_soy",
+		{"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"}}
 })
@@ -131,7 +152,7 @@ minetest.register_node("farming:soy_4", table.copy(def))
 def.tiles = {"farming_soy_5.png"}
 def.drop = {
 	max_items = 1, items = {
-		{items = {'farming:soy_pod'}, rarity = 1},
+		{items = {"farming:soy_pod"}, rarity = 1},
 	}
 }
 minetest.register_node("farming:soy_5", table.copy(def))
@@ -140,9 +161,9 @@ minetest.register_node("farming:soy_5", table.copy(def))
 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},
+		{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))
@@ -152,11 +173,11 @@ 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}
+		{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))

crops/sunflower.lua

@@ -0,0 +1,155 @@
+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_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

@@ -17,6 +17,23 @@ minetest.register_craftitem("farming:tomato", {
 	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 def = {
 	drawtype = "plantlike",

crops/vanilla.lua

@@ -8,7 +8,7 @@ minetest.register_craftitem("farming:vanilla", {
 	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),
+	on_use = minetest.item_eat(1)
 })
 
 -- crop definition
@@ -49,11 +49,11 @@ minetest.register_node("farming:vanilla_extract", {
 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"},
+		{"group:food_vanilla", "group:food_vanilla", "group:food_vanilla"},
+		{"group:food_vanilla", "farming:bottle_ethanol", "group:food_water_glass"},
 	},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"group:food_water_glass", "vessels:drinking_glass"}
 	}
 })
 
@@ -61,7 +61,7 @@ minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:vanilla_extract",
 	burntime = 25,
-	replacements = {{ "farming:vanilla_extract", "vessels:glass_bottle" }}
+	replacements = {{"farming:vanilla_extract", "vessels:glass_bottle"}}
 })
 
 -- stage 1
@@ -92,9 +92,9 @@ minetest.register_node("farming:vanilla_6", table.copy(def))
 def.tiles = {"farming_vanilla_7.png"}
 def.drop = {
 	items = {
-		{items = {'farming:vanilla'}, rarity = 1},
-		{items = {'farming:vanilla'}, rarity = 2},
-		{items = {'farming:vanilla'}, rarity = 3}
+		{items = {"farming:vanilla"}, rarity = 1},
+		{items = {"farming:vanilla"}, rarity = 2},
+		{items = {"farming:vanilla"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:vanilla_7", table.copy(def))
@@ -104,10 +104,10 @@ 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}
+		{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))

crops/wheat.lua

@@ -46,9 +46,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	output = "farming:wheat 3",
-	recipe = {
-		{"farming:straw"}
-	}
+	recipe = {{"farming:straw"}}
 })
 
 -- check and register stairs
@@ -80,11 +78,10 @@ minetest.register_craftitem("farming:flour", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:flour",
 	recipe = {
-		"farming:wheat", "farming:wheat", "farming:wheat",
-		"farming:wheat", "farming:mortar_pestle"
+		{"farming:wheat", "farming:wheat", "farming:wheat"},
+		{"farming:wheat", "farming:mortar_pestle", ""}
 	},
 	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}
 })
@@ -113,9 +110,8 @@ minetest.register_craftitem("farming:bread_slice", {
 })
 
 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"}}
 })
 

farming.conf_example

@@ -35,7 +35,11 @@ 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
+farming.rice = true
 
 -- default rarety of crops on map (higher number = more crops)
 farming.rarety = 0.002

food.lua

@@ -1,6 +1,57 @@
 
 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"}}
+})
+
+if minetest.get_modpath("bucket_wooden") then
+
+	minetest.register_craft({
+		output = "farming:glass_water 4",
+		recipe = {
+			{"vessels:drinking_glass", "vessels:drinking_glass"},
+			{"vessels:drinking_glass", "vessels:drinking_glass"},
+			{"group:water_bucket_wooden", "farming:hemp_fibre"}
+		},
+		replacements = {{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}}
+	})
+end
+
 --= Sugar
 
 minetest.register_craftitem("farming:sugar", {
@@ -16,6 +67,19 @@ minetest.register_craft({
 	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
 
@@ -33,7 +97,48 @@ minetest.register_node("farming:salt", {
 	selection_box = {
 		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 +149,41 @@ 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({
+	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", {
@@ -68,29 +208,14 @@ minetest.register_craft({
 	recipe = {
 		{"flowers:rose", "flowers:rose", "flowers:rose"},
 		{"flowers:rose", "flowers:rose", "flowers:rose"},
-		{"group:water_bucket", "group:food_pot", "vessels:glass_bottle"}
+		{"group:food_water_glass", "group:food_pot", "vessels:glass_bottle"}
 	},
 	replacements = {
-		{"group:water_bucket", "bucket:bucket_empty"},
+		{"group:food_water_glass", "vessels:drinking_glass"},
 		{"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", {
@@ -105,7 +230,7 @@ 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"},
@@ -123,9 +248,10 @@ minetest.register_craftitem("farming:garlic_bread", {
 })
 
 minetest.register_craft({
-	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)
@@ -182,11 +308,10 @@ minetest.register_craftitem("farming:porridge", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:porridge",
 	recipe = {
-		"group:food_oats", "group:food_oats", "group:food_oats",
-		"group:food_oats", "group:food_bowl", "group:food_milk_glass"
+		{"group:food_oats", "group:food_oats", "group:food_oats"},
+		{"group:food_oats", "group:food_bowl", "group:food_milk_glass"}
 	},
 	replacements = {
 		{"mobs:glass_milk", "vessels:drinking_glass"},
@@ -203,16 +328,17 @@ minetest.register_craftitem("farming:jaffa_cake", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
-	output = "farming:jaffa_cake",
+	output = "farming:jaffa_cake 3",
 	recipe = {
-		"farming:baking_tray", "group:food_egg", "group:food_sugar",
-		"group:food_flour", "group:food_cocoa", "group:food_orange",
-		"group:food_milk"
+		{"farming:baking_tray", "group:food_egg", "group:food_sugar"},
+		{"group:food_flour", "group:food_cocoa", "group:food_orange"},
+		{"group:food_milk", "", ""}
 	},
 	replacements = {
 		{"farming:baking_tray", "farming:baking_tray"},
-		{"mobs:bucket_milk", "bucket:bucket_empty"}
+		{"mobs:bucket_milk", "bucket:bucket_empty"},
+		{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"},
+		{"farming:soy_milk", "vessels:drining_glass"}
 	}
 })
 
@@ -226,10 +352,9 @@ minetest.register_craftitem("farming:apple_pie", {
 
 minetest.register_craft({
 	output = "farming:apple_pie",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_sugar",
-		"group:food_apple", "group:food_baking_tray"
+		{"group:food_flour", "group:food_sugar", "group:food_apple"},
+		{"", "group:food_baking_tray", ""}
 	},
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
@@ -254,11 +379,11 @@ minetest.register_craftitem("farming:cactus_juice", {
 })
 
 minetest.register_craft({
-	output = "farming:cactus_juice 2",
-	type = "shapeless",
+	output = "farming:cactus_juice",
 	recipe = {
-		"vessels:drinking_glass", "vessels:drinking_glass",
-		"default:cactus", "farming:juicer"
+		{"default:cactus"},
+		{"farming:juicer"},
+		{"vessels:drinking_glass"}
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"}
@@ -273,30 +398,39 @@ minetest.register_craftitem("farming:pasta", {
 	groups = {food_pasta = 1}
 })
 
-if minetest.get_modpath("mobs_animal") or minetest.get_modpath("xanadu")then
 minetest.register_craft({
 	output = "farming:pasta",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_mixing_bowl",
-		"group:food_butter"
+		{"group:food_flour", "group:food_butter", "group:food_mixing_bowl"}
 	},
 	replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}}
 })
-else
+
 minetest.register_craft({
 	output = "farming:pasta",
-	type = "shapeless",
 	recipe = {
-		"group:food_flour", "group:food_mixing_bowl",
-		"group:food_oil"
+		{"group:food_flour", "group:food_oil", "group:food_mixing_bowl"}
 	},
 	replacements = {
 		{"group:food_mixing_bowl", "farming:mixing_bowl"},
 		{"group:food_oil", "vessels:glass_bottle"}
 	}
 })
-end
+
+-- Mac & Cheese
+
+minetest.register_craftitem("farming:mac_and_cheese", {
+	description = S("Mac & Cheese"),
+	inventory_image = "farming_mac_and_cheese.png",
+	on_use = minetest.item_eat(6, "farming:bowl")
+})
+
+minetest.register_craft({
+	output = "farming:mac_and_cheese",
+	recipe = {
+		{"group:food_pasta", "group:food_cheese", "group:food_bowl"}
+	}
+})
 
 -- Spaghetti
 
@@ -308,10 +442,9 @@ minetest.register_craftitem("farming:spaghetti", {
 
 minetest.register_craft({
 	output = "farming:spaghetti",
-	type = "shapeless",
 	recipe = {
-		"group:food_pasta", "group:food_saucepan",
-		"group:food_tomato", "group:food_garlic_clove", "group:food_garlic_clove"
+		{"group:food_pasta", "group:food_saucepan", "group:food_tomato"},
+		{"group:food_garlic_clove", "group:food_garlic_clove", ""}
 	},
 	replacements = {{"group:food_saucepan", "farming:saucepan"}}
 })
@@ -324,18 +457,16 @@ minetest.register_craftitem("farming:bibimbap", {
 	on_use = minetest.item_eat(8, "farming:bowl")
 })
 
-if minetest.get_modpath("mobs_animal") or minetest.get_modpath("xanadu")then
 minetest.register_craft({
 	output = "farming:bibimbap",
-	type = "shapeless",
 	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"
+		{"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"}}
 })
-else
+
 minetest.register_craft({
 	output = "farming:bibimbap",
 	type = "shapeless",
@@ -346,7 +477,6 @@ minetest.register_craft({
 	},
 	replacements = {{"group:food_skillet", "farming:skillet"}}
 })
-end
 
 -- Burger
 
@@ -357,12 +487,11 @@ minetest.register_craftitem("farming:burger", {
 })
 
 minetest.register_craft({
-	type = "shapeless",
 	output = "farming:burger",
 	recipe = {
-		"farming:bread", "group:food_meat", "group:food_cheese",
-		"group:food_tomato", "group:food_cucumber", "group:food_onion",
-		"group:food_lettuce"
+		{"farming:bread", "group:food_meat", "group:food_cheese"},
+		{"group:food_tomato", "group:food_cucumber", "group:food_onion"},
+		{"group:food_lettuce", "", ""}
 	}
 })
 
@@ -380,7 +509,7 @@ minetest.register_craft({
 	recipe = {
 		"group:food_bowl", "group:food_tomato", "group:food_cucumber",
 		"group:food_lettuce", "group:food_oil"
-	},
+	}
 })
 
 -- Triple Berry Smoothie
@@ -401,3 +530,177 @@ minetest.register_craft({
 		"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"},
+		{"mobs:bucket_milk", "bucket:bucket_empty"},
+		{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_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

@@ -39,7 +39,7 @@ minetest.override_item("default:junglegrass", {
 		max_items = 1,
 		items = {
 			{items = {"farming:seed_cotton"}, rarity = 8},
-			{items = {"farming:seed_rice"},rarity = 8},
+			{items = {"farming:rice"},rarity = 8},
 			{items = {"default:junglegrass"}}
 		}
 	}

hoes.lua

@@ -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"},
 

init.lua

@@ -7,7 +7,7 @@
 
 farming = {
 	mod = "redo",
-	version = "20201213",
+	version = "20220603",
 	path = minetest.get_modpath("farming"),
 	select = {
 		type = "fixed",
@@ -29,8 +29,27 @@ end
 local statistics = dofile(farming.path .. "/statistics.lua")
 
 -- Intllib
-local S = minetest.get_translator and minetest.get_translator("farming") or
-		dofile(farming.path .. "/intllib.lua")
+local S
+if minetest.get_translator ~= nil then
+	S = minetest.get_translator("farming") -- 5.x translation function
+else
+	if minetest.get_modpath("intllib") then
+		dofile(minetest.get_modpath("intllib") .. "/init.lua")
+		if intllib.make_gettext_pair then
+			gettext, ngettext = intllib.make_gettext_pair() -- new gettext method
+		else
+			gettext = intllib.Getter() -- old text file method
+		end
+		S = gettext
+	else -- boilerplate function
+		S = function(str, ...)
+			local args = {...}
+			return str:gsub("@%d+", function(match)
+				return args[tonumber(match:sub(2))]
+			end)
+		end
+	end
+end
 
 farming.intllib = S
 
@@ -340,7 +359,6 @@ function farming.plant_growth_timer(pos, elapsed, node_name)
 	if max_growth == 1 or lambda < 2.0 then
 
 		local light = (minetest.get_node_light(light_pos) or 0)
-		--print ("light level:", light)
 
 		if light < MIN_LIGHT or light > MAX_LIGHT then
 			return true
@@ -389,7 +407,12 @@ end
 -- refill placed plant by crabman (26/08/2015) updated by TenPlus1
 function farming.refill_plant(player, plantname, index)
 
+	if not player then return end
+
 	local inv = player:get_inventory()
+
+	if not inv then return end
+
 	local old_stack = inv:get_stack("main", index)
 
 	if old_stack:get_name() ~= "" then
@@ -426,7 +449,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname)
 	-- thanks to Krock for helping with this issue :)
 	local def = minetest.registered_nodes[under.name]
 	if placer and itemstack and def and def.on_rightclick then
-		return def.on_rightclick(pt.under, under, placer, itemstack)
+		return def.on_rightclick(pt.under, under, placer, itemstack, pt)
 	end
 
 	local above = minetest.get_node(pt.above)
@@ -475,7 +498,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname)
 			-- check for refill
 			if itemstack:get_count() == 0 then
 
-				minetest.after(0.10,
+				minetest.after(0.2,
 					farming.refill_plant,
 					placer,
 					name,
@@ -633,7 +656,11 @@ 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.rice = true
 farming.rarety = 0.002
 
 
@@ -697,12 +724,16 @@ ddoo("peas.lua", farming.peas)
 ddoo("beetroot.lua", farming.beetroot)
 ddoo("chili.lua", farming.chili)
 ddoo("ryeoatrice.lua", farming.grains)
+ddoo("rice.lua", farming.rice)
 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")

intllib.lua

@@ -1,45 +0,0 @@
-
--- Fallback functions for when `intllib` is not installed.
--- Code released under Unlicense <http://unlicense.org>.
-
--- Get the latest version of this file at:
---   https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
-
-local function format(str, ...)
-	local args = { ... }
-	local function repl(escape, open, num, close)
-		if escape == "" then
-			local replacement = tostring(args[tonumber(num)])
-			if open == "" then
-				replacement = replacement..close
-			end
-			return replacement
-		else
-			return "@"..open..num..close
-		end
-	end
-	return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
-end
-
-local gettext, ngettext
-if minetest.get_modpath("intllib") then
-	if intllib.make_gettext_pair then
-		-- New method using gettext.
-		gettext, ngettext = intllib.make_gettext_pair()
-	else
-		-- Old method using text files.
-		gettext = intllib.Getter()
-	end
-end
-
--- Fill in missing functions.
-
-gettext = gettext or function(msgid, ...)
-	return format(msgid, ...)
-end
-
-ngettext = ngettext or function(msgid, msgid_plural, n, ...)
-	return format(n==1 and msgid or msgid_plural, ...)
-end
-
-return gettext, ngettext

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
@@ -155,3 +160,26 @@ Created by Felfa (CC0)
   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
+
+Created by DMBuce (MIT - https://github.com/DMBuce/hatchling-snacks)
+  farming_mac_and_cheese.png

locale/de.txt

@@ -2,7 +2,8 @@
 # textdomain: farming
 # author: Xanthin
 # author: TheDarkTiger
-# last update: 2020/Apr/26
+# author: SwissalpS
+# last update: 2022/Feb/26
 
 ###### folder . ######
 
@@ -10,22 +11,22 @@
 Seed=Saatgut
 
 ### compatibility.lua ###
-Banana=
-Banana Leaves=
-Orange=
-Strawberry=
+Banana=Banane
+Banana Leaves=Bananenblätter
+Orange=Apfelsine
+Strawberry=Erdbeere
 
 ### food.lua ###
 Sugar=Zucker
-Salt=
-Rose Water=
-Turkish Delight=
-Garlic Bread=
+Salt=Salz
+Rose Water=Rosenwasser
+Turkish Delight=Lokum
+Garlic Bread=Knoblauchbrot
 Donut=Donut
 Chocolate Donut=Schokodonut
 Apple Donut=Apfeldonut
-Porridge=
-Jaffa Cake=
+Porridge=Haferbrei
+Jaffa Cake=Jaffakeks
 
 ### hoes.lua ###
 Hoe=Hacke
@@ -36,8 +37,8 @@ Bronze Hoe=Bronzehacke
 Mese Hoe=Mesehacke
 Diamond Hoe=Diamanthacke
 # Surcharge du mod [Toolranks] à faire #
-Hoe Bomb (use or throw on grassy areas to hoe land)=
-Mithril Scythe (Right-click to harvest and replant crops)=
+Hoe Bomb (use or throw on grassy areas to hoe land)=Hackbombe (Auf Grasland werfen oder benutzen)
+Mithril Scythe (Right-click to harvest and replant crops)=Mithril-Sense (Rechts-Klick zum Ernten und Wiedereinpflanzen)
 # Surcharge du mod [Toolranks] à faire #
 
 ### soil.lua ###
@@ -45,15 +46,15 @@ Soil=Ackerboden
 Wet Soil=Bewässerter Ackerboden
 
 ### utensils.lua ###
-Wooden Bowl=
-Saucepan=
-Cooking Pot=
-Baking Tray=
-Skillet=
-Mortar and Pestle=
-Cutting Board=
-Juicer=
-Glass Mixing Bowl=
+Wooden Bowl=Holzschale
+Saucepan=Kasserolle
+Cooking Pot=Kochtopf
+Baking Tray=Kuchenblech
+Skillet=Bratpfanne
+Mortar and Pestle=Mörser und Stößel
+Cutting Board=Schneidebrett
+Juicer=Entsafter
+Glass Mixing Bowl=Glasschüssel
 
 
 ###### folder ./crops ######
@@ -67,28 +68,28 @@ Green Beans=Grüne Bohnen
 Bean Pole (place on soil before planting beans)=Bohnenstange (vor dem Pflanzen der Bohnen auf den\nAckerboden stellen)
 
 ### beetroot.lua ###
-Beetroot=
-Beetroot Soup=
+Beetroot=Rote Beete
+Beetroot Soup=Rote Beete Suppe
 
 ### blueberry.lua ###
 Blueberries=Blaubeeren
 Blueberry Muffin=Blaubeermuffin
-Blueberry Pie=
+Blueberry Pie=Blaubeerkuchen
 
 ### carrot.lua ##
 Carrot=Möhre
-Carrot Juice=
+Carrot Juice=Möhrensaft
 Golden Carrot=Goldene Möhre
 
 ### chili.lua ###
-Chili Pepper=
-Bowl of Chili=
+Chili Pepper=Chili
+Bowl of Chili=Chili Schale
 
 ### cocoa.lua ###
 Cocoa Beans=Kakaobohne
 Cookie=Keks
 Bar of Dark Chocolate=Tafel Zartbitterschokolade
-Chocolate Block=
+Chocolate Block=Schokoladenstück
 
 ### coffee.lua ###
 Coffee Beans=Kaffeebohnen
@@ -97,21 +98,21 @@ Cup of Coffee=Tasse Kaffee
 ### corn.lua ###
 Corn=Mais
 Corn on the Cob=Maiskolben
-Cornstarch=
+Cornstarch=Speisestärke
 Bottle of Ethanol=Flasche Ethanol
 
 ### cotton.lua ###
 Cotton Seed=Baumwollsamen
 Cotton=Baumwolle
-String=
+String=Faden
 
 ### cucumber.lua ###
 Cucumber=Gurke
 
 ### garlic.lua ###
-Garlic clove=
-Garlic=
-Garlic Braid=
+Garlic clove=Knoblauchzehe
+Garlic=Knoblauch
+Garlic Braid=Knoblauchzopf
 
 ### grapes.lua ###
 Grapes=Weintrauben
@@ -122,7 +123,7 @@ Hemp Seed=Hanfsamen
 Hemp Leaf=Hanfblatt
 Bottle of Hemp Oil=Flasche mit Hanföl
 Hemp Fibre=Hanffaser
-Hemp Block=
+Hemp Block=Hanfblock
 Hemp Rope=Hanfseil
 
 ### melon.lua ###
@@ -130,33 +131,33 @@ Melon Slice=Melonenscheibe
 Melon=Melone
 
 ### onion.lua ###
-Onion=
+Onion=Zwiebel
 
 ### peas.lua ###
-Pea Pod=
-Peas=
-Pea Soup=
+Pea Pod=Erbsenschote
+Peas=Erbsen
+Pea Soup=Erbsensuppe
 
 ### pepper.lua ###
-Peppercorn=
-Pepper=
-Ground Pepper=
+Peppercorn=Pfefferkorn
+Pepper=Pfeffer
+Ground Pepper=Gemahlener Pfeffer
 
 ### pinapple.lua ###
-Pineapple Top=
-Pineapple=
-Pineapple Ring=
-Pineapple Juice=
+Pineapple Top=Ananasdeckel
+Pineapple=Ananas
+Pineapple Ring=Ananasscheibe
+Pineapple Juice=Ananassaft
 
 ### potato.lua ###
 Potato=Kartoffel
 Baked Potato=Ofenkartoffel
-Cucumber and Potato Salad=
+Cucumber and Potato Salad=Gurken und Tomatensalat
 
 ### pumpkin.lua ###
 Pumpkin Slice=Kürbisscheibe
 Jack 'O Lantern (punch to turn on and off)=Kürbislaterne (Punch zum Ein- und Ausschalten)
-Scarecrow Bottom=
+Scarecrow Bottom=Vogelscheuchengestell
 Pumpkin Bread=Kürbisbrot
 Pumpkin Dough=Kürbisteig
 Pumpkin=Kürbis
@@ -170,16 +171,16 @@ Rhubarb=Rhabarber
 Rhubarb Pie=Rhabarberkuchen
 
 ### ryeoatrice.lua ###
-Rye=
-Rye seed=
-Oat=
-Oat seed=
-Rice=
-Rice grains=
-Rice Bread=
-Rice Flour=
-Multigrain Flour=
-Multigrain Bread=
+Rye=Roggen
+Rye seed=Roggensaat
+Oat=Hafer
+Oat seed=Hafersamen
+Rice=Reis
+Rice grains=Reissaat
+Rice Bread=Reiswaffel
+Rice Flour=Reismehl
+Multigrain Flour=Mehrkornmehl
+Multigrain Bread=Mehrkornbrot
 
 ### tomato.lua ###
 Tomato=Tomate
@@ -190,6 +191,6 @@ Wheat=Weizen
 Straw=Stroh
 Flour=Mehl
 Bread=Brot
-Sliced Bread=
-Toast=
-Toast Sandwich=
+Sliced Bread=Geschnittenes Brot
+Toast=Toast
+Toast Sandwich=Toast Sandwich

locale/es.txt

@@ -0,0 +1,195 @@
+# Translation of the farming mod by TenPlus1
+# textdomain: farming
+# author: PICCORO Lenz McKAY <mckaygerhard@gmail.com>
+# author: SwissalpS
+# last update: 2022/Feb/26
+
+###### folder . ######
+
+### init.lua ###
+Seed=Semilla
+
+### compatibility.lua ###
+Banana=Banana
+Banana Leaves=Hojas de banana
+Orange=Naranja
+Strawberry=Fresa
+
+### food.lua ###
+Sugar=Azúcar
+Salt=Sal
+Rose Water=Agua de rosa
+Turkish Delight=Delicia turca
+Garlic Bread=Pan de ajo
+Donut=Dona
+Chocolate Donut=Dona de chocolate
+Apple Donut=Dona de manzana
+Porridge=Papilla
+Jaffa Cake=Pastel de jaffa
+
+### hoes.lua ###
+Hoe=Azadón
+Wooden Hoe=Azadón de madera
+Stone Hoe=Azadón de piedra
+Steel Hoe=Azadón de acero
+Bronze Hoe=Azadón de bronze
+Mese Hoe=Azadón de mese
+Diamond Hoe=Azadón de diamante
+# Surcharge du mod [Toolranks] à faire #
+Hoe Bomb (use or throw on grassy areas to hoe land)=Azadón bomba (usar o tirar en áreas verdes para rozar)
+Mithril Scythe (Right-click to harvest and replant crops)=Guadaña de mithril (clic derecho para cosechar y replantar cultivos)
+# Surcharge du mod [Toolranks] à faire #
+
+### soil.lua ###
+Soil=Suelo
+Wet Soil=Suelo mojado
+
+### utensils.lua ###
+Wooden Bowl=Cuenco de madera
+Saucepan=Cacerola
+Cooking Pot=Olla
+Baking Tray=Bandeja de hornear
+Skillet=Sarten
+Mortar and Pestle=Mortero y maja
+Cutting Board=Tabla de cortar
+Juicer=Exprimidor
+Glass Mixing Bowl=Tazón de vidrio para mezclar
+
+
+###### folder ./crops ######
+
+### barley.lua ###
+Barley Seed=Semilla de cebada
+Barley=Cebada
+
+### beans.lua ###
+Green Beans=Frijoles verdes
+Bean Pole (place on soil before planting beans)=Base de frijol (colocar en el suelo antes de plantar frijoles)
+
+### beetroot.lua ###
+Beetroot=Remolacha
+Beetroot Soup=Sopa de remolacha
+
+### blueberry.lua ###
+Blueberries=Arándanos
+Blueberry Muffin=Muffin de arándanos
+Blueberry Pie=Pastel de arándanos
+
+### carrot.lua ##
+Carrot=Zanahoria
+Carrot Juice=Jugo de zanahoria
+Golden Carrot=Zanahoria dorada
+
+### chili.lua ###
+Chili Pepper=Ají picante
+Bowl of Chili=Tazón de chili
+
+### cocoa.lua ###
+Cocoa Beans=Granos de cacao
+Cookie=Galleta
+Bar of Dark Chocolate=Barra de chocolate negro
+Chocolate Block=Bloque de chocolate
+
+### coffee.lua ###
+Coffee Beans=Granos de café
+Cup of Coffee=Taza de café
+
+### corn.lua ###
+Corn=Maíz
+Corn on the Cob=Mazorca de maíz
+Cornstarch=Almidón de maíz
+Bottle of Ethanol=Botella de etanol
+
+### cotton.lua ###
+Cotton Seed=Semilla de algodón
+Cotton=Algodón
+String=Guita
+
+### cucumber.lua ###
+Cucumber=Pepino
+
+### garlic.lua ###
+Garlic clove=Diente de ajo
+Garlic=Ajo
+Garlic Braid=Trenza de ajo
+
+### grapes.lua ###
+Grapes=Uvas
+Trellis (place on soil before planting grapes)=Enrejado (colocar en el suelo antes de plantar las uvas)
+
+### hemp.lua ###
+Hemp Seed=Semilla de cáñamo
+Hemp Leaf=Hoja de cáñamo
+Bottle of Hemp Oil=Botella de aceite de cáñamo
+Hemp Fibre=Fibra de cáñamo
+Hemp Block=Bloque de cáñamo
+Hemp Rope=Cuerda de cáñamo
+
+### melon.lua ###
+Melon Slice=Rebanada de sandía
+Melon=Sandía
+
+### onion.lua ###
+Onion=Cebolla
+
+### peas.lua ###
+Pea Pod=Vaina de guisantes
+Peas=Guisantes
+Pea Soup=Sopa de guisantes
+
+### pepper.lua ###
+Peppercorn=Grano de pimienta
+Pepper=Pimienta
+Ground Pepper=Pimienta molida
+
+### pinapple.lua ###
+Pineapple Top=Tapa de piña
+Pineapple=Piña
+Pineapple Ring=Anillo de piña
+Pineapple Juice=Jugo de piña
+
+### potato.lua ###
+Potato=Patata
+Baked Potato=Patata al horno
+Cucumber and Potato Salad=Ensalada de pepino y patata
+
+### pumpkin.lua ###
+Pumpkin Slice=Pedazo de calabaza
+Jack 'O Lantern (punch to turn on and off)=Farol de Jack (golpea para encender o apagar)
+Scarecrow Bottom=Espantapájaros abajo
+Pumpkin Bread=Pan de calabaza
+Pumpkin Dough=Masa de calabaza
+Pumpkin=Calabaza
+
+### raspberry.lua ###
+Raspberries=Frambuesa
+Raspberry Smoothie=Batido de frambuesa
+
+### rhubarb.lua ###
+Rhubarb=Ruibarbo
+Rhubarb Pie=Pastel de ruibarbo
+
+### ryeoatrice.lua ###
+Rye=Centeno
+Rye seed=Semilla de centeno
+Oat=Avena
+Oat seed=Semilla de avena
+Rice=Arroz
+Rice grains=Granos de arroz
+Rice Bread=Pan de arroz
+Rice Flour=Harina de arroz
+Multigrain Flour=Harina multigrano
+Multigrain Bread=Pan multicereales
+
+### tomato.lua ###
+Tomato=Tomate
+
+### wheat.lua ###
+Wheat Seed=Semilla de trigo
+Wheat=Trigo
+Straw=Paja
+Flour=Harina
+Bread=Pan
+Sliced Bread=Pan rebanado
+Toast=Tostadas
+Toast Sandwich=Emparedado de tostadas

locale/farming.de.tr

@@ -1,94 +1,94 @@
 # textdomain:farming
-#%s Hoe=
+%s Hoe=%s Hacke
 Apple Donut=Apfeldonut
-#Apple Pie=
+Apple Pie=Apfelkuchen
 Baked Potato=Ofenkartoffel
-#Baking Tray=
-#Banana=
-#Banana Leaves=
+Baking Tray=Kuchenblech
+Banana=Banane
+Banana Leaves=Bananenblätter
 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=
-#Beetroot Soup=
-#Bibimbap=
+Beetroot=Rote Beete
+Beetroot Soup=Rote Beete Suppe
+Bibimbap=Bibimbap
 Wild Blueberries=Wilde Blaubeeren
 Blueberry Muffin=Blaubeermuffin
-#Blueberry Pie=
+Blueberry Pie=Blaubeerkuchen
 Bottle of Ethanol=Flasche Ethanol
 Bottle of Hemp Oil=Flasche mit Hanföl
-#Bowl of Chili=
+Bowl of Chili=Chili Schale
 Bread=Brot
 Bronze Hoe=Bronzehacke
-#Cabbage=
-#Cactus Juice=
+Cabbage=Kohl
+Cactus Juice=Kaktussaft
 Carrot=Möhre
-#Carrot Juice=
-#Chili Pepper=
-#Chocolate Block=
+Carrot Juice=Möhrensaft
+Chili Pepper=Chili
+Chocolate Block=Schokoladenstück
 Chocolate Donut=Schokodonut
 Cocoa Beans=Kakaobohne
 Coffee Beans=Kaffeebohnen
 Cookie=Keks
-#Cooking Pot=
+Cooking Pot=Kochtopf
 Corn=Mais
 Corn on the Cob=Maiskolben
-#Cornstarch=
+Cornstarch=Speisestärke
 Cotton=Baumwolle
 Cotton Seed=Baumwollsamen
 Cucumber=Gurke
-#Cucumber and Potato Salad=
+Cucumber and Potato Salad=Gurken und Tomatensalat
 Cup of Coffee=Tasse Kaffee
-#Cutting Board=
+Cutting Board=Schneidebrett
 Diamond Hoe=Diamanthacke
 Donut=Donut
 Flour=Mehl
-#Garlic=
-#Garlic Braid=
-#Garlic Bread=
-#Garlic clove=
-#Glass Mixing Bowl=
+Garlic=Knoblauch
+Garlic Braid=Knoblauchzopf
+Garlic Bread=Knoblauchbrot
+Garlic clove=Knoblauchzehe
+Glass Mixing Bowl=Glasschüssel
 Golden Carrot=Goldene Möhre
 Grapes=Weintrauben
 Green Beans=Grüne Bohnen
-#Ground Pepper=
-#Hemp Block=
+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)=
+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=
-#Juicer=
+Jaffa Cake=Jaffakeks
+Juicer=Entsafter
 Melon=Melone
 Melon Slice=Melonenscheibe
 Mese Hoe=Mesehacke
-#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=
+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
@@ -98,37 +98,38 @@ Raspberries=Himbeeren
 Raspberry Smoothie=Himbeersmoothie
 Rhubarb=Rhabarber
 Rhubarb Pie=Rhabarberkuchen
-#Rice=
-#Rice Bread=
-#Rice Flour=
-#Rice grains=
-#Rose Water=
-#Rye=
-#Rye seed=
-#Salt=
-#Saucepan=
-#Savanna Soil=
-#Scarecrow Bottom=
+Rice=Reis
+Rice Bread=Reiswaffel
+Rice Flour=Reismehl
+Rice grains=Reissaat
+Rose Water=Rosenwasser
+Rye=Roggen
+Rye seed=Roggensaat
+Salt=Salz
+Salad=Salat
+Saucepan=Kasserolle
+Savanna Soil=Savannaerde
+Scarecrow Bottom=Vogelscheuchengestell
 Seed=Saatgut
-#Skillet=
-#Sliced Bread=
+Skillet=Bratpfanne
+Sliced Bread=Geschnittenes Brot
 Soil=Ackerboden
-#Spaghetti=
+Spaghetti=Spaghetti
 Steel Hoe=Stahlhacke
 Stone Hoe=Steinhacke
 Straw=Stroh
-#Strawberry=
-#String=
+Strawberry=Erdbeere
+String=Faden
 Sugar=Zucker
-#Toast=
-#Toast Sandwich=
+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=
-#Wet Savanna Soil=
+Turkish Delight=Lokum
+Wet Savanna Soil=Feuchte Savannaerde
 Wet Soil=Bewässerter Ackerboden
 Wheat=Weizen
 Wheat Seed=Weizenkörner
-#Wild Cotton=
-#Wooden Bowl=
+Wild Cotton=Wilde Baumwolle
+Wooden Bowl=Holzschale
 Wooden Hoe=Holzhacke

locale/farming.es.tr

@@ -0,0 +1,134 @@
+# textdomain:farming
+%s Hoe=%s Azadón
+Apple Donut=Dona de manzana
+Apple Pie=Pastel de manzana
+Baked Potato=Patata al horno
+Baking Tray=Bandeja de hornear
+Banana=Banana
+Banana Leaves=Hojas de banana
+Bar of Dark Chocolate=Barra de chocolate negro
+Barley=Cebada
+Barley Seed=Semilla de cebada
+Bean Pole (place on soil before planting beans)=Base de frijol (colocar en el suelo antes de plantar frijoles)
+Beetroot=Remolacha
+Beetroot Soup=Sopa de remolacha
+#Bibimbap=
+Wild Blueberries=Arándanos silvestres
+Blueberry Muffin=Muffin de arándanos
+Blueberry Pie=Pastel de arándanos
+Bottle of Ethanol=Botella de etanol
+Bottle of Hemp Oil=Botella de aceite de cáñamo
+Bowl of Chili=Tazón de chili
+Bread=Pan
+Bronze Hoe=Azadón de bronze
+Cabbage=Repollo
+Cactus Juice=Jugo de cactus
+Carrot=Zanahoria
+Carrot Juice=Jugo de zanahoria
+Chili Pepper=Ají picante
+Chocolate Block=Bloque de chocolate
+Chocolate Donut=Dona de chocolate
+Cocoa Beans=Granos de cacao
+Coffee Beans=Granos de café
+Cookie=Galleta
+Cooking Pot=Olla
+Corn=Maíz
+Corn on the Cob=Mazorca de maíz
+Cornstarch=Almidón de maíz
+Cotton=Algodón
+Cotton Seed=Semilla de algodón
+Cucumber=Pepino
+Cucumber and Potato Salad=Ensalada de pepino y patata
+Cup of Coffee=Taza de café
+Cutting Board=Tabla de cortar
+Diamond Hoe=Azadón de diamante
+Donut=Dona
+Flour=Harina
+Garlic=Ajo
+Garlic Braid=Trenza de ajo
+Garlic Bread=Pan de ajo
+Garlic clove=Diente de ajo
+Glass Mixing Bowl=Tazón de vidrio para mezclar
+Golden Carrot=Zanahoria dorada
+Grapes=Uvas
+Green Beans=Frijoles verdes
+Ground Pepper=Pimienta molida
+Hemp Block=Bloque de cáñamo
+Hemp Fibre=Fibra de cáñamo
+Hemp Leaf=Hoja de cáñamo
+Hemp Rope=Cuerda de cáñamo
+Hemp Seed=Semilla de cáñamo
+Hoe=Azadón
+Hoe Bomb (use or throw on grassy areas to hoe land)=Azadón bomba (usar o tirar en áreas verdes para rozar)
+Jack 'O Lantern (punch to turn on and off)=Farol de Jack (golpea para encender o apagar)
+Jaffa Cake=Pastel de jaffa
+Juicer=Exprimidor
+Melon=Sandía
+Melon Slice=Rebanada de sandía
+Mese Hoe=Azadón de mese
+Mint Leaf=Hoja de menta
+Mint Seeds=Semilla de menta
+Mint Tea=Té de menta
+Mithril Scythe (Right-click to harvest and replant crops)=Guadaña de mithril (clic derecho para cosechar y replantar cultivos)
+Mortar and Pestle=Mortero y maja
+Multigrain Bread=Pan multicereales
+Multigrain Flour=Harina multigrano
+Oat seed=Semilla de avena
+Oats=Avena
+Onion=Cebolla
+Onion Soup=Sopa de cebolla
+Orange=Naranja
+Pasta=Pasta
+Pea Pod=Vaina de guisantes
+Pea Soup=Sopa de guisantes
+Peas=Guisantes
+Pepper=Pimienta
+Peppercorn=Grano de pimienta
+Pineapple=Piña
+Pineapple Juice=Jugo de piña
+Pineapple Ring=Anillo de piña
+Pineapple Top=Tapa de piña
+Porridge=Papilla
+Potato=Patata
+Pumpkin=Calabaza
+Pumpkin Bread=Pan de calabaza
+Pumpkin Dough=Masa de calabaza
+Pumpkin Slice=Pedazo de calabaza
+Raspberries=Frambuesa
+Raspberry Smoothie=Batido de frambuesa
+Rhubarb=Ruibarbo
+Rhubarb Pie=Pastel de ruibarbo
+Rice=Arroz
+Rice Bread=Pan de arroz
+Rice Flour=Harina de arroz
+Rice grains=Granos de arroz
+Rose Water=Agua de rosa
+Rye=Centeno
+Rye seed=Semilla de centeno
+Salt=Sal
+Saucepan=Cacerola
+Savanna Soil=Suelo de sabana
+Scarecrow Bottom=Espantapájaros abajo
+Seed=Semilla
+Skillet=Sarten
+Sliced Bread=Pan rebanado
+Soil=Suelo
+Spaghetti=Espaguetis
+Steel Hoe=Azadón de acero
+Stone Hoe=Azadón de piedra
+Straw=Paja
+Strawberry=Fresa
+String=Guita
+Sugar=Azúcar
+Toast=Tostadas
+Toast Sandwich=Emparedado de tostadas
+Tomato=Tomate
+Trellis (place on soil before planting grapes)=Enrejado (colocar en el suelo antes de plantar las uvas)
+Turkish Delight=Delicia turca
+Wet Savanna Soil=Suelo humedo de savana
+Wet Soil=Suelo mojado
+Wheat=Trigo
+Wheat Seed=Semilla de trigo
+Wild Cotton=Algodón salvaje
+Wooden Bowl=Cuenco de madera
+Wooden Hoe=Azadón de madera

locale/farming.fr.tr

@@ -13,7 +13,7 @@ Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur
 Beetroot=Betterave
 Beetroot Soup=Soupe de betterave
 Bibimbap=Bibimbap
-Wild Blueberries=Myrtilles Sauvages
+Wild Blueberries=Myrtilles sauvages
 Blueberry Muffin=Muffin aux myrtilles
 Blueberry Pie=Tarte aux myrtilles
 Bottle of Ethanol=Bouteille d'éthanol
@@ -33,7 +33,7 @@ Coffee Beans=Grains de café
 Cookie=Biscuit
 Cooking Pot=Marmitte
 Corn=Maïs
-Corn on the Cob=Maïs cuit
+Corn on the Cob=Cobette (maïs cuit)
 Cornstarch=Fécule de maïs
 Cotton=Coton
 Cotton Seed=Graines de coton
@@ -111,7 +111,7 @@ Savanna Soil=Terre de la savane binnée
 Scarecrow Bottom=Base d'épouventail
 Seed=Graine
 Skillet=Poêle
-Sliced Bread=Tranche de Pain
+Sliced Bread=Tranche de pain
 Soil=Terre binnée
 Spaghetti=Spaghetti
 Steel Hoe=Binette en acier

locale/farming.zh_CN.tr

@@ -118,7 +118,7 @@ Steel Hoe=钢锄头
 Stone Hoe=石锄
 Straw=稻草
 Strawberry=草莓
-String=字符串
+String=线
 Sugar=糖
 Toast=烤面包片
 Toast Sandwich=三明治面包

locale/farming.zh_TW.tr

@@ -60,7 +60,7 @@ 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)=傑克燈（按一下開關）
+Jack 'O Lantern (punch to turn on and off)=南瓜燈（按一下開關）
 Jaffa Cake=佳發餅
 Juicer=榨汁機
 Melon=甜瓜

locale/fr.txt

@@ -2,7 +2,8 @@
 # textdomain: farming
 # author: Papaou30
 # author: TheDarkTiger
-# last update: 2020/Apr/26
+# author: SwissalpS
+# last update: 2022/Feb/26
 
 ###### folder . ######
 
@@ -11,16 +12,16 @@ Seed=Graine
 
 ### compatibility.lua ###
 Banana=Banane
-Banana Leaves=Feuilles de Banane
+Banana Leaves=Feuilles de banane
 Orange=Orange
 Strawberry=Fraise
 
 ### food.lua ###
 Sugar=Sucre
 Salt=Sel
-Rose Water=Eau de Rose
-Turkish Delight=Douceur Turque
-Garlic Bread=Pain à l'Ail
+Rose Water=Eau de rose
+Turkish Delight=Douceur turque
+Garlic Bread=Pain à l'ail
 Donut=Beignet
 Chocolate Donut=Beignet au chocolat
 Apple Donut=Beignet aux pommes
@@ -29,37 +30,37 @@ Jaffa Cake=Petit gâteau à l'orange "Jaffa"
 
 ### hoes.lua ###
 Hoe=Binette
-Wooden Hoe=Binette en Bois
-Stone Hoe=Binette en Pierre
-Steel Hoe=Binette en Acier
-Bronze Hoe=Binette en Bronze
-Mese Hoe=Binette en Mese
-Diamond Hoe=Binette en Diamant
+Wooden Hoe=Binette en bois
+Stone Hoe=Binette en pierre
+Steel Hoe=Binette en acier
+Bronze Hoe=Binette en bronze
+Mese Hoe=Binette en mese
+Diamond Hoe=Binette en diamant
 # Surcharge du mod [Toolranks] à faire #
 Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner)
-Mithril Scythe (Right-click to harvest and replant crops)=Faux en Mithril (Récolte et replante des graines)
+Mithril Scythe (Right-click to harvest and replant crops)=Faux en mithril (Récolte et replante des graines)
 # Surcharge du mod [Toolranks] à faire #
 
 ### soil.lua ###
-Soil=Sol binné
-Wet Soil=Sol binné humide
+Soil=Terre binnée
+Wet Soil=Terre humide et binnée
 
 ### utensils.lua ###
-Wooden Bowl=Bol en Bois
+Wooden Bowl=Bol en bois
 Saucepan=Casserole
-Cooking Pot=Fait-tout
+Cooking Pot=Marmitte
 Baking Tray=Lèche-frite
 Skillet=Poêle
-Mortar and Pestle=Mortier et Pilon
+Mortar and Pestle=Mortier et pilon
 Cutting Board=Planche à découper
 Juicer=Presse-agrumes
-Glass Mixing Bowl=Terrine en Verre
+Glass Mixing Bowl=Terrine en verre
 
 
 ###### folder ./crops ######
 
 ### barley.lua ###
-Barley Seed=Graine d'Orge
+Barley Seed=Graine d'orge
 Barley=Orge
 
 ### beans.lua ###
@@ -67,28 +68,28 @@ Green Beans=Haricots verts
 Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur le sol avant de planter des haricots)
 
 ### beetroot.lua ###
-Beetroot=Betrave
-Beetroot Soup=Soupe de Betrave
+Beetroot=Betterave
+Beetroot Soup=Soupe de betterave
 
 ### blueberry.lua ###
 Blueberries=Myrtilles
-Blueberry Muffin=Muffin aux Myrtilles
-Blueberry Pie=Tarte aux Myrtilles
+Blueberry Muffin=Muffin aux myrtilles
+Blueberry Pie=Tarte aux myrtilles
 
 ### carrot.lua ##
 Carrot=Carotte
-Carrot Juice=Jus de Carotte
+Carrot Juice=Jus de carotte
 Golden Carrot=Carotte dorée
 
 ### chili.lua ###
-Chili Pepper=Piment Rouge
-Bowl of Chili=Assiette de Chilli
+Chili Pepper=Piment fort
+Bowl of Chili=Bol de chilli
 
 ### cocoa.lua ###
-Cocoa Beans=Fèves de Cacao
-Cookie=Cookie
-Bar of Dark Chocolate=Tablette de Chocolat noir
-Chocolate Block=Block de Chocolat
+Cocoa Beans=Fèves de cacao
+Cookie=Biscuit
+Bar of Dark Chocolate=Tablette de chocolat noir
+Chocolate Block=Bloc de chocolat
 
 ### coffee.lua ###
 Coffee Beans=Grains de café
@@ -96,12 +97,12 @@ Cup of Coffee=Tasse de café
 
 ### corn.lua ###
 Corn=Maïs
-Corn on the Cob=Cobette (Maïs cuit)
-Cornstarch=Fécule de Maïs
-Bottle of Ethanol=Bouteille d'Éthanol
+Corn on the Cob=Cobette (maïs cuit)
+Cornstarch=Fécule de maïs
+Bottle of Ethanol=Bouteille d'éthanol
 
 ### cotton.lua ###
-Cotton Seed=Graines de Coton
+Cotton Seed=Graines de coton
 Cotton=Coton
 String=Ficelle
 
@@ -109,8 +110,8 @@ String=Ficelle
 Cucumber=Concombre
 
 ### garlic.lua ###
-Garlic clove=Gousse d'Ail
-Garlic=Tête d'Ail
+Garlic clove=Gousse d'ail
+Garlic=Tête d'ail
 Garlic Braid=Ail tressé
 
 ### grapes.lua ###
@@ -118,52 +119,52 @@ Grapes=Raisins
 Trellis (place on soil before planting grapes)=Treillis (placer sur le sol avant de planter la vigne)
 
 ### hemp.lua ###
-Hemp Seed=Graines de Chanvre
-Hemp Leaf=Feuille de Chanvre
-Bottle of Hemp Oil=Bouteille d'huile de Chanvre
-Hemp Fibre=Fibre de Chanvre
-Hemp Block=Bloc de Chanvre
-Hemp Rope=Corde de Chanvre
+Hemp Seed=Graines de chanvre
+Hemp Leaf=Feuille de chanvre
+Bottle of Hemp Oil=Bouteille d'huile de chanvre
+Hemp Fibre=Fibre de chanvre
+Hemp Block=Bloc de chanvre
+Hemp Rope=Corde de chanvre
 
 ### melon.lua ###
-Melon Slice=Tranche de Melon
+Melon Slice=Tranche de melon
 Melon=Melon
 
 ### onion.lua ###
 Onion=Oignon
 
 ### peas.lua ###
-Pea Pod=Cosse de Petit-poids
-Peas=Petit-poids
-Pea Soup=Soupe de Petit-poids
+Pea Pod=Cosse de petit-pois
+Peas=Petit-pois
+Pea Soup=Soupe de petit-pois
 
 ### pepper.lua ###
-Peppercorn=Grain de Poivre
+Peppercorn=Grain de poivre
 Pepper=Poivron
 Ground Pepper=Poivre moulu
 
 ### pinapple.lua ###
-Pineapple Top=Pousse d'Ananas
+Pineapple Top=Pousse d'ananas
 Pineapple=Ananas
-Pineapple Ring=Tranche d'Ananas
-Pineapple Juice=Jus d'Ananas
+Pineapple Ring=Tranche d'ananas
+Pineapple Juice=Jus d'ananas
 
 ### potato.lua ###
 Potato=Pomme de terre
 Baked Potato=Pomme de terre cuite
-Cucumber and Potato Salad=Salade de Pomme de terre au Concombre
+Cucumber and Potato Salad=Salade de pomme de terre et concombre
 
 ### pumpkin.lua ###
-Pumpkin Slice=Tranche de Citrouille
+Pumpkin Slice=Tranche de citrouille
 Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Frapper pour allumer et éteindre)
-Scarecrow Bottom=Base d'Epouventail
-Pumpkin Bread=Pain à la Citrouille
-Pumpkin Dough=Pâton de pain à la Citrouille
+Scarecrow Bottom=Base d'épouventail
+Pumpkin Bread=Pain à la citrouille
+Pumpkin Dough=Pâton de pain à la citrouille
 Pumpkin=Citrouille
 
 ### raspberry.lua ###
 Raspberries=Framboises
-Raspberry Smoothie=Smoothie aux Framboises
+Raspberry Smoothie=Smoothie aux framboises
 
 ### rhubarb.lua ###
 Rhubarb=Rhubarbe
@@ -171,15 +172,15 @@ Rhubarb Pie=Tarte à la rhubarbe
 
 ### ryeoatrice.lua ###
 Rye=Seigle
-Rye seed=Grains de Seigle
+Rye seed=Grains de seigle
 Oat=Orge
-Oat seed=Grains d'Orge
+Oat seed=Grains d'orge
 Rice=Riz
-Rice grains=Grain de Riz
-Rice Bread=Pain de Riz
-Rice Flour=Farine de Riz
-Multigrain Flour=Farine Multi-céréales
-Multigrain Bread=Pain aux Céréales
+Rice grains=Grain de riz
+Rice Bread=Pain de riz
+Rice Flour=Farine de riz
+Multigrain Flour=Farine multi-céréales
+Multigrain Bread=Pain aux céréales
 
 ### tomato.lua ###
 Tomato=Tomate
@@ -190,6 +191,6 @@ Wheat=Blé
 Straw=Paille
 Flour=Farine
 Bread=Pain
-Sliced Bread=Tranche de Pain
-Toast=Pain Grillé
-Toast Sandwich=Sandwich au Pain
+Sliced Bread=Tranche de pain
+Toast=Pain grillé
+Toast Sandwich=Sandwich au pain grillé

locale/zh_CN.txt

@@ -59,7 +59,7 @@ Cornstarch=玉米淀粉
 Bottle of Ethanol=一瓶乙醇
 Cotton Seed=棉籽
 Cotton=棉花
-String=字符串
+String=线
 Cucumber=黄瓜
 Garlic clove=蒜瓣
 Garlic=大蒜

locale/zh_TW.txt

@@ -89,7 +89,7 @@ Potato=土豆
 Baked Potato=焗馬鈴薯
 Cucumber and Potato Salad=黃瓜土豆沙拉
 Pumpkin Slice=南瓜片
-Jack 'O Lantern (punch to turn on and off)=傑克燈（按一下開關）
+Jack 'O Lantern (punch to turn on and off)=南瓜燈（按一下開關）
 Scarecrow Bottom=稻草人屁股
 Pumpkin Bread=南瓜麵包
 Pumpkin Dough=南瓜麵糰

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)
@@ -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,23 +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",
-"default:dirt_with_coniferous_litter"}, "group:water", 1, farming.mint)
 register_plant("cabbage_6", 2, 10, nil, "", -1, farming.cabbage)
 register_plant("lettuce_5", 5, 30, nil, "", -1, farming.lettuce)
 register_plant("blackberry_4", 3, 10, nil, "", -1, farming.blackberry)
-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)
 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)
@@ -71,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",
@@ -94,6 +106,7 @@ minetest.register_decoration({
 })
 end
 
+
 if farming.chili then
 minetest.register_decoration({
 	deco_type = "simple",
@@ -115,10 +128,40 @@ minetest.register_decoration({
 })
 end
 
-if farming.pepper then
+
+if farming.artichoke then
 minetest.register_decoration({
 	deco_type = "simple",
-	place_on = {"default:dirt_with_rainforest_litter"},
+	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 = tmp1,
 	sidelen = 16,
 	noise_params = {
 		offset = 0,
@@ -136,10 +179,22 @@ minetest.register_decoration({
 })
 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,
@@ -151,14 +206,24 @@ minetest.register_decoration({
 	},
 	y_min = 18,
 	y_max = 30,
-	decoration = {"farming:pineapple_8"}
+	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,
@@ -168,7 +233,7 @@ minetest.register_decoration({
 		octaves = 3,
 		persist = 0.7
 	},
-	biomes = {"savanna"},
+	biomes = tmp2,
 	y_max = 31000,
 	y_min = 1,
 	decoration = "farming:cotton_wild"

soil.lua

@@ -1,6 +1,11 @@
 
 local S = farming.intllib
 
+
+-- default dry soil node
+local dry_soil = "farming:soil"
+
+
 -- add soil types to existing dirt blocks
 minetest.override_item("default:dirt", {
 	soil = {
@@ -34,29 +39,71 @@ minetest.override_item("default:dirt_with_rainforest_litter", {
 	}
 })
 
-minetest.override_item("default:dirt_with_coniferous_litter", {
+if minetest.registered_nodes["default:dirt_with_coniferous_litter"] then
+
+	minetest.override_item("default:dirt_with_coniferous_litter", {
 		soil = {
 			base = "default:dirt_with_coniferous_litter",
 			dry = "farming:soil",
 			wet = "farming:soil_wet"
 		}
-})
+	})
+end
 
-minetest.override_item("default:dry_dirt", {
+
+-- savanna soil
+if minetest.registered_nodes["default:dry_dirt"] then
+
+	minetest.override_item("default:dry_dirt", {
 		soil = {
 			base = "default:dry_dirt",
 			dry = "farming:dry_soil",
 			wet = "farming:dry_soil_wet"
 		}
-})
+	})
 
-minetest.override_item("default:dry_dirt_with_dry_grass", {
+	minetest.override_item("default:dry_dirt_with_dry_grass", {
 		soil = {
 			base = "default:dry_dirt_with_dry_grass",
 			dry = "farming:dry_soil",
 			wet = "farming:dry_soil_wet"
 		}
-})
+	})
+
+	minetest.register_node("farming:dry_soil", {
+		description = S("Savanna Soil"),
+		tiles = {
+			"default_dry_dirt.png^farming_soil.png",
+			"default_dry_dirt.png"
+		},
+		drop = "default:dry_dirt",
+		groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 2, field = 1},
+		sounds = default.node_sound_dirt_defaults(),
+		soil = {
+			base = "default:dry_dirt",
+			dry = "farming:dry_soil",
+			wet = "farming:dry_soil_wet"
+		}
+	})
+
+	minetest.register_node("farming:dry_soil_wet", {
+		description = S("Wet Savanna Soil"),
+		tiles = {
+			"default_dry_dirt.png^farming_soil_wet.png",
+			"default_dry_dirt.png^farming_soil_wet_side.png"
+		},
+		drop = "default:dry_dirt",
+		groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 3, field = 1},
+		sounds = default.node_sound_dirt_defaults(),
+		soil = {
+			base = "default:dry_dirt",
+			dry = "farming:dry_soil",
+			wet = "farming:dry_soil_wet"
+		}
+	})
+
+	dry_soil = "farming:dry_soil"
+end
 
 -- normal soil
 minetest.register_node("farming:soil", {
@@ -77,7 +124,8 @@ minetest.register_node("farming:soil_wet", {
 	description = S("Wet Soil"),
 	tiles = {
 		"default_dirt.png^farming_soil_wet.png",
-		"default_dirt.png^farming_soil_wet_side.png"},
+		"default_dirt.png^farming_soil_wet_side.png"
+	},
 	drop = "default:dirt",
 	groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 3, field = 1},
 	sounds = default.node_sound_dirt_defaults(),
@@ -88,42 +136,11 @@ minetest.register_node("farming:soil_wet", {
 	}
 })
 
--- savanna soil
-if minetest.registered_nodes["default:dry_dirt"] then
-minetest.register_node("farming:dry_soil", {
-	description = S("Savanna Soil"),
-	tiles = {
-		"default_dry_dirt.png^farming_soil.png",
-		"default_dry_dirt.png"},
-	drop = "default:dry_dirt",
-	groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 2, field = 1},
-	sounds = default.node_sound_dirt_defaults(),
-	soil = {
-		base = "default:dry_dirt",
-		dry = "farming:dry_soil",
-		wet = "farming:dry_soil_wet"
-	}
-})
-
-minetest.register_node("farming:dry_soil_wet", {
-	description = S("Wet Savanna Soil"),
-	tiles = {
-		"default_dry_dirt.png^farming_soil_wet.png",
-		"default_dry_dirt.png^farming_soil_wet_side.png"},
-	drop = "default:dry_dirt",
-	groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 3, field = 1},
-	sounds = default.node_sound_dirt_defaults(),
-	soil = {
-		base = "default:dry_dirt",
-		dry = "farming:dry_soil",
-		wet = "farming:dry_soil_wet"
-	}
-})
-end
 
 -- sand is not soil, change existing sand-soil to use dry soil
-minetest.register_alias("farming:desert_sand_soil", "farming:dry_soil")
-minetest.register_alias("farming:desert_sand_soil_wet", "farming:dry_soil_wet")
+minetest.register_alias("farming:desert_sand_soil", dry_soil)
+minetest.register_alias("farming:desert_sand_soil_wet", dry_soil .. "_wet")
+
 
 -- if water near soil then change to wet soil
 minetest.register_abm({
@@ -148,7 +165,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