From 630db84ad13682eadc0035c251febfa07353a969 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 25 May 2013 22:39:25 +0200 Subject: bugfix --- unified_inventory/api.lua | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/unified_inventory/api.lua b/unified_inventory/api.lua index ab55903..02c08e9 100644 --- a/unified_inventory/api.lua +++ b/unified_inventory/api.lua @@ -58,7 +58,7 @@ minetest.register_on_joinplayer(function(player) unified_inventory.alternate[player_name] = 1 unified_inventory.current_item[player_name] =nil unified_inventory.set_inventory_formspec(player,unified_inventory.get_formspec(player, unified_inventory.default)) - + --crafting guide inventories local inv = minetest.create_detached_inventory(player:get_player_name().."craftrecipe",{ allow_put = function(inv, listname, index, stack, player) @@ -75,8 +75,8 @@ local inv = minetest.create_detached_inventory(player:get_player_name().."craftr return 0 end, }) - inv:set_size("output", 1) - inv:set_size("build", 3*3) +inv:set_size("output", 1) +inv:set_size("build", 3*3) -- refill slot unified_inventory.refill = minetest.create_detached_inventory(player_name.."refill", { @@ -93,7 +93,6 @@ unified_inventory.refill = minetest.create_detached_inventory(player_name.."refi end, }) unified_inventory.refill:set_size("main", 1) -end) -- trash slot unified_inventory.trash = minetest.create_detached_inventory("trash", { @@ -111,24 +110,18 @@ unified_inventory.trash = minetest.create_detached_inventory("trash", { end, }) unified_inventory.trash:set_size("main", 1) +end) -- set_inventory_formspec unified_inventory.set_inventory_formspec = function(player,formspec) if player then - if minetest.setting_getbool("creative_mode") then - -- if creative mode is on then wait a bit - minetest.after(0.01,function() - player:set_inventory_formspec(formspec) - end) - else player:set_inventory_formspec(formspec) - end end end -- get_formspec unified_inventory.get_formspec = function(player,page) - if player==nil then return "" end + if player==nil then return "" end local player_name = player:get_player_name() unified_inventory.current_page[player_name]=page -- cgit v1.2.3 From 0d81a3f42a96378ab0fa4d34737ad99de19b2f66 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 25 May 2013 23:00:12 +0200 Subject: Bugfix --- item_drop/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/item_drop/init.lua b/item_drop/init.lua index db1f2a3..54b617f 100644 --- a/item_drop/init.lua +++ b/item_drop/init.lua @@ -4,6 +4,7 @@ time_pick = 3 if technic.config:getBool("enable_item_pickup") then minetest.register_globalstep(function(dtime) for _,player in ipairs(minetest.get_connected_players()) do + if player and player:get_hp() > 0 then local pos = player:getpos() pos.y = pos.y+0.5 local inv = player:get_inventory() @@ -26,6 +27,7 @@ if technic.config:getBool("enable_item_pickup") then end end end + end end end) end -- cgit v1.2.3 From 77254735e4a533bcce90e579f56fbae2c3c34359 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Wed, 29 May 2013 03:59:25 +0200 Subject: Make treetap work with moretrees rubber tree. Add moretrees as dependency --- technic/depends.txt | 1 + technic/tree_tap.lua | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/technic/depends.txt b/technic/depends.txt index 3859f8a..7d2e8c3 100644 --- a/technic/depends.txt +++ b/technic/depends.txt @@ -2,3 +2,4 @@ default moreores pipeworks mesecons +moretrees diff --git a/technic/tree_tap.lua b/technic/tree_tap.lua index 107faed..9d805d5 100644 --- a/technic/tree_tap.lua +++ b/technic/tree_tap.lua @@ -7,7 +7,8 @@ local pos=minetest.get_pointed_thing_position(pointed_thing,above) local node=minetest.env:get_node(pos) local node_name=node.name - if node_name == "farming_plus:rubber_tree_full" or node_name == "farming:rubber_tree_full" or node_name == "technic:rubber_tree_full" then + if node_name == "moretrees:rubber_tree_trunk" then + node.name = "moretrees:rubber_tree_trunk_empty" user:get_inventory():add_item("main",ItemStack("technic:raw_latex")) minetest.env:set_node(pos,node) local item=itemstack:to_table() @@ -47,3 +48,13 @@ description = "Rubber Fiber", inventory_image = "technic_rubber.png", }) + +minetest.register_abm({ + nodenames = {"moretrees:rubber_tree_trunk_empty"}, + interval = 60, + chance = 15, + action = function(pos, node) + node.name = "moretrees:rubber_tree_trunk" + minetest.env:set_node(pos, node) + end +}) -- cgit v1.2.3 From 7d890428f547758ffd907252b2effb1d743c02e4 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Thu, 30 May 2013 06:01:01 +0200 Subject: HV Battery Box textures added --- technic/textures/technic_hv_battery_box_bottom.png | Bin 0 -> 653 bytes technic/textures/technic_hv_battery_box_side0.png | Bin 0 -> 777 bytes technic/textures/technic_hv_battery_box_top.png | Bin 0 -> 792 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 technic/textures/technic_hv_battery_box_bottom.png create mode 100644 technic/textures/technic_hv_battery_box_side0.png create mode 100644 technic/textures/technic_hv_battery_box_top.png diff --git a/technic/textures/technic_hv_battery_box_bottom.png b/technic/textures/technic_hv_battery_box_bottom.png new file mode 100644 index 0000000..996b2d4 Binary files /dev/null and b/technic/textures/technic_hv_battery_box_bottom.png differ diff --git a/technic/textures/technic_hv_battery_box_side0.png b/technic/textures/technic_hv_battery_box_side0.png new file mode 100644 index 0000000..fffd8ea Binary files /dev/null and b/technic/textures/technic_hv_battery_box_side0.png differ diff --git a/technic/textures/technic_hv_battery_box_top.png b/technic/textures/technic_hv_battery_box_top.png new file mode 100644 index 0000000..49dee71 Binary files /dev/null and b/technic/textures/technic_hv_battery_box_top.png differ -- cgit v1.2.3