update

mods/bonemeal/mods.lua

@@ -46,7 +46,8 @@ if farming and farming.mod and farming.mod == "redo" then
 		{"farming:vanilla_", 8},
 		{"farming:soy_", 7},
 		{"farming:artichoke_", 5},
-		{"farming:parsley_", 3}
+		{"farming:parsley_", 3},
+		{"farming:sunflower_", 8}
 	})
 end
 

mods/farming/README.md

@@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 
 ### Changelog:
 
-- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya and vanilla (thanks Felfa), added tofu, added salt crystals (thanks gorlock)
+- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock)
 - 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy
 options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna
 - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates

mods/farming/crops/sunflower.lua

@@ -0,0 +1,160 @@
+local S = farming.intllib
+
+-- sunflower
+minetest.register_craftitem("farming:sunflower", {
+	description = S("Sunflower"),
+	inventory_image = "farming_sunflower.png",
+	groups = {flammable = 2}
+})
+
+-- sunflower seeds
+minetest.register_craftitem("farming:seed_sunflower", {
+	description = S("Sunflower Seeds"),
+	inventory_image = "farming_sunflower_seeds.png",
+	groups = {seed = 2, food_sunflower_seeds = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "farming:sunflower_1")
+	end
+})
+
+minetest.register_alias("farming:sunflower_seeds", "farming:seed_sunflower")
+
+minetest.register_craft({
+	output = "farming:seed_sunflower 5",
+	recipe = {{"farming:sunflower"}}
+})
+
+-- sunflower seeds (toasted)
+minetest.register_craftitem("farming:sunflower_seeds_toasted", {
+	description = S("Toasted Sunflower Seeds"),
+	inventory_image = "farming_sunflower_seeds_toasted.png",
+	groups = {food_sunflower_seeds_toasted = 1, flammable = 2},
+	on_use = minetest.item_eat(1)
+})
+
+minetest.register_craft({
+	type = "cooking",
+	cooktime = 10,
+	output = "farming:sunflower_seeds_toasted",
+	recipe = "farming:seed_sunflower"
+})
+
+-- sunflower oil
+minetest.register_node("farming:sunflower_oil", {
+	description = S("Bottle of Sunflower Oil"),
+	drawtype = "plantlike",
+	tiles = {"farming_sunflower_oil.png"},
+	inventory_image = "farming_sunflower_oil.png",
+	wield_image = "farming_sunflower_oil.png",
+	paramtype = "light",
+	is_ground_content = false,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
+	},
+	groups = {
+		food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1,
+		flammable = 2
+	},
+	sounds = default.node_sound_glass_defaults()
+})
+
+minetest.register_craft( {
+	output = "farming:sunflower_oil",
+	recipe = {
+		{"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"},
+		{"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"},
+		{"group:food_sunflower_seeds", "vessels:glass_bottle", "group:food_sunflower_seeds"}
+	}
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "farming:sunflower_oil",
+	burntime = 30,
+	replacements = {{"farming:sunflower_oil", "vessels:glass_bottle"}}
+})
+
+-- sunflower seed bread
+minetest.register_craftitem("farming:sunflower_bread", {
+	description = S("Sunflower Seed Bread"),
+	inventory_image = "farming_sunflower_bread.png",
+	on_use = minetest.item_eat(8),
+	groups = {food_bread = 1, flammable = 2}
+})
+
+minetest.register_craftitem("farming:sunflower_bread", {
+	description = S("Sunflower Bread"),
+	inventory_image = "farming_sunflower_bread.png"
+})
+
+minetest.register_craft({
+	output = "farming:sunflower_bread",
+	recipe = {{"group:food_sunflower_seeds_toasted", "group:food_bread", "group:food_sunflower_seeds_toasted"}}
+})
+
+-- sunflower definition
+local def = {
+	drawtype = "plantlike",
+	tiles = {"farming_sunflower_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop = "",
+	selection_box = farming.select,
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		not_in_creative_inventory = 1, growing = 1
+	},
+	sounds = default.node_sound_leaves_defaults()
+}
+
+-- stage 1
+minetest.register_node("farming:sunflower_1", table.copy(def))
+
+-- stage 2
+def.tiles = {"farming_sunflower_2.png"}
+minetest.register_node("farming:sunflower_2", table.copy(def))
+
+-- stage 3
+def.tiles = {"farming_sunflower_3.png"}
+minetest.register_node("farming:sunflower_3", table.copy(def))
+
+-- stage 4
+def.tiles = {"farming_sunflower_4.png"}
+minetest.register_node("farming:sunflower_4", table.copy(def))
+
+-- stage 5
+def.tiles = {"farming_sunflower_5.png"}
+minetest.register_node("farming:sunflower_5", table.copy(def))
+
+-- stage 6
+def.tiles = {"farming_sunflower_6.png"}
+def.visual_scale = 1.9
+minetest.register_node("farming:sunflower_6", table.copy(def))
+
+-- stage 7
+def.tiles = {"farming_sunflower_7.png"}
+minetest.register_node("farming:sunflower_7", table.copy(def))
+
+-- stage 8 (final)
+def.tiles = {"farming_sunflower_8.png"}
+def.groups.growing = nil
+def.drop = {
+	items = {
+		{items = {"farming:sunflower"}, rarity = 1},
+		{items = {"farming:sunflower"}, rarity = 6}
+	}
+}
+minetest.register_node("farming:sunflower_8", table.copy(def))
+
+-- add to registered_plants
+farming.registered_plants["farming:sunflower"] = {
+	crop = "farming:sunflower",
+	seed = "farming:seed_sunflower",
+	minlight = 14,
+	maxlight = farming.max_light,
+	steps = 8
+}

