Merge remote-tracking branch 'upstream/master'

crops/cocoa.lua

@@ -135,15 +135,11 @@ 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

crops/corn.lua

@@ -32,6 +32,25 @@ 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"),

crops/ryeoatrice.lua

@@ -18,6 +18,10 @@ 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({
 	output = "farming:flour",
 	recipe = {
@@ -42,6 +46,10 @@ 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({
 	output = "farming:flour",
 	recipe = {
@@ -66,6 +74,10 @@ minetest.override_item("farming:rice", {
 	groups = {food_rice = 1, flammable = 4}
 })
 
+minetest.override_item("farming:rice_1", {drop = {}})
+minetest.override_item("farming:rice_2", {drop = {}})
+minetest.override_item("farming:rice_3", {drop = {}})
+
 minetest.register_craftitem("farming:rice_bread", {
 	description = S("Rice Bread"),
 	inventory_image = "farming_rice_bread.png",

crops/soy.lua

@@ -42,15 +42,6 @@ minetest.register_node("farming:soy_sauce", {
 	sounds = default.node_sound_glass_defaults()
 })
 
--- river water availability check
-local bucket_water
-
-if minetest.get_mapgen_setting("mgname") == "valleys"
-or minetest.get_modpath("ethereal") then
-	bucket_water = "bucket:bucket_river_water"
-else
-	bucket_water = "bucket:bucket_water"
-end
 
 -- soy sauce recipe
 minetest.register_craft( {
@@ -58,10 +49,10 @@ minetest.register_craft( {
 	recipe = {
 		{"group:food_soy", "group:food_salt", "group:food_soy"},
 		{"", "group:food_juicer", ""},
-		{"", bucket_water, "vessels:glass_bottle"}
+		{"", "bucket:bucket_water", "vessels:glass_bottle"}
 	},
 	replacements = {
-		{bucket_water, "bucket:bucket_empty"},
+		{"bucket:bucket_water", "bucket:bucket_empty"},
 		{"group:food_juicer", "farming:juicer"}
 	}
 })

food.lua

@@ -1,6 +1,44 @@
 
 local S = farming.intllib
 
+--= filter sea water into river water
+minetest.register_craft({
+	output = "bucket:bucket_river_water",
+	recipe = {
+		{"farming:hemp_fibre"},
+		{"farming:hemp_fibre"},
+		{"bucket:bucket_water"}
+	}
+})
+
+--= glass of water
+
+minetest.register_craftitem("farming:glass_water", {
+	description = S("Glass of Water"),
+	inventory_image = "farming_water_glass.png",
+	groups = {food_water_glass = 1, flammable = 3, vessel = 1}
+})
+
+minetest.register_craft({
+	output = "farming:glass_water 4",
+	recipe = {
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"bucket:bucket_river_water", ""}
+	},
+	replacements = {{"bucket:bucket_river_water", "bucket:bucket_empty"}}
+})
+
+minetest.register_craft({
+	output = "farming:glass_water 4",
+	recipe = {
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"bucket:bucket_water", "farming:hemp_fibre"}
+	},
+	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
+})
+
 --= Sugar
 
 minetest.register_craftitem("farming:sugar", {
@@ -647,10 +685,10 @@ minetest.register_craft({
 	recipe = {
 		{"group:food_rice", "group:food_sugar", "group:food_rice"},
 		{"", "group:food_mortar_pestle", ""},
-		{"", "bucket:bucket_river_water", ""}
+		{"", "farming:glass_water", ""}
 	},
 	replacements = {
 		{"group:food_mortar_pestle", "farming:mortar_pestle"},
-		{"bucket:bucket_river_water", "bucket:bucket_empty"}
+		{"farming:glass_water", "vessels:drinking_glass"}
 	}
 })

license.txt

@@ -173,3 +173,9 @@ Created by gorlock (CC0)
 Created by sirrobzeroone (CC0)
   farming_gyoza.png
   farming_pineapple_ring.png
+
+Created by TechM8 (https://www.deviantart.com/techm8)
+  farming_popcorn.png
+
+Created by RZR0 (CC-BY-NC-SA)
+  farming_blueberry_pie.png

locale/farming.de.tr

@@ -21,7 +21,7 @@ Bottle of Hemp Oil=Flasche mit Hanföl
 Bowl of Chili=Chili Schale
 Bread=Brot
 Bronze Hoe=Bronzehacke
-Cabbage=Salat
+Cabbage=Weißkohl
 Cactus Juice=Kaktussaft
 Carrot=Möhre
 Carrot Juice=Möhrensaft
@@ -61,7 +61,7 @@ Hemp Seed=Hanfsamen
 Hoe=Hacke
 Hoe Bomb (use or throw on grassy areas to hoe land)=Hackbombe (Auf Grasland werfen oder benutzen)
 Jack 'O Lantern (punch to turn on and off)=Kürbislaterne (Punch zum Ein- und Ausschalten)
-Jaffa Cake=Jaffa-Torte
+Jaffa Cake=Jaffakeks
 Juicer=Entsafter
 Melon=Melone
 Melon Slice=Melonenscheibe
@@ -88,7 +88,7 @@ Pineapple=Ananas
 Pineapple Juice=Ananassaft
 Pineapple Ring=Ananasscheibe
 Pineapple Top=Ananasdeckel
-Porridge=Brei
+Porridge=Haferbrei
 Potato=Kartoffel
 Pumpkin=Kürbis
 Pumpkin Bread=Kürbisbrot

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=甜瓜
@@ -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=甜瓜
@@ -118,7 +118,7 @@ Steel Hoe=鋼鋤頭
 Stone Hoe=石鋤
 Straw=稻草
 Strawberry=草莓
-String=字符串
+String=線
 Sugar=糖
 Toast=烤麵包片
 Toast Sandwich=三明治麵包

lucky_block.lua

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