From 630db84ad13682eadc0035c251febfa07353a969 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 25 May 2013 22:39:25 +0200 Subject: [PATCH 1/4] 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 From 0d81a3f42a96378ab0fa4d34737ad99de19b2f66 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 25 May 2013 23:00:12 +0200 Subject: [PATCH 2/4] 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 From 77254735e4a533bcce90e579f56fbae2c3c34359 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Wed, 29 May 2013 03:59:25 +0200 Subject: [PATCH 3/4] 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 +}) From 7d890428f547758ffd907252b2effb1d743c02e4 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Thu, 30 May 2013 06:01:01 +0200 Subject: [PATCH 4/4] HV Battery Box textures added --- .../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 0000000000000000000000000000000000000000..996b2d4cfdcd63908ee512b0f2165c090f861e7b GIT binary patch literal 653 zcmV;80&@L{P)(7T;J|G13}rY z@Tm0bALX;xpEoohhzV*+SA!`%6I7rIR1pK?~cCg+;Y-8Ps>%tTzdJjrt+Cgd69y9@8?Wz>6W zmn7eP`URy+a}9{PuoAw1^9$@oK4KXRI91TgNE$kdM@)YF>1Td>^E?KfYu zkBxWNNu2>Ibc3TxXDySe;pQAq2iG-;83aN6@h5Rj#0&yNp|j{Llv*|Dndt7=Z6IA- zbMoPt8wL1gu#_Sy*zTwdTXBid)#PI`GdONLw|&Rmd3ip_nq(FLx;f%2B_|7e+No-E zCOwq<-~aH{>o3{2XIzBswsZaaA2H)&8@ro|!bOD!%mh0&#&CY9Ul9ZzP+8Ppg$?8B zY7E|6H(!RloeW7z^+p=00000NkvXXu0mjfouVKV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fffd8eaa561b18485900a9899520329a116f0e4c GIT binary patch literal 777 zcmV+k1NQuhP)YDqQc_5Wv#5})F{UTbUB^#sEd62-fcd$QIF|u#N)#2& z+r%^(!`UTK*KxCJDOL137ZF~xi8eK88z=`A(H+XoA;o${Sr73P(Ad)kaOv-;QE?UO z$reR5LWWhpt^{SgG31@a9vf!?OBpxEyk{W*?$|P8?z}bG<$m)zMPmq{V$N=tc(AkJ z?i)8(0N`f08M(_nkO~GI%r1ENX3gGsliXz@Dm*?u2%Zhh(AArOg9s6Gwhs2GCmZC} zSe!Jd!Q(NlwFy^cd~`sF14zJ#;rmMPXVPOKN7D8Z_&=Rl%0%Qo;0OTwHc>`oLML)mREFvEZ!WMKGcXQ`tDcm ze*S};A~{9A{pl~hfBu4DxIkJ#MB}}o#DH02<}gKU0OuQ99N+x#JFQj5aYRHI`kuSr zUhvMNOQsMI?@((YR)cZ<1-5gu<}AeW2=YEGzUpMBD9)DaPlZeX0lS`S)bhApu| zTo!6htfw=rHmnsy8u#oleeZZ}xWrkDwHE6-OgA9DqxA!MU1@6|hRA7i4?t;!R9F0} z(TbOiwJ8dk+Ju}dB_&!cq zNFn$H}gLW WI#dbF@1UUo0000