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

6 files changed, 22 insertions, 3 deletions

diff --git a/extranodes/init.lua b/extranodes/init.lua
index eb54067..4b304b1 100644
--- a/extranodes/init.lua
+++ b/extranodes/init.lua
@@ -185,3 +185,14 @@ minetest.register_craft({
 		{ "technic:raw_latex", "default:fence_wood", "technic:raw_latex"},
 	}
 })
+
+minetest.register_craftitem(":technic:diamond_seed", {
+	description = "Diamond Seed",
+	inventory_image = "technic_diamond_seed.png",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "technic:diamond_seed",
+	recipe = "technic:graphite"
+})
\ No newline at end of file
diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua
index 4684ba0..6b887fa 100644
--- a/technic/machines/register/centrifuge_recipes.lua
+++ b/technic/machines/register/centrifuge_recipes.lua
@@ -15,7 +15,7 @@ local recipes = {
 	{ "technic:stainless_steel_dust 4",    "technic:wrought_iron_dust 3", "technic:chromium_dust" },
 	{ "technic:brass_dust 3",              "technic:copper_dust 2",       "technic:zinc_dust"     },
 	{ "technic:chernobylite_dust",         "default:sand",                "technic:uranium3_dust" },
-	{ "default:dirt 4",                    "default:sand",                "default:gravel",       "default:clay_lump 2"     },
+	{ "default:dirt 4",                    "default:sand",                "default:gravel",       "default:clay_lump 4" },
 }
 
 local function uranium_dust(p)
@@ -32,7 +32,15 @@ if minetest.get_modpath("bushes_classic") then
 end
 
 if minetest.get_modpath("farming") then
-	table.insert(recipes, { "farming:wheat 4", "farming:seed_wheat 3", "default:dry_shrub 1" })
+	if minetest.get_modpath("cottages") then
+		-- work as a mechanized threshing floor
+		table.insert(recipes, { "farming:wheat", "farming:seed_wheat", "cottages:straw_mat" })
+		table.insert(recipes, { "farming:barley", "farming:seed_barley", "cottages:straw_mat" })
+	else
+		-- work in a less fancy and less efficient manner
+		table.insert(recipes, { "farming:wheat 4", "farming:seed_wheat 3", "default:dry_shrub 1" })
+		table.insert(recipes, { "farming:barley 4", "farming:seed_barley 3", "default:dry_shrub 1" })
+	end
 end
 
 for _, data in pairs(recipes) do
diff --git a/technic/machines/register/compressor_recipes.lua b/technic/machines/register/compressor_recipes.lua
index d516722..02fd741 100644
--- a/technic/machines/register/compressor_recipes.lua
+++ b/technic/machines/register/compressor_recipes.lua
@@ -17,7 +17,7 @@ local recipes = {
 	{"technic:coal_dust 4",        "technic:graphite"},
 	{"technic:carbon_cloth",       "technic:carbon_plate"},
 	{"technic:uranium35_ingot 5",  "technic:uranium_fuel"},
-	{"technic:graphite 25",        "default:diamond"}
+	{"technic:diamond_seed 25",    "default:diamond"}
 }
 
 if minetest.get_modpath("ethereal") then
diff --git a/technic/textures/technic_diamond_seed.png b/technic/textures/technic_diamond_seed.png
new file mode 100644
index 0000000..53d88fb
--- /dev/null
+++ b/technic/textures/technic_diamond_seed.png
diff --git a/technic/textures/technic_hv_electric_furnace_front.png b/technic/textures/technic_hv_electric_furnace_front.png
index e1f9bc5..5051cd8 100644
--- a/technic/textures/technic_hv_electric_furnace_front.png
+++ b/technic/textures/technic_hv_electric_furnace_front.png
diff --git a/technic/textures/technic_hv_electric_furnace_front_active.png b/technic/textures/technic_hv_electric_furnace_front_active.png
index 1baeade..76dfbb3 100644
--- a/technic/textures/technic_hv_electric_furnace_front_active.png
+++ b/technic/textures/technic_hv_electric_furnace_front_active.png