Merge https://github.com/h-v-smacker/technic

3 files changed, 41 insertions, 3 deletions

diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua
index 209d376..30f3b38 100644
--- a/technic/machines/register/alloy_recipes.lua
+++ b/technic/machines/register/alloy_recipes.lua
@@ -47,6 +47,11 @@ if minetest.get_modpath("ethereal") then
 	end
 end
 
+if minetest.get_modpath("moreblocks") then
+	table.insert(recipes, {"default:stone", "default:steel_ingot", "moreblocks:iron_stone 4", 3})
+	table.insert(recipes, {"default:stone", "default:coal_lump", "moreblocks:coal_stone 4", 3})
+end
+
 if minetest.get_modpath("bakedclay") then
 	
 	local clay = {"white", "grey", "black", "red", "yellow",
diff --git a/technic/machines/register/thresher_recipes.lua b/technic/machines/register/thresher_recipes.lua
index 3b43766..bbab3f1 100644
--- a/technic/machines/register/thresher_recipes.lua
+++ b/technic/machines/register/thresher_recipes.lua
@@ -42,6 +42,24 @@ if minetest.get_modpath("farming") then
 	end
 end
 
+if minetest.get_modpath("farming") and farming.mod and farming.mod == "redo" then
+	-- farming redo uses recipes unfriendly with respect to automation. E.g. using the cutting board.
+	-- in the end, it's hard to automate a farm, since crops have to be processed individually.
+	-- here, we use the thresher to provide a universal device to deal with those
+	table.insert(recipes, { input = "farming:pumpkin_8", 
+		                        output = {"farming:pumpkin_slice 5"} })
+-- 	table.insert(recipes, { input = "farming:pumpkin", 
+-- 		                        output = {"farming:pumpkin_slice 5"} })
+	table.insert(recipes, { input = "farming:melon_8", 
+		                        output = {"farming:melon_slice 5"} })
+	table.insert(recipes, { input = "farming:pineapple", 
+		                        output = {"farming:pineapple_ring 6", "farming:pineapple_top"} })
+	table.insert(recipes, { input = "farming:garlic", 
+		                        output = {"farming:garlic_clove 10"} })
+	table.insert(recipes, { input = "farming:pepper", 
+		                        output = {"farming:peppercorn 2"} })
+end
+
 -- using thresher as a sorting machine for grass seeds
 table.insert(recipes, { input = "default:grass_1 99", 
                         output = {"default:dry_grass_1 80", "default:dry_shrub 7", "default:junglegrass 12"}, 
diff --git a/technic/tools/spray_painter.lua b/technic/tools/spray_painter.lua
index ff7ce04..bbdcd7a 100644
--- a/technic/tools/spray_painter.lua
+++ b/technic/tools/spray_painter.lua
@@ -67,7 +67,18 @@ if minetest.get_modpath("ehlphabet") then
 		paramtype = "light",
 		paramtype2 = "colorwallmounted",
 		palette = "technic_paint_palette.png",
-})
+	})
+	
+	minetest.register_node(":ehlphabet:block_color_fluorescent", {
+		description = S("Ehlphabet Block (colored)"),
+		tiles = {"ehlphabet_000.png"},
+		groups = {cracky = 3, not_in_creative_inventory = 1},
+		light_source = 7,
+		drop = "ehlphabet:block",
+		paramtype = "light",
+		paramtype2 = "colorwallmounted",
+		palette = "technic_paint_palette.png",
+	})
 
 end
 
@@ -146,10 +157,14 @@ local function spray_paint(itemstack, user, pointed_thing, ptype)
 	if target then
 	
 		-- if pointing at ehlphabet block (regular or colored)
-		if (target.name == "ehlphabet:block" or target.name == "ehlphabet:block_color") then
+		if (target.name == "ehlphabet:block" or target.name == "ehlphabet:block_color" or target.name == "ehlphabet:block_color_fluorescent") then
 		
 			if target.name == "ehlphabet:block" then
-				minetest.swap_node(pointed_thing.under, { name = "ehlphabet:block_color" })
+				if not ptype then
+					minetest.swap_node(pointed_thing.under, { name = "ehlphabet:block_color" })
+				else
+					minetest.swap_node(pointed_thing.under, { name = "ehlphabet:block_color_fluorescent" })
+				end
 				target = minetest.get_node_or_nil(pointed_thing.under) 
 			end