From f97625c9789721c93ec0f142c8a91014acc04000 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 16 Mar 2017 00:16:28 -0400 Subject: update technic --- technic/machines/register/centrifuge_recipes.lua | 1 + technic/machines/register/grinder_recipes.lua | 27 +++++++++++---------- technic/machines/supply_converter.lua | 2 +- technic/textures/technic_chernobylite_dust.png | Bin 0 -> 436 bytes .../technicx32/technic_chernobylite_dust.png | Bin 0 -> 1233 bytes 5 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 technic/textures/technic_chernobylite_dust.png create mode 100644 technic/textures/technicx32/technic_chernobylite_dust.png (limited to 'technic') diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua index b4db47c..4684ba0 100644 --- a/technic/machines/register/centrifuge_recipes.lua +++ b/technic/machines/register/centrifuge_recipes.lua @@ -14,6 +14,7 @@ local recipes = { { "technic:bronze_dust 4", "technic:copper_dust 3", "technic:tin_dust" }, { "technic:stainless_steel_dust 4", "technic:wrought_iron_dust 3", "technic:chromium_dust" }, { "technic:brass_dust 3", "technic:copper_dust 2", "technic:zinc_dust" }, + { "technic:chernobylite_dust", "default:sand", "technic:uranium3_dust" }, { "default:dirt 4", "default:sand", "default:gravel", "default:clay_lump 2" }, } diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 7eaa7d4..7ba1e0f 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -10,18 +10,18 @@ end local recipes = { -- Dusts - {"default:coal_lump", "technic:coal_dust 2"}, - {"default:copper_lump", "technic:copper_dust 2"}, - {"default:desert_stone", "default:desert_sand"}, - {"default:gold_lump", "technic:gold_dust 2"}, - {"default:iron_lump", "technic:wrought_iron_dust 2"}, - {"technic:chromium_lump", "technic:chromium_dust 2"}, - {"technic:uranium_lump", "technic:uranium_dust 2"}, - {"technic:zinc_lump", "technic:zinc_dust 2"}, - {"technic:lead_lump", "technic:lead_dust 2"}, - {"technic:sulfur_lump", "technic:sulfur_dust 2"}, - {"default:stone", "technic:stone_dust"}, - {"default:sand", "technic:stone_dust"}, + {"default:coal_lump", "technic:coal_dust 2"}, + {"default:copper_lump", "technic:copper_dust 2"}, + {"default:desert_stone", "default:desert_sand"}, + {"default:gold_lump", "technic:gold_dust 2"}, + {"default:iron_lump", "technic:wrought_iron_dust 2"}, + {"technic:chromium_lump", "technic:chromium_dust 2"}, + {"technic:uranium_lump", "technic:uranium_dust 2"}, + {"technic:zinc_lump", "technic:zinc_dust 2"}, + {"technic:lead_lump", "technic:lead_dust 2"}, + {"technic:sulfur_lump", "technic:sulfur_dust 2"}, + {"default:stone", "technic:stone_dust"}, + {"default:sand", "technic:stone_dust"}, -- Other {"default:cobble", "default:gravel"}, @@ -92,6 +92,7 @@ register_dust("Brass", "technic:brass_ingot") register_dust("Bronze", "default:bronze_ingot") register_dust("Carbon Steel", "technic:carbon_steel_ingot") register_dust("Cast Iron", "technic:cast_iron_ingot") +register_dust("Chernobylite", "technic:chernobylite_block") register_dust("Chromium", "technic:chromium_ingot") register_dust("Coal", nil) register_dust("Copper", "default:copper_ingot") @@ -100,11 +101,11 @@ register_dust("Gold", "default:gold_ingot") register_dust("Mithril", "moreores:mithril_ingot") register_dust("Silver", "moreores:silver_ingot") register_dust("Stainless Steel", "technic:stainless_steel_ingot") +register_dust("Stone", "default:stone") register_dust("Sulfur", nil) register_dust("Tin", "moreores:tin_ingot") register_dust("Wrought Iron", "technic:wrought_iron_ingot") register_dust("Zinc", "technic:zinc_ingot") -register_dust("Stone", "default:stone") if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then register_dust("Akalin", "glooptest:akalin_ingot") register_dust("Alatro", "glooptest:alatro_ingot") diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index a94b9e2..0d32439 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -68,7 +68,7 @@ local run = function(pos, node, run_stage) -- Machine information local machine_name = S("Supply Converter") local meta = minetest.get_meta(pos) - local enabled = meta:get_int("enabled") ~= 0 and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0) + local enabled = meta:get_string("enabled") ~= "0" and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0) local demand = enabled and meta:get_int("power") or 0 local pos_up = {x=pos.x, y=pos.y+1, z=pos.z} diff --git a/technic/textures/technic_chernobylite_dust.png b/technic/textures/technic_chernobylite_dust.png new file mode 100644 index 0000000..6f36bf6 Binary files /dev/null and b/technic/textures/technic_chernobylite_dust.png differ diff --git a/technic/textures/technicx32/technic_chernobylite_dust.png b/technic/textures/technicx32/technic_chernobylite_dust.png new file mode 100644 index 0000000..b922db4 Binary files /dev/null and b/technic/textures/technicx32/technic_chernobylite_dust.png differ -- cgit v1.2.3