summaryrefslogtreecommitdiff
path: root/technic
diff options
context:
space:
mode:
Diffstat (limited to 'technic')
-rw-r--r--technic/crafts.lua17
-rw-r--r--technic/items.lua5
-rw-r--r--technic/machines/HV/forcefield.lua2
-rw-r--r--technic/machines/HV/quarry.lua2
-rw-r--r--technic/machines/LV/cnc.lua2
-rw-r--r--technic/machines/LV/compressor.lua8
-rw-r--r--technic/machines/LV/extractor.lua2
-rw-r--r--technic/machines/LV/geothermal.lua6
-rw-r--r--technic/machines/MV/centrifuge.lua2
-rw-r--r--technic/machines/MV/wind_mill.lua2
-rw-r--r--technic/machines/other/frames.lua4
-rw-r--r--technic/machines/supply_converter.lua3
-rw-r--r--technic/textures/technic_motor.pngbin2517 -> 0 bytes
-rw-r--r--technic/tools/chainsaw.lua6
-rw-r--r--technic/tools/mining_drill.lua2
-rw-r--r--technic/tools/vacuum.lua2
16 files changed, 34 insertions, 31 deletions
diff --git a/technic/crafts.lua b/technic/crafts.lua
index 7d51f29..90bd2dd 100644
--- a/technic/crafts.lua
+++ b/technic/crafts.lua
@@ -88,16 +88,13 @@ minetest.register_craft({
{'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'},
{'technic:wrought_iron_ingot', '', 'technic:wrought_iron_ingot'},
{'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'},
- }
-})
-
-minetest.register_craft({
- output = 'technic:motor',
- recipe = {
- {'technic:carbon_steel_ingot', 'technic:copper_coil', 'technic:carbon_steel_ingot'},
- {'technic:carbon_steel_ingot', 'technic:copper_coil', 'technic:carbon_steel_ingot'},
- {'technic:carbon_steel_ingot', 'default:copper_ingot', 'technic:carbon_steel_ingot'},
- }
+ },
+ replacements = {
+ {"basic_materials:copper_wire", "basic_materials:empty_spool"},
+ {"basic_materials:copper_wire", "basic_materials:empty_spool"},
+ {"basic_materials:copper_wire", "basic_materials:empty_spool"},
+ {"basic_materials:copper_wire", "basic_materials:empty_spool"}
+ },
})
local isolation = mesecons_materials and "mesecons_materials:fiber" or "technic:rubber"
diff --git a/technic/items.lua b/technic/items.lua
index d527c8b..d89ed46 100644
--- a/technic/items.lua
+++ b/technic/items.lua
@@ -74,11 +74,6 @@ minetest.register_craftitem("technic:copper_coil", {
inventory_image = "technic_copper_coil.png",
})
-minetest.register_craftitem("technic:motor", {
- description = S("Electric Motor"),
- inventory_image = "technic_motor.png",
-})
-
minetest.register_craftitem("technic:lv_transformer", {
description = S("Low Voltage Transformer"),
inventory_image = "technic_lv_transformer.png",
diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua
index 157dc33..230c8b0 100644
--- a/technic/machines/HV/forcefield.lua
+++ b/technic/machines/HV/forcefield.lua
@@ -17,7 +17,7 @@ local cable_entry = "^technic_cable_connection_overlay.png"
minetest.register_craft({
output = "technic:forcefield_emitter_off",
recipe = {
- {"default:mese", "technic:motor", "default:mese" },
+ {"default:mese", "basic_materials:motor", "default:mese" },
{"technic:deployer_off", "technic:machine_casing", "technic:deployer_off"},
{"default:mese", "technic:hv_cable", "default:mese" },
}
diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua
index 86ca395..b7cc501 100644
--- a/technic/machines/HV/quarry.lua
+++ b/technic/machines/HV/quarry.lua
@@ -7,7 +7,7 @@ local cable_entry = "^technic_cable_connection_overlay.png"
minetest.register_craft({
recipe = {
{"technic:carbon_plate", "pipeworks:filter", "technic:composite_plate"},
- {"technic:motor", "technic:machine_casing", "technic:diamond_drill_head"},
+ {"basic_materials:motor", "technic:machine_casing", "technic:diamond_drill_head"},
{"technic:carbon_steel_block", "technic:hv_cable", "technic:carbon_steel_block"}},
output = "technic:quarry",
})
diff --git a/technic/machines/LV/cnc.lua b/technic/machines/LV/cnc.lua
index fdfec99..b8eb729 100644
--- a/technic/machines/LV/cnc.lua
+++ b/technic/machines/LV/cnc.lua
@@ -14,7 +14,7 @@ minetest.register_craft({
output = 'technic:cnc',
recipe = {
{'default:glass', 'technic:diamond_drill_head', 'default:glass'},
- {'technic:control_logic_unit', 'technic:machine_casing', 'technic:motor'},
+ {'technic:control_logic_unit', 'technic:machine_casing', 'basic_materials:motor'},
{'technic:carbon_steel_ingot', 'technic:lv_cable', 'technic:carbon_steel_ingot'},
},
})
diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua
index c1a1d73..84eb4c5 100644
--- a/technic/machines/LV/compressor.lua
+++ b/technic/machines/LV/compressor.lua
@@ -4,10 +4,14 @@ minetest.register_alias("compressor", "technic:lv_compressor")
minetest.register_craft({
output = 'technic:lv_compressor',
recipe = {
- {'default:stone', 'technic:motor', 'default:stone'},
+ {'default:stone', 'basic_materials:motor', 'default:stone'},
{'mesecons:piston', 'technic:machine_casing', 'mesecons:piston'},
{'basic_materials:silver_wire', 'technic:lv_cable', 'basic_materials:silver_wire'},
- }
+ },
+ replacements = {
+ {"basic_materials:silver_wire", "basic_materials:empty_spool"},
+ {"basic_materials:silver_wire", "basic_materials:empty_spool"}
+ },
})
technic.register_compressor({tier = "LV", demand = {300}, speed = 1})
diff --git a/technic/machines/LV/extractor.lua b/technic/machines/LV/extractor.lua
index 55d0140..123ad05 100644
--- a/technic/machines/LV/extractor.lua
+++ b/technic/machines/LV/extractor.lua
@@ -4,7 +4,7 @@ minetest.register_alias("extractor", "technic:lv_extractor")
minetest.register_craft({
output = 'technic:lv_extractor',
recipe = {
- {'technic:treetap', 'technic:motor', 'technic:treetap'},
+ {'technic:treetap', 'basic_materials:motor', 'technic:treetap'},
{'technic:treetap', 'technic:machine_casing', 'technic:treetap'},
{'', 'technic:lv_cable', ''},
}
diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua
index 1699a52..d828f6d 100644
--- a/technic/machines/LV/geothermal.lua
+++ b/technic/machines/LV/geothermal.lua
@@ -13,7 +13,11 @@ minetest.register_craft({
{'technic:granite', 'default:diamond', 'technic:granite'},
{'basic_materials:copper_wire', 'technic:machine_casing', 'basic_materials:copper_wire'},
{'technic:granite', 'technic:lv_cable', 'technic:granite'},
- }
+ },
+ replacements = {
+ {"basic_materials:copper_wire", "basic_materials:empty_spool"},
+ {"basic_materials:copper_wire", "basic_materials:empty_spool"}
+ },
})
minetest.register_craftitem("technic:geothermal", {
diff --git a/technic/machines/MV/centrifuge.lua b/technic/machines/MV/centrifuge.lua
index a0aad64..fdc086f 100644
--- a/technic/machines/MV/centrifuge.lua
+++ b/technic/machines/MV/centrifuge.lua
@@ -1,7 +1,7 @@
minetest.register_craft({
output = "technic:mv_centrifuge",
recipe = {
- {"technic:motor", "technic:copper_plate", "technic:diamond_drill_head"},
+ {"basic_materials:motor", "technic:copper_plate", "technic:diamond_drill_head"},
{"technic:copper_plate", "technic:machine_casing", "technic:copper_plate" },
{"pipeworks:one_way_tube", "technic:mv_cable", "pipeworks:mese_filter" },
}
diff --git a/technic/machines/MV/wind_mill.lua b/technic/machines/MV/wind_mill.lua
index 9df12b9..1baf54c 100644
--- a/technic/machines/MV/wind_mill.lua
+++ b/technic/machines/MV/wind_mill.lua
@@ -13,7 +13,7 @@ minetest.register_craft({
minetest.register_craft({
output = 'technic:wind_mill',
recipe = {
- {'', 'technic:motor', ''},
+ {'', 'basic_materials:motor', ''},
{'technic:carbon_steel_ingot', 'technic:carbon_steel_block', 'technic:carbon_steel_ingot'},
{'', 'technic:mv_cable', ''},
}
diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua
index ab07d58..f991ba7 100644
--- a/technic/machines/other/frames.lua
+++ b/technic/machines/other/frames.lua
@@ -988,7 +988,7 @@ minetest.register_craft({
output = 'technic:frame_motor',
recipe = {
{ '', 'technic:frame_111111', '' },
- { 'group:mesecon_conductor_craftable', 'technic:motor', 'group:mesecon_conductor_craftable' },
+ { 'group:mesecon_conductor_craftable', 'basic_materials:motor', 'group:mesecon_conductor_craftable' },
{ '', 'technic:frame_111111', '' },
}
})
@@ -1016,7 +1016,7 @@ minetest.register_craft({
output = 'technic:template_motor',
recipe = {
{ '', 'technic:template', '' },
- { 'group:mesecon_conductor_craftable', 'technic:motor', 'group:mesecon_conductor_craftable' },
+ { 'group:mesecon_conductor_craftable', 'basic_materials:motor', 'group:mesecon_conductor_craftable' },
{ '', 'technic:template', '' },
}
})
diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua
index 6c520ca..24601c6 100644
--- a/technic/machines/supply_converter.lua
+++ b/technic/machines/supply_converter.lua
@@ -204,7 +204,8 @@ minetest.register_craft({
{'basic_materials:gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'},
{'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'},
{'technic:mv_cable', 'technic:rubber', 'technic:lv_cable'},
- }
+ },
+ replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, },
})
for tier, machines in pairs(technic.machines) do
diff --git a/technic/textures/technic_motor.png b/technic/textures/technic_motor.png
deleted file mode 100644
index 77d4b91..0000000
--- a/technic/textures/technic_motor.png
+++ /dev/null
Binary files differ
diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua
index 75e028c..8245fd6 100644
--- a/technic/tools/chainsaw.lua
+++ b/technic/tools/chainsaw.lua
@@ -363,8 +363,10 @@ minetest.register_craft({
output = "technic:chainsaw",
recipe = {
{"technic:stainless_steel_ingot", trigger, "technic:battery"},
- {"basic_materials:copper_wire", "technic:motor", "technic:battery"},
+ {"basic_materials:copper_wire", "basic_materials:motor", "technic:battery"},
{"", "", "technic:stainless_steel_ingot"},
- }
+ },
+ replacements = { {"basic_materials:copper_wire", "basic_materials:empty_spool"}, },
+
})
diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua
index 1cf7491..250c461 100644
--- a/technic/tools/mining_drill.lua
+++ b/technic/tools/mining_drill.lua
@@ -7,7 +7,7 @@ minetest.register_craft({
output = 'technic:mining_drill',
recipe = {
{'default:tin_ingot', 'technic:diamond_drill_head', 'default:tin_ingot'},
- {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'},
+ {'technic:stainless_steel_ingot', 'basic_materials:motor', 'technic:stainless_steel_ingot'},
{'', 'technic:red_energy_crystal', 'default:copper_ingot'},
}
})
diff --git a/technic/tools/vacuum.lua b/technic/tools/vacuum.lua
index 037f3bb..b5afcb5 100644
--- a/technic/tools/vacuum.lua
+++ b/technic/tools/vacuum.lua
@@ -55,7 +55,7 @@ minetest.register_craft({
output = 'technic:vacuum',
recipe = {
{'pipeworks:tube_1', 'pipeworks:filter', 'technic:battery'},
- {'pipeworks:tube_1', 'technic:motor', 'technic:battery'},
+ {'pipeworks:tube_1', 'basic_materials:motor', 'technic:battery'},
{'technic:stainless_steel_ingot', '', ''},
}
})
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 03:30:10 +0000