Merge remote-tracking branch 'upstream/master'

remove moreores hoes (inc. within moreores now)
remove moreores dependency
2021-01-02 14:23:48 +01:00 · 2021-01-01 20:58:43 +00:00 · 2021-01-01 20:23:51 +00:00 · 2020-12-31 19:48:12 +00:00
3 changed files with 7 additions and 4 deletions
--- a/hoes.lua
+++ b/hoes.lua
@ -481,7 +481,7 @@ if minetest.get_modpath("moreores") then
 			{"", "", "group:stick"}
 		}
 	})
-
+--[[
 	farming.register_hoe(":moreores:hoe_silver", {
 		description = S("%s Hoe"):format(S("Silver")),
 		inventory_image = "moreores_tool_silverhoe.png",
@ -510,5 +510,5 @@ if minetest.get_modpath("moreores") then
 		minetest.override_item("moreores:hoe_mithril", {
 			original_description = desc,
 			description = toolranks.create_description(desc)})
-	end
+	end]]
 end
--- a/license.txt
+++ b/license.txt
@ -149,7 +149,7 @@ Created by OgelGames (CC BY-SA 4.0)
   farming_cactus_juice.png
   farming_salad.png

-Created by Felfa
+Created by Felfa (CC0)
   farming_blackberry*.png
   farming_lettuce*.png
   farming_burger.png
--- a/mod.conf
+++ b/mod.conf
@ -1 +1,4 @@
 name = farming
+depends = default
+optional_depends = stairs, intllib, lucky_block, toolranks
+description = Adds many plants and food to Minetest
Author	SHA1	Message	Date
sys4	62b83f71a4	Merge remote-tracking branch 'upstream/master'	2021-01-02 14:23:48 +01:00
tenplus1	95dd74cc15	remove moreores hoes (inc. within moreores now)	2021-01-01 20:58:43 +00:00
tenplus1	303fc017e0	remove moreores dependency	2021-01-01 20:23:51 +00:00
tenplus1	2a77424a48	update mod.conf	2020-12-31 19:48:12 +00:00