Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-07-16 23:37:53 +02:00
commit 48951090c0
6 changed files with 47 additions and 7 deletions

View File

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

View File

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

View File

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

View File

@ -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=三明治面包

View File

@ -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=三明治麵包

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B