Rebase technic mod

mods/ITEMS/base/crafting.lua

@@ -452,38 +452,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = 'base:zincblock',
-	recipe = {
-		{'base:zinc_ingot', 'base:zinc_ingot', 'base:zinc_ingot'},
-		{'base:zinc_ingot', 'base:zinc_ingot', 'base:zinc_ingot'},
-		{'base:zinc_ingot', 'base:zinc_ingot', 'base:zinc_ingot'},
-	}
-})
-
-minetest.register_craft({
-	output = 'base:zinc_ingot 9',
-	recipe = {
-		{'base:zincblock'},
-	}
-})
-
-minetest.register_craft({
-	output = 'base:leadblock',
-	recipe = {
-		{'base:lead_ingot', 'base:lead_ingot', 'base:lead_ingot'},
-		{'base:lead_ingot', 'base:lead_ingot', 'base:lead_ingot'},
-		{'base:lead_ingot', 'base:lead_ingot', 'base:lead_ingot'},
-	}
-})
-
-minetest.register_craft({
-	output = 'base:lead_ingot 9',
-	recipe = {
-		{'base:leadblock'},
-	}
-})
-
 minetest.register_craft({
 	output = 'base:silverblock',
 	recipe = {
@@ -799,14 +767,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "base:granite_brick 4",
-	recipe = {
-		{"base:granite", "base:granite"},
-		{"base:granite", "base:granite"},
-	}
-})
-
 minetest.register_craft({
 	output = "base:slate_tile 4",
 	recipe = {
@@ -924,18 +884,6 @@ minetest.register_craft({
 	recipe = "base:gold_lump",
 })
 
-minetest.register_craft({
-	type = "cooking",
-	output = "base:zinc_ingot",
-	recipe = "base:zinc_lump",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "base:lead_ingot",
-	recipe = "base:lead_lump",
-})
-
 minetest.register_craft({
 	type = "cooking",
 	output = "base:silver_ingot",
@@ -960,12 +908,6 @@ minetest.register_craft({
 	recipe = "base:diorite_cobble",
 })
 
-minetest.register_craft({
-	type = "cooking",
-	output = "base:granite",
-	recipe = "base:granite_cobble",
-})
-
 minetest.register_craft({
 	type = "cooking",
 	output = "base:limestone",

mods/ITEMS/base/craftitems.lua

@@ -55,16 +55,6 @@ minetest.register_craftitem("base:gold_lump", {
 	inventory_image = "base_gold_lump.png",
 })
 
-minetest.register_craftitem("base:zinc_lump", {
-	description = "Zinc Lump",
-	inventory_image = "base_zinc_lump.png",
-})
-
-minetest.register_craftitem("base:lead_lump", {
-	description = "Lead Lump",
-	inventory_image = "base_lead_lump.png",
-})
-
 minetest.register_craftitem("base:silver_lump", {
 	description = "Silver Lump",
 	inventory_image = "base_silver_lump.png",
@@ -115,16 +105,6 @@ minetest.register_craftitem("base:gold_ingot", {
 	inventory_image = "base_gold_ingot.png"
 })
 
-minetest.register_craftitem("base:zinc_ingot", {
-	description = "Zinc Ingot",
-	inventory_image = "base_zinc_ingot.png",
-})
-
-minetest.register_craftitem("base:lead_ingot", {
-	description = "Lead Ingot",
-	inventory_image = "base_lead_ingot.png",
-})
-
 minetest.register_craftitem("base:silver_ingot", {
 	description = "Silver Ingot",
 	inventory_image = "base_silver_ingot.png",

mods/ITEMS/base/nodes_base.lua

@@ -197,28 +197,6 @@ minetest.register_node("base:diorite_brick", {
 	sounds = base.node_sound_stone_defaults(),
 })
 
-minetest.register_node("base:granite", {
-	description = "Granite",
-	tiles = {"base_granite.png"},
-	groups = {cracky = 2, stone = 1},
-	drop = 'base:granite_cobble',
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:granite_cobble", {
-	description = "Granite Cobble",
-	tiles = {"base_granite_cobble.png"},
-	groups = {cracky = 2, stone = 1},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:granite_brick", {
-	description = "Granite Brick",
-	tiles = {"base_granite_brick.png"},
-	groups = {cracky = 2, stone = 1},
-	sounds = base.node_sound_stone_defaults(),
-})
-
 minetest.register_node("base:limestone", {
 	description = "Limestone",
 	tiles = {"base_limestone.png"},
@@ -562,7 +540,7 @@ minetest.register_node("base:stone_with_iron", {
 
 minetest.register_node("base:granite_with_iron", {
 	description = "Iron Ore",
-	tiles = {"base_granite.png^base_mineral_iron.png"},
+	tiles = {"technic_granite.png^base_mineral_iron.png"},
 	groups = {cracky = 2},
 	drop = 'base:iron_lump',
 	sounds = base.node_sound_stone_defaults(),
@@ -586,7 +564,7 @@ minetest.register_node("base:stone_with_copper", {
 
 minetest.register_node("base:granite_with_copper", {
 	description = "Copper Ore",
-	tiles = {"base_granite.png^base_mineral_copper.png"},
+	tiles = {"technic_granite.png^base_mineral_copper.png"},
 	groups = {cracky = 2},
 	drop = 'base:copper_lump',
 	sounds = base.node_sound_stone_defaults(),
@@ -602,7 +580,7 @@ minetest.register_node("base:copperblock", {
 
 minetest.register_node("base:granite_with_opal", {
 	description = "Opal Ore",
-	tiles = {"base_granite.png^base_mineral_opal.png"},
+	tiles = {"technic_granite.png^base_mineral_opal.png"},
 	groups = {cracky = 2},
 	drop = "base:opal",
 	sounds = base.node_sound_stone_defaults(),
@@ -618,7 +596,7 @@ minetest.register_node("base:stone_with_tin", {
 
 minetest.register_node("base:granite_with_tin", {
 	description = "Tin Ore",
-	tiles = {"base_granite.png^base_mineral_tin.png"},
+	tiles = {"technic_granite.png^base_mineral_tin.png"},
 	groups = {cracky = 2},
 	drop = "base:tin_lump",
 	sounds = base.node_sound_stone_defaults(),
@@ -672,39 +650,6 @@ minetest.register_node("base:bronzeblock", {
 	sounds = base.node_sound_metal_defaults(),
 })
 
-minetest.register_node("base:stone_with_zinc", {
-	description = "Zinc Ore",
-	tiles = {"base_stone.png^base_mineral_zinc.png" },
-	is_ground_content = true,
-	groups = {cracky = 3},
-	drop = "base:zinc_lump",
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:zincblock", {
-	description = "Zinc Block",
-	tiles = {"base_zinc_block.png"},
-	is_ground_content = false,
-	groups = {cracky = 1, level = 2},
-	sounds = base.node_sound_metal_defaults(),
-})
-
-minetest.register_node("base:stone_with_lead", {
-	description = "Lead Ore",
-	tiles = {"base_stone.png^base_mineral_lead.png" },
-	groups = {cracky = 3},
-	drop = "base:lead_lump",
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:leadblock", {
-	description = "Lead Block",
-	tiles = {"base_lead_block.png"},
-	is_ground_content = false,
-	groups = {cracky = 1, level = 2},
-	sounds = base.node_sound_metal_defaults(),
-})
-
 minetest.register_node("base:stone_with_silver", {
 	description = "Silver Ore",
 	tiles = {"base_stone.png^base_mineral_silver.png" },
@@ -796,7 +741,7 @@ minetest.register_node("base:stone_with_amethyst", {
 
 minetest.register_node("base:granite_with_amethyst", {
 	description = "Amethyst Ore",
-	tiles = {"base_granite.png^base_mineral_amethyst.png"},
+	tiles = {"technic_granite.png^base_mineral_amethyst.png"},
 	groups = {cracky = 1},
 	drop = "base:amethyst",
 	sounds = base.node_sound_stone_defaults(),
@@ -820,7 +765,7 @@ minetest.register_node("base:stone_with_emerald", {
 
 minetest.register_node("base:granite_with_emerald", {
 	description = "Emerald Ore",
-	tiles = {"base_granite.png^base_mineral_emerald.png"},
+	tiles = {"technic_granite.png^base_mineral_emerald.png"},
 	groups = {cracky = 1},
 	drop = "base:emerald",
 	sounds = base.node_sound_stone_defaults(),
@@ -860,7 +805,7 @@ minetest.register_node("base:stone_with_smoky_quartz", {
 
 minetest.register_node("base:granite_with_smoky_quartz", {
 	description = "Smoky Quartz Ore",
-	tiles = {"base_granite.png^base_mineral_smoky_quartz.png"},
+	tiles = {"technic_granite.png^base_mineral_smoky_quartz.png"},
 	groups = {cracky = 1},
 	drop = "base:smoky_quartz",
 	sounds = base.node_sound_stone_defaults(),

mods/ITEMS/technic/.mailmap

@@ -0,0 +1,4 @@
+RealBadAngel <maciej.kasatkin@o2.pl> <mk@realbadangel.pl>
+Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
+Vanessa Ezekowitz <vanessaezekowitz@gmail.com> <vanessa@rainbird.(none)>
+kaeza <kaeza@users.sf.net> Diego Martínez <kaeza@users.sf.net>

mods/ITEMS/technic/README.md

@@ -1,35 +1,23 @@
 Technic
 =======
 
+Credits for contributing to the project (in alphabetical order):
+  * kpoppel
+  * Nekogloop
+  * Nore/Ekdohibs
+  * ShadowNinja
+  * VanessaE
+  * And many others...
+
+FAQ
+---
+
+1. My technic circuit doesn't work.  No power is distrubuted.
+  * A: Make sure you have a switching station connected.
+
 License
 -------
 
-Copyright (C) 2012-2014 Maciej Kasatkin (RealBadAngel)
-
-Technic chests code is licensed under the GNU LGPLv2+.
-
-Texture licenses:
-
-BlockMen modified by Zefram (CC BY-SA 3.0):
-  * technic_chernobylite_block.png
-  * technic_corium_flowing_animated.png
-  * technic_corium_source_animated.png
-
-celeron55 (Perttu Ahola) modified by Zefram (CC BY-SA 3.0):
-  * technic_bucket_corium.png
-
-sdzen (Elise Staudter) (CC BY-SA 3.0):
-  * most of the older 16x16 textures
-
-RealBadAngel: (WTFPL)
-  * Everything else.
-
-CC BY-SA 3.0: <http://creativecommons.org/licenses/by-sa/3.0/>
-
-Sound licenses:
-
-veikk0 (Veikko Mäkelä) (CC BY-SA 4.0):
-  * technic_hv_nuclear_reactor_siren_danger_loop.ogg
-    * Derived from "Nuclear alarm.wav" by Freesound.org user rene___ from <https://freesound.org/people/rene___/sounds/56778/>. Originally licensed under CC0 1.0 <https://creativecommons.org/publicdomain/zero/1.0/>
-
-CC BY-SA 4.0: <https://creativecommons.org/licenses/by-sa/4.0/>
+Unless otherwise stated, all components of this modpack are licensed under the 
+LGPL, V2 or later.  See also the individual mod folders for their
+secondary/alternate licenses, if any.

mods/ITEMS/technic/extranodes/depends.txt

@@ -0,0 +1,6 @@
+base
+technic_worldgen
+concrete
+unifieddyes?
+intllib?
+moreblocks?

mods/ITEMS/technic/extranodes/init.lua

@@ -0,0 +1,187 @@
+-- Minetest 0.4.6 mod: extranodes
+-- namespace: technic
+-- Boilerplate to support localized strings if intllib mod is installed.
+local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
+
+if minetest.get_modpath("moreblocks") then
+
+	-- register stairsplus/circular_saw nodes
+	-- we skip blast resistant concrete and uranium intentionally
+	-- chrome seems to be too hard of a metal to be actually sawable
+
+	stairsplus:register_all("technic", "marble", "technic:marble", {
+		description=S("Marble"),
+		groups={cracky=3, not_in_creative_inventory=1},
+		tiles={"technic_marble.png"},
+	})
+
+	stairsplus:register_all("technic", "marble_bricks", "technic:marble_bricks", {
+		description=S("Marble Bricks"),
+		groups={cracky=3, not_in_creative_inventory=1},
+		tiles={"technic_marble_bricks.png"},
+	})
+
+	stairsplus:register_all("technic", "granite", "technic:granite", {
+		description=S("Granite"),
+		groups={cracky=1, not_in_creative_inventory=1},
+		tiles={"technic_granite.png"},
+	})
+
+	stairsplus:register_all("technic", "concrete", "technic:concrete", {
+		description=S("Concrete"),
+		groups={cracky=3, not_in_creative_inventory=1},
+		tiles={"technic_concrete_block.png"},
+	})
+
+	stairsplus:register_all("technic", "zinc_block", "technic:zinc_block", {
+		description=S("Zinc Block"),
+		groups={cracky=1, not_in_creative_inventory=1},
+		tiles={"technic_zinc_block.png"},
+	})
+
+	stairsplus:register_all("technic", "cast_iron_block", "technic:cast_iron_block", {
+		description=S("Cast Iron Block"),
+		groups={cracky=1, not_in_creative_inventory=1},
+		tiles={"technic_cast_iron_block.png"},
+	})
+
+	stairsplus:register_all("technic", "carbon_steel_block", "technic:carbon_steel_block", {
+		description=S("Carbon Steel Block"),
+		groups={cracky=1, not_in_creative_inventory=1},
+		tiles={"technic_carbon_steel_block.png"},
+	})
+
+	stairsplus:register_all("technic", "stainless_steel_block", "technic:stainless_steel_block", {
+		description=S("Stainless Steel Block"),
+		groups={cracky=1, not_in_creative_inventory=1},
+		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")
+		minetest.register_alias(modname .. ":slab_" .. origname .. "_wall", newmod..":slab_" .. newname .. "_wall")
+		minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter", newmod..":slab_" .. newname .. "_quarter")
+		minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter_inverted", newmod..":slab_" .. newname .. "_quarter_inverted")
+		minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter_wall", newmod..":slab_" .. newname .. "_quarter_wall")
+		minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter", newmod..":slab_" .. newname .. "_three_quarter")
+		minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter_inverted", newmod..":slab_" .. newname .. "_three_quarter_inverted")
+		minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter_wall", newmod..":slab_" .. newname .. "_three_quarter_wall")
+		minetest.register_alias(modname .. ":stair_" .. origname, newmod..":stair_" .. newname)
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_inverted", newmod..":stair_" .. newname .. "_inverted")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_wall", newmod..":stair_" .. newname .. "_wall")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half", newmod..":stair_" .. newname .. "_wall_half")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half_inverted", newmod..":stair_" .. newname .. "_wall_half_inverted")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_half", newmod..":stair_" .. newname .. "_half")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_half_inverted", newmod..":stair_" .. newname .. "_half_inverted")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_right_half", newmod..":stair_" .. newname .. "_right_half")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_right_half_inverted", newmod..":stair_" .. newname .. "_right_half_inverted")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half", newmod..":stair_" .. newname .. "_wall_half")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half_inverted", newmod..":stair_" .. newname .. "_wall_half_inverted")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_inner", newmod..":stair_" .. newname .. "_inner")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_inner_inverted", newmod..":stair_" .. newname .. "_inner_inverted")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_outer", newmod..":stair_" .. newname .. "_outer")
+		minetest.register_alias(modname .. ":stair_" .. origname .. "_outer_inverted", newmod..":stair_" .. newname .. "_outer_inverted")
+		minetest.register_alias(modname .. ":panel_" .. origname .. "_bottom", newmod..":panel_" .. newname .. "_bottom")
+		minetest.register_alias(modname .. ":panel_" .. origname .. "_top", newmod..":panel_" .. newname .. "_top")
+		minetest.register_alias(modname .. ":panel_" .. origname .. "_vertical", newmod..":panel_" .. newname .. "_vertical")
+		minetest.register_alias(modname .. ":micro_" .. origname .. "_bottom", newmod..":micro_" .. newname .. "_bottom")
+		minetest.register_alias(modname .. ":micro_" .. origname .. "_top", newmod..":micro_" .. newname .. "_top")
+	end 
+
+	register_technic_stairs_alias("stairsplus", "concrete", "technic", "concrete")
+	register_technic_stairs_alias("stairsplus", "marble", "technic", "marble")
+	register_technic_stairs_alias("stairsplus", "granite", "technic", "granite")
+	register_technic_stairs_alias("stairsplus", "marble_bricks", "technic", "marble_bricks")
+
+end
+
+local iclip_def = {
+	description = "Insulator/cable clip",
+	drawtype = "mesh",
+	mesh = "technic_insulator_clip.obj",
+	tiles = {"technic_insulator_clip.png"},
+	is_ground_content = false,
+	groups = {choppy=1, snappy=1, oddly_breakable_by_hand=1 },
+	sounds = base.node_sound_stone_defaults(),
+}
+
+local iclipfence_def = {
+	description = "Insulator/cable clip",
+	tiles = {"technic_insulator_clip.png"},
+	is_ground_content = false,
+	paramtype = "light",
+	drawtype = "nodebox",
+	node_box = {
+		type = "connected",
+		fixed = {
+			{ -0.25,   0.75,   -0.25,   0.25,   1.25,   0.25   }, -- the clip on top
+			{ -0.125, 0.6875, -0.125, 0.125, 0.75,   0.125 },
+			{ -0.1875,  0.625,  -0.1875,  0.1875,  0.6875, 0.1875  },
+			{ -0.125, 0.5625, -0.125, 0.125, 0.625,  0.125 },
+			{ -0.1875,  0.5,    -0.1875,  0.1875,  0.5625, 0.1875  },
+			{ -0.125, 0.4375, -0.125, 0.125, 0.5,    0.125 },
+			{ -0.1875,  0.375,  -0.1875,  0.1875,  0.4375, 0.1875  },
+			{ -0.125, -0.5,    -0.125,  0.125,  0.375,  0.125  }, -- the post, slightly short
+		},
+		-- connect_top =
+		-- connect_bottom =
+		connect_front = {{-1/16,3/16,-1/2,1/16,5/16,-1/8},
+			{-1/16,-5/16,-1/2,1/16,-3/16,-1/8}},
+		connect_left = {{-1/2,3/16,-1/16,-1/8,5/16,1/16},
+			{-1/2,-5/16,-1/16,-1/8,-3/16,1/16}},
+		connect_back = {{-1/16,3/16,1/8,1/16,5/16,1/2},
+			{-1/16,-5/16,1/8,1/16,-3/16,1/2}},
+		connect_right = {{1/8,3/16,-1/16,1/2,5/16,1/16},
+			{1/8,-5/16,-1/16,1/2,-3/16,1/16}},
+	},
+	connects_to = {"group:fence", "group:wood", "group:tree"},
+	groups = {fence=1, choppy=1, snappy=1, oddly_breakable_by_hand=1 },
+	sounds = base.node_sound_stone_defaults(),
+}
+
+if minetest.get_modpath("unifieddyes") then
+	iclip_def.paramtype2 = "colorwallmounted"
+	iclip_def.palette = "unifieddyes_palette_colorwallmounted.png"
+	iclip_def.after_place_node = function(pos, placer, itemstack, pointed_thing)
+		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
+	end
+	iclip_def.after_dig_node = unifieddyes.after_dig_node
+	iclip_def.groups = {choppy=1, snappy=1, oddly_breakable_by_hand=1, ud_param2_colorable = 1}
+
+	iclipfence_def.paramtype2 = "color"
+	iclipfence_def.palette = "unifieddyes_palette_extended.png"
+	iclipfence_def.on_construct = unifieddyes.on_construct
+	iclipfence_def.after_place_node = unifieddyes.recolor_on_place
+	iclipfence_def.after_dig_node = unifieddyes.after_dig_node
+	iclipfence_def.groups = {fence=1, choppy=1, snappy=1, oddly_breakable_by_hand=1, ud_param2_colorable = 1}
+	iclipfence_def.place_param2 = 171 -- medium amber, low saturation, closest color to base:wood
+end
+
+minetest.register_node(":technic:insulator_clip", iclip_def)
+minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def)
+
+minetest.register_craft({
+	output = "technic:insulator_clip",
+	recipe = {
+		{ "", "dye:white", ""},
+		{ "", "technic:raw_latex", ""},
+		{ "technic:raw_latex", "base:stone", "technic:raw_latex"},
+	}
+})
+
+minetest.register_craft({
+	output = "technic:insulator_clip_fencepost 2",
+	recipe = {
+		{ "", "dye:white", ""},
+		{ "", "technic:raw_latex", ""},
+		{ "technic:raw_latex", "base:fence_wood", "technic:raw_latex"},
+	}
+})

mods/ITEMS/technic/extranodes/locale/de.txt

@@ -0,0 +1,9 @@
+# German Translation for technic_extranodes
+# Deutsche Übersetzung von technic_extranodes
+# by Xanthin
+
+Marble = Marmor
+Marble Bricks = Marmorziegel
+Granite = Granit
+Concrete = Beton
+

mods/ITEMS/technic/extranodes/locale/es.txt

@@ -0,0 +1,7 @@
+# technic_extranodes traducido por Carlos Barraza
+
+Marble = Mármol
+Marble Bricks = Ladrillos de mármol
+Granite = Granito
+Concrete = Concreto
+

mods/ITEMS/technic/extranodes/locale/template.txt

@@ -0,0 +1,7 @@
+# technic_extranodes translation template
+
+Marble =
+Marble Bricks =
+Granite =
+Concrete =
+

mods/ITEMS/technic/extranodes/locale/tr.txt

@@ -0,0 +1,6 @@
+# turkish translation by mahmutelmas06
+
+Marble = Mermer
+Marble Bricks = Mermer tuğla
+Granite = Granit
+Concrete = Beton

mods/ITEMS/technic/extranodes/models/technic_insulator_clip.obj

@@ -0,0 +1,173 @@
+# Blender v2.72 (sub 0) OBJ File: ''
+# www.blender.org
+o Cube
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+v -0.249997 0.500000 0.249997
+v -0.249997 0.500000 -0.249997
+v 0.249997 0.500000 -0.249997
+v 0.249997 0.500000 0.249997
+v -0.187500 0.500000 0.187500
+v -0.187500 0.500000 -0.187500
+v 0.187500 0.500000 -0.187500
+v 0.187500 0.500000 0.187500
+v -0.187500 0.750000 0.187500
+v -0.187500 0.750000 -0.187500
+v 0.187500 0.750000 -0.187500
+v 0.187500 0.750000 0.187500
+v -0.250000 0.750000 0.250000
+v -0.250000 0.750000 -0.250000
+v 0.250000 0.750000 -0.250000
+v 0.250000 0.750000 0.250000
+v -0.250000 1.250000 0.250000
+v -0.250000 1.250000 -0.250000
+v 0.250000 1.250000 -0.250000
+v 0.250000 1.250000 0.250000
+v -0.500000 0.312500 0.500000
+v -0.500000 0.312500 -0.500000
+v 0.500000 0.312500 -0.500000
+v 0.500000 0.312500 0.500000
+v 0.187500 0.625000 0.187500
+v 0.187500 0.625000 -0.187500
+v -0.187500 0.625000 -0.187500
+v -0.187500 0.625000 0.187500
+v 0.187500 0.562500 0.187500
+v 0.187500 0.687500 -0.187500
+v -0.187500 0.687500 -0.187500
+v -0.187500 0.562500 0.187500
+v 0.187500 0.687500 0.187500
+v 0.187500 0.562500 -0.187500
+v -0.187500 0.562500 -0.187500
+v -0.187500 0.687500 0.187500
+v 0.168668 0.531250 0.168668
+v 0.168668 0.718750 -0.168668
+v -0.168668 0.718750 -0.168668
+v -0.168668 0.531250 0.168668
+v 0.168668 0.656250 0.168668
+v 0.168668 0.593750 -0.168668
+v -0.168668 0.593750 -0.168668
+v -0.168668 0.656250 0.168668
+v 0.168668 0.593750 0.168668
+v 0.168668 0.656250 -0.168668
+v -0.168668 0.656250 -0.168668
+v -0.168668 0.593750 0.168668
+v 0.168668 0.718750 0.168668
+v 0.168668 0.531250 -0.168668
+v -0.168668 0.531250 -0.168668
+v -0.168668 0.718750 0.168668
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.749997 0.749997
+vt 0.749997 0.250003
+vt 0.250003 0.250003
+vt 0.250003 0.749997
+vt 0.000000 0.812500
+vt 1.000000 0.812500
+vt 0.312500 0.312500
+vt 0.312500 0.687500
+vt 0.687500 0.312500
+vt 0.687500 0.687500
+vt 0.331332 1.218750
+vt 0.668668 1.218750
+vt 0.687500 1.250000
+vt 0.312500 1.250000
+vt 0.750000 1.250000
+vt 0.750000 1.750000
+vt 0.250000 1.750000
+vt 0.250000 1.250000
+vt 0.331332 1.093750
+vt 0.668668 1.093750
+vt 0.687500 1.125000
+vt 0.312500 1.125000
+vt 0.331332 1.093750
+vt 0.668668 1.093750
+vt 0.331332 1.156250
+vt 0.668668 1.156250
+vt 0.687500 1.187500
+vt 0.312500 1.187500
+vt 0.331332 1.156250
+vt 0.668668 1.156250
+vt 0.331332 1.031250
+vt 0.668668 1.031250
+vt 0.687500 1.062500
+vt 0.312500 1.062500
+vt 0.312500 1.000000
+vt 0.687500 1.000000
+vn 0.000000 -1.000000 -0.000000
+vn -0.600000 0.800000 -0.000000
+vn 0.000000 0.800000 -0.600000
+vn 0.600000 0.800000 0.000000
+vn -0.000000 0.000000 1.000000
+vn 0.000000 1.000000 0.000000
+vn 0.856500 -0.516200 0.000000
+vn 0.000000 -0.516200 -0.856500
+vn -0.000000 -0.516200 0.856500
+vn -0.856500 -0.516200 -0.000000
+vn -1.000000 0.000000 -0.000000
+vn 0.000000 -0.000000 -1.000000
+vn 1.000000 -0.000000 0.000000
+vn -0.000000 0.800000 0.600000
+vn 0.856500 0.516200 0.000000
+vn 0.000000 0.516200 -0.856500
+vn -0.000000 0.516200 0.856500
+vn -0.856500 0.516200 -0.000000
+g Cube_Cube_Material
+s off
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 25/2/2 5/5/2 6/6/2 26/1/2
+f 26/1/3 6/6/3 7/7/3 27/4/3
+f 27/4/4 7/7/4 8/8/4 28/3/4
+f 25/9/5 1/4/5 4/1/5 28/10/5
+f 8/8/6 7/7/6 11/11/6 12/12/6
+f 7/7/6 6/6/6 10/13/6 11/11/6
+f 5/5/6 8/8/6 12/12/6 9/14/6
+f 6/6/6 5/5/6 9/14/6 10/13/6
+f 53/15/7 42/16/7 15/17/7 16/18/7
+f 42/15/8 43/16/8 14/17/8 15/18/8
+f 56/15/9 53/16/9 16/17/9 13/18/9
+f 43/15/10 56/16/10 13/17/10 14/18/10
+f 14/4/1 18/4/1 19/4/1 15/4/1
+f 17/19/11 21/20/11 22/21/11 18/22/11
+f 18/19/12 22/20/12 23/21/12 19/22/12
+f 19/19/13 23/20/13 24/21/13 20/22/13
+f 21/21/5 17/22/5 20/19/5 24/20/5
+f 21/5/6 24/8/6 23/7/6 22/6/6
+f 15/4/1 19/4/1 20/4/1 16/4/1
+f 16/4/1 20/4/1 17/4/1 13/4/1
+f 13/4/1 17/4/1 18/4/1 14/4/1
+f 1/1/11 25/10/11 26/9/11 2/4/11
+f 2/1/12 26/10/12 27/9/12 3/4/12
+f 3/1/13 27/10/13 28/9/13 4/4/13
+f 5/5/14 25/2/14 28/3/14 8/8/14
+f 49/23/7 46/24/7 30/25/7 29/26/7
+f 46/27/8 47/28/8 31/25/8 30/26/8
+f 52/23/9 49/24/9 29/25/9 32/26/9
+f 47/23/10 52/24/10 32/25/10 31/26/10
+f 45/29/7 50/30/7 34/31/7 37/32/7
+f 50/33/8 51/34/8 35/31/8 34/32/8
+f 48/33/9 45/34/9 37/31/9 40/32/9
+f 51/29/10 48/30/10 40/31/10 35/32/10
+f 41/35/7 54/36/7 38/37/7 33/38/7
+f 54/35/8 55/36/8 39/37/8 38/38/8
+f 44/35/9 41/36/9 33/37/9 36/38/9
+f 55/35/10 44/36/10 36/37/10 39/38/10
+f 37/32/15 34/31/15 42/16/15 53/15/15
+f 34/32/16 35/31/16 43/16/16 42/15/16
+f 40/32/17 37/31/17 53/16/17 56/15/17
+f 35/32/18 40/31/18 56/16/18 43/15/18
+f 33/38/15 38/37/15 46/24/15 49/23/15
+f 38/38/16 39/37/16 47/28/16 46/27/16
+f 36/38/17 33/37/17 49/24/17 52/23/17
+f 39/38/18 36/37/18 52/24/18 47/23/18
+f 29/26/15 30/25/15 50/30/15 45/29/15
+f 30/26/16 31/25/16 51/34/16 50/33/16
+f 32/26/17 29/25/17 45/34/17 48/33/17
+f 31/26/18 32/25/18 48/30/18 51/29/18
+f 12/39/15 11/40/15 54/36/15 41/35/15
+f 11/39/16 10/40/16 55/36/16 54/35/16
+f 9/39/17 12/40/17 41/36/17 44/35/17
+f 10/39/18 9/40/18 44/36/18 55/35/18

mods/ITEMS/technic/modpack.txt

@@ -0,0 +1 @@
+

mods/ITEMS/technic/ores.lua

@@ -1,147 +0,0 @@
---[[
-	Chromium
---]]
-
-minetest.register_node("technic:stone_with_chromium", {
-	description = "Chromium Ore",
-	tiles = {"base_stone.png^technic_mineral_chromium.png"},
-	groups = {cracky=3},
-	drop = "technic:chromium_lump",
-	sounds = base.node_sound_stone_defaults(),
-}) 
-
-minetest.register_node("technic:granite_with_chromium", {
-	description = "Chromium Ore",
-	tiles = {"base_granite.png^technic_mineral_chromium.png"},
-	groups = {cracky=3},
-	drop = "technic:chromium_lump",
-	sounds = base.node_sound_stone_defaults(),
-}) 
-
-minetest.register_node("technic:chromium_block", {
-	description = "Chromium Block",
-	tiles = {"technic_chromium_block.png"},
-	is_ground_content = false,
-	groups = {cracky = 1, level = 2},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_craftitem("technic:chromium_lump", {
-	description = "Chromium Lump",
-	inventory_image = "technic_chromium_lump.png",
-})
-
-minetest.register_craftitem("technic:chromium_ingot", {
-	description = "Chromium Ingot",
-	inventory_image = "technic_chromium_ingot.png",
-})
-
-minetest.register_craft({
-	output = 'technic:chromium_block',
-	recipe = {
-		{'technic:chromium_ingot', 'technic:chromium_ingot', 'technic:chromium_ingot'},
-		{'technic:chromium_ingot', 'technic:chromium_ingot', 'technic:chromium_ingot'},
-		{'technic:chromium_ingot', 'technic:chromium_ingot', 'technic:chromium_ingot'},
-	}
-})
-
-minetest.register_craft({
-	output = 'technic:chromium_ingot 9',
-	recipe = {
-		{'technic:chromium_block'},
-	}
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "technic:chromium_ingot",
-	recipe = "technic:chromium_lump",
-})
-
-
---[[
-	Sulfur
---]]
-
-minetest.register_node("technic:stone_with_sulfur", {
-	description = "Sulfur Ore",
-	tiles = {"base_stone.png^technic_mineral_sulfur.png" },
-	groups = {cracky=3},
-	drop = "technic:sulfur_lump",
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_craftitem("technic:sulfur_lump", {
-	description = "Sulfur Lump",
-	inventory_image = "technic_sulfur_lump.png",
-})
-
-
---[[
-	Uranium
---]]
-
-
-minetest.register_node("technic:stone_with_uranium", {
-	description = "Uranium Ore",
-	tiles = {"base_stone.png^technic_mineral_uranium.png"},
-	paramtype = "light",
-	groups = {cracky = 3, radioactive = 1},
-	drop = "technic:uranium_lump",
-	sounds = base.node_sound_stone_defaults(),
-	light_source = 1,
-}) 
-
-minetest.register_node("technic:granite_with_uranium", {
-	description = "Uranium Ore",
-	tiles = {"base_granite.png^technic_mineral_uranium.png"},
-	paramtype = "light",
-	groups = {cracky = 3, radioactive = 1},
-	drop = "technic:uranium_lump",
-	sounds = base.node_sound_stone_defaults(),
-	light_source = 1,
-}) 
-
-minetest.register_node("technic:uranium_block", {
-	description = "Uranium Block",
-	tiles = {"technic_uranium_block.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	groups = {uranium_block = 1, cracky = 1, level = 2, radioactive = 2},
-	sounds = base.node_sound_stone_defaults(),
-	light_source = 2,
-})
-
-minetest.register_craftitem("technic:uranium_lump", {
-	description = "Uranium Lump",
-	inventory_image = "technic_uranium_lump.png",
-})
-
-minetest.register_craftitem("technic:uranium_ingot", {
-	description = "Uranium Ingot",
-	inventory_image = "technic_uranium_ingot.png",
-	groups = {uranium_ingot =1},
-})
-
-minetest.register_craft({
-	output = 'technic:uranium_block',
-	recipe = {
-		{'technic:uranium_ingot', 'technic:uranium_ingot', 'technic:uranium_ingot'},
-		{'technic:uranium_ingot', 'technic:uranium_ingot', 'technic:uranium_ingot'},
-		{'technic:uranium_ingot', 'technic:uranium_ingot', 'technic:uranium_ingot'},
-	}
-})
-
-minetest.register_craft({
-	output = 'technic:uranium_ingot 9',
-	recipe = {
-		{'technic:uraniumblock'},
-	}
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "technic:uranium_ingot",
-	recipe = "technic:uranium_lump",
-})
-

mods/ITEMS/technic/technic/README.md

@@ -0,0 +1,35 @@
+Technic
+=======
+
+License
+-------
+
+Copyright (C) 2012-2014 Maciej Kasatkin (RealBadAngel)
+
+Technic chests code is licensed under the GNU LGPLv2+.
+
+Texture licenses:
+
+BlockMen modified by Zefram (CC BY-SA 3.0):
+  * technic_chernobylite_block.png
+  * technic_corium_flowing_animated.png
+  * technic_corium_source_animated.png
+
+celeron55 (Perttu Ahola) modified by Zefram (CC BY-SA 3.0):
+  * technic_bucket_corium.png
+
+sdzen (Elise Staudter) (CC BY-SA 3.0):
+  * most of the older 16x16 textures
+
+RealBadAngel: (WTFPL)
+  * Everything else.
+
+CC BY-SA 3.0: <http://creativecommons.org/licenses/by-sa/3.0/>
+
+Sound licenses:
+
+veikk0 (Veikko Mäkelä) (CC BY-SA 4.0):
+  * technic_hv_nuclear_reactor_siren_danger_loop.ogg
+    * Derived from "Nuclear alarm.wav" by Freesound.org user rene___ from <https://freesound.org/people/rene___/sounds/56778/>. Originally licensed under CC0 1.0 <https://creativecommons.org/publicdomain/zero/1.0/>
+
+CC BY-SA 4.0: <https://creativecommons.org/licenses/by-sa/4.0/>

mods/ITEMS/technic/technic/crafts.lua

@@ -44,7 +44,7 @@ minetest.register_craft({
 	output = 'technic:diamond_drill_head',
 	recipe = {
 		{'technic:stainless_steel_ingot', 'base:diamond', 'technic:stainless_steel_ingot'},
-		{'base:diamond', '', 'base:diamond'},
+		{'base:diamond',               '',                'base:diamond'},
 		{'technic:stainless_steel_ingot', 'base:diamond', 'technic:stainless_steel_ingot'},
 	}
 })
@@ -164,7 +164,7 @@ minetest.register_craft({
 	recipe = {
 		{'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'},
 		{'base:bronze_ingot',          'base:bronze_ingot',          'base:bronze_ingot'},
-		{'base:tin_ingot',            'base:tin_ingot',            'base:tin_ingot'},
+		{'moreores:tin_ingot',            'moreores:tin_ingot',            'moreores:tin_ingot'},
 	}
 })
 
@@ -196,76 +196,3 @@ minetest.register_craft({
 		"group:sand",
 	},
 })
-
-
-minetest.register_craftitem("technic:brass_ingot", {
-	description = "Brass Ingot",
-	inventory_image = "technic_brass_ingot.png",
-})
-
-minetest.register_alias("technic:wrought_iron_ingot", "base:steel_ingot")
-
-minetest.override_item("base:steel_ingot", {
-	description = "Wrought Iron Ingot",
-	inventory_image = "technic_wrought_iron_ingot.png",
-})
-
-minetest.register_craftitem("technic:cast_iron_ingot", {
-	description = "Cast Iron Ingot",
-	inventory_image = "technic_cast_iron_ingot.png",
-})
-
-minetest.register_craftitem("technic:carbon_steel_ingot", {
-	description = "Carbon Steel Ingot",
-	inventory_image = "technic_carbon_steel_ingot.png",
-})
-
-minetest.register_craftitem("technic:stainless_steel_ingot", {
-	description = "Stainless Steel Ingot",
-	inventory_image = "technic_stainless_steel_ingot.png",
-})
-
-local function register_block(block, ingot)
-	minetest.register_craft({
-		output = block,
-		recipe = {
-			{ingot, ingot, ingot},
-			{ingot, ingot, ingot},
-			{ingot, ingot, ingot},
-		}
-	})
-
-	minetest.register_craft({
-		output = ingot.." 9",
-		recipe = {
-			{block}
-		}
-	})
-end
-
-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")
-
-
-minetest.register_craft({
-	type = 'cooking',
-	recipe = minetest.registered_aliases["technic:wrought_iron_ingot"],
-	output = "technic:cast_iron_ingot",
-})
-
-minetest.register_craft({
-	type = 'cooking',
-	recipe = "technic:cast_iron_ingot",
-	cooktime = 2,
-	output = "technic:wrought_iron_ingot",
-})
-
-minetest.register_craft({
-	type = 'cooking',
-	recipe = "technic:carbon_steel_ingot",
-	cooktime = 2,
-	output = "technic:wrought_iron_ingot",
-})
-

mods/ITEMS/technic/technic/depends.txt

@@ -1,6 +1,9 @@
 base
 pipeworks
+technic_worldgen
 bucket?
+chests?
+furnace?
 screwdriver?
 mesecons?
 mesecons_mvps?

mods/ITEMS/technic/technic/init.lua

@@ -26,9 +26,6 @@ dofile(modpath.."/config.lua")
 -- Helper functions
 dofile(modpath.."/helpers.lua")
 
--- Ores
-dofile(modpath.."/ores.lua")
-
 -- Items 
 dofile(modpath.."/items.lua")
 

mods/ITEMS/technic/technic/items.lua

@@ -155,7 +155,6 @@ minetest.register_node("technic:machine_casing", {
 	sounds = base.node_sound_stone_defaults(),
 })
 
-
 for p = 0, 35 do
 	local nici = (p ~= 0 and p ~= 7 and p ~= 35) and 1 or nil
 	local psuffix = p == 7 and "" or p

mods/ITEMS/technic/technic/machines/HV/nuclear_reactor.lua

@@ -257,7 +257,7 @@ minetest.register_abm({
 		local accum_badness = meta:get_int("structure_accumulated_badness")
 		if badness == 0 then
 			if accum_badness ~= 0 then
-				meta:set_int("structure_accumulated_badness", accum_badness - 4)
+				meta:set_int("structure_accumulated_badness", math.max(accum_badness - 4, 0))
 				siren_clear(pos, meta)
 			end
 		else

mods/ITEMS/technic/technic/machines/HV/quarry.lua

@@ -215,7 +215,7 @@ minetest.register_node("technic:quarry", {
 		"technic_carbon_steel_block.png"..cable_entry,
 		"technic_carbon_steel_block.png"..cable_entry,
 		"technic_carbon_steel_block.png"..cable_entry,
-		"technic_carbon_steel_block.png^tools_steelpick.png",
+		"technic_carbon_steel_block.png^tools_diamondpick.png",
 		"technic_carbon_steel_block.png"..cable_entry
 	},
 	paramtype2 = "facedir",

mods/ITEMS/technic/technic/machines/LV/cnc_nodes.lua

@@ -77,15 +77,15 @@ technic.cnc.register_all("technic:stainless_steel_block",
 
 -- Marble
 ------------
-technic.cnc.register_all("base:marble",
+technic.cnc.register_all("technic:marble",
                 {cracky=3, not_in_creative_inventory=1},
-                {"base_marble.png"},
+                {"technic_marble.png"},
                 S("Marble"))
 
 -- Granite
 ------------
-technic.cnc.register_all("base:granite",
+technic.cnc.register_all("technic:granite",
                 {cracky=1, not_in_creative_inventory=1},
-                {"base_granite.png"},
+                {"technic_granite.png"},
                 S("Granite"))
 

mods/ITEMS/technic/technic/machines/LV/grinder.lua

@@ -3,8 +3,8 @@ minetest.register_alias("grinder", "technic:lv_grinder")
 minetest.register_craft({
 	output = 'technic:lv_grinder',
 	recipe = {
-		{'base:desert_sandstone', 'base:diamond',        'base:desert_sandstone'},
-		{'base:desert_sandstone', 'technic:machine_casing', 'base:desert_sandstone'},
+		{'base:desert_stone', 'base:diamond',        'base:desert_stone'},
+		{'base:desert_stone', 'technic:machine_casing', 'base:desert_stone'},
 		{'technic:granite',      'technic:lv_cable',       'technic:granite'},
 	}
 })

mods/ITEMS/technic/technic/machines/register/battery_box.lua

@@ -17,54 +17,9 @@ technic.register_power_tool("technic:blue_energy_crystal", 450000)
 minetest.register_craft({
 	output = "technic:battery",
 	recipe = {
-		{"group:wood", "base:copper_ingot", "group:wood"},
-		{"group:wood", "base:tin_ingot",   "group:wood"},
-		{"group:wood", "base:copper_ingot", "group:wood"},
-	}
-})
--- Sulfur-lead-water recipes:
--- With sulfur lumps:
--- With water:
-minetest.register_craft({
-	output = "technic:battery",
-	recipe = {
-		{"group:wood",         "technic:sulfur_lump", "group:wood"},
-		{"technic:lead_ingot", "bucket:bucket_water", "technic:lead_ingot"},
-		{"group:wood",         "technic:sulfur_lump", "group:wood"},
-	},
-	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"}
-	}
-})
--- With oil extract:
-minetest.register_craft({
-	output = "technic:battery",
-	recipe = {
-		{"group:wood",         "technic:sulfur_lump",   "group:wood"},
-		{"technic:lead_ingot", "homedecor:oil_extract", "technic:lead_ingot"},
-		{"group:wood",         "technic:sulfur_lump",   "group:wood"},
-	}
-})
--- With sulfur dust:
--- With water:
-minetest.register_craft({
-	output = "technic:battery",
-	recipe = {
-		{"group:wood",         "technic:sulfur_dust", "group:wood"},
-		{"technic:lead_ingot", "bucket:bucket_water", "technic:lead_ingot"},
-		{"group:wood",         "technic:sulfur_dust", "group:wood"},
-	},
-	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"}
-	}
-})
--- With oil extract:
-minetest.register_craft({
-	output = "technic:battery",
-	recipe = {
-		{"group:wood",         "technic:sulfur_dust",   "group:wood"},
-		{"technic:lead_ingot", "homedecor:oil_extract", "technic:lead_ingot"},
-		{"group:wood",         "technic:sulfur_dust",   "group:wood"},
+		{"group:wood", "base:nickel_ingot", "group:wood"},
+		{"group:wood", "base:aluminium_ingot",   "group:wood"},
+		{"group:wood", "base:nickel_ingot", "group:wood"},
 	}
 })
 

mods/ITEMS/technic/technic/machines/register/compressor_recipes.lua

@@ -11,7 +11,7 @@ end
 local recipes = {
 	{"base:snowblock",          "base:ice"},
 	{"base:sand 2",             "base:sandstone"},
-	{"base:desert_sand",        "base:desert_sandstone"},
+	{"base:desert_sand",        "base:desert_stone"},
 	{"technic:mixed_metal_ingot",  "technic:composite_plate"},
 	{"base:copper_ingot 5",     "technic:copper_plate"},
 	{"technic:coal_dust 4",        "technic:graphite"},