From 95ba8538721acf589bb67b78a62913a4b68c98f8 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 10 Jul 2021 19:36:21 +0100 Subject: [PATCH 1/3] add glass of water and recipe to filter sea water into river --- food.lua | 28 ++++++++++++++++++++++++++++ textures/farming_water_glass.png | Bin 0 -> 167 bytes 2 files changed, 28 insertions(+) create mode 100644 textures/farming_water_glass.png diff --git a/food.lua b/food.lua index a7f5af1..3be519e 100644 --- a/food.lua +++ b/food.lua @@ -1,6 +1,34 @@ 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"}} +}) + --= Sugar minetest.register_craftitem("farming:sugar", { diff --git a/textures/farming_water_glass.png b/textures/farming_water_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..081f8d6e38845c5c09b4ada1682c936875ebac2a GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ%`eKGJoWUlOY`r?E&Kn08?L4Lsu4$p3+0XYtyE{-7_*OLgqC{VK~_=+0)d-l+Y$5Adq07uBo|FvSG`vrAwDKyiGDIWCJ>+dN+4W+j1U0pjix_ Lu6{1-oD!M Date: Sun, 11 Jul 2021 09:08:50 +0100 Subject: [PATCH 2/3] fix grain drops --- crops/ryeoatrice.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index e1f6a72..090cd74 100644 --- a/crops/ryeoatrice.lua +++ b/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", From f5a82f1478b52dc349428711ce25a6dbaf44484e Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 11 Jul 2021 17:27:12 +0100 Subject: [PATCH 3/3] translation update (thanks Snowyu and Nordal) --- locale/farming.de.tr | 6 +++--- locale/farming.zh_CN.tr | 4 ++-- locale/farming.zh_TW.tr | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/farming.de.tr b/locale/farming.de.tr index a918326..175990e 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=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 diff --git a/locale/farming.zh_CN.tr b/locale/farming.zh_CN.tr index 3e9c2f9..8820705 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=甜瓜 @@ -118,7 +118,7 @@ Steel Hoe=钢锄头 Stone Hoe=石锄 Straw=稻草 Strawberry=草莓 -String=字符串 +String=线 Sugar=糖 Toast=烤面包片 Toast Sandwich=三明治面包 diff --git a/locale/farming.zh_TW.tr b/locale/farming.zh_TW.tr index 5a8449b..a72f739 100644 --- a/locale/farming.zh_TW.tr +++ b/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=三明治麵包