Merge remote-tracking branch 'upstream/master'

crops/blueberry.lua

@@ -3,7 +3,7 @@ local S = farming.intllib
 
 -- blueberries
 minetest.register_craftitem("farming:blueberries", {
-	description = S("Blueberries"),
+	description = S("Wild Blueberries"),
 	inventory_image = "farming_blueberries.png",
 	groups = {seed = 2, food_blueberries = 1, food_blueberry = 1,
 			food_berry = 1, flammable = 2},

crops/coffee.lua

@@ -11,7 +11,7 @@ minetest.register_craftitem("farming:coffee_beans", {
 	end
 })
 
--- cold cup of coffee
+-- cup of coffee
 minetest.register_node("farming:coffee_cup", {
 	description = S("Cup of Coffee"),
 	drawtype = "torchlike",
@@ -37,13 +37,27 @@ minetest.register_craft( {
 	type = "shapeless",
 	recipe = {
 		"vessels:drinking_glass", "group:food_coffee",
-		"bucket:bucket_water", "group:food_saucepan"},
+		"group:water_bucket", "group:food_saucepan"},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"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 = {
 	drawtype = "plantlike",

crops/hemp.lua

@@ -78,21 +78,23 @@ minetest.register_craft( {
 	output = "farming:hemp_fibre 8",
 	recipe = {
 		{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"},
-		{"farming:hemp_leaf", "bucket:bucket_water", "farming:hemp_leaf"},
+		{"farming:hemp_leaf", "group:water_bucket", "farming:hemp_leaf"},
 		{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}
 	},
-	replacements = {{ "bucket:bucket_water", "bucket:bucket_empty"}}
+	replacements = {{"group:water_bucket", "bucket:bucket_empty"}}
 })
 
+if minetest.get_modpath("bucket_wooden") then
 	minetest.register_craft( {
 		output = "farming:hemp_fibre 8",
 		recipe = {
 			{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"},
-		{"farming:hemp_leaf", "bucket:bucket_river_water", "farming:hemp_leaf"},
+			{"farming:hemp_leaf", "group:water_bucket_wooden", "farming:hemp_leaf"},
 			{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}
 		},
-	replacements = {{ "bucket:bucket_river_water", "bucket:bucket_empty"}}
+		replacements = {{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}}
 	})
+end
 
 -- hemp block
 minetest.register_node("farming:hemp_block", {

crops/mint.lua

@@ -33,14 +33,30 @@ minetest.register_craft({
 	recipe = {
 		"vessels:drinking_glass", "group:food_mint",
 		"group:food_mint", "group:food_mint",
-		"farming:juicer", "bucket:bucket_water"
+		"farming:juicer", "group:water_bucket"
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"},
-		{"bucket:bucket_water", "bucket:bucket_empty"}
+		{"group:water_bucket", "bucket:bucket_empty"}
 	}
 })
 
+if minetest.get_modpath("bucket_wooden") then
+	minetest.register_craft({
+		output = "farming:mint_tea",
+		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 = {
 	drawtype = "plantlike",

food.lua

@@ -68,14 +68,29 @@ minetest.register_craft({
 	recipe = {
 		{"flowers:rose", "flowers:rose", "flowers:rose"},
 		{"flowers:rose", "flowers:rose", "flowers:rose"},
-		{"bucket:bucket_water", "group:food_pot", "vessels:glass_bottle"}
+		{"group:water_bucket", "group:food_pot", "vessels:glass_bottle"}
 	},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"},
+		{"group:water_bucket", "bucket:bucket_empty"},
 		{"group:food_pot", "farming:pot"}
 	}
 })
 
+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", {
@@ -168,23 +183,28 @@ minetest.register_craftitem("farming:porridge", {
 
 minetest.after(0, function()
 
-	local fluid = "bucket:bucket_water"
+	local fluid = "group:water_bucket"
-	local fluid_return = "bucket:bucket_water"
+	local fluid_return = {
+		{"group:water_bucket", "bucket:bucket_empty"},
+		{"group:water_bucket_wooden", "bucket:bucket_empty"}
+	}
 
 	if minetest.get_modpath("mobs") and mobs and mobs.mod == "redo" then
 		fluid = "group:food_milk"
-		fluid_return = "mobs:bucket_milk"
+		fluid_return = {
-	end
+			{"mobs:bucket_milk", "bucket:bucket_empty"}
-
+		}
+	else
 		minetest.register_craft({
 			type = "shapeless",
 			output = "farming:porridge",
 			recipe = {
-			"group:food_barley", "group:food_barley", "group:food_wheat",
+				"group:food_oats", "group:food_oats", "group:food_oats",
-			"group:food_wheat", "group:food_bowl", fluid
+				"group:food_oats", "group:food_bowl", "group:water_bucket_wooden"
 			},
-		replacements = {{fluid_return, "bucket:bucket_empty"}}
+			replacements = fluid_return
 		})
+	end
 
 	minetest.register_craft({
 		type = "shapeless",
@@ -193,8 +213,11 @@ minetest.after(0, function()
 			"group:food_oats", "group:food_oats", "group:food_oats",
 			"group:food_oats", "group:food_bowl", fluid
 		},
-		replacements = {{fluid_return, "bucket:bucket_empty"}}
+		replacements = fluid_return
 	})
+
+	if minetest.get_modpath("bucket_wooden") then
+	end
 end)
 
 --= Jaffa Cake

locale/farming.de.tr

@@ -13,7 +13,7 @@ Bean Pole (place on soil before planting beans)=Bohnenstange (vor dem Pflanzen d
 #Beetroot=
 #Beetroot Soup=
 #Bibimbap=
-Blueberries=Blaubeeren
+Wild Blueberries=Wilde Blaubeeren
 Blueberry Muffin=Blaubeermuffin
 #Blueberry Pie=
 Bottle of Ethanol=Flasche Ethanol

locale/farming.en.tr

@@ -13,7 +13,7 @@
 #Beetroot=
 #Beetroot Soup=
 #Bibimbap=
-#Blueberries=
+#Wild Blueberries=
 #Blueberry Muffin=
 #Blueberry Pie=
 #Bottle of Ethanol=

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
-Blueberries=Myrtilles
+Wild Blueberries=Myrtilles Sauvages
 Blueberry Muffin=Muffin aux myrtilles
 Blueberry Pie=Tarte aux myrtilles
 Bottle of Ethanol=Bouteille d'éthanol

locale/farming.it.tr

@@ -13,7 +13,7 @@ Bean Pole (place on soil before planting beans)=Palina per fagiolini (mettila su
 Beetroot=Barbabietola
 Beetroot Soup=Zuppa di barbabietola
 #Bibimbap=
-Blueberries=Mirtilli
+Wild Blueberries=Mirtilli Selvatici
 Blueberry Muffin=Focaccina di mirtilli
 Blueberry Pie=Tortino di mirtilli
 Bottle of Ethanol=Bottiglia di alcol etilico

locale/farming.pt.tr

@@ -13,7 +13,7 @@ Bean Pole (place on soil before planting beans)=Apoio de feijao (coloque no solo
 #Beetroot=
 #Beetroot Soup=
 #Bibimbap=
-Blueberries=Mirtilos
+Wild Blueberries=Mirtilos Selvagens
 Blueberry Muffin=Muffin de Mirtilos
 #Blueberry Pie=
 Bottle of Ethanol=Garrafa de Etanol

locale/farming.ru.tr

@@ -13,7 +13,7 @@ Bean Pole (place on soil before planting beans)=Жердь для бобовых
 Beetroot=Свекла
 Beetroot Soup=Борщ
 #Bibimbap=
-Blueberries=Голубика
+Wild Blueberries=Голубика
 Blueberry Muffin=Кекс с голубикой
 Blueberry Pie=Пирог с голубикой
 Bottle of Ethanol=Бутылка спирта

locale/farming.zh_CN.tr

@@ -13,7 +13,7 @@ Bean Pole (place on soil before planting beans)=豆杆（种豆前先放在土
 Beetroot=甜菜根
 Beetroot Soup=甜菜根汤
 #Bibimbap=
-Blueberries=蓝莓
+Wild Blueberries=蓝莓
 Blueberry Muffin=蓝莓松糕
 Blueberry Pie=蓝莓派
 Bottle of Ethanol=一瓶乙醇

locale/farming.zh_TW.tr

@@ -13,7 +13,7 @@ Bean Pole (place on soil before planting beans)=豆杆（種豆前先放在土
 Beetroot=甜菜根
 Beetroot Soup=甜菜根湯
 #Bibimbap=
-Blueberries=藍莓
+Wild Blueberries=藍莓
 Blueberry Muffin=藍莓鬆糕
 Blueberry Pie=藍莓派
 Bottle of Ethanol=一瓶乙醇