Merge branch 'indev'
authorShadowNinja <noreply@gmail.com>
Mon, 8 Jul 2013 20:53:44 +0000 (16:53 -0400)
committerShadowNinja <noreply@gmail.com>
Mon, 8 Jul 2013 20:57:56 +0000 (16:57 -0400)
commit19c9a0443b17176a27329b69ee16fe28d7be6fd8
tree9125c9ca38798426a1bf01a247e98bb532ec9b6b
parent3a3700537baa748e459258385d27bb79ab391546
parent79e8d26989cf20108bc69cf3b1da32655d57735a
Merge branch 'indev'

Conflicts:
technic/alloy_furnace.lua
technic/alloy_furnaces_commons.lua
technic/battery_box.lua
technic/battery_box_hv.lua
technic/battery_box_mv.lua
technic/chainsaw.lua
technic/cnc.lua
technic/cnc_nodes.lua
technic/electric_furnace.lua
technic/grinder.lua
technic/init.lua
technic/solar_array_hv.lua
technic/solar_array_lv.lua
technic/solar_array_mv.lua
technic/solar_panel.lua
unified_inventory/api.lua
unified_inventory/depends.txt
24 files changed:
technic/alloy_furnace.lua
technic/alloy_furnaces_commons.lua
technic/battery_box.lua
technic/battery_box_hv.lua
technic/battery_box_mv.lua
technic/chainsaw.lua
technic/cnc.lua
technic/electric_furnace.lua
technic/generator.lua
technic/grinder.lua
technic/init.lua
technic/items.lua
technic/mining_drill.lua
technic/mining_laser_mk1.lua
technic/music_player.lua
technic/solar_array_hv.lua
technic/solar_array_lv.lua
technic/solar_array_mv.lua
technic/solar_panel.lua
technic/tool_workshop.lua
technic/water_mill.lua
technic_worldgen/nodes.lua
unified_inventory/api.lua
unified_inventory/depends.txt