vlapsley
/
outback
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update technic battery recipe

master
vlapsley 2017-09-17 11:39:17 +10:00
parent 321bced703
commit 9454b7c103
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/ITEMS/technic/technic/machines/register/battery_box.lua
View File

@ -17,11 +17,7 @@ minetest.register_craft({
output = "technic:battery",
recipe = {
{"group:wood", "base:nickel_ingot", "group:wood"},
<<<<<<< HEAD:mods/ITEMS/technic/technic/machines/register/battery_box.lua
{"group:wood", "base:aluminium_ingot", "group:wood"},
=======
{"group:wood", "base:aluminium_ingot", "group:wood"},
>>>>>>> 25921a596b16961d1e3d66c7132ba4ad18850852:mods/ITEMS/technic/machines/register/battery_box.lua
{"group:wood", "base:nickel_ingot", "group:wood"},
}
})