From: ShadowNinja Date: Fri, 5 Jul 2013 05:09:33 +0000 (-0400) Subject: Use ores from default instead of moreores X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=2d168e5afc57f8da9973b67d0811cc33fed9e3a3;p=zefram%2Fminetest%2Ftechnic.git Use ores from default instead of moreores --- diff --git a/technic/alloy_furnace.lua b/technic/alloy_furnace.lua index 149688e..3982ab2 100644 --- a/technic/alloy_furnace.lua +++ b/technic/alloy_furnace.lua @@ -10,9 +10,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:alloy_furnace', recipe = { - {'default:brick', 'default:brick', 'default:brick'}, - {'default:brick', '', 'default:brick'}, - {'default:steel_ingot', 'moreores:copper_ingot', 'default:steel_ingot'}, + {'default:brick', 'default:brick', 'default:brick'}, + {'default:brick', '', 'default:brick'}, + {'default:steel_ingot', 'default:copper_ingot', 'default:steel_ingot'}, } }) diff --git a/technic/alloy_furnaces_commons.lua b/technic/alloy_furnaces_commons.lua index 9c9c42a..16821b9 100644 --- a/technic/alloy_furnaces_commons.lua +++ b/technic/alloy_furnaces_commons.lua @@ -30,10 +30,10 @@ if unified_inventory then end register_alloy_recipe ("technic:copper_dust",3, "technic:tin_dust",1, "technic:bronze_dust",4) -register_alloy_recipe ("moreores:copper_ingot",3, "moreores:tin_ingot",1, "moreores:bronze_ingot",4) +register_alloy_recipe ("default:copper_ingot",3, "moreores:tin_ingot",1, "default:bronze_ingot",4) register_alloy_recipe ("technic:iron_dust",3, "technic:chromium_dust",1, "technic:stainless_steel_dust",4) register_alloy_recipe ("default:steel_ingot",3, "technic:chromium_ingot",1, "technic:stainless_steel_ingot",4) register_alloy_recipe ("technic:copper_dust",2, "technic:zinc_dust",1, "technic:brass_dust",3) -register_alloy_recipe ("moreores:copper_ingot",2, "technic:zinc_ingot",1, "technic:brass_ingot",3) +register_alloy_recipe ("default:copper_ingot",2, "technic:zinc_ingot",1, "technic:brass_ingot",3) register_alloy_recipe ("default:sand",2, "technic:coal_dust",2, "technic:silicon_wafer",1) register_alloy_recipe ("technic:silicon_wafer",1, "technic:gold_dust",1, "technic:doped_silicon_wafer",1) diff --git a/technic/battery_box.lua b/technic/battery_box.lua index 5726053..0e5c072 100644 --- a/technic/battery_box.lua +++ b/technic/battery_box.lua @@ -22,9 +22,9 @@ register_power_tool ("technic:blue_energy_crystal",500000) minetest.register_craft({ output = 'technic:battery 1', recipe = { - {'default:wood', 'moreores:copper_ingot', 'default:wood'}, - {'default:wood', 'moreores:tin_ingot', 'default:wood'}, - {'default:wood', 'moreores:copper_ingot', 'default:wood'}, + {'default:wood', 'default:copper_ingot', 'default:wood'}, + {'default:wood', 'moreores:tin_ingot', 'default:wood'}, + {'default:wood', 'default:copper_ingot', 'default:wood'}, } }) diff --git a/technic/chainsaw.lua b/technic/chainsaw.lua index 5b3b05b..d73b59b 100644 --- a/technic/chainsaw.lua +++ b/technic/chainsaw.lua @@ -33,8 +33,8 @@ minetest.register_craft({ output = 'technic:chainsaw', recipe = { {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:battery'}, - {'technic:stainless_steel_ingot', 'technic:motor', 'technic:battery'}, - {'','','moreores:copper_ingot'}, + {'technic:stainless_steel_ingot', 'technic:motor', 'technic:battery'}, + {'', '', 'default:copper_ingot'}, } }) diff --git a/technic/electric.lua b/technic/electric.lua index 2eb2bf3..b6406af 100644 --- a/technic/electric.lua +++ b/technic/electric.lua @@ -21,27 +21,27 @@ minetest.register_alias("electric_furnace", "technic:electric_furnace") minetest.register_craft({ output = 'technic:battery 1', recipe = { - {'default:wood', 'moreores:copper_ingot', 'default:wood'}, - {'default:wood', 'moreores:tin_ingot', 'default:wood'}, - {'default:wood', 'moreores:copper_ingot', 'default:wood'}, + {'default:wood', 'default:copper_ingot', 'default:wood'}, + {'default:wood', 'moreores:tin_ingot', 'default:wood'}, + {'default:wood', 'default:copper_ingot', 'default:wood'}, } }) minetest.register_craft({ output = 'technic:battery_box 1', recipe = { - {'technic:battery', 'default:wood', 'technic:battery'}, - {'technic:battery', 'moreores:copper_ingot', 'technic:battery'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'technic:battery', 'default:wood', 'technic:battery'}, + {'technic:battery', 'default:copper_ingot', 'technic:battery'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, } }) minetest.register_craft({ output = 'technic:electric_furnace', recipe = { - {'default:brick', 'default:brick', 'default:brick'}, - {'default:brick', '', 'default:brick'}, - {'default:steel_ingot', 'moreores:copper_ingot', 'default:steel_ingot'}, + {'default:brick', 'default:brick', 'default:brick'}, + {'default:brick', '', 'default:brick'}, + {'default:steel_ingot', 'default:copper_ingot', 'default:steel_ingot'}, } }) @@ -265,4 +265,4 @@ minetest.register_abm({ end, -}) \ No newline at end of file +}) diff --git a/technic/generator.lua b/technic/generator.lua index ae899a6..d8f4d06 100644 --- a/technic/generator.lua +++ b/technic/generator.lua @@ -4,9 +4,9 @@ minetest.register_alias("generator", "technic:generator_active") minetest.register_craft({ output = 'technic:generator', recipe = { - {'default:stone', 'default:stone', 'default:stone'}, - {'default:stone', '', 'default:stone'}, - {'default:stone', 'moreores:copper_ingot', 'default:stone'}, + {'default:stone', 'default:stone', 'default:stone'}, + {'default:stone', '', 'default:stone'}, + {'default:stone', 'default:copper_ingot', 'default:stone'}, } }) diff --git a/technic/grinder.lua b/technic/grinder.lua index 1d8fb2e..88a5001 100644 --- a/technic/grinder.lua +++ b/technic/grinder.lua @@ -78,7 +78,7 @@ minetest.register_craftitem( "technic:copper_dust", { }) minetest.register_craft({ type = "cooking", - output = "moreores:copper_ingot", + output = "default:copper_ingot", recipe = "technic:copper_dust", }) @@ -111,7 +111,7 @@ minetest.register_craftitem( "technic:gold_dust", { }) minetest.register_craft({ type = "cooking", - output = "moreores:gold_ingot", + output = "default:gold_ingot", recipe = "technic:gold_dust", }) @@ -144,7 +144,7 @@ minetest.register_craftitem( "technic:bronze_dust", { }) minetest.register_craft({ type = "cooking", - output = "moreores:bronze_ingot", + output = "default:bronze_ingot", recipe = "technic:bronze_dust", }) @@ -186,8 +186,8 @@ minetest.register_craft({ output = 'technic:grinder', recipe = { {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, - {'default:desert_stone', 'default:diamond', 'default:desert_stone'}, - {'default:stone', 'moreores:copper_ingot', 'default:stone'}, + {'default:desert_stone', 'default:diamond', 'default:desert_stone'}, + {'default:stone', 'default:copper_ingot', 'default:stone'}, } }) diff --git a/technic/items.lua b/technic/items.lua index 66c5c85..6532e00 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -75,27 +75,27 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:green_energy_crystal', recipe = { - {'moreores:gold_ingot', 'technic:battery', 'dye:green'}, + {'default:gold_ingot', 'technic:battery', 'dye:green'}, {'technic:battery', 'technic:red_energy_crystal', 'technic:battery'}, - {'dye:green', 'technic:battery', 'moreores:gold_ingot'}, + {'dye:green', 'technic:battery', 'default:gold_ingot'}, } }) minetest.register_craft({ output = 'technic:blue_energy_crystal', recipe = { - {'moreores:gold_ingot', 'technic:battery', 'dye:blue'}, + {'default:gold_ingot', 'technic:battery', 'dye:blue'}, {'technic:battery', 'technic:green_energy_crystal', 'technic:battery'}, - {'dye:blue', 'technic:battery', 'moreores:gold_ingot'}, + {'dye:blue', 'technic:battery', 'default:gold_ingot'}, } }) minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { - {'moreores:gold_ingot', 'technic:battery', 'dye:red'}, + {'default:gold_ingot', 'technic:battery', 'dye:red'}, {'technic:battery', 'default:diamondblock', 'technic:battery'}, - {'dye:red', 'technic:battery', 'moreores:gold_ingot'}, + {'dye:red', 'technic:battery', 'default:gold_ingot'}, } }) @@ -124,9 +124,9 @@ minetest.register_craftitem( "technic:fine_copper_wire", { minetest.register_craft({ output = 'technic:fine_copper_wire 2', recipe = { - {'', 'moreores:copper_ingot', ''}, - {'', 'moreores:copper_ingot', ''}, - {'', 'moreores:copper_ingot', ''}, + {'', 'default:copper_ingot', ''}, + {'', 'default:copper_ingot', ''}, + {'', 'default:copper_ingot', ''}, } }) @@ -156,7 +156,7 @@ minetest.register_craft({ recipe = { {'default:steel_ingot', 'technic:copper_coil', 'default:steel_ingot'}, {'default:steel_ingot', 'technic:copper_coil', 'default:steel_ingot'}, - {'default:steel_ingot', 'moreores:copper_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:copper_ingot', 'default:steel_ingot'}, } }) @@ -214,8 +214,8 @@ minetest.register_craftitem( "technic:control_logic_unit", { minetest.register_craft({ output = 'technic:control_logic_unit', recipe = { - {'', 'moreores:gold_ingot', ''}, - {'moreores:copper_ingot', 'technic:silicon_wafer', 'moreores:copper_ingot'}, - {'', 'moreores:copper_ingot', ''}, + {'', 'default:gold_ingot', ''}, + {'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'}, + {'', 'default:copper_ingot', ''}, } }) diff --git a/technic/mining_drill.lua b/technic/mining_drill.lua index 33a8e5a..0dfcf10 100644 --- a/technic/mining_drill.lua +++ b/technic/mining_drill.lua @@ -9,24 +9,24 @@ minetest.register_craft({ output = 'technic:mining_drill', recipe = { {'technic:stainless_steel_ingot', 'technic:diamond_drill_head', 'technic:stainless_steel_ingot'}, - {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'}, - {'', 'technic:red_energy_crystal', 'moreores:copper_ingot'}, + {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'}, + {'', 'technic:red_energy_crystal', 'default:copper_ingot'}, } }) minetest.register_craft({ output = 'technic:mining_drill_mk2', recipe = { - {'technic:diamond_drill_head', 'technic:diamond_drill_head', 'technic:diamond_drill_head'}, - {'technic:stainless_steel_ingot', 'technic:mining_drill', 'technic:stainless_steel_ingot'}, - {'', 'technic:green_energy_crystal', ''}, + {'technic:diamond_drill_head', 'technic:diamond_drill_head', 'technic:diamond_drill_head'}, + {'technic:stainless_steel_ingot', 'technic:mining_drill', 'technic:stainless_steel_ingot'}, + {'', 'technic:green_energy_crystal', ''}, } }) minetest.register_craft({ output = 'technic:mining_drill_mk3', recipe = { - {'technic:diamond_drill_head', 'technic:diamond_drill_head', 'technic:diamond_drill_head'}, - {'technic:stainless_steel_ingot', 'technic:mining_drill_mk2', 'technic:stainless_steel_ingot'}, - {'', 'technic:blue_energy_crystal', ''}, + {'technic:diamond_drill_head', 'technic:diamond_drill_head', 'technic:diamond_drill_head'}, + {'technic:stainless_steel_ingot', 'technic:mining_drill_mk2', 'technic:stainless_steel_ingot'}, + {'', 'technic:blue_energy_crystal', ''}, } }) diff --git a/technic/mining_laser_mk1.lua b/technic/mining_laser_mk1.lua index 5bafb6c..7b9c655 100644 --- a/technic/mining_laser_mk1.lua +++ b/technic/mining_laser_mk1.lua @@ -76,8 +76,8 @@ minetest.register_craft({ output = 'technic:laser_mk1', recipe = { {'default:diamond', 'default:steel_ingot', 'technic:battery'}, - {'', 'default:steel_ingot', 'technic:battery'}, - {'', '', 'moreores:copper_ingot'}, + {'', 'default:steel_ingot', 'technic:battery'}, + {'', '', 'default:copper_ingot'}, } }) diff --git a/technic/music_player.lua b/technic/music_player.lua index 81b9a65..34558b3 100644 --- a/technic/music_player.lua +++ b/technic/music_player.lua @@ -2,9 +2,9 @@ minetest.register_alias("music_player", "technic:music_player") minetest.register_craft({ output = 'technic:music_player', recipe = { - {'default:wood', 'default:wood', 'default:wood'}, - {'default:diamond', 'default:diamond', 'default:diamond'}, - {'default:stone', 'moreores:copper_ingot', 'default:stone'}, + {'default:wood', 'default:wood', 'default:wood'}, + {'default:diamond', 'default:diamond', 'default:diamond'}, + {'default:stone', 'default:copper_ingot', 'default:stone'}, } }) diff --git a/technic/tool_workshop.lua b/technic/tool_workshop.lua index 1174633..9a292b4 100644 --- a/technic/tool_workshop.lua +++ b/technic/tool_workshop.lua @@ -2,9 +2,9 @@ minetest.register_alias("tool_workshop", "technic:tool_workshop") minetest.register_craft({ output = 'technic:tool_workshop', recipe = { - {'default:wood', 'default:wood', 'default:wood'}, - {'default:wood', 'default:diamond', 'default:wood'}, - {'default:stone', 'moreores:copper_ingot', 'default:stone'}, + {'default:wood', 'default:wood', 'default:wood'}, + {'default:wood', 'default:diamond', 'default:wood'}, + {'default:stone', 'default:copper_ingot', 'default:stone'}, } }) diff --git a/technic/water.lua b/technic/water.lua index 6ddaa46..044ee59 100644 --- a/technic/water.lua +++ b/technic/water.lua @@ -6,27 +6,27 @@ minetest.register_alias("electric_furnace", "technic:electric_furnace") minetest.register_craft({ output = 'technic:battery 1', recipe = { - {'default:wood', 'moreores:copper_ingot', 'default:wood'}, - {'default:wood', 'moreores:tin_ingot', 'default:wood'}, - {'default:wood', 'moreores:copper_ingot', 'default:wood'}, + {'default:wood', 'default:copper_ingot', 'default:wood'}, + {'default:wood', 'moreores:tin_ingot', 'default:wood'}, + {'default:wood', 'default:copper_ingot', 'default:wood'}, } }) minetest.register_craft({ output = 'technic:battery_box 1', recipe = { - {'technic:battery', 'default:wood', 'technic:battery'}, - {'technic:battery', 'moreores:copper_ingot', 'technic:battery'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'technic:battery', 'default:wood', 'technic:battery'}, + {'technic:battery', 'default:copper_ingot', 'technic:battery'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, } }) minetest.register_craft({ output = 'technic:electric_furnace', recipe = { - {'default:brick', 'default:brick', 'default:brick'}, - {'default:brick', '', 'default:brick'}, - {'default:steel_ingot', 'moreores:copper_ingot', 'default:steel_ingot'}, + {'default:brick', 'default:brick', 'default:brick'}, + {'default:brick', '', 'default:brick'}, + {'default:steel_ingot', 'default:copper_ingot', 'default:steel_ingot'}, } }) @@ -556,9 +556,9 @@ minetest.register_node("technic:solar_panel", { minetest.register_craft({ output = 'technic:solar_panel 1', recipe = { - {'default:sand', 'default:sand','default:sand'}, - {'default:sand', 'moreores:copper_ingot','default:sand'}, - {'default:sand', 'default:sand','default:sand'}, + {'default:sand', 'default:sand', 'default:sand'}, + {'default:sand', 'default:copper_ingot', 'default:sand'}, + {'default:sand', 'default:sand', 'default:sand'}, } }) @@ -585,4 +585,4 @@ minetest.register_abm( meta:set_float("active",0) end end, -}) \ No newline at end of file +}) diff --git a/technic/water_mill.lua b/technic/water_mill.lua index 52966ed..808923a 100644 --- a/technic/water_mill.lua +++ b/technic/water_mill.lua @@ -3,9 +3,9 @@ minetest.register_alias("water_mill", "technic:water_mill") minetest.register_craft({ output = 'technic:water_mill', recipe = { - {'default:stone', 'default:stone', 'default:stone'}, - {'default:wood', 'default:diamond', 'default:wood'}, - {'default:stone', 'moreores:copper_ingot', 'default:stone'}, + {'default:stone', 'default:stone', 'default:stone'}, + {'default:wood', 'default:diamond', 'default:wood'}, + {'default:stone', 'default:copper_ingot', 'default:stone'}, } }) diff --git a/technic/wires.lua b/technic/wires.lua index e09fc2a..db8c823 100644 --- a/technic/wires.lua +++ b/technic/wires.lua @@ -6,7 +6,7 @@ minetest.register_alias("lv_cable", "technic:lv_cable") minetest.register_craft({ output = 'technic:lv_cable 6', recipe = { - {'moreores:copper_ingot', 'moreores:copper_ingot', 'moreores:copper_ingot'}, + {'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'}, } }) diff --git a/technic_chests/copper_chest.lua b/technic_chests/copper_chest.lua index c121e78..44a42f3 100644 --- a/technic_chests/copper_chest.lua +++ b/technic_chests/copper_chest.lua @@ -1,18 +1,18 @@ minetest.register_craft({ output = 'technic:copper_chest 1', recipe = { - {'moreores:copper_ingot','moreores:copper_ingot','moreores:copper_ingot'}, - {'moreores:copper_ingot','technic:iron_chest','moreores:copper_ingot'}, - {'moreores:copper_ingot','moreores:copper_ingot','moreores:copper_ingot'}, + {'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'}, + {'default:copper_ingot', 'technic:iron_chest', 'default:copper_ingot'}, + {'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'}, } }) minetest.register_craft({ output = 'technic:copper_locked_chest 1', recipe = { - {'moreores:copper_ingot','moreores:copper_ingot','moreores:copper_ingot'}, - {'moreores:copper_ingot','technic:iron_locked_chest','moreores:copper_ingot'}, - {'moreores:copper_ingot','moreores:copper_ingot','moreores:copper_ingot'}, + {'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'}, + {'default:copper_ingot', 'technic:iron_locked_chest', 'default:copper_ingot'}, + {'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'}, } }) diff --git a/technic_chests/gold_chest.lua b/technic_chests/gold_chest.lua index fa275fa..8dc1274 100644 --- a/technic_chests/gold_chest.lua +++ b/technic_chests/gold_chest.lua @@ -19,18 +19,18 @@ local chest_mark_colors = { minetest.register_craft({ output = 'technic:gold_chest 1', recipe = { - {'moreores:gold_ingot','moreores:gold_ingot','moreores:gold_ingot'}, - {'moreores:gold_ingot','technic:silver_chest','moreores:gold_ingot'}, - {'moreores:gold_ingot','moreores:gold_ingot','moreores:gold_ingot'}, + {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, + {'default:gold_ingot', 'technic:silver_chest', 'default:gold_ingot'}, + {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, } }) minetest.register_craft({ output = 'technic:gold_locked_chest 1', recipe = { - {'moreores:gold_ingot','moreores:gold_ingot','moreores:gold_ingot'}, - {'moreores:gold_ingot','technic:silver_locked_chest','moreores:gold_ingot'}, - {'moreores:gold_ingot','moreores:gold_ingot','moreores:gold_ingot'}, + {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, + {'default:gold_ingot', 'technic:silver_locked_chest', 'default:gold_ingot'}, + {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, } })