Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sys Quatre 2021-01-02 14:23:48 +01:00
commit 62b83f71a4
3 changed files with 7 additions and 4 deletions

View File

@ -481,7 +481,7 @@ if minetest.get_modpath("moreores") then
{"", "", "group:stick"} {"", "", "group:stick"}
} }
}) })
--[[
farming.register_hoe(":moreores:hoe_silver", { farming.register_hoe(":moreores:hoe_silver", {
description = S("%s Hoe"):format(S("Silver")), description = S("%s Hoe"):format(S("Silver")),
inventory_image = "moreores_tool_silverhoe.png", inventory_image = "moreores_tool_silverhoe.png",
@ -510,5 +510,5 @@ if minetest.get_modpath("moreores") then
minetest.override_item("moreores:hoe_mithril", { minetest.override_item("moreores:hoe_mithril", {
original_description = desc, original_description = desc,
description = toolranks.create_description(desc)}) description = toolranks.create_description(desc)})
end end]]
end end

View File

@ -149,7 +149,7 @@ Created by OgelGames (CC BY-SA 4.0)
farming_cactus_juice.png farming_cactus_juice.png
farming_salad.png farming_salad.png
Created by Felfa Created by Felfa (CC0)
farming_blackberry*.png farming_blackberry*.png
farming_lettuce*.png farming_lettuce*.png
farming_burger.png farming_burger.png

View File

@ -1 +1,4 @@
name = farming name = farming
depends = default
optional_depends = stairs, intllib, lucky_block, toolranks
description = Adds many plants and food to Minetest