Merge https://github.com/minetest-mods/technic into pandorabox

concrete/depends.txt

@@ -1,3 +1,4 @@
 default
+basic_materials
 intllib?
-
+moreblocks?

concrete/init.lua

@@ -23,24 +23,6 @@ else
 	steel_ingot = "default:steel_ingot"
 end
 
-minetest.register_craft({
-	output = 'technic:rebar 6',
-	recipe = {
-		{'','', steel_ingot},
-		{'',steel_ingot,''},
-		{steel_ingot, '', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'technic:concrete 5',
-	recipe = {
-		{'default:stone','technic:rebar','default:stone'},
-		{'technic:rebar','default:stone','technic:rebar'},
-		{'default:stone','technic:rebar','default:stone'},
-	}
-})
-
 minetest.register_craft({
 	output = 'technic:concrete_post_platform 6',
 	recipe = {
@@ -51,9 +33,9 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:concrete_post 12',
 	recipe = {
-		{'default:stone','technic:rebar','default:stone'},
-		{'default:stone','technic:rebar','default:stone'},
-		{'default:stone','technic:rebar','default:stone'},
+		{'default:stone','basic_materials:steel_bar','default:stone'},
+		{'default:stone','basic_materials:steel_bar','default:stone'},
+		{'default:stone','basic_materials:steel_bar','default:stone'},
 	}
 })
 
@@ -66,18 +48,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craftitem(":technic:rebar", {
-	description = S("Rebar"),
-	inventory_image = "technic_rebar.png",
-})
-
-minetest.register_node(":technic:concrete", {
-	description = S("Concrete Block"),
-	tiles = {"technic_concrete_block.png",},
-	groups = {cracky=1, level=2, concrete=1},
-	sounds = default.node_sound_stone_defaults(),
-})
-
 minetest.register_node(":technic:blast_resistant_concrete", {
 	description = S("Blast-resistant Concrete Block"),
 	tiles = {"technic_blast_resistant_concrete_block.png",},
@@ -91,6 +61,20 @@ minetest.register_node(":technic:blast_resistant_concrete", {
 	end,
 })
 
+if minetest.get_modpath("moreblocks") then
+	stairsplus:register_all("technic","blast_resistant_concrete","technic:blast_resistant_concrete",{
+		description = "Blast-resistant Concrete",
+		tiles = {"technic_blast_resistant_concrete_block.png",},
+		groups = {cracky=1, level=3, concrete=1},
+		sounds = default.node_sound_stone_defaults(),
+		on_blast = function(pos, intensity)
+			if intensity > 1 then
+				minetest.remove_node(pos)
+				minetest.add_item(pos, "technic:blast_resistant_concrete")
+			end
+		end,
+	})
+end
 
 local box_platform = {-0.5,  0.3,  -0.5,  0.5,  0.5, 0.5}
 local box_post     = {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15}
@@ -101,7 +85,7 @@ local box_right    = {0,     -0.3, -0.1,  0.5,  0.3, 0.1}
 
 minetest.register_node(":technic:concrete_post_platform", {
 	description = S("Concrete Post Platform"),
-	tiles = {"technic_concrete_block.png",},
+	tiles = {"basic_materials_concrete_block.png",},
 	groups={cracky=1, level=2},
 	sounds = default.node_sound_stone_defaults(),
 	paramtype = "light",
@@ -133,7 +117,7 @@ for platform = 0, 1 do
 
 	minetest.register_node(":technic:concrete_post"..(platform == 1 and "_with_platform" or ""), {
 		description = S("Concrete Post"),
-		tiles = {"technic_concrete_block.png"},
+		tiles = {"basic_materials_concrete_block.png"},
 		groups = {cracky=1, level=2, concrete_post=1, not_in_creative_inventory=platform},
 		sounds = default.node_sound_stone_defaults(),
 		drop = (platform == 1 and "technic:concrete_post_platform" or

extranodes/depends.txt

@@ -1,5 +1,6 @@
 default
 technic_worldgen
+basic_materials
 concrete
 unifieddyes?
 intllib?

extranodes/init.lua

@@ -30,7 +30,7 @@ if minetest.get_modpath("moreblocks") then
 	stairsplus:register_all("technic", "concrete", "technic:concrete", {
 		description=S("Concrete"),
 		groups={cracky=3, not_in_creative_inventory=1},
-		tiles={"technic_concrete_block.png"},
+		tiles={"basic_materials_concrete_block.png"},
 	})
 
 	stairsplus:register_all("technic", "zinc_block", "technic:zinc_block", {
@@ -57,12 +57,6 @@ if minetest.get_modpath("moreblocks") then
 		tiles={"technic_stainless_steel_block.png"},
 	})
 
-	stairsplus:register_all("technic", "brass_block", "technic:brass_block", {
-		description=S("Brass Block"),
-		groups={cracky=1, not_in_creative_inventory=1},
-		tiles={"technic_brass_block.png"},
-	})
-
 	function register_technic_stairs_alias(modname, origname, newmod, newname)
 		minetest.register_alias(modname .. ":slab_" .. origname, newmod..":slab_" .. newname)
 		minetest.register_alias(modname .. ":slab_" .. origname .. "_inverted", newmod..":slab_" .. newname .. "_inverted")

technic/crafts.lua

@@ -38,6 +38,12 @@ if pipeworks.enable_teleport_tube then
 	})
 end
 
+-- basic materials' brass ingot
+
+minetest.clear_craft({
+	output = "basic_materials:brass_ingot",
+})
+
 -- tubes crafting recipes
 
 minetest.register_craft({
@@ -71,54 +77,24 @@ minetest.register_craft({
 	output = 'technic:red_energy_crystal',
 	recipe = {
 		{'moreores:silver_ingot', 'technic:battery', 'dye:red'},
-		{'technic:battery', 'default:diamondblock', 'technic:battery'},
+		{'technic:battery', 'basic_materials:energy_crystal_simple', 'technic:battery'},
 		{'dye:red', 'technic:battery', 'moreores:silver_ingot'},
 	}
 })
 
-minetest.register_craft({
-	output = 'technic:fine_copper_wire 2',
-	recipe = {
-		{'', 'default:copper_ingot', ''},
-		{'', 'default:copper_ingot', ''},
-		{'', 'default:copper_ingot', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'technic:fine_gold_wire 2',
-	recipe = {
-		{'', 'default:gold_ingot', ''},
-		{'', 'default:gold_ingot', ''},
-		{'', 'default:gold_ingot', ''},
-	}
-})
-
-minetest.register_craft({
-	output = 'technic:fine_silver_wire 2',
-	recipe = {
-		{'', 'moreores:silver_ingot', ''},
-		{'', 'moreores:silver_ingot', ''},
-		{'', 'moreores:silver_ingot', ''},
-	}
-})
-
 minetest.register_craft({
 	output = 'technic:copper_coil 1',
 	recipe = {
-		{'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'},
+		{'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'},
 		{'technic:wrought_iron_ingot', '', 'technic:wrought_iron_ingot'},
-		{'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_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'},
-	}
+		{'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'},
+	},
+	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"
@@ -153,10 +129,11 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:control_logic_unit',
 	recipe = {
-		{'', 'technic:fine_gold_wire', ''},
+		{'', 'basic_materials:gold_wire', ''},
 		{'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'},
 		{'', 'technic:chromium_ingot', ''},
-	}
+	},
+	replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, },
 })
 
 minetest.register_craft({
@@ -179,7 +156,7 @@ minetest.register_craft({
 	output = "technic:machine_casing",
 	recipe = {
 		{ "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" },
-		{ "technic:cast_iron_ingot", "technic:brass_ingot", "technic:cast_iron_ingot" },
+		{ "technic:cast_iron_ingot", "basic_materials:brass_ingot", "technic:cast_iron_ingot" },
 		{ "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" },
 	},
 })

technic/depends.txt

@@ -1,6 +1,7 @@
 default
 pipeworks
 technic_worldgen
+basic_materials
 bucket?
 screwdriver?
 mesecons?

technic/items.lua

@@ -69,32 +69,11 @@ minetest.register_tool("technic:red_energy_crystal", {
 	}
 }) 
 
-
-minetest.register_craftitem("technic:fine_copper_wire", {
-	description = S("Fine Copper Wire"),
-	inventory_image = "technic_fine_copper_wire.png",
-})
-
-minetest.register_craftitem("technic:fine_gold_wire", {
-	description = S("Fine Gold Wire"),
-	inventory_image = "technic_fine_gold_wire.png",
-})
-
-minetest.register_craftitem("technic:fine_silver_wire", {
-	description = S("Fine Silver Wire"),
-	inventory_image = "technic_fine_silver_wire.png",
-})
-
 minetest.register_craftitem("technic:copper_coil", {
 	description = S("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",

technic/locale/de.txt

@@ -67,7 +67,6 @@ Disabled =
 %s Alloy Furnace = %s Legierungsofen
 %s Battery Box = %s Batteriebox
 %s Cable = %s Kabel
-%s CNC Machine = %s CNC-Maschine
 %s Compressor = %s Kompressor
 %s Extractor = %s Extraktor
 %s Forcefield Emitter = %s Kraftfeld-Emitter 
@@ -121,41 +120,6 @@ Digging finished =
 Digging %d m above machine =
 Digging %d m below machine =
 
-## CNC
-Cylinder = Zylinder
-Element Cross = Halbes Kreuzelement
-Element Cross Double = Kreuzelement
-Element Edge = Halbes Eckelement
-Element Edge Double = Eckelement
-Element End = Halbes Endelement
-Element End Double = Endelement
-Element Straight = Halbes aufrechtes Element
-Element Straight Double = Aufrechtes Element
-Element T = Halbes T-Element
-Element T Double = T-Element
-Horizontal Cylinder = Liegender Zylinder
-One Curved Edge Block = Block mit einer abgerundeten Kante
-Pyramid = Pyramide
-Slope = Schraege
-Slope Edge = Schraege mit Ecke
-Slope Inner Edge = Schraege mit Innenecke
-Slope Lying = Liegende Schraege
-Slope Upside Down = Umgedrehte Schraege
-Slope Upside Down Edge = Umgedrehte Schraege mit Ecke
-Slope Upside Down Inner Edge = Umgedrehte Schraege mit Innenecke
-Sphere = Kugel
-Spike = Spitze
-Stick = Stange
-Two Curved Edge Block = Block mit zwei abgerundeten Kanten
-Brick = Ziegel:
-Cobble = Pflasterstein:
-Dirt = Erde:
-Leaves = Laub:
-Sandstone = Sandstein:
-Stone = Stein:
-Tree = Baumstamm:
-Wooden = Holz:
-
 ## Grinder Recipes
 # $1: Name
 %s Dust = %sstaub

technic/locale/es.txt

@@ -63,7 +63,6 @@ Disabled =
 %s Alloy Furnace = Horno de Aleacion %s
 %s Battery Box = Caja de Bateria %s
 %s Cable = Cable %s
-%s CNC Machine = Maquina CNC %s
 %s Compressor = Compresor %s
 %s Extractor = Extractor %s
 %s Forcefield Emitter = Emisor de Campo de Fuerza %s
@@ -115,40 +114,6 @@ Digging finished =
 Digging %d m above machine =
 Digging %d m below machine =
 
-## CNC Machine
-Element Edge = Elemento Borde
-Tree = Arbol
-Element Cross Double = Elemento Cruz Doble
-Spike = Pica
-Element Edge Double = Elemento Borde Doble
-Two Curved Edge Block = Dos Bloques de Borde Curvados
-Pyramid = Piramide
-Slope Upside Down Inner Edge = Borde Interno de Rampa Al Reves
-Slope Upside Down Edge = Borde de Rampa Al Reves
-Element Straight Double = Elemento Doble Recto
-Sphere = Esfera
-Element End Double = Doble Fin de Elemento
-Element Straight = Recta de Elemento
-Horizontal Cylinder = Cilindro Horizontal
-Slope Inner Edge = Borde Interno de Rampa
-One Curved Edge Block = Un Bloque de Borde Curvado
-Element Cross = Cruce de Elementos
-Stick = Varita
-Element End = Fin de Elemento
-Slope Lying = Rampa en Reposo
-Slope Upside Down = Rampa Al Reves
-Slope Edge = Borde de Rampa
-Slope = Rampa
-Element T = Elemento T
-Cylinder = Cilindro
-Cobble = Adoquines
-Stone = Piedra
-Brick = Ladrillo
-Dirt = Tierra
-Sandstone = Arenisca
-Wooden = Madera
-Leaves = Hojas
-
 ## Grinder Recipes
 # $1: Name
 %s Dust = Polvo de %s

technic/locale/it.txt

@@ -64,7 +64,6 @@ Disabled = Disabilitato
 %s Alloy Furnace = %s Fornace per leghe
 %s Battery Box =  %s Box batterie
 %s Cable = Cavo %s
-%s CNC Machine = Tornio CNC %s
 %s Compressor = Compressore %s
 %s Extractor = Estrattore %s
 %s Forcefield Emitter = Emettitore di campo di forza %s
@@ -118,41 +117,6 @@ Digging finished = Scavo finito
 Digging %d m above machine = Scavo di %d m sopra la macchina
 Digging %d m below machine = Scavo di %d m sotto la macchina
 
-## CNC
-Cylinder = Cilindro
-Element Cross = Elemento a croce
-Element Cross Double = Elemento a croce doppio
-Element Edge = Elemento bordo
-Element Edge Double = Elemento bordo doppio
-Element End = Elemento finale
-Element End Double = Elemento finale doppio
-Element Straight = Elemento dritto
-Element Straight Double = Elemento dritto doppio
-Element T = Elemento a T
-Element T Double = Elemento a T doppio
-Horizontal Cylinder = Cilindro orizzontale
-One Curved Edge Block = Blocco con bordo curvo
-Pyramid = Piramide
-Slope = Inclinato
-Slope Edge = Bordo inclinato
-Slope Inner Edge = Bordo interno inclinato
-Slope Lying = Pendenza bugiarda
-Slope Upside Down = Pendenza capovolta
-Slope Upside Down Edge = Bordo inclinato capovolto
-Slope Upside Down Inner Edge = Bordo interno inclinato capovolto
-Sphere = Sfera
-Spike = Spuntone
-Stick = Bastone
-Two Curved Edge Block = Blocco con bordo a doppia curva
-Brick = Mattone
-Cobble = Ciottolato
-Dirt = Terra
-Leaves = Foglie
-Sandstone = Arenaria
-Stone = Pietra
-Tree = Albero
-Wooden = Legno
-
 ## Grinder Recipes
 # $1: Name
 %s Dust = Polvere di %s

technic/locale/template.txt

@@ -71,7 +71,6 @@ Disabled =
 %s Alloy Furnace =
 %s Battery Box =
 %s Cable =
-%s CNC Machine =
 %s Centrifuge =
 %s Compressor =
 %s Extractor =
@@ -127,40 +126,6 @@ Digging %d m above machine =
 Digging %d m below machine =
 @1 (@2 @3 -> @4 @5) =
 
-## CNC
-Cylinder =
-Element Cross =
-Element Cross Double =
-Element Edge =
-Element Edge Double =
-Element End =
-Element End Double =
-Element Straight =
-Element Straight Double =
-Element T =
-Element T Double =
-Horizontal Cylinder =
-One Curved Edge Block =
-Pyramid =
-Slope =
-Slope Edge =
-Slope Inner Edge =
-Slope Lying =
-Slope Upside Down =
-Slope Upside Down Edge =
-Slope Upside Down Inner Edge =
-Sphere =
-Spike =
-Stick =
-Two Curved Edge Block =
-Brick =
-Cobble =
-Dirt =
-Leaves =
-Sandstone =
-Stone =
-Tree =
-Wooden =
 
 ## Grinder Recipes
 # $1: Name

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"        },
 	}

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",
 })

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'},
-		{'technic:fine_silver_wire', 'technic:lv_cable',       'technic:fine_silver_wire'},
-	}
+		{'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})

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',       ''},
 	}

technic/machines/LV/geothermal.lua

@@ -11,9 +11,13 @@ minetest.register_craft({
 	output = 'technic:geothermal',
 	recipe = {
 		{'technic:granite',          'default:diamond',        'technic:granite'},
-		{'technic:fine_copper_wire', 'technic:machine_casing', 'technic:fine_copper_wire'},
+		{'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", {

technic/machines/LV/init.lua

@@ -23,8 +23,6 @@ dofile(path.."/compressor.lua")
 
 dofile(path.."/music_player.lua")
 
-dofile(path.."/cnc.lua")
-dofile(path.."/cnc_api.lua")
 dofile(path.."/cnc_nodes.lua")
 
-dofile(path.."/lamp.lua")
+dofile(path.."/lamp.lua")

technic/machines/LV/solar_panel.lua

@@ -9,9 +9,9 @@ minetest.register_craft({
 	output = 'technic:solar_panel',
 	recipe = {
 		{'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer'},
-		{'technic:fine_silver_wire',    'technic:lv_cable',            'mesecons_materials:glue'},
-
-	}
+		{'basic_materials:silver_wire',    'technic:lv_cable',            'mesecons_materials:glue'},
+	},
+	replacements = { {"basic_materials:silver_wire", "basic_materials:empty_spool"}, },
 })
 
 

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"     },
 	}

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',           ''},
 	}

technic/machines/other/frames.lua

@@ -979,7 +979,7 @@ minetest.register_craft({
 	output = 'technic:frame_111111',
 	recipe = {
 		{ '',              'default:stick',       '' },
-		{ 'default:stick', 'technic:brass_ingot', 'default:stick' },
+		{ 'default:stick', 'basic_materials:brass_ingot', 'default:stick' },
 		{ '',              'default:stick',       '' },
 	}
 })
@@ -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', '' },
 	}
 })
@@ -996,9 +996,9 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:template 10',
 	recipe = {
-		{ '',                    'technic:brass_ingot',  '' },
-		{ 'technic:brass_ingot', 'default:mese_crystal', 'technic:brass_ingot' },
-		{ '',                    'technic:brass_ingot',  '' },
+		{ '',                    'basic_materials:brass_ingot',  '' },
+		{ 'basic_materials:brass_ingot', 'default:mese_crystal', 'basic_materials:brass_ingot' },
+		{ '',                    'basic_materials:brass_ingot',  '' },
 	}
 })
 
@@ -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', '' },
 	}
 })

technic/machines/register/alloy_recipes.lua

@@ -21,7 +21,7 @@ local recipes = {
 	{"technic:carbon_steel_dust 3",   "technic:chromium_dust",      "technic:stainless_steel_dust 4"},
 	{"technic:carbon_steel_ingot 3",  "technic:chromium_ingot",     "technic:stainless_steel_ingot 4"},
 	{"technic:copper_dust 2",         "technic:zinc_dust",          "technic:brass_dust 3"},
-	{"default:copper_ingot 2",        "technic:zinc_ingot",         "technic:brass_ingot 3"},
+	{"default:copper_ingot 2",        "technic:zinc_ingot",         "basic_materials:brass_ingot 3"},
 	{"default:sand 2",                "technic:coal_dust 2",        "technic:silicon_wafer"},
 	{"technic:silicon_wafer",         "technic:gold_dust",          "technic:doped_silicon_wafer"},
 	-- from https://en.wikipedia.org/wiki/Carbon_black

technic/machines/register/cables.lua

@@ -117,6 +117,19 @@ local function clear_networks(pos)
 	end
 end
 
+local function item_place_override_node(itemstack, placer, pointed, node)
+	-- Call the default on_place function with a fake itemstack
+	local temp_itemstack = ItemStack(itemstack)
+	temp_itemstack:set_name(node.name)
+	local original_count = temp_itemstack:get_count()
+	temp_itemstack = 
+		minetest.item_place(temp_itemstack, placer, pointed, node.param2) or
+		temp_itemstack
+	-- Remove the same number of items from the real itemstack
+	itemstack:take_item(original_count - temp_itemstack:get_count())
+	return itemstack
+end
+
 function technic.register_cable(tier, size)
 	local ltier = string.lower(tier)
 	cable_tier["technic:"..ltier.."_cable"] = tier
@@ -228,11 +241,10 @@ function technic.register_cable(tier, size)
 						num = xyz[((fine_pointed[bigger] < 0 and "-") or "") .. bigger]
 					end
 				end
-				minetest.set_node(pointed_thing.above, {name = "technic:"..ltier.."_cable_plate_"..num})
-				if not (creative and creative.is_enabled_for(placer)) then
-					itemstack:take_item()
-				end
-				return itemstack
+				return item_place_override_node(
+					itemstack, placer, pointed_thing,
+					{name = "technic:"..ltier.."_cable_plate_"..num}
+				)
 			end
 		else
 			def.groups.not_in_creative_inventory = 1

technic/machines/register/grinder_recipes.lua

@@ -98,7 +98,7 @@ local function register_dust(name, ingot)
 end
 
 -- Sorted alphibeticaly
-register_dust("Brass",           "technic:brass_ingot")
+register_dust("Brass",           "basic_materials:brass_ingot")
 register_dust("Bronze",          "default:bronze_ingot")
 register_dust("Carbon Steel",    "technic:carbon_steel_ingot")
 register_dust("Cast Iron",       "technic:cast_iron_ingot")

technic/machines/supply_converter.lua

@@ -201,10 +201,11 @@ minetest.register_node("technic:supply_converter", {
 minetest.register_craft({
 	output = 'technic:supply_converter 1',
 	recipe = {
-		{'technic:fine_gold_wire', 'technic:rubber',         'technic:doped_silicon_wafer'},
+		{'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

technic/radiation.lua

@@ -146,7 +146,7 @@ local rad_resistance_node = {
 	["moreores:mithril_block"] = 26,
 	["moreores:silver_block"] = 53,
 	["snow:snow_brick"] = 2.8,
-	["technic:brass_block"] = 43,
+	["basic_materials:brass_block"] = 43,
 	["technic:carbon_steel_block"] = 40,
 	["technic:cast_iron_block"] = 40,
 	["technic:chernobylite_block"] = 40,

technic/tools/chainsaw.lua

@@ -363,8 +363,10 @@ minetest.register_craft({
 	output = "technic:chainsaw",
 	recipe = {
 		{"technic:stainless_steel_ingot", trigger,                      "technic:battery"},
-		{"technic:fine_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"}, },
+
 })
 

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'},
 	}
 })

technic/tools/mining_lasers.lua

@@ -11,8 +11,8 @@ local S = technic.getter
 minetest.register_craft({
 	output = "technic:laser_mk1",
 	recipe = {
-		{"default:diamond", "technic:brass_ingot",        "default:obsidian_glass"},
-		{"",                "technic:brass_ingot",        "technic:red_energy_crystal"},
+		{"default:diamond", "basic_materials:brass_ingot",        "default:obsidian_glass"},
+		{"",                "basic_materials:brass_ingot",        "technic:red_energy_crystal"},
 		{"",                "",                           "default:copper_ingot"},
 	}
 })

technic/tools/prospector.lua

@@ -122,7 +122,7 @@ minetest.register_craft({
 	output = "technic:prospector",
 	recipe = {
 		{"moreores:pick_silver", "moreores:mithril_block", "pipeworks:teleport_tube_1"},
-		{"technic:brass_ingot", "technic:control_logic_unit", "technic:brass_ingot"},
+		{"basic_materials:brass_ingot", "technic:control_logic_unit", "basic_materials:brass_ingot"},
 		{"", "technic:blue_energy_crystal", ""},
 	}
 })

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', '',                 ''},
 	}
 })

technic_chests/copper_chest.lua

@@ -19,7 +19,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:copper_locked_chest 1',
 	recipe = {
-		{'default:steel_ingot'},
+		{'basic_materials:padlock'},
 		{'technic:copper_chest'},
 	}
 })

technic_chests/depends.txt

@@ -1,4 +1,6 @@
 default
+basic_materials
+moreblocks?
 moreores?
 pipeworks?
 intllib?

technic_chests/gold_chest.lua

@@ -30,7 +30,7 @@ end
 minetest.register_craft({
 	output = 'technic:gold_locked_chest',
 	recipe = {
-		{'default:steel_ingot'},
+		{'basic_materials:padlock'},
 		{'technic:gold_chest'},
 	}
 })

technic_chests/init.lua

@@ -15,6 +15,63 @@ dofile(modpath.."/silver_chest.lua")
 dofile(modpath.."/gold_chest.lua")
 dofile(modpath.."/mithril_chest.lua")
 
+-- undo all of the locked wooden chest recipes created by default and
+-- moreblocks, and just make them use a padlock.
+
+if minetest.get_modpath("moreblocks") then
+	minetest.clear_craft({
+		type = "shapeless",
+		recipe = {
+			"default:chest",
+			"default:gold_ingot",
+		}
+	})
+
+	minetest.clear_craft({
+		type = "shapeless",
+		recipe = {
+			"default:chest",
+			"default:bronze_ingot",
+		}
+	})
+
+	minetest.clear_craft({
+		type = "shapeless",
+		recipe = {
+			"default:chest",
+			"default:copper_ingot",
+		}
+	})
+end
+
+minetest.clear_craft({
+	type = "shapeless",
+	recipe = {
+		"default:chest",
+		"default:steel_ingot",
+	}
+})
+
+minetest.clear_craft({output = "default:chest_locked"})
+
+minetest.register_craft({
+	output = "default:chest_locked",
+	recipe = {
+		{ "group:wood", "group:wood", "group:wood" },
+		{ "group:wood", "basic_materials:padlock", "group:wood" },
+		{ "group:wood", "group:wood", "group:wood" }
+	}
+})
+
+minetest.register_craft({
+	output = "default:chest_locked",
+	type = "shapeless",
+	recipe = {
+		"default:chest",
+		"basic_materials:padlock"
+	}
+})
+
 minetest.register_lbm({
 	name = "technic_chests:fix_wooden_chests",
 	nodenames = {"default:chest"},

technic_chests/iron_chest.lua

@@ -26,7 +26,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:iron_locked_chest 1',
 	recipe = {
-		{'default:steel_ingot'},
+		{'basic_materials:padlock'},
 		{'technic:iron_chest'},
 	}
 })

technic_chests/mithril_chest.lua

@@ -21,7 +21,7 @@ end
 minetest.register_craft({
 	output = 'technic:mithril_locked_chest 1',
 	recipe = {
-		{'default:steel_ingot'},
+		{'basic_materials:padlock'},
 		{'technic:mithril_chest'},
 	}
 })

technic_chests/silver_chest.lua

@@ -21,7 +21,7 @@ end
 minetest.register_craft({
 	output = 'technic:silver_locked_chest',
 	recipe = {
-		{'default:steel_ingot'},
+		{'basic_materials:padlock'},
 		{'technic:silver_chest'},
 	}
 })

technic_cnc/cnc.lua

@@ -7,18 +7,70 @@
 --   I could imagine some form of API allowing modders to come with their own node
 --   box definitions and easily stuff it in the this machine for production.
 
-local S = technic.getter
+local S = technic_cnc.getter
 
+local allow_metadata_inventory_put
+local allow_metadata_inventory_take
+local allow_metadata_inventory_move
+local can_dig
+local desc_tr = S("CNC Machine")
 
-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:carbon_steel_ingot', 'technic:lv_cable',           'technic:carbon_steel_ingot'},
-	},
-})
+if technic_cnc.use_technic then
+	minetest.register_craft({
+		output = 'technic:cnc',
+		recipe = {
+			{'default:glass',              'technic:diamond_drill_head', 'default:glass'},
+			{'technic:control_logic_unit', 'technic:machine_casing',     'basic_materials:motor'},
+			{'technic:carbon_steel_ingot', 'technic:lv_cable',           'technic:carbon_steel_ingot'},
+		},
+	})
 
