From 8842235ec647d5799fa4f90b6ec364509cfc281c Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Fri, 28 Jan 2022 16:18:38 +0000
Subject: [PATCH 01/12] blueberries can make blue dye

---
 crops/blueberry.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crops/blueberry.lua b/crops/blueberry.lua
index 9ec14b6..5834353 100644
--- a/crops/blueberry.lua
+++ b/crops/blueberry.lua
@@ -43,6 +43,12 @@ minetest.register_craft({
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
 
+-- Bue Dye
+minetest.register_craft({
+	output = "dye:blue",
+	recipe = {{"farming:blueberries"}}
+})
+
 -- blueberry definition
 local def = {
 	drawtype = "plantlike",

From 60a6bad9d09bf27f1aa727382b5e3a7da57fe38a Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Sat, 29 Jan 2022 09:45:41 +0000
Subject: [PATCH 02/12] tweak soil types to work better with older 0.4.x
 clients

---
 soil.lua | 129 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 73 insertions(+), 56 deletions(-)

diff --git a/soil.lua b/soil.lua
index fbb11f8..ea23c29 100644
--- a/soil.lua
+++ b/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", {
-	soil = {
-		base = "default:dirt_with_coniferous_litter",
-		dry = "farming:soil",
-		wet = "farming:soil_wet"
-	}
-})
+if minetest.registered_nodes["default:dirt_with_coniferous_litter"] 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: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_with_dry_grass", {
-	soil = {
-		base = "default:dry_dirt_with_dry_grass",
-		dry = "farming:dry_soil",
-		wet = "farming:dry_soil_wet"
-	}
-})
+
+-- 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", {
+		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({

From d59e200a42a3077abeee1a8a990de4faceafa7ca Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Sat, 29 Jan 2022 09:54:24 +0000
Subject: [PATCH 03/12] better translation support

---
 init.lua    | 23 +++++++++++++++++++++--
 intllib.lua | 45 ---------------------------------------------
 2 files changed, 21 insertions(+), 47 deletions(-)
 delete mode 100644 intllib.lua

diff --git a/init.lua b/init.lua
index 94878de..fddbc59 100644
--- a/init.lua
+++ b/init.lua
@@ -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
 
diff --git a/intllib.lua b/intllib.lua
deleted file mode 100644
index 6669d72..0000000
--- a/intllib.lua
+++ /dev/null
@@ -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

From 8be42d5f636923b2ec7bb01110e973dcbececd21 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Mon, 21 Feb 2022 18:39:07 +0000
Subject: [PATCH 04/12] fix pea and soy crop names (thanks nixnoxus)

---
 crops/peas.lua | 2 +-
 crops/soy.lua  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crops/peas.lua b/crops/peas.lua
index 50b8234..94053f2 100644
--- a/crops/peas.lua
+++ b/crops/peas.lua
@@ -83,7 +83,7 @@ minetest.register_node("farming:pea_5", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:pea_pod"] = {
-	crop = "farming:pea_pod",
+	crop = "farming:pea",
 	seed = "farming:pea_pod",
 	minlight = farming.min_light,
 	maxlight = farming.max_light,
diff --git a/crops/soy.lua b/crops/soy.lua
index 97c71be..e0ed093 100644
--- a/crops/soy.lua
+++ b/crops/soy.lua
@@ -184,7 +184,7 @@ minetest.register_node("farming:soy_7", table.copy(def))
 
 -- add to registered_plants
 farming.registered_plants["farming:soy_pod"] = {
-	crop = "farming:soy_pod",
+	crop = "farming:soy",
 	seed = "farming:soy_pod",
 	minlight = farming.min_light,
 	maxlight = farming.max_light,

From 11a829baf77a40ebd8c311ca60d83227c131b828 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Tue, 22 Feb 2022 08:28:56 +0000
Subject: [PATCH 05/12] typo

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

diff --git a/crops/blueberry.lua b/crops/blueberry.lua
index 5834353..be1d3b2 100644
--- a/crops/blueberry.lua
+++ b/crops/blueberry.lua
@@ -43,7 +43,7 @@ minetest.register_craft({
 	replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
 })
 
--- Bue Dye
+-- Blue Dye
 minetest.register_craft({
 	output = "dye:blue",
 	recipe = {{"farming:blueberries"}}

From 3cbbb3678e8e0f24a75d28496ddbba71cb5afa32 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Wed, 23 Feb 2022 08:27:30 +0000
Subject: [PATCH 06/12] add spanish translation (thx mckaygerhard), add trellis
 setting to registered_crops (thx nixnoxus)

---
 api.txt              |   1 +
 crops/beans.lua      |   1 +
 crops/cocoa.lua      |   1 +
 crops/grapes.lua     |   1 +
 locale/es.txt        | 194 +++++++++++++++++++++++++++++++++++++++++++
 locale/farming.es.tr | 134 ++++++++++++++++++++++++++++++
 6 files changed, 332 insertions(+)
 create mode 100644 locale/es.txt
 create mode 100644 locale/farming.es.tr

diff --git a/api.txt b/api.txt
index 81092c6..cd8cc76 100644
--- a/api.txt
+++ b/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
 
diff --git a/crops/beans.lua b/crops/beans.lua
index f1a6e16..02ebe1a 100644
--- a/crops/beans.lua
+++ b/crops/beans.lua
@@ -222,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,
diff --git a/crops/cocoa.lua b/crops/cocoa.lua
index 74132d5..8c3e64e 100644
--- a/crops/cocoa.lua
+++ b/crops/cocoa.lua
@@ -199,6 +199,7 @@ 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_raw",
 	minlight = farming.min_light,
diff --git a/crops/grapes.lua b/crops/grapes.lua
index 47d64e0..ee8fe38 100644
--- a/crops/grapes.lua
+++ b/crops/grapes.lua
@@ -229,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,
diff --git a/locale/es.txt b/locale/es.txt
new file mode 100644
index 0000000..185261b
--- /dev/null
+++ b/locale/es.txt
@@ -0,0 +1,194 @@
+# Translation of the farming mod by TenPlus1
+# textdomain: farming
+# author: PICCORO Lenz McKAY <mckaygerhard@gmail.com>
+# last update: 2022/Feb/16
+
+###### folder . ######
+
+### init.lua ###
+Seed=Semillas
+
+### compatibility.lua ###
+Banana=Banana
+Banana Leaves=Hojas de banana
+Orange=Naranja
+Strawberry=Fresas
+
+### food.lua ###
+Sugar=Azucar
+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=Azadon
+Wooden Hoe=Azadon de Madera
+Stone Hoe=Azadon de Piedra
+Steel Hoe=Azadon de Acero
+Bronze Hoe=Azadon de Bronze
+Mese Hoe=Azadon de Mese
+Diamond Hoe=Azadon de Diamante
+# Surcharge du mod [Toolranks] à faire #
+Hoe Bomb (use or throw on grassy areas to hoe land)=Bomba de azada (usar o arrojar en áreas verdes para cavar tierra)
+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 Seco
+
+### utensils.lua ###
+Wooden Bowl=Cuenco de Madera
+Saucepan=Cacerola
+Cooking Pot=Olla
+Baking Tray=Bandeja Hornear
+Skillet=Sarten
+Mortar and Pestle=Mortero y Maza
+Cutting Board=Tabla de cortar
+Juicer=Exprimidor
+Glass Mixing Bowl=Tazón de mezcla de vidrio
+
+
+###### folder ./crops ######
+
+### barley.lua ###
+Barley Seed=Semillas de Cevada
+Barley=Cevada
+
+### 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=Chile o ajies
+Bowl of Chili=Tazon de Chile o ajies
+
+### cocoa.lua ###
+Cocoa Beans=Amendras de Cacao
+Cookie=Galleta
+Bar of Dark Chocolate=Barra de Chocolate Negro
+Chocolate Block=Bloque de Chocolate
+
+### coffee.lua ###
+Coffee Beans=Grano de Cafe
+Cup of Coffee=Taza de Cafe
+
+### corn.lua ###
+Corn=Maiz
+Corn on the Cob=Mazorca de Maiz
+Cornstarch=Almidon
+Bottle of Ethanol=Garrafa de Etanol
+
+### cotton.lua ###
+Cotton Seed=Sementes de Algodon
+Cotton=Algodon
+String=Cadena
+
+### 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)=Grade de Ripas (colocar en el suelo antes de plantar las uvas)
+
+### hemp.lua ###
+Hemp Seed=Semilla de Caniamo
+Hemp Leaf=Folha de Caniamo
+Bottle of Hemp Oil=Garrafa de Aceite de Caniamo
+Hemp Fibre=Fibra de Caniamo
+Hemp Block=Bloque de Caniamo
+Hemp Rope=Corda de Caniamo
+
+### melon.lua ###
+Melon Slice=Rebanada de Melon
+Melon=Melon
+
+### onion.lua ###
+Onion=Cebolla
+
+### peas.lua ###
+Pea Pod=Vaina de guisante
+Peas=Gisantes
+Pea Soup=Sopa de Guisantes
+
+### pepper.lua ###
+Peppercorn=Grano de Pimienta
+Pepper=Pimienta
+Ground Pepper=Pimienta Molida
+
+### pinapple.lua ###
+Pineapple Top=Tope de Piña
+Pineapple=Pinia
+Pineapple Ring=Anillo de pinia
+Pineapple Juice=Jugo de pinia
+
+### potato.lua ###
+Potato=Batata
+Baked Potato=Batata Cocida
+Cucumber and Potato Salad=Ensalada de Pepino y Patatas
+
+### pumpkin.lua ###
+Pumpkin Slice=Pedazo de Calabaza
+Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (golpea para encender o apagar)
+Scarecrow Bottom=Espantapajaros abajo
+Pumpkin Bread=Pan de Calabaza
+Pumpkin Dough=Masa de Calabaza
+Pumpkin=Calabaza
+
+### raspberry.lua ###
+Raspberries=Frambuesa
+Raspberry Smoothie=Batida de Frambuesa
+
+### rhubarb.lua ###
+Rhubarb=Ruibarbo
+Rhubarb Pie=Torta 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 multicereal
+Multigrain Bread=Pan multicereal
+
+### tomato.lua ###
+Tomato=Tomate
+
+### wheat.lua ###
+Wheat Seed=Semillas de Trigo
+Wheat=Trigo
+Straw=Paja
+Flour=Harina
+Bread=Pan
+Sliced Bread=Pan rebanado
+Toast=Tostadas
+Toast Sandwich=Emparedado de tostadas
diff --git a/locale/farming.es.tr b/locale/farming.es.tr
new file mode 100644
index 0000000..09a86f3
--- /dev/null
+++ b/locale/farming.es.tr
@@ -0,0 +1,134 @@
+# textdomain:farming
+%s Hoe=%s Azadon
+Apple Donut=Dona de Manzana
+Apple Pie=Pastel de Manzana
+Baked Potato=Papa al Horno
+Baking Tray=Bandeja Hornear
+Banana=Platano
+Banana Leaves=Hojas de Platano
+Bar of Dark Chocolate=Barra de Chocolate amargo
+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 los 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=Azadon de Bronze
+Cabbage=Repollo
+Cactus Juice=Jugo de Cactus
+Carrot=Zanahoria
+Carrot Juice=Jugo de Zanahoria
+Chili Pepper=Aji 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 de cocinar
+Corn=Maiz
+Corn on the Cob=Mazorca
+Cornstarch=Maicena
+Cotton=Algodon
+Cotton Seed=Semilla de Algodon
+Cucumber=Ensalada
+Cucumber and Potato Salad=Ensalada de Pepino y Papas
+Cup of Coffee=Taza de Cafe
+Cutting Board=Tabla de Cortar
+Diamond Hoe=Azado 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=Cuenco de vidrio
+Golden Carrot=Zanahoria Dorada
+Grapes=Uvas
+Green Beans=Arvejas Verdes
+Ground Pepper=Pimienta Molida
+Hemp Block=Bloque de Canamo
+Hemp Fibre=Fibra de Canamo
+Hemp Leaf=Hoja de Canamo
+Hemp Rope=Cuerda de Canamo
+Hemp Seed=Semilla de Canamo
+Hoe=Azadon
+Hoe Bomb (use or throw on grassy areas to hoe land)=Azado Bomba (usar o tirar en áreas verdes para cavar)
+Jack 'O Lantern (punch to turn on and off)=Lampara de Jack (pulsar para encender o apagar)
+Jaffa Cake=Pastel de Jaffa
+Juicer=Licuadora
+Melon=Melon
+Melon Slice=Rebanada de Melon
+Mese Hoe=Azada de Mese
+Mint Leaf=Hoja de Menta
+Mint Seeds=Semilla de Menta
+Mint Tea=Te de Menta
+Mithril Scythe (Right-click to harvest and replant crops)=Hoz 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=Gisantes
+Pepper=Pimienta
+Peppercorn=Vaina de Pimienta
+Pineapple=Piña
+Pineapple Juice=Jugo de piña
+Pineapple Ring=Anillo de piña
+Pineapple Top=Hojas de piña
+Porridge=Avena hojuelas
+Potato=Patata
+Pumpkin=Calabaza
+Pumpkin Bread=Pan de Calabaza
+Pumpkin Dough=Batido de Calabaza
+Pumpkin Slice=Rebanada de Calabaza
+Raspberries=Frambuesa
+Raspberry Smoothie=Batido de Frambuesa
+Rhubarb=Ruibardo
+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 rosas
+Rye=Centeno
+Rye seed=Semilla de Centeno
+Salt=Sal
+Saucepan=Cacerola
+Savanna Soil=Suelo de sabana
+Scarecrow Bottom=Espantapajaros abajo
+Seed=Semilla
+Skillet=Sarten
+Sliced Bread=Pan Rebanado
+Soil=Suelo
+Spaghetti=Espagueti
+Steel Hoe=Azado de Acero
+Stone Hoe=Azado de Piedra
+Straw=Paja
+Strawberry=Fresa
+String=Cadena
+Sugar=Azucar
+Toast=Tostadas
+Toast Sandwich=Emparedado Tostados
+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=Azada de madera

From b2145204be88c5c109b69020a2790ed4543b1464 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Wed, 23 Feb 2022 18:51:10 +0000
Subject: [PATCH 07/12] typos

---
 locale/es.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/es.txt b/locale/es.txt
index 185261b..a924747 100644
--- a/locale/es.txt
+++ b/locale/es.txt
@@ -41,7 +41,7 @@ Mithril Scythe (Right-click to harvest and replant crops)=Guadaña de mithril (c
 
 ### soil.lua ###
 Soil=Suelo
-Wet Soil=Suelo Seco
+Wet Soil=Suelo mojado
 
 ### utensils.lua ###
 Wooden Bowl=Cuenco de Madera
@@ -133,7 +133,7 @@ Onion=Cebolla
 
 ### peas.lua ###
 Pea Pod=Vaina de guisante
-Peas=Gisantes
+Peas=Guisantes
 Pea Soup=Sopa de Guisantes
 
 ### pepper.lua ###

From 35c5245b3c6ff47b7c96c885f89e23aceb41f008 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Thu, 24 Feb 2022 08:15:37 +0000
Subject: [PATCH 08/12] fix spanish translations

---
 locale/es.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/es.txt b/locale/es.txt
index a924747..d288392 100644
--- a/locale/es.txt
+++ b/locale/es.txt
@@ -117,15 +117,15 @@ Grapes=Uvas
 Trellis (place on soil before planting grapes)=Grade de Ripas (colocar en el suelo antes de plantar las uvas)
 
 ### hemp.lua ###
-Hemp Seed=Semilla de Caniamo
-Hemp Leaf=Folha de Caniamo
-Bottle of Hemp Oil=Garrafa de Aceite de Caniamo
-Hemp Fibre=Fibra de Caniamo
-Hemp Block=Bloque de Caniamo
-Hemp Rope=Corda de Caniamo
+Hemp Seed=Semilla de Cáñamo
+Hemp Leaf=Folha de Cáñamo
+Bottle of Hemp Oil=Garrafa de Aceite de Cáñamo
+Hemp Fibre=Fibra de Cáñamo
+Hemp Block=Bloque de Cáñamo
+Hemp Rope=Corda de Cáñamo
 
 ### melon.lua ###
-Melon Slice=Rebanada de Melon
+Melon Slice=Melón o Sandía
 Melon=Melon
 
 ### onion.lua ###

From a897924b830bd3d31adafe8cf79d87581b21e412 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Fri, 25 Feb 2022 08:14:38 +0000
Subject: [PATCH 09/12] update translations (thanks SwissalpS)

---
 locale/de.txt           | 123 ++++++++++++++--------------
 locale/es.txt           | 151 +++++++++++++++++------------------
 locale/farming.de.tr    |   4 +-
 locale/farming.es.tr    | 172 ++++++++++++++++++++--------------------
 locale/farming.fr.tr    |   6 +-
 locale/farming.zh_CN.tr |   2 +-
 locale/farming.zh_TW.tr |   2 +-
 locale/fr.txt           | 135 +++++++++++++++----------------
 locale/zh_TW.txt        |   2 +-
 9 files changed, 300 insertions(+), 297 deletions(-)

diff --git a/locale/de.txt b/locale/de.txt
index a18f79e..b06202d 100644
--- a/locale/de.txt
+++ b/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
diff --git a/locale/es.txt b/locale/es.txt
index d288392..f5e1ebc 100644
--- a/locale/es.txt
+++ b/locale/es.txt
@@ -1,41 +1,42 @@
 # Translation of the farming mod by TenPlus1
 # textdomain: farming
 # author: PICCORO Lenz McKAY <mckaygerhard@gmail.com>
-# last update: 2022/Feb/16
+# author: SwissalpS
+# last update: 2022/Feb/26
 
 ###### folder . ######
 
 ### init.lua ###
-Seed=Semillas
+Seed=Semilla
 
 ### compatibility.lua ###
 Banana=Banana
 Banana Leaves=Hojas de banana
 Orange=Naranja
-Strawberry=Fresas
+Strawberry=Fresa
 
 ### food.lua ###
-Sugar=Azucar
+Sugar=Azúcar
 Salt=Sal
 Rose Water=Agua de rosa
 Turkish Delight=Delicia turca
-Garlic Bread=Pan de Ajo
+Garlic Bread=Pan de ajo
 Donut=Dona
-Chocolate Donut=Dona de Chocolate
-Apple Donut=Dona de Manzana
+Chocolate Donut=Dona de chocolate
+Apple Donut=Dona de manzana
 Porridge=Papilla
-Jaffa Cake=Pastel de Jaffa
+Jaffa Cake=Pastel de jaffa
 
 ### hoes.lua ###
-Hoe=Azadon
-Wooden Hoe=Azadon de Madera
-Stone Hoe=Azadon de Piedra
-Steel Hoe=Azadon de Acero
-Bronze Hoe=Azadon de Bronze
-Mese Hoe=Azadon de Mese
-Diamond Hoe=Azadon de Diamante
+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)=Bomba de azada (usar o arrojar en áreas verdes para cavar tierra)
+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 #
 
@@ -44,129 +45,129 @@ Soil=Suelo
 Wet Soil=Suelo mojado
 
 ### utensils.lua ###
-Wooden Bowl=Cuenco de Madera
+Wooden Bowl=Cuenco de madera
 Saucepan=Cacerola
 Cooking Pot=Olla
-Baking Tray=Bandeja Hornear
+Baking Tray=Bandeja de hornear
 Skillet=Sarten
-Mortar and Pestle=Mortero y Maza
+Mortar and Pestle=Mortero y maja
 Cutting Board=Tabla de cortar
 Juicer=Exprimidor
-Glass Mixing Bowl=Tazón de mezcla de vidrio
+Glass Mixing Bowl=Tazón de vidrio para mezclar
 
 
 ###### folder ./crops ######
 
 ### barley.lua ###
-Barley Seed=Semillas de Cevada
-Barley=Cevada
+Barley Seed=Semilla de cebada
+Barley=Cebada
 
 ### beans.lua ###
-Green Beans=Frijoles Verdes
+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
+Beetroot Soup=Sopa de remolacha
 
 ### blueberry.lua ###
 Blueberries=Arándanos
-Blueberry Muffin=Muffin de Arándanos
-Blueberry Pie=Pastel de 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
+Carrot Juice=Jugo de zanahoria
+Golden Carrot=Zanahoria dorada
 
 ### chili.lua ###
-Chili Pepper=Chile o ajies
-Bowl of Chili=Tazon de Chile o ajies
+Chili Pepper=Ají picante
+Bowl of Chili=Tazón de chili
 
 ### cocoa.lua ###
-Cocoa Beans=Amendras de Cacao
+Cocoa Beans=Granos de cacao
 Cookie=Galleta
-Bar of Dark Chocolate=Barra de Chocolate Negro
-Chocolate Block=Bloque de Chocolate
+Bar of Dark Chocolate=Barra de chocolate negro
+Chocolate Block=Bloque de chocolate
 
 ### coffee.lua ###
-Coffee Beans=Grano de Cafe
-Cup of Coffee=Taza de Cafe
+Coffee Beans=Granos de café
+Cup of Coffee=Taza de café
 
 ### corn.lua ###
-Corn=Maiz
-Corn on the Cob=Mazorca de Maiz
-Cornstarch=Almidon
-Bottle of Ethanol=Garrafa de Etanol
+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=Sementes de Algodon
-Cotton=Algodon
-String=Cadena
+Cotton Seed=Semilla de algodón
+Cotton=Algodón
+String=Guita
 
 ### cucumber.lua ###
 Cucumber=Pepino
 
 ### garlic.lua ###
-Garlic clove=Diente de Ajo
+Garlic clove=Diente de ajo
 Garlic=Ajo
-Garlic Braid=Trenza de Ajo
+Garlic Braid=Trenza de ajo
 
 ### grapes.lua ###
 Grapes=Uvas
-Trellis (place on soil before planting grapes)=Grade de Ripas (colocar en el suelo antes de plantar las 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=Folha de Cáñamo
-Bottle of Hemp Oil=Garrafa de Aceite de Cáñamo
-Hemp Fibre=Fibra de Cáñamo
-Hemp Block=Bloque de Cáñamo
-Hemp Rope=Corda de Cáñamo
+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=Melón o Sandía
-Melon=Melon
+Melon Slice=Rebanada de sandía
+Melon=Sandía
 
 ### onion.lua ###
 Onion=Cebolla
 
 ### peas.lua ###
-Pea Pod=Vaina de guisante
+Pea Pod=Vaina de guisantes
 Peas=Guisantes
-Pea Soup=Sopa de Guisantes
+Pea Soup=Sopa de guisantes
 
 ### pepper.lua ###
-Peppercorn=Grano de Pimienta
+Peppercorn=Grano de pimienta
 Pepper=Pimienta
-Ground Pepper=Pimienta Molida
+Ground Pepper=Pimienta molida
 
 ### pinapple.lua ###
-Pineapple Top=Tope de Piña
-Pineapple=Pinia
-Pineapple Ring=Anillo de pinia
-Pineapple Juice=Jugo de pinia
+Pineapple Top=Tapa de piña
+Pineapple=Piña
+Pineapple Ring=Anillo de piña
+Pineapple Juice=Jugo de piña
 
 ### potato.lua ###
-Potato=Batata
-Baked Potato=Batata Cocida
-Cucumber and Potato Salad=Ensalada de Pepino y Patatas
+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)=Jack 'O Lantern (golpea para encender o apagar)
-Scarecrow Bottom=Espantapajaros abajo
-Pumpkin Bread=Pan de Calabaza
-Pumpkin Dough=Masa de Calabaza
+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=Batida de Frambuesa
+Raspberry Smoothie=Batido de frambuesa
 
 ### rhubarb.lua ###
 Rhubarb=Ruibarbo
-Rhubarb Pie=Torta de Ruibarbo
+Rhubarb Pie=Pastel de ruibarbo
 
 ### ryeoatrice.lua ###
 Rye=Centeno
@@ -175,16 +176,16 @@ Oat=Avena
 Oat seed=Semilla de avena
 Rice=Arroz
 Rice grains=Granos de arroz
-Rice Bread=PAn de arroz
+Rice Bread=Pan de arroz
 Rice Flour=Harina de arroz
-Multigrain Flour=Harina multicereal
-Multigrain Bread=Pan multicereal
+Multigrain Flour=Harina multigrano
+Multigrain Bread=Pan multicereales
 
 ### tomato.lua ###
 Tomato=Tomate
 
 ### wheat.lua ###
-Wheat Seed=Semillas de Trigo
+Wheat Seed=Semilla de trigo
 Wheat=Trigo
 Straw=Paja
 Flour=Harina
diff --git a/locale/farming.de.tr b/locale/farming.de.tr
index 175990e..b83240b 100644
--- a/locale/farming.de.tr
+++ b/locale/farming.de.tr
@@ -5,7 +5,7 @@ Apple Pie=Apfelkuchen
 Baked Potato=Ofenkartoffel
 Baking Tray=Kuchenblech
 Banana=Banane
-Banana Leaves=Bananenblatt
+Banana Leaves=Bananenblätter
 Bar of Dark Chocolate=Tafel Zartbitterschokolade
 Barley=Gerste
 Barley Seed=Gerstenkörner
@@ -48,7 +48,7 @@ Garlic=Knoblauch
 Garlic Braid=Knoblauchzopf
 Garlic Bread=Knoblauchbrot
 Garlic clove=Knoblauchzehe
-Glass Mixing Bowl=Glasschlüssel
+Glass Mixing Bowl=Glasschüssel
 Golden Carrot=Goldene Möhre
 Grapes=Weintrauben
 Green Beans=Grüne Bohnen
diff --git a/locale/farming.es.tr b/locale/farming.es.tr
index 09a86f3..773ac90 100644
--- a/locale/farming.es.tr
+++ b/locale/farming.es.tr
@@ -1,134 +1,134 @@
 # textdomain:farming
-%s Hoe=%s Azadon
-Apple Donut=Dona de Manzana
-Apple Pie=Pastel de Manzana
-Baked Potato=Papa al Horno
-Baking Tray=Bandeja Hornear
-Banana=Platano
-Banana Leaves=Hojas de Platano
-Bar of Dark Chocolate=Barra de Chocolate amargo
+%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 los frijoles)
+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
+Beetroot Soup=Sopa de remolacha
 #Bibimbap=
-Wild Blueberries=Arándanos Silvestres
-Blueberry Muffin=Muffin de Arándanos
+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 Ethanol=Botella de etanol
 Bottle of Hemp Oil=Botella de aceite de cáñamo
-Bowl of Chili=Tazón de Chili
+Bowl of Chili=Tazón de chili
 Bread=Pan
-Bronze Hoe=Azadon de Bronze
+Bronze Hoe=Azadón de bronze
 Cabbage=Repollo
-Cactus Juice=Jugo de Cactus
+Cactus Juice=Jugo de cactus
 Carrot=Zanahoria
-Carrot Juice=Jugo de Zanahoria
-Chili Pepper=Aji Picante
+Carrot Juice=Jugo de zanahoria
+Chili Pepper=Ají picante
 Chocolate Block=Bloque de chocolate
 Chocolate Donut=Dona de chocolate
-Cocoa Beans=Granos De Cacao
+Cocoa Beans=Granos de cacao
 Coffee Beans=Granos de café
 Cookie=Galleta
-Cooking Pot=Olla de cocinar
-Corn=Maiz
-Corn on the Cob=Mazorca
-Cornstarch=Maicena
-Cotton=Algodon
-Cotton Seed=Semilla de Algodon
-Cucumber=Ensalada
-Cucumber and Potato Salad=Ensalada de Pepino y Papas
-Cup of Coffee=Taza de Cafe
-Cutting Board=Tabla de Cortar
-Diamond Hoe=Azado de Diamante
+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=Cuenco de vidrio
-Golden Carrot=Zanahoria Dorada
+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=Arvejas Verdes
-Ground Pepper=Pimienta Molida
-Hemp Block=Bloque de Canamo
-Hemp Fibre=Fibra de Canamo
-Hemp Leaf=Hoja de Canamo
-Hemp Rope=Cuerda de Canamo
-Hemp Seed=Semilla de Canamo
-Hoe=Azadon
-Hoe Bomb (use or throw on grassy areas to hoe land)=Azado Bomba (usar o tirar en áreas verdes para cavar)
-Jack 'O Lantern (punch to turn on and off)=Lampara de Jack (pulsar para encender o apagar)
-Jaffa Cake=Pastel de Jaffa
-Juicer=Licuadora
-Melon=Melon
-Melon Slice=Rebanada de Melon
-Mese Hoe=Azada de Mese
-Mint Leaf=Hoja de Menta
-Mint Seeds=Semilla de Menta
-Mint Tea=Te de Menta
-Mithril Scythe (Right-click to harvest and replant crops)=Hoz de Mithril (clic derecho para cosechar y replantar cultivos)
-Mortar and Pestle=Mortero y Maja
-Multigrain Bread=Pan Multicereales
+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
+Oat seed=Semilla de avena
 Oats=Avena
 Onion=Cebolla
-Onion Soup=Sopa de Cebolla
+Onion Soup=Sopa de cebolla
 Orange=Naranja
 Pasta=Pasta
-Pea Pod=Vaina de Guisantes
-Pea Soup=Sopa de Guisantes
-Peas=Gisantes
+Pea Pod=Vaina de guisantes
+Pea Soup=Sopa de guisantes
+Peas=Guisantes
 Pepper=Pimienta
-Peppercorn=Vaina de Pimienta
+Peppercorn=Grano de pimienta
 Pineapple=Piña
 Pineapple Juice=Jugo de piña
 Pineapple Ring=Anillo de piña
-Pineapple Top=Hojas de piña
-Porridge=Avena hojuelas
+Pineapple Top=Tapa de piña
+Porridge=Papilla
 Potato=Patata
 Pumpkin=Calabaza
-Pumpkin Bread=Pan de Calabaza
-Pumpkin Dough=Batido de Calabaza
-Pumpkin Slice=Rebanada de Calabaza
+Pumpkin Bread=Pan de calabaza
+Pumpkin Dough=Masa de calabaza
+Pumpkin Slice=Pedazo de calabaza
 Raspberries=Frambuesa
-Raspberry Smoothie=Batido de Frambuesa
-Rhubarb=Ruibardo
+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 Bread=Pan de arroz
+Rice Flour=Harina de arroz
 Rice grains=Granos de arroz
-Rose Water=Agua de rosas
+Rose Water=Agua de rosa
 Rye=Centeno
-Rye seed=Semilla de Centeno
+Rye seed=Semilla de centeno
 Salt=Sal
 Saucepan=Cacerola
 Savanna Soil=Suelo de sabana
-Scarecrow Bottom=Espantapajaros abajo
+Scarecrow Bottom=Espantapájaros abajo
 Seed=Semilla
 Skillet=Sarten
-Sliced Bread=Pan Rebanado
+Sliced Bread=Pan rebanado
 Soil=Suelo
-Spaghetti=Espagueti
-Steel Hoe=Azado de Acero
-Stone Hoe=Azado de Piedra
+Spaghetti=Espaguetis
+Steel Hoe=Azadón de acero
+Stone Hoe=Azadón de piedra
 Straw=Paja
 Strawberry=Fresa
-String=Cadena
-Sugar=Azucar
+String=Guita
+Sugar=Azúcar
 Toast=Tostadas
-Toast Sandwich=Emparedado Tostados
+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
+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
+Wheat Seed=Semilla de trigo
+Wild Cotton=Algodón salvaje
 Wooden Bowl=Cuenco de madera
-Wooden Hoe=Azada de madera
+Wooden Hoe=Azadón de madera
diff --git a/locale/farming.fr.tr b/locale/farming.fr.tr
index 528ba21..4da1c81 100644
--- a/locale/farming.fr.tr
+++ b/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
diff --git a/locale/farming.zh_CN.tr b/locale/farming.zh_CN.tr
index 8820705..adc97fe 100644
--- a/locale/farming.zh_CN.tr
+++ b/locale/farming.zh_CN.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=甜瓜
diff --git a/locale/farming.zh_TW.tr b/locale/farming.zh_TW.tr
index a72f739..1ec8279 100644
--- a/locale/farming.zh_TW.tr
+++ b/locale/farming.zh_TW.tr
@@ -118,7 +118,7 @@ Steel Hoe=鋼鋤頭
 Stone Hoe=石鋤
 Straw=稻草
 Strawberry=草莓
-String=線
+String=字符串
 Sugar=糖
 Toast=烤麵包片
 Toast Sandwich=三明治麵包
diff --git a/locale/fr.txt b/locale/fr.txt
index 04a5b1b..95559a7 100644
--- a/locale/fr.txt
+++ b/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,66 +30,66 @@ 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 ###
 Green Beans=Haricots verts
-Bean Pole (place on soil before planting beans)=Tuteur pour haricots  (placer sur le sol avant de planter des haricots)
+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é
diff --git a/locale/zh_TW.txt b/locale/zh_TW.txt
index 5bd109b..ef96d52 100644
--- a/locale/zh_TW.txt
+++ b/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=南瓜麵糰

From a19f852ddf79603eb72026b65dcfe8e332092116 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Mon, 28 Feb 2022 08:18:21 +0000
Subject: [PATCH 10/12] fix de translations

---
 locale/farming.de.tr | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/locale/farming.de.tr b/locale/farming.de.tr
index b83240b..3fb935b 100644
--- a/locale/farming.de.tr
+++ b/locale/farming.de.tr
@@ -21,7 +21,7 @@ Bottle of Hemp Oil=Flasche mit Hanföl
 Bowl of Chili=Chili Schale
 Bread=Brot
 Bronze Hoe=Bronzehacke
-Cabbage=Weißkohl
+Cabbage=Kohl
 Cactus Juice=Kaktussaft
 Carrot=Möhre
 Carrot Juice=Möhrensaft
@@ -106,6 +106,7 @@ Rose Water=Rosenwasser
 Rye=Roggen
 Rye seed=Roggensaat
 Salt=Salz
+Salad=Salat
 Saucepan=Kasserolle
 Savanna Soil=Savannaerde
 Scarecrow Bottom=Vogelscheuchengestell

From 8cdca1804cff61e3b759e0decf3384059d06fa97 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Wed, 2 Mar 2022 12:58:16 +0000
Subject: [PATCH 11/12] update readme (thanks mckaygerhard)

---
 README.md | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 155 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6c7b1a8..0c4a974 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,23 @@
-# 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...
 
@@ -9,10 +25,145 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 
 "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: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:
 
+- 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

From 33bb4a3a9560f9405f119149b37a2289a64fda83 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Wed, 2 Mar 2022 12:59:53 +0000
Subject: [PATCH 12/12] list

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0c4a974..cfabffa 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,9 @@ Farming Redo is a simplified version of the built-in farming mod in minetest and
 
 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_1"    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