diff options
| author | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-04-13 20:50:39 -0400 |
|---|---|---|
| committer | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-04-13 20:50:39 -0400 |
| commit | b8cd2f723c7c9079e631d7a4078862ff47b24915 (patch) | |
| tree | 5b6edd73dcdc58ec8513ac291773cb1cd80272d3 /technic | |
| parent | b9bdb0241ea944cacb054e6768f4cda98dbcff94 (diff) | |
| download | dreambuilder_modpack-b8cd2f723c7c9079e631d7a4078862ff47b24915.tar dreambuilder_modpack-b8cd2f723c7c9079e631d7a4078862ff47b24915.tar.gz dreambuilder_modpack-b8cd2f723c7c9079e631d7a4078862ff47b24915.tar.bz2 dreambuilder_modpack-b8cd2f723c7c9079e631d7a4078862ff47b24915.tar.xz dreambuilder_modpack-b8cd2f723c7c9079e631d7a4078862ff47b24915.zip | |
update technic
Diffstat (limited to 'technic')
| -rw-r--r-- | technic/machines/other/constructor.lua | 3 | ||||
| -rw-r--r-- | technic/machines/register/battery_box.lua | 3 | ||||
| -rw-r--r-- | technic/machines/register/compressor_recipes.lua | 6 | ||||
| -rw-r--r-- | technic/machines/register/grinder_recipes.lua | 6 |
4 files changed, 7 insertions, 11 deletions
diff --git a/technic/machines/other/constructor.lua b/technic/machines/other/constructor.lua index 9c64051..5847fdb 100644 --- a/technic/machines/other/constructor.lua +++ b/technic/machines/other/constructor.lua @@ -2,6 +2,7 @@ local S = technic.getter local function deploy_node(inv, slot_name, pos, node, machine_node) + if node.param2 > 3 then return end if node.name ~= "air" then if node.name == "ignore" or node.name == "default:lava_source" or @@ -162,6 +163,7 @@ local function make_constructor(mark, length) 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_rotate = screwdriver.rotate_simple }) minetest.register_node("technic:constructor_mk"..mark.."_on", { @@ -180,6 +182,7 @@ local function make_constructor(mark, length) 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_rotate = false }) end diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua index e26ee09..c04875b 100644 --- a/technic/machines/register/battery_box.lua +++ b/technic/machines/register/battery_box.lua @@ -136,8 +136,7 @@ function technic.register_battery_box(data) local below = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}) local meta = minetest.get_meta(pos) - if below.name ~= "technic:"..ltier.."_cable" - and not string.find(below.name, "technic:"..ltier.."_cable_plate") then + if not technic.is_tier_cable(below.name, tier) then meta:set_string("infotext", S("%s Battery Box Has No Network"):format(tier)) return end diff --git a/technic/machines/register/compressor_recipes.lua b/technic/machines/register/compressor_recipes.lua index 872be04..a625f1a 100644 --- a/technic/machines/register/compressor_recipes.lua +++ b/technic/machines/register/compressor_recipes.lua @@ -20,11 +20,11 @@ local recipes = { } -- defuse the default sandstone recipe, since we have the compressor to take over in a more realistic manner -minetest.register_craft({ - output = "default:sand 0", +minetest.clear_craft({ + output = "default:sandstone", recipe = { {'group:sand', 'group:sand'}, - {'group:sand', 'group:sand'} + {'group:sand', 'group:sand'} }, }) diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 64eb8e1..fa55e7a 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -62,12 +62,6 @@ for _, data in pairs(recipes) do technic.register_grinder_recipe({input = {data[1]}, output = data[2]}) end --- defuse common grinder unfriendly recipes -if minetest.get_modpath("fake_fire") then -- from homedecor_modpack - minetest.register_craft({ output='default:cobble 0', recipe={{'default:cobble'}}}) - minetest.register_craft({ output='default:gravel 0', recipe={{'default:gravel'}}}) -end - -- dusts local function register_dust(name, ingot) local lname = string.lower(name) |