mtcontrib/farming
1
0
Fork 1
mirror of https://codeberg.org/tenplus1/farming.git synced 2025-06-28 22:36:45 +02:00
Code Issues Releases Wiki Activity

Compare commits

base: mtcontrib:master
Branches Tags
mtcontrib:master nalc:master
nalc:nalc-1.2.0
...
compare: nalc:nalc-1.2.0
Branches Tags
nalc:master mtcontrib:master
nalc:nalc-1.2.0

5 Commits
master ... nalc-1.2.0

Author SHA1 Message Date
sys4
016528f585 Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-06-16 21:43:22 +02:00
sys4
88ed7b5a7f Supprime la génération des carottes et du maïs 2020-06-14 15:42:23 +02:00
sys4
e9d97cfeb1 Merge branch 'master' of yunohost.local:mtcontrib/farming into nalc-1.2-dev 2019-12-22 13:05:51 +01:00
sys4
19577a3917 Merge branch 'master' into nalc-1.2 2019-05-09 21:40:50 +02:00
sys4-fr
ec40c00836 Ajoute message de chargement du mod dans le journal "action" 2018-12-25 15:48:08 +01:00
2 changed files with 4 additions and 2 deletions
Expand all files Collapse all files

2
init.lua
View File

@ -695,3 +695,5 @@ dofile(farming.path.."/food.lua")
dofile(farming.path.."/mapgen.lua")
dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility
dofile(farming.path.."/lucky_block.lua")
minetest.log("action", "[farming] loaded.")

4
mapgen.lua
View File

@ -34,7 +34,7 @@ end
-- add crops to mapgen
register_plant("potato_3", 15, 40, nil, "", -1, farming.potato)
register_plant("tomato_7", 5, 20, nil, "", -1, farming.tomato)
register_plant("corn_7", 12, 22, nil, "", -1, farming.corn)
register_plant("corn_7", 12, 22, nil, "", -1, nil)
register_plant("coffee_5", 20, 45, {"default:dirt_with_dry_grass",
"default:dirt_with_rainforest_litter",
"default:dry_dirt_with_dry_grass"}, "", -1, farming.coffee)
@ -59,7 +59,7 @@ if minetest.get_mapgen_setting("mg_name") == "v6" then
register_plant("pumpkin_8", 1, 20, nil, "group:water", 1, farming.pumpkin)
else
-- v7 maps have a beach so plants growing near water is limited to 6 high
register_plant("carrot_8", 1, 15, nil, "", -1, farming.carrot)
register_plant("carrot_8", 1, 15, nil, "", -1, nil)
register_plant("cucumber_4", 1, 10, nil, "", -1, farming.cucumber)
register_plant("melon_8", 1, 6, {"default:dirt_with_dry_grass",
"default:dirt_with_rainforest_litter"}, "", -1, farming.melon)