mods/farming/farming.conf_example

@@ -37,6 +37,7 @@ farming.soy = 0.001
 farming.vanilla = 0.001
 farming.artichoke = 0.001
 farming.parsley = 0.002
+farming.sunflower = 0.001
 farming.grains = true -- true or false only
 
 -- default rarety of crops on map (higher number = more crops)

mods/farming/init.lua

@@ -7,7 +7,7 @@
 
 farming = {
 	mod = "redo",
-	version = "20210311",
+	version = "20210928",
 	path = minetest.get_modpath("farming"),
 	select = {
 		type = "fixed",
@@ -635,6 +635,7 @@ farming.vanilla = 0.001
 farming.lettuce = 0.001
 farming.artichoke = 0.001
 farming.parsley = 0.002
+farming.sunflower = 0.001
 farming.grains = true
 farming.rarety = 0.002
 
@@ -707,6 +708,7 @@ ddoo("vanilla.lua", farming.vanilla)
 ddoo("lettuce.lua", farming.lettuce)
 ddoo("artichoke.lua", farming.artichoke)
 ddoo("parsley.lua", farming.parsley)
+ddoo("sunflower.lua", farming.sunflower)
 
 dofile(farming.path .. "/food.lua")
 dofile(farming.path .. "/mapgen.lua")

mods/farming/license.txt

@@ -166,6 +166,7 @@ Created by Felfa (CC0)
   farming_potato_omelette.png
   farming_spanish_potatoes.png
   farming_vanilla_flan.png
+  farming_sunflower*.png
 
 Created by gorlock (CC0)
   farming_salt_crystal.png

mods/farming/mapgen.lua

@@ -54,6 +54,7 @@ register_plant("lettuce_5", 5, 30, nil, "", -1, farming.lettuce)
 register_plant("blackberry_4", 3, 10, nil, "", -1, farming.blackberry)
 register_plant("vanilla_7", 5, 35, nil, "", -1, farming.vanilla)
 register_plant("parsley_3", 10, 40, nil, "", -1, farming.parsley)
+register_plant("sunflower_8", 10, 40, nil, "", -1, farming.sunflower)
 register_plant("mint_4", 1, 75, {
 	"default:dirt_with_grass", "default:dirt_with_coniferous_litter"},
 	"group:water", 1, farming.mint)

mods/skinsdb/meta/character_2124.txt

@@ -0,0 +1,3 @@
+Pilot
+yotuderconnect
+CC BY 4.0

mods/techpack/tubelib_addons1/quarry.lua

@@ -417,7 +417,7 @@ minetest.register_node("tubelib_addons1:quarry_defect", {
 			return false
 		end
 		local inv = M(pos):get_inventory()
-		return inv:is_empty("main")
+		return inv:is_empty("main") and inv:is_empty("fuel")
 	end,
 
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)