From d5a7ade0d554dd9270552b86a3976dc48a63d8e9 Mon Sep 17 00:00:00 2001 From: Maciej Kasatkin Date: Thu, 11 Oct 2012 17:44:25 +0200 Subject: [PATCH] Added Water can + bug fixes --- alloy_furnace.lua | 2 +- init.lua | 6 ++-- iron_chest.lua | 2 +- textures/technic_water_can.png | Bin 0 -> 1420 bytes water_can.lua | 62 +++++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 textures/technic_water_can.png create mode 100644 water_can.lua diff --git a/alloy_furnace.lua b/alloy_furnace.lua index ff805ab..3f02d9a 100644 --- a/alloy_furnace.lua +++ b/alloy_furnace.lua @@ -24,7 +24,7 @@ end register_alloy_recipe ("technic:copper_dust",3, "technic:tin_dust",1, "technic:bronze_dust",4) register_alloy_recipe ("moreores:copper_ingot",3, "moreores:tin_ingot",1, "moreores:bronze_ingot",4) register_alloy_recipe ("technic:iron_dust",3, "technic:chromium_dust",1, "technic:stainless_steel_dust",4) -register_alloy_recipe ("technic:steel_ingot",3, "technic:chromium_ingot",1, "technic:stainless_steel_ingot",4) +register_alloy_recipe ("default:steel_ingot",3, "technic:chromium_ingot",1, "technic:stainless_steel_ingot",4) register_alloy_recipe ("technic:copper_dust",2, "technic:zinc_dust",1, "technic:brass_dust",3) register_alloy_recipe ("technic:copper_ingot",2, "technic:zinc_ingot",1, "technic:brass_ingot",3) register_alloy_recipe ("default:sand",2, "technic:coal_dust",2, "technic:silicon_wafer",1) diff --git a/init.lua b/init.lua index f149b53..95a519f 100644 --- a/init.lua +++ b/init.lua @@ -24,14 +24,13 @@ dofile(minetest.get_modpath("technic").."/electric_furnace.lua") dofile(minetest.get_modpath("technic").."/battery_box.lua") dofile(minetest.get_modpath("technic").."/wires.lua") dofile(minetest.get_modpath("technic").."/wires_mv.lua") ---dofile(minetest.get_modpath("technic").."/dyes.lua") +dofile(minetest.get_modpath("technic").."/dyes.lua") dofile(minetest.get_modpath("technic").."/ores.lua") dofile(minetest.get_modpath("technic").."/tool_workshop.lua") dofile(minetest.get_modpath("technic").."/music_player.lua") dofile(minetest.get_modpath("technic").."/grinder.lua") dofile(minetest.get_modpath("technic").."/mining_laser_mk1.lua") ---dofile(minetest.get_modpath("technic").."/project_table.lua") dofile(minetest.get_modpath("technic").."/injector.lua") dofile(minetest.get_modpath("technic").."/generator.lua") dofile(minetest.get_modpath("technic").."/solar_panel.lua") @@ -44,8 +43,9 @@ dofile(minetest.get_modpath("technic").."/screwdriver.lua") dofile(minetest.get_modpath("technic").."/sonic_screwdriver.lua") dofile(minetest.get_modpath("technic").."/node_breaker.lua") dofile(minetest.get_modpath("technic").."/deployer.lua") ---dofile(minetest.get_modpath("technic").."/rubber.lua") dofile(minetest.get_modpath("technic").."/tree_tap.lua") +dofile(minetest.get_modpath("technic").."/torchlight.lua") +dofile(minetest.get_modpath("technic").."/water_can.lua") function has_locked_chest_privilege(meta, player) diff --git a/iron_chest.lua b/iron_chest.lua index b6685b2..f0e0fcb 100644 --- a/iron_chest.lua +++ b/iron_chest.lua @@ -11,7 +11,7 @@ minetest.register_craft({ output = 'technic:iron_locked_chest 1', recipe = { {'default:steel_ingot','default:steel_ingot','default:steel_ingot'}, - {'default:steel_ingot','default:locked_chest','default:steel_ingot'}, + {'default:steel_ingot','default:chest_locked','default:steel_ingot'}, {'default:steel_ingot','default:steel_ingot','default:steel_ingot'}, } }) diff --git a/textures/technic_water_can.png b/textures/technic_water_can.png new file mode 100644 index 0000000000000000000000000000000000000000..411e91fd24d572475cf4aeaeb09e379ad576f804 GIT binary patch literal 1420 zcmV;71#|j|P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX3JVV)4o&%|%m4rd9!W$&R9M5k zmrIOX#TACXQ@3v4zCHb#nI1o|XN&>I$Sjb8SeUS61LhSZBH;w_5Lj4IBqBtT4MJ=p z2n#!k6iWyplweB;3*m)XAe3a4C{mEJ04y6ytvXqB&%+*fk9%b0 ztV*}4?)lHD|37sKHek=Zdizl8A3QMGcTR?N{=n1Q`1sv#IPlv$c2uY5&kR~SI+2xQ zzxyu$`wmQT@~v~j0r=UAG4CB-T=V_07p9`p=D0O;u1;ei5fPy}y+Es(>cU*Y&OIe| z++M_`9_K9Kv$sH} z`0_(+l#T0e0p^Hntp6Q07nnk`N_|VwAx0KRLGBKm|F;uxo-u` z`R^~Z0l4Sk3e9?|i;YyrHbA%y1dl_v|De z96Aj^t`L@Ug;0}@(zx8lOO7y1#8{!SJ&UzgGFeMt1?L=5))K{nA_P`2MsQw-190-4 zDgaNtvRhAoF-H&vda+uQPRr3+^i1w5gBnyF*^vM-ip>~|SWF*lLs*0H2 z*{+%&1VdH%{2vzyGXXMSVP60)=@t*~SLL#2Y2ulkX<~zGZx>^jIa_Dset*MGB~bddNfpH|@-G z>R*?zp}~d$-YJ)7+eF!bTp?tMDrNvnZGQm0h)hq*x(We`s*uS9?ATr6%YR-XTd)+$ z8LSN$o6O;yvRnXV0~x5?6obk@qIp$vc}rz`j`7VoN@Ee7wp+8u$Ocr9cDj-JRM%4~ z(kr{F*A7oU z-$o{ zc)wC4L_|96lrRh=Uk*o3962k;4|knD@$zlMKh0kI;2vIm{O>&Y{1myo)ppB~cD%M1 zQ=Ic6V!Bf6VVKxb9C`oHSIwpUj~<-jqa)|8r*FBoJ^7nm{Q32j*UTdacc^!sR@32J zm)2Xi=SPmd`JZK{`<|QR