+	allow_metadata_inventory_put = technic.machine_inventory_put
+	allow_metadata_inventory_take = technic.machine_inventory_take
+	allow_metadata_inventory_move = technic.machine_inventory_move
+	can_dig = technic.machine_can_dig
+	desc_tr = S("%s CNC Machine"):format("LV")
+else
+	minetest.register_craft({
+		output = 'technic:cnc',
+		recipe = {
+			{'default:glass',       'default:diamond',    'default:glass'},
+			{'basic_materials:ic',  'default:steelblock', 'basic_materials:motor'},
+			{'default:steel_ingot', 'default:mese',       'default:steel_ingot'},
+		},
+	})
+
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		if minetest.is_protected(pos, player:get_player_name()) then
+			return 0
+		end
+		return stack:get_count()
+	end
+
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+		if minetest.is_protected(pos, player:get_player_name()) then
+			return 0
+		end
+		return stack:get_count()
+	end
+
+	allow_metadata_inventory_move = function(pos, from_list, from_index,
+	                                to_list, to_index, count, player)
+		if minetest.is_protected(pos, player:get_player_name()) then
+			return 0
+		end
+		return stack:get_count()
+	end
+
+	can_dig = function(pos, player)
+		if player and minetest.is_protected(pos, player:get_player_name()) then return false end
+		local meta = minetest.get_meta(pos);
+		local inv = meta:get_inventory()
+		return inv:is_empty("dst")
+			and inv:is_empty("src")
+			and default.can_interact_with_node(player, pos)
+	end
+end
 
 local shape = {}
 local onesize_products = {
@@ -40,7 +92,7 @@ local onesize_products = {
 	twocurvededge            = 1,
 }
 local twosize_products = {
-	element_straight         = 4,
+	element_straight         = 2,
 	element_end              = 2,
 	element_cross            = 1,
 	element_t                = 1,
@@ -90,30 +142,32 @@ local cnc_formspec =
 	"listring[current_name;src]"..
 	"listring[current_player;main]"
 
-local size = 1;
-
 -- The form handler is declared here because we need it in both the inactive and active modes
 -- in order to be able to change programs wile it is running.
 local function form_handler(pos, formname, fields, sender)
+	local meta       = minetest.get_meta(pos)
+
 	-- REGISTER MILLING PROGRAMS AND OUTPUTS:
 	------------------------------------------
 	-- Program for half/full size
 	if fields["full"] then
-		size = 1
+		meta:set_int("size", 1)
 		return
 	end
 
 	if fields["half"] then
-		size = 2
+		meta:set_int("size", 2)
 		return
 	end
 
 	-- Resolve the node name and the number of items to make
-	local meta       = minetest.get_meta(pos)
 	local inv        = meta:get_inventory()
 	local inputstack = inv:get_stack("src", 1)
 	local inputname  = inputstack:get_name()
 	local multiplier = 0
+	local size       = meta:get_int("size")
+	if size < 1 then size = 1 end
+
 	for k, _ in pairs(fields) do
 		-- Set a multipier for the half/full size capable blocks
 		if twosize_products[k] ~= nil then
@@ -139,7 +193,19 @@ local function form_handler(pos, formname, fields, sender)
 			break
 		end
 	end
-	return
+
+	if not technic_cnc.use_technic then
+		local result = meta:get_string("cnc_product")
+
+		if not inv:is_empty("src")
+		  and minetest.registered_nodes[result]
+		  and inv:room_for_item("dst", result) then
+			local srcstack = inv:get_stack("src", 1)
+			srcstack:take_item()
+			inv:set_stack("src", 1, srcstack)
+			inv:add_item("dst", result.." "..meta:get_int("cnc_multiplier"))
+		end
+	end
 end
 
 -- Action code performing the transformation
@@ -147,7 +213,7 @@ local run = function(pos, node)
 	local meta         = minetest.get_meta(pos)
 	local inv          = meta:get_inventory()
 	local eu_input     = meta:get_int("LV_EU_input")
-	local machine_name = S("%s CNC Machine"):format("LV")
+	local machine_name = desc_tr
 	local machine_node = "technic:cnc"
 	local demand       = 450
 
@@ -181,8 +247,8 @@ local run = function(pos, node)
 end
 
 -- The actual block inactive state
-minetest.register_node("technic:cnc", {
-	description = S("%s CNC Machine"):format("LV"),
+minetest.register_node(":technic:cnc", {
+	description = desc_tr,
 	tiles       = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
 	               "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"},
 	groups = {cracky=2, technic_machine=1, technic_lv=1},
@@ -191,40 +257,44 @@ minetest.register_node("technic:cnc", {
 	legacy_facedir_simple = true,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		meta:set_string("infotext", S("%s CNC Machine"):format("LV"))
+		meta:set_string("infotext", desc_tr)
 		meta:set_float("technic_power_machine", 1)
 		meta:set_string("formspec", cnc_formspec)
 		local inv = meta:get_inventory()
 		inv:set_size("src", 1)
 		inv:set_size("dst", 4)
 	end,
-	can_dig = technic.machine_can_dig,
-	allow_metadata_inventory_put = technic.machine_inventory_put,
-	allow_metadata_inventory_take = technic.machine_inventory_take,
-	allow_metadata_inventory_move = technic.machine_inventory_move,
+	can_dig = can_dig,
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
+	allow_metadata_inventory_move = allow_metadata_inventory_move,
 	on_receive_fields = form_handler,
-	technic_run = run,
+	technic_run = technic_cnc.use_technic and run,
 })
 
 -- Active state block
-minetest.register_node("technic:cnc_active", {
-	description = S("%s CNC Machine"):format("LV"),
-	tiles       = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
-	               "technic_cnc_side.png",       "technic_cnc_side.png",   "technic_cnc_front_active.png"},
-	groups = {cracky=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1},
-	connect_sides = {"bottom", "back", "left", "right"},
-	paramtype2 = "facedir",
-	drop = "technic:cnc",
-	legacy_facedir_simple = true,
-	can_dig = technic.machine_can_dig,
-	allow_metadata_inventory_put = technic.machine_inventory_put,
-	allow_metadata_inventory_take = technic.machine_inventory_take,
-	allow_metadata_inventory_move = technic.machine_inventory_move,
-	on_receive_fields = form_handler,
-	technic_run = run,
-	technic_disabled_machine_name = "technic:cnc",
-})
+if technic_cnc.use_technic then
 
-technic.register_machine("LV", "technic:cnc",        technic.receiver)
-technic.register_machine("LV", "technic:cnc_active", technic.receiver)
+	minetest.register_node(":technic:cnc_active", {
+		description = desc_tr,
+		tiles       = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
+					   "technic_cnc_side.png",       "technic_cnc_side.png",   "technic_cnc_front_active.png"},
+		groups = {cracky=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1},
+		connect_sides = {"bottom", "back", "left", "right"},
+		paramtype2 = "facedir",
+		drop = "technic:cnc",
+		legacy_facedir_simple = true,
+		can_dig = can_dig,
+		allow_metadata_inventory_put = allow_metadata_inventory_put,
+		allow_metadata_inventory_take = allow_metadata_inventory_take,
+		allow_metadata_inventory_move = allow_metadata_inventory_move,
+		on_receive_fields = form_handler,
+		technic_run = run,
+		technic_disabled_machine_name = "technic:cnc",
+	})
 
+	technic.register_machine("LV", "technic:cnc",        technic.receiver)
+	technic.register_machine("LV", "technic:cnc_active", technic.receiver)
+else
+	minetest.register_alias("technic:cnc_active", "technic:cnc")
+end

technic_cnc/cnc_api.lua

@@ -1,16 +1,14 @@
 -- API for the technic CNC machine
 -- Again code is adapted from the NonCubic Blocks MOD v1.4 by yves_de_beck
 
-local S = technic.getter
-
-technic.cnc = {}
+local S = technic_cnc.getter
 
 -- REGISTER NONCUBIC FORMS, CREATE MODELS AND RECIPES:
 ------------------------------------------------------
 
 -- Define slope boxes for the various nodes
 -------------------------------------------
-technic.cnc.programs = {
+technic_cnc.programs = {
 	{ suffix  = "technic_cnc_stick",
 		model = {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15},
 		desc  = S("Stick")
@@ -83,7 +81,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_oblate_spheroid",
-		model = "technic_oblate_spheroid.obj",
+		model = "technic_cnc_oblate_spheroid.obj",
 		desc  = S("Oblate spheroid"),
 		cbox  = {
 			type = "fixed",
@@ -96,32 +94,32 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_sphere",
-		model = "technic_sphere.obj",
+		model = "technic_cnc_sphere.obj",
 		desc  = S("Sphere")
 	},
 
 	{ suffix  = "technic_cnc_cylinder_horizontal",
-		model = "technic_cylinder_horizontal.obj",
+		model = "technic_cnc_cylinder_horizontal.obj",
 		desc  = S("Horizontal Cylinder")
 	},
 
 	{ suffix  = "technic_cnc_cylinder",
-		model = "technic_cylinder.obj",
+		model = "technic_cnc_cylinder.obj",
 		desc  = S("Cylinder")
 	},
 
 	{ suffix  = "technic_cnc_twocurvededge",
-		model = "technic_two_curved_edge.obj",
+		model = "technic_cnc_two_curved_edge.obj",
 		desc  = S("Two Curved Edge/Corner Block")
 	},
 
 	{ suffix  = "technic_cnc_onecurvededge",
-		model = "technic_one_curved_edge.obj",
+		model = "technic_cnc_one_curved_edge.obj",
 		desc  = S("One Curved Edge Block")
 	},
 
 	{ suffix  = "technic_cnc_spike",
-		model = "technic_pyramid_spike.obj",
+		model = "technic_cnc_pyramid_spike.obj",
 		desc  = S("Spike"),
 		cbox    = {
 			type = "fixed",
@@ -135,7 +133,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_pyramid",
-		model = "technic_pyramid.obj",
+		model = "technic_cnc_pyramid.obj",
 		desc  = S("Pyramid"),
 		cbox  = {
 			type = "fixed",
@@ -149,7 +147,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_slope_inner_edge_upsdown",
-		model = "technic_innercorner_upsdown.obj",
+		model = "technic_cnc_innercorner_upsdown.obj",
 		desc  = S("Slope Upside Down Inner Edge/Corner"),
 		sbox  = {
 			type = "fixed",
@@ -170,7 +168,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_slope_edge_upsdown",
-		model = "technic_outercorner_upsdown.obj",
+		model = "technic_cnc_outercorner_upsdown.obj",
 		desc  = S("Slope Upside Down Outer Edge/Corner"),
 		cbox  = {
 			type = "fixed",
@@ -184,7 +182,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_slope_inner_edge",
-		model = "technic_innercorner.obj",
+		model = "technic_cnc_innercorner.obj",
 		desc  = S("Slope Inner Edge/Corner"),
 		sbox  = {
 			type = "fixed",
@@ -205,7 +203,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_slope_edge",
-		model = "technic_outercorner.obj",
+		model = "technic_cnc_outercorner.obj",
 		desc  = S("Slope Outer Edge/Corner"),
 		cbox  = {
 			type = "fixed",
@@ -219,7 +217,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_slope_upsdown",
-		model = "technic_slope_upsdown.obj",
+		model = "technic_cnc_slope_upsdown.obj",
 		desc  = S("Slope Upside Down"),
 		cbox  = {
 			type = "fixed",
@@ -233,7 +231,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_slope_lying",
-		model = "technic_slope_horizontal.obj",
+		model = "technic_cnc_slope_horizontal.obj",
 		desc  = S("Slope Lying"),
 		cbox  = {
 			type = "fixed",
@@ -247,7 +245,7 @@ technic.cnc.programs = {
 	},
 
 	{ suffix  = "technic_cnc_slope",
-		model = "technic_slope.obj",
+		model = "technic_cnc_slope.obj",
 		desc  = S("Slope"),
 		cbox  = {
 			type = "fixed",
@@ -263,7 +261,7 @@ technic.cnc.programs = {
 }
 
 -- Allow disabling certain programs for some node. Default is allowing all types for all nodes
-technic.cnc.programs_disable = {
+technic_cnc.programs_disable = {
 	-- ["default:brick"] = {"technic_cnc_stick"}, -- Example: Disallow the stick for brick
 	-- ...
 	["default:dirt"] = {"technic_cnc_oblate_spheroid", "technic_cnc_slope_upsdown", "technic_cnc_edge",
@@ -273,7 +271,7 @@ technic.cnc.programs_disable = {
 }
 
 -- Generic function for registering all the different node types
-function technic.cnc.register_program(recipeitem, suffix, model, groups, images, description, cbox, sbox)
+function technic_cnc.register_program(recipeitem, suffix, model, groups, images, description, cbox, sbox)
 
 	local dtype
 	local nodeboxdef
@@ -308,12 +306,12 @@ function technic.cnc.register_program(recipeitem, suffix, model, groups, images,
 end
 
 -- function to iterate over all the programs the CNC machine knows
-function technic.cnc.register_all(recipeitem, groups, images, description)
-	for _, data in ipairs(technic.cnc.programs) do
+function technic_cnc.register_all(recipeitem, groups, images, description)
+	for _, data in ipairs(technic_cnc.programs) do
 		-- Disable node creation for disabled node types for some material
 		local do_register = true
-		if technic.cnc.programs_disable[recipeitem] ~= nil then
-			for __, disable in ipairs(technic.cnc.programs_disable[recipeitem]) do
+		if technic_cnc.programs_disable[recipeitem] ~= nil then
+			for __, disable in ipairs(technic_cnc.programs_disable[recipeitem]) do
 				if disable == data.suffix then
 					do_register = false
 				end
@@ -321,49 +319,49 @@ function technic.cnc.register_all(recipeitem, groups, images, description)
 		end
 		-- Create the node if it passes the test
 		if do_register then
-			technic.cnc.register_program(recipeitem, data.suffix, data.model,
+			technic_cnc.register_program(recipeitem, data.suffix, data.model,
 			    groups, images, description.." "..data.desc, data.cbox, data.sbox)
 		end
 	end
 end
 
 
--- REGISTER NEW TECHNIC_CNC_API's PART 2: technic.cnc..register_element_end(subname, recipeitem, groups, images, desc_element_xyz)
+-- REGISTER NEW TECHNIC_CNC_API's PART 2: technic_cnc..register_element_end(subname, recipeitem, groups, images, desc_element_xyz)
 -----------------------------------------------------------------------------------------------------------------------
-function technic.cnc.register_slope_edge_etc(recipeitem, groups, images, desc_slope, desc_slope_lying, desc_slope_upsdown, desc_slope_edge, desc_slope_inner_edge, desc_slope_upsdwn_edge, desc_slope_upsdwn_inner_edge, desc_pyramid, desc_spike, desc_onecurvededge, desc_twocurvededge, desc_cylinder, desc_cylinder_horizontal, desc_spheroid, desc_element_straight, desc_element_edge, desc_element_t, desc_element_cross, desc_element_end)
+function technic_cnc.register_slope_edge_etc(recipeitem, groups, images, desc_slope, desc_slope_lying, desc_slope_upsdown, desc_slope_edge, desc_slope_inner_edge, desc_slope_upsdwn_edge, desc_slope_upsdwn_inner_edge, desc_pyramid, desc_spike, desc_onecurvededge, desc_twocurvededge, desc_cylinder, desc_cylinder_horizontal, desc_spheroid, desc_element_straight, desc_element_edge, desc_element_t, desc_element_cross, desc_element_end)
 
-         technic.cnc.register_slope(recipeitem, groups, images, desc_slope)
-         technic.cnc.register_slope_lying(recipeitem, groups, images, desc_slope_lying)
-         technic.cnc.register_slope_upsdown(recipeitem, groups, images, desc_slope_upsdown)
-         technic.cnc.register_slope_edge(recipeitem, groups, images, desc_slope_edge)
-         technic.cnc.register_slope_inner_edge(recipeitem, groups, images, desc_slope_inner_edge)
-         technic.cnc.register_slope_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_edge)
-         technic.cnc.register_slope_inner_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_inner_edge)
-         technic.cnc.register_pyramid(recipeitem, groups, images, desc_pyramid)
-         technic.cnc.register_spike(recipeitem, groups, images, desc_spike)
-         technic.cnc.register_onecurvededge(recipeitem, groups, images, desc_onecurvededge)
-         technic.cnc.register_twocurvededge(recipeitem, groups, images, desc_twocurvededge)
-         technic.cnc.register_cylinder(recipeitem, groups, images, desc_cylinder)
-         technic.cnc.register_cylinder_horizontal(recipeitem, groups, images, desc_cylinder_horizontal)
-         technic.cnc.register_spheroid(recipeitem, groups, images, desc_spheroid)
-         technic.cnc.register_element_straight(recipeitem, groups, images, desc_element_straight)
-         technic.cnc.register_element_edge(recipeitem, groups, images, desc_element_edge)
-         technic.cnc.register_element_t(recipeitem, groups, images, desc_element_t)
-         technic.cnc.register_element_cross(recipeitem, groups, images, desc_element_cross)
-         technic.cnc.register_element_end(recipeitem, groups, images, desc_element_end)
+         technic_cnc.register_slope(recipeitem, groups, images, desc_slope)
+         technic_cnc.register_slope_lying(recipeitem, groups, images, desc_slope_lying)
+         technic_cnc.register_slope_upsdown(recipeitem, groups, images, desc_slope_upsdown)
+         technic_cnc.register_slope_edge(recipeitem, groups, images, desc_slope_edge)
+         technic_cnc.register_slope_inner_edge(recipeitem, groups, images, desc_slope_inner_edge)
+         technic_cnc.register_slope_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_edge)
+         technic_cnc.register_slope_inner_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_inner_edge)
+         technic_cnc.register_pyramid(recipeitem, groups, images, desc_pyramid)
+         technic_cnc.register_spike(recipeitem, groups, images, desc_spike)
+         technic_cnc.register_onecurvededge(recipeitem, groups, images, desc_onecurvededge)
+         technic_cnc.register_twocurvededge(recipeitem, groups, images, desc_twocurvededge)
+         technic_cnc.register_cylinder(recipeitem, groups, images, desc_cylinder)
+         technic_cnc.register_cylinder_horizontal(recipeitem, groups, images, desc_cylinder_horizontal)
+         technic_cnc.register_spheroid(recipeitem, groups, images, desc_spheroid)
+         technic_cnc.register_element_straight(recipeitem, groups, images, desc_element_straight)
+         technic_cnc.register_element_edge(recipeitem, groups, images, desc_element_edge)
+         technic_cnc.register_element_t(recipeitem, groups, images, desc_element_t)
+         technic_cnc.register_element_cross(recipeitem, groups, images, desc_element_cross)
+         technic_cnc.register_element_end(recipeitem, groups, images, desc_element_end)
 end
 
 -- REGISTER STICKS: noncubic.register_xyz(recipeitem, groups, images, desc_element_xyz)
 ------------------------------------------------------------------------------------------------------------
-function technic.cnc.register_stick_etc(recipeitem, groups, images, desc_stick)
-         technic.cnc.register_stick(recipeitem, groups, images, desc_stick)
+function technic_cnc.register_stick_etc(recipeitem, groups, images, desc_stick)
+         technic_cnc.register_stick(recipeitem, groups, images, desc_stick)
 end
 
-function technic.cnc.register_elements(recipeitem, groups, images, desc_element_straight_double, desc_element_edge_double, desc_element_t_double, desc_element_cross_double, desc_element_end_double)
-         technic.cnc.register_element_straight_double(recipeitem, groups, images, desc_element_straight_double)
-         technic.cnc.register_element_edge_double(recipeitem, groups, images, desc_element_edge_double)
-         technic.cnc.register_element_t_double(recipeitem, groups, images, desc_element_t_double)
-         technic.cnc.register_element_cross_double(recipeitem, groups, images, desc_element_cross_double)
-         technic.cnc.register_element_end_double(recipeitem, groups, images, desc_element_end_double)
+function technic_cnc.register_elements(recipeitem, groups, images, desc_element_straight_double, desc_element_edge_double, desc_element_t_double, desc_element_cross_double, desc_element_end_double)
+         technic_cnc.register_element_straight_double(recipeitem, groups, images, desc_element_straight_double)
+         technic_cnc.register_element_edge_double(recipeitem, groups, images, desc_element_edge_double)
+         technic_cnc.register_element_t_double(recipeitem, groups, images, desc_element_t_double)
+         technic_cnc.register_element_cross_double(recipeitem, groups, images, desc_element_cross_double)
+         technic_cnc.register_element_end_double(recipeitem, groups, images, desc_element_end_double)
 end
 

technic_cnc/cnc_materials.lua

@@ -0,0 +1,131 @@
+-- REGISTER MATERIALS AND PROPERTIES FOR NONCUBIC ELEMENTS:
+-----------------------------------------------------------
+
+local S = technic_cnc.getter
+
+-- DIRT
+-------
+technic_cnc.register_all("default:dirt",
+                {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
+                {"default_dirt.png"},
+                S("Dirt"))
+-- (DIRT WITH) GRASS
+--------------------
+technic_cnc.register_all("default:dirt_with_grass",
+                {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
+                {"default_grass.png"},
+                S("Grassy dirt"))
+-- WOOD
+-------
+technic_cnc.register_all("default:wood",
+                {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1},
+                {"default_wood.png"},
+                S("Wooden"))
+-- STONE
+--------
+technic_cnc.register_all("default:stone",
+                {cracky=3, not_in_creative_inventory=1},
+                {"default_stone.png"},
+                S("Stone"))
+-- COBBLE
+---------
+technic_cnc.register_all("default:cobble",
+                {cracky=3, not_in_creative_inventory=1},
+                {"default_cobble.png"},
+                S("Cobble"))
+-- BRICK
+--------
+technic_cnc.register_all("default:brick",
+                {cracky=3, not_in_creative_inventory=1},
+                {"default_brick.png"},
+                S("Brick"))
+
+-- SANDSTONE
+------------
+technic_cnc.register_all("default:sandstone",
+                {crumbly=2, cracky=3, not_in_creative_inventory=1},
+                {"default_sandstone.png"},
+                S("Sandstone"))
+
+-- LEAVES
+---------
+technic_cnc.register_all("default:leaves",
+                {snappy=2, choppy=2, oddly_breakable_by_hand=3, not_in_creative_inventory=1},
+                {"default_leaves.png"},
+                S("Leaves"))
+-- TREE
+-------
+technic_cnc.register_all("default:tree",
+                {snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=3, wood=1, not_in_creative_inventory=1},
+                {"default_tree.png"},
+                S("Tree"))
+
+-- Bronze
+--------
+technic_cnc.register_all("default:bronzeblock",
+                {cracky=1, level=2, not_in_creative_inventory=1},
+                {"default_bronze_block.png"},
+                S("Bronze"))
+
+
+local steeltex = "default_steel_block.png"
+local steelname = "Steel"
+
+if technic_cnc.technic_modpath then
+	steeltex = "technic_wrought_iron_block.png"
+	steelname = "Wrought Iron"
+
+	-- Stainless Steel
+	--------
+	technic_cnc.register_all("technic:stainless_steel_block",
+					{cracky=1, level=2, not_in_creative_inventory=1},
+					{"technic_stainless_steel_block.png"},
+					S("Stainless Steel"))
+
+	-- Marble
+	------------
+	technic_cnc.register_all("technic:marble",
+					{cracky=3, not_in_creative_inventory=1},
+					{"technic_marble.png"},
+					S("Marble"))
+
+	-- Granite
+	------------
+	technic_cnc.register_all("technic:granite",
+					{cracky=1, not_in_creative_inventory=1},
+					{"technic_granite.png"},
+					S("Granite"))
+
+	-- Blast-resistant concrete
+	---------------------------
+
+	technic_cnc.register_all("technic:blast_resistant_concrete",
+					{cracky=2, level=2, not_in_creative_inventory=1},
+					{"technic_blast_resistant_concrete_block.png"},
+					S("Blast-resistant concrete"))
+end
+
+-- STEEL
+---------------
+technic_cnc.register_all("default:steelblock",
+				{cracky=1, level=2, not_in_creative_inventory=1},
+				{steeltex},
+				S(steelname))
+
+-- CONCRETE AND CEMENT
+----------------------
+
+technic_cnc.register_all("basic_materials:concrete_block",
+				{cracky=2, level=2, not_in_creative_inventory=1},
+				{"basic_materials_concrete_block.png"},
+				S("Concrete"))
+
+technic_cnc.register_all("basic_materials:cement_block",
+				{cracky=2, level=2, not_in_creative_inventory=1},
+				{"basic_materials_cement_block.png"},
+				S("Cement"))
+
+technic_cnc.register_all("basic_materials:brass_block",
+				{cracky=1, level=2, not_in_creative_inventory=1},
+				{"basic_materials_brass_block.png"},
+				S("Brass block"))

technic_cnc/depends.txt

@@ -0,0 +1,3 @@
+default
+basic_materials
+technic?

technic_cnc/init.lua

@@ -0,0 +1,18 @@
+local modpath = minetest.get_modpath("technic_cnc")
+
+technic_cnc = {}
+
+technic_cnc.technic_modpath = minetest.get_modpath("technic")
+
+technic_cnc.use_technic = technic_cnc.technic_modpath
+                          and minetest.settings:get_bool("technic_cnc_use_technic") ~= false
+
+if rawget(_G, "intllib") then
+	technic_cnc.getter = intllib.Getter()
+else
+	technic_cnc.getter = function(s,a,...)if a==nil then return s end a={a,...}return s:gsub("(@?)@(%(?)(%d+)(%)?)",function(e,o,n,c)if e==""then return a[tonumber(n)]..(o==""and c or"")else return"@"..o..n..c end end) end
+end
+
+dofile(modpath.."/cnc.lua")
+dofile(modpath.."/cnc_api.lua")
+dofile(modpath.."/cnc_materials.lua")

technic_cnc/locale/de.txt

@@ -0,0 +1,36 @@
+## CNC
+CNC Machine = CNC-Maschine
+%s CNC Machine = %s CNC-Maschine
+Cylinder = Zylinder
+Element Cross = Halbes Kreuzelement
+Element Cross Double = Kreuzelement
+Element Edge = Halbes Eckelement
+Element Edge Double = Eckelement
+Element End = Halbes Endelement
+Element End Double = Endelement
+Element Straight = Halbes aufrechtes Element
+Element Straight Double = Aufrechtes Element
+Element T = Halbes T-Element
+Element T Double = T-Element
+Horizontal Cylinder = Liegender Zylinder
+One Curved Edge Block = Block mit einer abgerundeten Kante
+Pyramid = Pyramide
+Slope = Schraege
+Slope Edge = Schraege mit Ecke
+Slope Inner Edge = Schraege mit Innenecke
+Slope Lying = Liegende Schraege
+Slope Upside Down = Umgedrehte Schraege
+Slope Upside Down Edge = Umgedrehte Schraege mit Ecke
+Slope Upside Down Inner Edge = Umgedrehte Schraege mit Innenecke
+Sphere = Kugel
+Spike = Spitze
+Stick = Stange
+Two Curved Edge Block = Block mit zwei abgerundeten Kanten
+Brick = Ziegel:
+Cobble = Pflasterstein:
+Dirt = Erde:
+Leaves = Laub:
+Sandstone = Sandstein:
+Stone = Stein:
+Tree = Baumstamm:
+Wooden = Holz:

technic_cnc/locale/es.txt

@@ -0,0 +1,35 @@
+## CNC
+CNC Machine = Maquina CNC
+%s CNC Machine = Maquina CNC %s
+Element Edge = Elemento Borde
+Tree = Arbol
+Element Cross Double = Elemento Cruz Doble
+Spike = Pica
+Element Edge Double = Elemento Borde Doble
+Two Curved Edge Block = Dos Bloques de Borde Curvados
+Pyramid = Piramide
+Slope Upside Down Inner Edge = Borde Interno de Rampa Al Reves
+Slope Upside Down Edge = Borde de Rampa Al Reves
+Element Straight Double = Elemento Doble Recto
+Sphere = Esfera
+Element End Double = Doble Fin de Elemento
+Element Straight = Recta de Elemento
+Horizontal Cylinder = Cilindro Horizontal
+Slope Inner Edge = Borde Interno de Rampa
+One Curved Edge Block = Un Bloque de Borde Curvado
+Element Cross = Cruce de Elementos
+Stick = Varita
+Element End = Fin de Elemento
+Slope Lying = Rampa en Reposo
+Slope Upside Down = Rampa Al Reves
+Slope Edge = Borde de Rampa
+Slope = Rampa
+Element T = Elemento T
+Cylinder = Cilindro
+Cobble = Adoquines
+Stone = Piedra
+Brick = Ladrillo
+Dirt = Tierra
+Sandstone = Arenisca
+Wooden = Madera
+Leaves = Hojas

technic_cnc/locale/it.txt

@@ -0,0 +1,36 @@
+## CNC
+CNC Machine = Tornio CNC
+%s CNC Machine = Tornio CNC %s
+Cylinder = Cilindro
+Element Cross = Elemento a croce
+Element Cross Double = Elemento a croce doppio
+Element Edge = Elemento bordo
+Element Edge Double = Elemento bordo doppio
+Element End = Elemento finale
+Element End Double = Elemento finale doppio
+Element Straight = Elemento dritto
+Element Straight Double = Elemento dritto doppio
+Element T = Elemento a T
+Element T Double = Elemento a T doppio
+Horizontal Cylinder = Cilindro orizzontale
+One Curved Edge Block = Blocco con bordo curvo
+Pyramid = Piramide
+Slope = Inclinato
+Slope Edge = Bordo inclinato
+Slope Inner Edge = Bordo interno inclinato
+Slope Lying = Pendenza bugiarda
+Slope Upside Down = Pendenza capovolta
+Slope Upside Down Edge = Bordo inclinato capovolto
+Slope Upside Down Inner Edge = Bordo interno inclinato capovolto
+Sphere = Sfera
+Spike = Spuntone
+Stick = Bastone
+Two Curved Edge Block = Blocco con bordo a doppia curva
+Brick = Mattone
+Cobble = Ciottolato
+Dirt = Terra
+Leaves = Foglie
+Sandstone = Arenaria
+Stone = Pietra
+Tree = Albero
+Wooden = Legno

technic_cnc/locale/template.txt

@@ -0,0 +1,36 @@
+## CNC
+CNC Machine =
+%s CNC Machine =
+Cylinder =
+Element Cross =
+Element Cross Double =
+Element Edge =
+Element Edge Double =
+Element End =
+Element End Double =
+Element Straight =
+Element Straight Double =
+Element T =
+Element T Double =
+Horizontal Cylinder =
+One Curved Edge Block =
+Pyramid =
+Slope =
+Slope Edge =
+Slope Inner Edge =
+Slope Lying =
+Slope Upside Down =
+Slope Upside Down Edge =
+Slope Upside Down Inner Edge =
+Sphere =
+Spike =
+Stick =
+Two Curved Edge Block =
+Brick =
+Cobble =
+Dirt =
+Leaves =
+Sandstone =
+Stone =
+Tree =
+Wooden =

technic_worldgen/crafts.lua

@@ -48,11 +48,6 @@ minetest.register_craftitem(":technic:sulfur_lump", {
 	inventory_image = "technic_sulfur_lump.png",
 })
 
-minetest.register_craftitem(":technic:brass_ingot", {
-	description = S("Brass Ingot"),
-	inventory_image = "technic_brass_ingot.png",
-})
-
 minetest.register_alias("technic:wrought_iron_ingot", "default:steel_ingot")
 
 minetest.override_item("default:steel_ingot", {
@@ -97,7 +92,6 @@ register_block("technic:uranium_block", "technic:uranium_ingot")
 register_block("technic:chromium_block", "technic:chromium_ingot")
 register_block("technic:zinc_block", "technic:zinc_ingot")
 register_block("technic:lead_block", "technic:lead_ingot")
-register_block("technic:brass_block", "technic:brass_ingot")
 register_block("technic:cast_iron_block", "technic:cast_iron_ingot")
 register_block("technic:carbon_steel_block", "technic:carbon_steel_ingot")
 register_block("technic:stainless_steel_block", "technic:stainless_steel_ingot")

technic_worldgen/depends.txt

@@ -1,3 +1,9 @@
 default
+basic_materials
 intllib?
 mg?
+doors?
+farming?
+glooptest?
+mesecons_doors?
+vessels?