summaryrefslogtreecommitdiff
path: root/farming
diff options
context:
space:
mode:
Diffstat (limited to 'farming')
-rw-r--r--farming/README.md4
-rw-r--r--farming/api.txt6
-rw-r--r--farming/crops/barley.lua10
-rw-r--r--farming/crops/beans.lua2
-rw-r--r--farming/crops/blueberry.lua1
-rw-r--r--farming/crops/carrot.lua1
-rw-r--r--farming/crops/grapes.lua2
-rw-r--r--farming/crops/pineapple.lua1
-rw-r--r--farming/crops/raspberry.lua1
-rw-r--r--farming/crops/ryeoatrice.lua162
-rw-r--r--farming/farming.conf_example1
-rw-r--r--farming/food.lua32
-rw-r--r--farming/grass.lua5
-rw-r--r--farming/hoes.lua140
-rw-r--r--farming/init.lua11
-rw-r--r--farming/license.txt25
-rw-r--r--farming/lucky_block.lua4
-rw-r--r--farming/textures/farming_bread_multigrain.pngbin0 -> 583 bytes
-rw-r--r--farming/textures/farming_flour_multigrain.pngbin0 -> 161 bytes
-rw-r--r--farming/textures/farming_jaffa_cake.pngbin0 -> 185 bytes
-rw-r--r--farming/textures/farming_oat.pngbin0 -> 274 bytes
-rw-r--r--farming/textures/farming_oat_1.pngbin0 -> 114 bytes
-rw-r--r--farming/textures/farming_oat_2.pngbin0 -> 143 bytes
-rw-r--r--farming/textures/farming_oat_3.pngbin0 -> 173 bytes
-rw-r--r--farming/textures/farming_oat_4.pngbin0 -> 190 bytes
-rw-r--r--farming/textures/farming_oat_5.pngbin0 -> 219 bytes
-rw-r--r--farming/textures/farming_oat_6.pngbin0 -> 236 bytes
-rw-r--r--farming/textures/farming_oat_7.pngbin0 -> 255 bytes
-rw-r--r--farming/textures/farming_oat_8.pngbin0 -> 310 bytes
-rw-r--r--farming/textures/farming_oat_seed.pngbin0 -> 142 bytes
-rw-r--r--farming/textures/farming_rice.pngbin0 -> 325 bytes
-rw-r--r--farming/textures/farming_rice_1.pngbin0 -> 114 bytes
-rw-r--r--farming/textures/farming_rice_2.pngbin0 -> 143 bytes
-rw-r--r--farming/textures/farming_rice_3.pngbin0 -> 173 bytes
-rw-r--r--farming/textures/farming_rice_4.pngbin0 -> 189 bytes
-rw-r--r--farming/textures/farming_rice_5.pngbin0 -> 217 bytes
-rw-r--r--farming/textures/farming_rice_6.pngbin0 -> 245 bytes
-rw-r--r--farming/textures/farming_rice_7.pngbin0 -> 261 bytes
-rw-r--r--farming/textures/farming_rice_8.pngbin0 -> 336 bytes
-rw-r--r--farming/textures/farming_rice_bread.pngbin0 -> 392 bytes
-rw-r--r--farming/textures/farming_rice_flour.pngbin0 -> 272 bytes
-rw-r--r--farming/textures/farming_rice_seed.pngbin0 -> 201 bytes
-rw-r--r--farming/textures/farming_rye.pngbin0 -> 242 bytes
-rw-r--r--farming/textures/farming_rye_1.pngbin0 -> 114 bytes
-rw-r--r--farming/textures/farming_rye_2.pngbin0 -> 143 bytes
-rw-r--r--farming/textures/farming_rye_3.pngbin0 -> 173 bytes
-rw-r--r--farming/textures/farming_rye_4.pngbin0 -> 189 bytes
-rw-r--r--farming/textures/farming_rye_5.pngbin0 -> 217 bytes
-rw-r--r--farming/textures/farming_rye_6.pngbin0 -> 237 bytes
-rw-r--r--farming/textures/farming_rye_7.pngbin0 -> 254 bytes
-rw-r--r--farming/textures/farming_rye_8.pngbin0 -> 310 bytes
-rw-r--r--farming/textures/farming_rye_seed.pngbin0 -> 142 bytes
-rw-r--r--farming/textures/farming_scythe_mithril.pngbin0 -> 172 bytes
53 files changed, 391 insertions, 17 deletions
diff --git a/farming/README.md b/farming/README.md
index 55ddee0..8f3e671 100644
--- a/farming/README.md
+++ b/farming/README.md
@@ -13,6 +13,8 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
### Changelog:
+- 1.40 - Added Mithril Scythe to quick harvest and replant crops on right-click.
+- 1.39 - Added Rice, Rye and Oats thanks to Ademants Grains mod. Added Jaffa Cake and multigrain bread.
- 1.38 - Pumpkin grows into block, use chopping board to cut into 4x slices, same with melon block, 2x2 slices makes a block, cocoa pods are no longer walkable
- 1.37 - Added custom 'growth_check(pos, nodename) function for crop nodes to use (check cocoa.lua for example)
- 1.36 - Added Beetroot, Beetroot Soup (6x beetroot, 1x bowl), fix register_plant() issue, add new recipes
@@ -59,4 +61,4 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
- 0.1 - Fixed growing bug
- 0.0 - Initial release
-### Lucky Blocks: 38
+### Lucky Blocks: 39
diff --git a/farming/api.txt b/farming/api.txt
index 0098624..acec5a0 100644
--- a/farming/api.txt
+++ b/farming/api.txt
@@ -56,3 +56,9 @@ growth_check = function(pos, node_name)
end
return true -- condition not met, skip next growth stage until next check
end,
+
+### Scythe items that will not drop
+
+This is a function to add items to a list that scythes will not drop, e.g. farming:trellis or farming:beanpole.
+
+farming.add_to_scythe_not_drops(item_name)
diff --git a/farming/crops/barley.lua b/farming/crops/barley.lua
index 6f3cb97..cc5ca0f 100644
--- a/farming/crops/barley.lua
+++ b/farming/crops/barley.lua
@@ -110,5 +110,13 @@ farming.registered_plants["farming:barley"] = {
seed = "farming:seed_barley",
minlight = 13,
maxlight = 15,
- steps = 8
+ steps = 7
}
+
+-- Fuel
+
+minetest.register_craft({
+ type = "fuel",
+ recipe = "farming:barley",
+ burntime = 1,
+})
diff --git a/farming/crops/beans.lua b/farming/crops/beans.lua
index a75030a..bd3b8ee 100644
--- a/farming/crops/beans.lua
+++ b/farming/crops/beans.lua
@@ -191,7 +191,7 @@ local crop_def = {
selection_box = farming.select,
groups = {
snappy = 3, flammable = 3, not_in_creative_inventory = 1,
- attached_node = 1, growing = 1
+ attached_node = 1, growing = 1, plant = 1
},
sounds = default.node_sound_leaves_defaults()
}
diff --git a/farming/crops/blueberry.lua b/farming/crops/blueberry.lua
index 64aee3e..6752e35 100644
--- a/farming/crops/blueberry.lua
+++ b/farming/crops/blueberry.lua
@@ -42,6 +42,7 @@ minetest.register_craft({
"group:food_flour", "group:food_sugar",
"group:food_blueberries", "group:food_baking_tray"
},
+ replacements = {{"group:food_baking_tray", "farming:baking_tray"}}
})
-- blueberry definition
diff --git a/farming/crops/carrot.lua b/farming/crops/carrot.lua
index b4baa8d..6ec1994 100644
--- a/farming/crops/carrot.lua
+++ b/farming/crops/carrot.lua
@@ -22,6 +22,7 @@ minetest.register_craftitem("farming:carrot_juice", {
description = S("Carrot Juice"),
inventory_image = "farming_carrot_juice.png",
on_use = minetest.item_eat(4, "vessels:drinking_glass"),
+ groups = {vessel = 1},
})
minetest.register_craft({
diff --git a/farming/crops/grapes.lua b/farming/crops/grapes.lua
index c341075..2b33427 100644
--- a/farming/crops/grapes.lua
+++ b/farming/crops/grapes.lua
@@ -186,7 +186,7 @@ local crop_def = {
selection_box = farming.select,
groups = {
snappy = 3, flammable = 3, not_in_creative_inventory = 1,
- attached_node = 1, growing = 1
+ attached_node = 1, growing = 1, plant = 1
},
sounds = default.node_sound_leaves_defaults()
}
diff --git a/farming/crops/pineapple.lua b/farming/crops/pineapple.lua
index 8a60310..f62042e 100644
--- a/farming/crops/pineapple.lua
+++ b/farming/crops/pineapple.lua
@@ -47,6 +47,7 @@ minetest.register_craftitem("farming:pineapple_juice", {
description = S("Pineapple Juice"),
inventory_image = "farming_pineapple_juice.png",
on_use = minetest.item_eat(4, "vessels:drinking_glass"),
+ groups = {vessel = 1},
})
minetest.register_craft({
diff --git a/farming/crops/raspberry.lua b/farming/crops/raspberry.lua
index 4938658..979bdfb 100644
--- a/farming/crops/raspberry.lua
+++ b/farming/crops/raspberry.lua
@@ -17,6 +17,7 @@ minetest.register_craftitem("farming:smoothie_raspberry", {
description = S("Raspberry Smoothie"),
inventory_image = "farming_raspberry_smoothie.png",
on_use = minetest.item_eat(2, "vessels:drinking_glass"),
+ groups = {vessel = 1},
})
minetest.register_craft({
diff --git a/farming/crops/ryeoatrice.lua b/farming/crops/ryeoatrice.lua
new file mode 100644
index 0000000..d064626
--- /dev/null
+++ b/farming/crops/ryeoatrice.lua
@@ -0,0 +1,162 @@
+
+local S = farming.intllib
+
+--= A nice addition from Ademant's grain mod :)
+
+-- Rye
+
+farming.register_plant("farming:rye", {
+ description = "Rye seed",
+ paramtype2 = "meshoptions",
+ inventory_image = "farming_rye_seed.png",
+ steps = 8,
+ place_param2 = 3,
+})
+
+minetest.override_item("farming:rye", {
+ groups = {food_rye = 1, flammable = 4}
+})
+
+minetest.register_craft({
+ type = "shapeless",
+ output = "farming:flour",
+ recipe = {
+ "farming:rye", "farming:rye", "farming:rye", "farming:rye",
+ "farming:mortar_pestle"
+ },
+ replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+})
+
+-- Oats
+
+farming.register_plant("farming:oat", {
+ description = "Oat seed",
+ paramtype2 = "meshoptions",
+ inventory_image = "farming_oat_seed.png",
+ steps = 8,
+ place_param2 = 3,
+})
+
+minetest.override_item("farming:oat", {
+ groups = {food_oats = 1, flammable = 4}
+})
+
+minetest.register_craft({
+ type = "shapeless",
+ output = "farming:flour",
+ recipe = {
+ "farming:oat", "farming:oat", "farming:oat", "farming:oat",
+ "farming:mortar_pestle"
+ },
+ replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+})
+
+-- Rice
+
+farming.register_plant("farming:rice", {
+ description = "Rice grains",
+ paramtype2 = "meshoptions",
+ inventory_image = "farming_rice_seed.png",
+ steps = 8,
+ place_param2 = 3,
+})
+
+minetest.override_item("farming:rice", {
+ groups = {food_rice = 1, flammable = 4}
+})
+
+minetest.register_craftitem("farming:rice_bread", {
+ description = "Rice Bread",
+ inventory_image = "farming_rice_bread.png",
+ on_use = minetest.item_eat(5),
+ groups = {food_rice_bread = 1, flammable = 2},
+})
+
+minetest.register_craftitem("farming:rice_flour", {
+ description = "Rice Flour",
+ inventory_image = "farming_rice_flour.png",
+ groups = {food_rice_flour = 1, flammable = 1},
+})
+
+minetest.register_craft({
+ type = "shapeless",
+ output = "farming:rice_flour",
+ recipe = {
+ "farming:rice", "farming:rice", "farming:rice", "farming:rice",
+ "farming:mortar_pestle"
+ },
+ replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+})
+
+minetest.register_craft({
+ type = "cooking",
+ cooktime = 15,
+ output = "farming:rice_bread",
+ recipe = "farming:rice_flour"
+})
+
+-- Multigrain flour
+
+minetest.register_craftitem("farming:flour_multigrain", {
+ description = S("Multigrain Flour"),
+ inventory_image = "farming_flour_multigrain.png",
+ groups = {food_flour = 1, flammable = 1},
+})
+
+minetest.register_craft({
+ type = "shapeless",
+ output = "farming:flour_multigrain",
+ recipe = {
+ "farming:wheat", "farming:barley", "farming:oat",
+ "farming:rye", "farming:mortar_pestle"
+ },
+ replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
+})
+
+-- Multigrain bread
+
+minetest.register_craftitem("farming:bread_multigrain", {
+ description = S("Multigrain Bread"),
+ inventory_image = "farming_bread_multigrain.png",
+ on_use = minetest.item_eat(7),
+ groups = {food_bread = 1, flammable = 2},
+})
+
+minetest.register_craft({
+ type = "cooking",
+ cooktime = 15,
+ output = "farming:bread_multigrain",
+ recipe = "farming:flour_multigrain"
+})
+
+-- Fuels
+
+minetest.register_craft({
+ type = "fuel",
+ recipe = "farming:rice_bread",
+ burntime = 1,
+})
+
+minetest.register_craft({
+ type = "fuel",
+ recipe = "farming:bread_multigrain",
+ burntime = 1,
+})
+
+minetest.register_craft({
+ type = "fuel",
+ recipe = "farming:rye",
+ burntime = 1,
+})
+
+minetest.register_craft({
+ type = "fuel",
+ recipe = "farming:oat",
+ burntime = 1,
+})
+
+minetest.register_craft({
+ type = "fuel",
+ recipe = "farming:rice",
+ burntime = 1,
+})
diff --git a/farming/farming.conf_example b/farming/farming.conf_example
index f652e9c..9d1769a 100644
--- a/farming/farming.conf_example
+++ b/farming/farming.conf_example
@@ -29,6 +29,7 @@ farming.pepper = true
farming.pineapple = true
farming.peas = true
farming.beetroot = true
+farming.grains = true
-- rarety of crops on map, default is 0.001 (higher number = more crops)
farming.rarety = 0.002
diff --git a/farming/food.lua b/farming/food.lua
index f099e53..1670f1f 100644
--- a/farming/food.lua
+++ b/farming/food.lua
@@ -185,4 +185,36 @@ minetest.after(0, function()
},
replacements = {{fluid_return, "bucket:bucket_empty"}}
})
+
+ minetest.register_craft({
+ type = "shapeless",
+ output = "farming:porridge",
+ recipe = {
+ "group:food_oats", "group:food_oats", "group:food_oats",
+ "group:food_oats", "group:food_bowl", fluid
+ },
+ replacements = {{fluid_return, "bucket:bucket_empty"}}
+ })
end)
+
+--= Jaffa Cake
+
+minetest.register_craftitem("farming:jaffa_cake", {
+ description = S("Jaffa Cake"),
+ inventory_image = "farming_jaffa_cake.png",
+ on_use = minetest.item_eat(6),
+})
+
+minetest.register_craft({
+ type = "shapeless",
+ output = "farming:jaffa_cake",
+ recipe = {
+ "farming:baking_tray", "group:food_egg", "group:food_sugar",
+ "group:food_flour", "group:food_cocoa", "group:food_orange",
+ "group:food_milk"
+ },
+ replacements = {
+ {"farming:baking_tray", "farming:baking_tray"},
+ {"mobs:bucket_milk", "bucket:bucket_empty"}
+ }
+})
diff --git a/farming/grass.lua b/farming/grass.lua
index 9644254..53ea606 100644
--- a/farming/grass.lua
+++ b/farming/grass.lua
@@ -8,6 +8,7 @@ for i = 4, 5 do
max_items = 1,
items = {
{items = {'farming:seed_wheat'}, rarity = 5},
+ {items = {'farming:seed_oat'},rarity = 5},
{items = {'default:grass_1'}},
}
},
@@ -21,7 +22,8 @@ for i = 4, 5 do
drop = {
max_items = 1,
items = {
- {items = {'farming:seed_barley'}, rarity = 6},
+ {items = {'farming:seed_barley'}, rarity = 5},
+ {items = {'farming:seed_rye'},rarity = 5},
{items = {'default:dry_grass_1'}},
}
},
@@ -37,6 +39,7 @@ minetest.override_item("default:junglegrass", {
max_items = 1,
items = {
{items = {'farming:seed_cotton'}, rarity = 8},
+ {items = {'farming:seed_rice'},rarity = 8},
{items = {'default:junglegrass'}},
}
},
diff --git a/farming/hoes.lua b/farming/hoes.lua
index 633e6f0..6ffa98f 100644
--- a/farming/hoes.lua
+++ b/farming/hoes.lua
@@ -330,3 +330,143 @@ minetest.register_craftitem("farming:hoe_bomb", {
end
end,
})
+
+-- Mithril Scythe (special item)
+
+farming.scythe_not_drops = {"farming:trellis", "farming:beanpole"}
+
+farming.add_to_scythe_not_drops = function(item)
+ table.insert(farming.scythe_not_drops, item)
+end
+
+minetest.register_tool("farming:scythe_mithril", {
+ description = S("Mithril Scythe (Right-click crop to harvest and replant)"),
+ inventory_image = "farming_scythe_mithril.png",
+ tool_capabilities = {
+ full_punch_interval = 0.8,
+ max_drop_level = 2,
+ groupcaps = {
+ fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 150, maxlevel = 2},
+ snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 150, maxlevel = 2},
+ },
+ damage_groups = {fleshy = 8},
+ },
+ sound = {breaks = "default_tool_breaks"},
+
+ on_place = function(itemstack, placer, pointed_thing)
+
+ if pointed_thing.type ~= "node" then
+ return
+ end
+
+ local pos = pointed_thing.under
+ local name = placer:get_player_name()
+
+ if minetest.is_protected(pos, name) then
+ return
+ end
+
+ local node = minetest.get_node_or_nil(pos)
+
+ if not node then
+ return
+ end
+
+ local def = minetest.registered_nodes[node.name]
+
+ if not def then
+ return
+ end
+
+ if not def.drop then
+ return
+ end
+
+ if not def.groups
+ or not def.groups.plant then
+ return
+ end
+
+ local drops = minetest.get_node_drops(node.name, "")
+
+ if not drops
+ or #drops == 0
+ or (#drops == 1 and drops[1] == "") then
+ return
+ end
+
+ -- get crop name
+ local mname = node.name:split(":")[1]
+ local pname = node.name:split(":")[2]
+ local sname = tonumber(pname:split("_")[2])
+ pname = pname:split("_")[1]
+
+ if not sname then
+ return
+ end
+
+ -- add dropped items
+ for _, dropped_item in pairs(drops) do
+
+ -- dont drop items on this list
+ for _, not_item in pairs(farming.scythe_not_drops) do
+
+ if dropped_item == not_item then
+ dropped_item = nil
+ end
+ end
+
+ if dropped_item then
+
+ local obj = minetest.add_item(pos, dropped_item)
+
+ if obj then
+
+ obj:set_velocity({
+ x = math.random(-10, 10) / 9,
+ y = 3,
+ z = math.random(-10, 10) / 9,
+ })
+ end
+ end
+ end
+
+ -- Run script hook
+ for _, callback in pairs(core.registered_on_dignodes) do
+ callback(pos, node)
+ end
+
+ -- play sound
+ minetest.sound_play("default_grass_footstep", {pos = pos, gain = 1.0})
+
+ local replace = mname .. ":" .. pname .. "_1"
+
+ if minetest.registered_nodes[replace] then
+
+ local p2 = minetest.registered_nodes[replace].place_param2 or 1
+
+ minetest.set_node(pos, {name = replace, param2 = p2})
+ else
+ minetest.set_node(pos, {name = "air"})
+ end
+
+ if not farming.is_creative(name) then
+
+ itemstack:add_wear(65535 / 150) -- 150 uses
+
+ return itemstack
+ end
+ end,
+})
+
+if minetest.get_modpath("moreores") then
+
+ minetest.register_craft({
+ output = "farming:scythe_mithril",
+ recipe = {
+ {"", "moreores:mithril_ingot", "moreores:mithril_ingot"},
+ {"moreores:mithril_ingot", "", "group:stick"},
+ {"", "", "group:stick"}
+ }
+ })
+end
diff --git a/farming/init.lua b/farming/init.lua
index 04fe300..98479a3 100644
--- a/farming/init.lua
+++ b/farming/init.lua
@@ -7,7 +7,7 @@
farming = {
mod = "redo",
- version = "20180929",
+ version = "20190111",
path = minetest.get_modpath("farming"),
select = {
type = "fixed",
@@ -457,6 +457,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname)
minetest.set_node(pt.above, {name = plantname, param2 = p2})
--minetest.get_node_timer(pt.above):start(1)
+--farming.handle_growth(pt.above)--, node)
minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0})
@@ -591,7 +592,7 @@ farming.registered_plants[mname .. ":" .. pname] = {
minlight = def.minlight,
maxlight = def.maxlight
}
-print(dump(farming.registered_plants[mname .. ":" .. pname]))
+--print(dump(farming.registered_plants[mname .. ":" .. pname]))
-- Return info
return {seed = mname .. ":seed_" .. pname, harvest = mname .. ":" .. pname}
end
@@ -621,6 +622,7 @@ farming.pepper = true
farming.pineapple = true
farming.peas = true
farming.beetroot = true
+farming.grains = true
farming.rarety = 0.002 -- 0.006
@@ -629,16 +631,14 @@ local input = io.open(farming.path.."/farming.conf", "r")
if input then
dofile(farming.path .. "/farming.conf")
input:close()
- input = nil
end
-- load new world-specific settings if found inside world folder
local worldpath = minetest.get_worldpath()
-local input = io.open(worldpath.."/farming.conf", "r")
+input = io.open(worldpath.."/farming.conf", "r")
if input then
dofile(worldpath .. "/farming.conf")
input:close()
- input = nil
end
@@ -685,6 +685,7 @@ ddoo("pineapple.lua", farming.pineapple)
ddoo("peas.lua", farming.peas)
ddoo("beetroot.lua", farming.beetroot)
ddoo("chili.lua", farming.chili)
+ddoo("ryeoatrice.lua", farming.grains)
dofile(farming.path.."/food.lua")
dofile(farming.path.."/mapgen.lua")
diff --git a/farming/license.txt b/farming/license.txt
index b7bb7a9..eba35f8 100644
--- a/farming/license.txt
+++ b/farming/license.txt
@@ -23,7 +23,7 @@ THE SOFTWARE.
License of media (textures):
----------------------------
-Created by PilzAdam (License: WTFPL):
+Created by PilzAdam (License: CC BY 3.0):
farming_bread.png
farming_soil.png
farming_soil_wet.png
@@ -41,7 +41,7 @@ Created by Calinou (License: CC BY-SA):
farming_tool_mesehoe.png
farming_tool_diamondhoe.png
-Created by VanessaE (License: WTFPL):
+Created by VanessaE (License: CC BY 3.0):
farming_cotton_seed.png
farming_wheat_seed.png
farming_flour.png
@@ -63,7 +63,7 @@ Created by VanessaE (License: WTFPL):
farming_cotton_7.png
farming_cotton_8.png
-Created by Doc (License: WTFPL):
+Created by Doc (License: CC BY 3.0):
farming_cucumber.png
farming_cucumber_1.png
farming_cucumber_2.png
@@ -80,7 +80,7 @@ Created by Doc (License: WTFPL):
farming_raspberry_3.png
farming_raspberry_4.png
-Created by Gambit:
+Created by Gambit (License: CC BY 3.0):
default_junglegrass.png
farming_carrot.png
farming_carrot_1.png
@@ -92,7 +92,7 @@ Created by Gambit:
farming_carrot_7.png
farming_carrot_8.png
-Created by JoseTheCrafter and edited by TenPlus1:
+Created by JoseTheCrafter and edited by TenPlus1 (CC BY 3.0):
farming_tomato.png
farming_tomato_1.png
farming_tomato_2.png
@@ -103,7 +103,7 @@ Created by JoseTheCrafter and edited by TenPlus1:
farming_tomato_7.png
farming_tomato_8.png
-Created by GeMinecraft and edited by TenPlus1:
+Created by GeMinecraft and edited by TenPlus1 (CC BY 3.0):
farming_corn.png
farming_corn_cob.png
farming_corn_1.png
@@ -115,7 +115,7 @@ Created by GeMinecraft and edited by TenPlus1:
farming_corn_7.png
farming_corn_8.png
-Created by TenPlus1
+Created by TenPlus1 (CC BY 3.0)
farming_cocoa_1.png
farming_cocoa_2.png
farming_cocoa_3.png
@@ -128,3 +128,14 @@ Created by TenPlus1
farming_rhubarb.png
farming_rhubarb_pie.png
farming_hemp*.png
+
+Created by ademant (CC-BY-3.0)
+ farming_rye*.png
+ farming_oat*.png
+ farming_rice*.png
+
+Created by PilzAdam and edited by SpaghettiToastBook (CC0):
+ farming_bread_multigrain.png
+
+Created by VanessaE and edited by SpaghettiToastBook (CC0):
+ farming_flour_multigrain.png
diff --git a/farming/lucky_block.lua b/farming/lucky_block.lua
index 6f656ff..5a69a68 100644
--- a/farming/lucky_block.lua
+++ b/farming/lucky_block.lua
@@ -34,6 +34,7 @@ if minetest.get_modpath("lucky_block") then
{"dro", {"farming:hoe_bomb"}, 10},
{"dro", {"farming:turkish_delight"}, 5},
{"lig"},
+ {"dro", {"farming:scythe_mithril"}, 1},
{"sch", "instafarm", 0, true, {
{"farming:wheat_8", "farming:carrot_8"},
{"farming:cotton_8", "farming:rhubarb_3"},
@@ -67,6 +68,9 @@ if minetest.get_modpath("lucky_block") then
{name = "farming:seed_barley", max = 15},
{name = "farming:seed_barley", max = 15},
{name = "farming:seed_hemp", max = 15},
+ {name = "farming:seed_rye", max = 15},
+ {name = "farming:seed_rice", max = 15},
+ {name = "farming:seed_oat", max = 15},
{name = "farming:soil_wet", max = 10},
}},
})
diff --git a/farming/textures/farming_bread_multigrain.png b/farming/textures/farming_bread_multigrain.png
new file mode 100644
index 0000000..66dda07
--- /dev/null
+++ b/farming/textures/farming_bread_multigrain.png
Binary files differ
diff --git a/farming/textures/farming_flour_multigrain.png b/farming/textures/farming_flour_multigrain.png
new file mode 100644
index 0000000..5367bc5
--- /dev/null
+++ b/farming/textures/farming_flour_multigrain.png
Binary files differ
diff --git a/farming/textures/farming_jaffa_cake.png b/farming/textures/farming_jaffa_cake.png
new file mode 100644
index 0000000..87cc003
--- /dev/null
+++ b/farming/textures/farming_jaffa_cake.png
Binary files differ
diff --git a/farming/textures/farming_oat.png b/farming/textures/farming_oat.png
new file mode 100644
index 0000000..e8d5c23
--- /dev/null
+++ b/farming/textures/farming_oat.png
Binary files differ
diff --git a/farming/textures/farming_oat_1.png b/farming/textures/farming_oat_1.png
new file mode 100644
index 0000000..177fbdf
--- /dev/null
+++ b/farming/textures/farming_oat_1.png
Binary files differ
diff --git a/farming/textures/farming_oat_2.png b/farming/textures/farming_oat_2.png
new file mode 100644
index 0000000..fe051ea
--- /dev/null
+++ b/farming/textures/farming_oat_2.png
Binary files differ
diff --git a/farming/textures/farming_oat_3.png b/farming/textures/farming_oat_3.png
new file mode 100644
index 0000000..5aba108
--- /dev/null
+++ b/farming/textures/farming_oat_3.png
Binary files differ
diff --git a/farming/textures/farming_oat_4.png b/farming/textures/farming_oat_4.png
new file mode 100644
index 0000000..833b134
--- /dev/null
+++ b/farming/textures/farming_oat_4.png
Binary files differ
diff --git a/farming/textures/farming_oat_5.png b/farming/textures/farming_oat_5.png
new file mode 100644
index 0000000..ec0803b
--- /dev/null
+++ b/farming/textures/farming_oat_5.png
Binary files differ
diff --git a/farming/textures/farming_oat_6.png b/farming/textures/farming_oat_6.png
new file mode 100644
index 0000000..847adc5
--- /dev/null
+++ b/farming/textures/farming_oat_6.png
Binary files differ
diff --git a/farming/textures/farming_oat_7.png b/farming/textures/farming_oat_7.png
new file mode 100644
index 0000000..3552811
--- /dev/null
+++ b/farming/textures/farming_oat_7.png
Binary files differ
diff --git a/farming/textures/farming_oat_8.png b/farming/textures/farming_oat_8.png
new file mode 100644
index 0000000..c7a5540
--- /dev/null
+++ b/farming/textures/farming_oat_8.png
Binary files differ
diff --git a/farming/textures/farming_oat_seed.png b/farming/textures/farming_oat_seed.png
new file mode 100644
index 0000000..893c93c
--- /dev/null
+++ b/farming/textures/farming_oat_seed.png
Binary files differ
diff --git a/farming/textures/farming_rice.png b/farming/textures/farming_rice.png
new file mode 100644
index 0000000..3d64c7e
--- /dev/null
+++ b/farming/textures/farming_rice.png
Binary files differ
diff --git a/farming/textures/farming_rice_1.png b/farming/textures/farming_rice_1.png
new file mode 100644
index 0000000..715bb2e
--- /dev/null
+++ b/farming/textures/farming_rice_1.png
Binary files differ
diff --git a/farming/textures/farming_rice_2.png b/farming/textures/farming_rice_2.png
new file mode 100644
index 0000000..2662d42
--- /dev/null
+++ b/farming/textures/farming_rice_2.png
Binary files differ
diff --git a/farming/textures/farming_rice_3.png b/farming/textures/farming_rice_3.png
new file mode 100644
index 0000000..fee87b2
--- /dev/null
+++ b/farming/textures/farming_rice_3.png
Binary files differ
diff --git a/farming/textures/farming_rice_4.png b/farming/textures/farming_rice_4.png
new file mode 100644
index 0000000..97b026f
--- /dev/null
+++ b/farming/textures/farming_rice_4.png
Binary files differ
diff --git a/farming/textures/farming_rice_5.png b/farming/textures/farming_rice_5.png
new file mode 100644
index 0000000..c249851
--- /dev/null
+++ b/farming/textures/farming_rice_5.png
Binary files differ
diff --git a/farming/textures/farming_rice_6.png b/farming/textures/farming_rice_6.png
new file mode 100644
index 0000000..c0e7233
--- /dev/null
+++ b/farming/textures/farming_rice_6.png
Binary files differ
diff --git a/farming/textures/farming_rice_7.png b/farming/textures/farming_rice_7.png
new file mode 100644
index 0000000..9d251ee
--- /dev/null
+++ b/farming/textures/farming_rice_7.png
Binary files differ
diff --git a/farming/textures/farming_rice_8.png b/farming/textures/farming_rice_8.png
new file mode 100644
index 0000000..41b37e0
--- /dev/null
+++ b/farming/textures/farming_rice_8.png
Binary files differ
diff --git a/farming/textures/farming_rice_bread.png b/farming/textures/farming_rice_bread.png
new file mode 100644
index 0000000..f14f741
--- /dev/null
+++ b/farming/textures/farming_rice_bread.png
Binary files differ
diff --git a/farming/textures/farming_rice_flour.png b/farming/textures/farming_rice_flour.png
new file mode 100644
index 0000000..2722151
--- /dev/null
+++ b/farming/textures/farming_rice_flour.png
Binary files differ
diff --git a/farming/textures/farming_rice_seed.png b/farming/textures/farming_rice_seed.png
new file mode 100644
index 0000000..854cd05
--- /dev/null
+++ b/farming/textures/farming_rice_seed.png
Binary files differ
diff --git a/farming/textures/farming_rye.png b/farming/textures/farming_rye.png
new file mode 100644
index 0000000..ebc5b37
--- /dev/null
+++ b/farming/textures/farming_rye.png
Binary files differ
diff --git a/farming/textures/farming_rye_1.png b/farming/textures/farming_rye_1.png
new file mode 100644
index 0000000..932b621
--- /dev/null
+++ b/farming/textures/farming_rye_1.png
Binary files differ
diff --git a/farming/textures/farming_rye_2.png b/farming/textures/farming_rye_2.png
new file mode 100644
index 0000000..b6a69b7
--- /dev/null
+++ b/farming/textures/farming_rye_2.png
Binary files differ
diff --git a/farming/textures/farming_rye_3.png b/farming/textures/farming_rye_3.png
new file mode 100644
index 0000000..aaa71c2
--- /dev/null
+++ b/farming/textures/farming_rye_3.png
Binary files differ
diff --git a/farming/textures/farming_rye_4.png b/farming/textures/farming_rye_4.png
new file mode 100644
index 0000000..ea1246e
--- /dev/null
+++ b/farming/textures/farming_rye_4.png
Binary files differ
diff --git a/farming/textures/farming_rye_5.png b/farming/textures/farming_rye_5.png
new file mode 100644
index 0000000..b359673
--- /dev/null
+++ b/farming/textures/farming_rye_5.png
Binary files differ
diff --git a/farming/textures/farming_rye_6.png b/farming/textures/farming_rye_6.png
new file mode 100644
index 0000000..749a2ef
--- /dev/null
+++ b/farming/textures/farming_rye_6.png
Binary files differ
diff --git a/farming/textures/farming_rye_7.png b/farming/textures/farming_rye_7.png
new file mode 100644
index 0000000..fc78198
--- /dev/null
+++ b/farming/textures/farming_rye_7.png
Binary files differ
diff --git a/farming/textures/farming_rye_8.png b/farming/textures/farming_rye_8.png
new file mode 100644
index 0000000..0b7c33e
--- /dev/null
+++ b/farming/textures/farming_rye_8.png
Binary files differ
diff --git a/farming/textures/farming_rye_seed.png b/farming/textures/farming_rye_seed.png
new file mode 100644
index 0000000..e65ba9b
--- /dev/null
+++ b/farming/textures/farming_rye_seed.png
Binary files differ
diff --git a/farming/textures/farming_scythe_mithril.png b/farming/textures/farming_scythe_mithril.png
new file mode 100644
index 0000000..17c89c5
--- /dev/null
+++ b/farming/textures/farming_scythe_mithril.png
Binary files differ