Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sys Quatre 2020-09-04 21:39:24 +02:00
commit 52575203c4
13 changed files with 213 additions and 158 deletions

View File

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

View File

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

View File

@ -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"}}
})
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", "farming:hemp_leaf", "farming:hemp_leaf"}
},
replacements = {{ "bucket:bucket_river_water", "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", "group:water_bucket_wooden", "farming:hemp_leaf"},
{"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}
},
replacements = {{"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}}
})
end
-- hemp block
minetest.register_node("farming:hemp_block", {

View File

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

View File

@ -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,24 +183,29 @@ minetest.register_craftitem("farming:porridge", {
minetest.after(0, function()
local fluid = "bucket:bucket_water"
local fluid_return = "bucket:bucket_water"
local fluid = "group:water_bucket"
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 = {
{"mobs:bucket_milk", "bucket:bucket_empty"}
}
else
minetest.register_craft({
type = "shapeless",
output = "farming:porridge",
recipe = {
"group:food_oats", "group:food_oats", "group:food_oats",
"group:food_oats", "group:food_bowl", "group:water_bucket_wooden"
},
replacements = fluid_return
})
end
minetest.register_craft({
type = "shapeless",
output = "farming:porridge",
recipe = {
"group:food_barley", "group:food_barley", "group:food_wheat",
"group:food_wheat", "group:food_bowl", fluid
},
replacements = {{fluid_return, "bucket:bucket_empty"}}
})
minetest.register_craft({
type = "shapeless",
output = "farming:porridge",
@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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=Бутылка спирта

View File

@ -1,134 +1,134 @@
# textdomain:farming
#%s Hoe=
Apple Donut=苹果甜甜圈
Apple Donut=苹果甜甜圈
#Apple Pie=
Baked Potato=焗马铃薯
Baking Tray=烤盘
Banana=香蕉
Banana Leaves=香蕉叶
Bar of Dark Chocolate=黑巧克力条
Barley=大麦
Barley Seed=大麦种子
Bean Pole (place on soil before planting beans)=豆杆(种豆前先放在土上)
Beetroot=甜菜根
Beetroot Soup=甜菜根汤
Baked Potato=焗马铃薯
Baking Tray=烤盘
Banana=香蕉
Banana Leaves=香蕉叶
Bar of Dark Chocolate=黑巧克力条
Barley=大麦
Barley Seed=大麦种子
Bean Pole (place on soil before planting beans)=豆杆(种豆前先放在土上)
Beetroot=甜菜根
Beetroot Soup=甜菜根汤
#Bibimbap=
Blueberries=蓝莓
Blueberry Muffin=蓝莓松糕
Blueberry Pie=蓝莓派
Bottle of Ethanol=一瓶乙醇
Bottle of Hemp Oil=一瓶大麻油
Bowl of Chili=一碗辣椒
Bread=面包
Bronze Hoe=青铜锄头
Wild Blueberries=蓝莓
Blueberry Muffin=蓝莓松糕
Blueberry Pie=蓝莓派
Bottle of Ethanol=一瓶乙醇
Bottle of Hemp Oil=一瓶大麻油
Bowl of Chili=一碗辣椒
Bread=面包
Bronze Hoe=青铜锄头
#Cabbage=
#Cactus Juice=
Carrot=胡萝卜
Carrot Juice=胡萝卜汁
Chili Pepper=辣椒
Chocolate Block=巧克力块
Chocolate Donut=巧克力甜甜圈
Cocoa Beans=可可豆
Coffee Beans=咖啡豆
Cookie=曲奇
Cooking Pot=锅
Corn=玉米
Corn on the Cob=玉米棒
Cornstarch=玉米淀粉
Cotton=棉花
Cotton Seed=棉籽
Cucumber=黄瓜
Cucumber and Potato Salad=黄瓜土豆沙拉
Cup of Coffee=一杯咖啡
Cutting Board=砧板
Diamond Hoe=钻石锄
Donut=甜甜圈
Flour=面粉
Garlic=大蒜
Garlic Braid=蒜辫
Garlic Bread=蒜香面包
Garlic clove=蒜瓣
Glass Mixing Bowl=搅拌杯
Golden Carrot=金萝卜
Grapes=葡萄
Green Beans=青豆
Ground Pepper=胡椒粉
Hemp Block=麻块
Hemp Fibre=大麻纤维
Hemp Leaf=大麻叶
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)=杰克灯(按一下开关)
Jaffa Cake=佳发饼
Juicer=榨汁机
Melon=甜瓜
Melon Slice=西瓜片
Mese Hoe=黄石锄头
Carrot=胡萝卜
Carrot Juice=胡萝卜汁
Chili Pepper=辣椒
Chocolate Block=巧克力块
Chocolate Donut=巧克力甜甜圈
Cocoa Beans=可可豆
Coffee Beans=咖啡豆
Cookie=曲奇
Cooking Pot=锅
Corn=玉米
Corn on the Cob=玉米棒
Cornstarch=玉米淀粉
Cotton=棉花
Cotton Seed=棉籽
Cucumber=黄瓜
Cucumber and Potato Salad=黄瓜土豆沙拉
Cup of Coffee=一杯咖啡
Cutting Board=砧板
Diamond Hoe=钻石锄
Donut=甜甜圈
Flour=面粉
Garlic=大蒜
Garlic Braid=蒜辫
Garlic Bread=蒜香面包
Garlic clove=蒜瓣
Glass Mixing Bowl=搅拌杯
Golden Carrot=金萝卜
Grapes=葡萄
Green Beans=青豆
Ground Pepper=胡椒粉
Hemp Block=麻块
Hemp Fibre=大麻纤维
Hemp Leaf=大麻叶
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)=杰克灯(按一下开关)
Jaffa Cake=佳发饼
Juicer=榨汁机
Melon=甜瓜
Melon Slice=西瓜片
Mese Hoe=黄石锄头
#Mint Leaf=
#Mint Seeds=
#Mint Tea=
Mithril Scythe (Right-click to harvest and replant crops)=秘银镰刀(右击可收获并重新种植作物)
Mortar and Pestle=研钵
Multigrain Bread=杂粮面包
Multigrain Flour=多粒面粉
Oat seed=燕麦籽
Mithril Scythe (Right-click to harvest and replant crops)=秘银镰刀(右击可收获并重新种植作物)
Mortar and Pestle=研钵
Multigrain Bread=杂粮面包
Multigrain Flour=多粒面粉
Oat seed=燕麦籽
#Oats=
Onion=洋葱
Onion=洋葱
#Onion Soup=
Orange=橙色
Orange=橙色
#Pasta=
Pea Pod=豌豆荚
Pea Soup=豌豆汤
Peas=豌豆
Pepper=胡椒粉
Peppercorn=胡椒粉
Pineapple=菠萝
Pineapple Juice=菠萝汁
Pineapple Ring=菠萝圈
Pineapple Top=菠萝上衣
Porridge=粥
Potato=土豆
Pumpkin=南瓜
Pumpkin Bread=南瓜面包
Pumpkin Dough=南瓜面团
Pumpkin Slice=南瓜片
Raspberries=覆盆子
Raspberry Smoothie=覆盆子冰沙
Rhubarb=大黄
Rhubarb Pie=大黄派
Rice=大米
Rice Bread=米饭面包
Rice Flour=米粉
Rice grains=稻谷
Rose Water=玫瑰汁
Rye=黑麦
Rye seed=黑麦种子
Salt=盐
Saucepan=平底锅
Pea Pod=豌豆荚
Pea Soup=豌豆汤
Peas=豌豆
Pepper=胡椒粉
Peppercorn=胡椒粉
Pineapple=菠萝
Pineapple Juice=菠萝汁
Pineapple Ring=菠萝圈
Pineapple Top=菠萝上衣
Porridge=粥
Potato=土豆
Pumpkin=南瓜
Pumpkin Bread=南瓜面包
Pumpkin Dough=南瓜面团
Pumpkin Slice=南瓜片
Raspberries=覆盆子
Raspberry Smoothie=覆盆子冰沙
Rhubarb=大黄
Rhubarb Pie=大黄派
Rice=大米
Rice Bread=米饭面包
Rice Flour=米粉
Rice grains=稻谷
Rose Water=玫瑰汁
Rye=黑麦
Rye seed=黑麦种子
Salt=盐
Saucepan=平底锅
#Savanna Soil=
Scarecrow Bottom=稻草人屁股
Seed=种子
Skillet=平底锅
Sliced Bread=切片面包
Soil=土壤
Scarecrow Bottom=稻草人屁股
Seed=种子
Skillet=平底锅
Sliced Bread=切片面包
Soil=土壤
#Spaghetti=
Steel Hoe=钢锄头
Stone Hoe=石锄
Straw=稻草
Strawberry=草莓
String=字符串
Sugar=糖
Toast=烤面包片
Toast Sandwich=三明治面包
Tomato=番茄
Trellis (place on soil before planting grapes)=棚架(种植葡萄前先放在土壤上)
Turkish Delight=土耳其软糖
Steel Hoe=钢锄头
Stone Hoe=石锄
Straw=稻草
Strawberry=草莓
String=字符串
Sugar=糖
Toast=烤面包片
Toast Sandwich=三明治面包
Tomato=番茄
Trellis (place on soil before planting grapes)=棚架(种植葡萄前先放在土壤上)
Turkish Delight=土耳其软糖
#Wet Savanna Soil=
Wet Soil=湿土
Wheat=小麦
Wheat Seed=小麦种子
Wet Soil=湿土
Wheat=小麦
Wheat Seed=小麦种子
#Wild Cotton=
Wooden Bowl=木碗
Wooden Hoe=木锄
Wooden Bowl=木碗
Wooden Hoe=木锄

View File

@ -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=一瓶乙醇