1
0
mirror of https://codeberg.org/tenplus1/farming.git synced 2025-06-30 07:11:13 +02:00

Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

This commit is contained in:
2020-06-16 21:43:22 +02:00
40 changed files with 1523 additions and 1346 deletions

View File

@ -7,7 +7,7 @@
farming = {
mod = "redo",
version = "20191202",
version = "20200527",
path = minetest.get_modpath("farming"),
select = {
type = "fixed",
@ -79,7 +79,8 @@ end
-- Growth Logic
local STAGE_LENGTH_AVG = 160.0
local STAGE_LENGTH_AVG = tonumber(
minetest.settings:get("farming_stage_length")) or 160
local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6
@ -623,6 +624,7 @@ farming.pepper = 0.002
farming.pineapple = 0.001
farming.peas = 0.001
farming.beetroot = 0.001
farming.mint = 0.005
farming.grains = true
farming.rarety = 0.002
@ -687,6 +689,7 @@ ddoo("peas.lua", farming.peas)
ddoo("beetroot.lua", farming.beetroot)
ddoo("chili.lua", farming.chili)
ddoo("ryeoatrice.lua", farming.grains)
ddoo("mint.lua", farming.mint)
dofile(farming.path.."/food.lua")
dofile(farming.path.."/mapgen.lua")