diff options
| author | root <root@mirzakhani.gpcf.eu> | 2018-06-20 18:05:58 +0200 |
|---|---|---|
| committer | root <root@mirzakhani.gpcf.eu> | 2018-06-20 18:05:58 +0200 |
| commit | 39ba8bae5e294ef7d74e7a47df5cbd833c7b7a60 (patch) | |
| tree | bbf292e70dffb2fb66cace63880ae45ed68e7198 | |
| parent | c029cd5a9897102c4c9eeb7e30336e6ae78e81a8 (diff) | |
| parent | faa4be7f6ae82b08aba51c1d32305e17236bf160 (diff) | |
Merge https://github.com/h-v-smacker/technic
| -rw-r--r-- | extranodes/antishroom.lua | 8 | ||||
| -rw-r--r-- | technic/machines/other/water_powered_grinder.lua | 2 | ||||
| -rw-r--r-- | technic/tools/spray_painter.lua | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/extranodes/antishroom.lua b/extranodes/antishroom.lua index e3259c1..38168eb 100644 --- a/extranodes/antishroom.lua +++ b/extranodes/antishroom.lua @@ -18,14 +18,14 @@ minetest.register_craftitem(":technic:antishroom",{ if target and target.name == "ethereal:mushroom_dirt" then local start_pos = { - x = pos.x - 10, - z = pos.z - 10, + x = pos.x - 16, + z = pos.z - 16, y = pos.y - 5 } local end_pos = { - x = pos.x + 10, - z = pos.z + 10, + x = pos.x + 16, + z = pos.z + 16, y = pos.y + 15 } diff --git a/technic/machines/other/water_powered_grinder.lua b/technic/machines/other/water_powered_grinder.lua index c5177cd..be46c6a 100644 --- a/technic/machines/other/water_powered_grinder.lua +++ b/technic/machines/other/water_powered_grinder.lua @@ -187,7 +187,7 @@ minetest.register_abm({ meta:set_int("processing", 0) - meta:set_string("infotext", S("%s is unpowered"):format(machine_name)) + meta:set_string("infotext", S("%s is unpowered\nMust be placed next to a mesecon water turbine\nThe turbine must be active"):format(machine_name)) technic.swap_node(pos, "technic:water_powered_grinder_unpowered") meta:set_string("formspec", formspec) end diff --git a/technic/tools/spray_painter.lua b/technic/tools/spray_painter.lua index 4415b84..1b63cc5 100644 --- a/technic/tools/spray_painter.lua +++ b/technic/tools/spray_painter.lua @@ -33,7 +33,7 @@ minetest.register_node ("technic:paint_layer", { wall_side = {-0.5, -0.5, -0.5, -0.49, 0.5, 0.5}, }, drop = "", - groups = {attached_node = 1, dig_immediate = 2, not_in_creative_inventory = 1}, + groups = {attached_node = 1, dig_immediate = 2, not_in_creative_inventory = 1, not_blocking_trains = 1}, paramtype = "light", paramtype2 = "colorwallmounted", palette = "technic_paint_palette.png", |