Commit Graph

7 Commits

Author SHA1 Message Date
ShadowNinja
19c9a0443b 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
2013-07-08 16:57:56 -04:00
RealBadAngel
8e03d7ded6 Sync with indev branch, bump version to 0.4.7 2013-06-30 07:12:02 +02:00
Vanessa Ezekowitz
a9f73e53d9 removed aaa_recipeshook from depends.txt as it is not used anymore. 2013-04-15 02:49:22 -04:00
RealBadAngel
642b8bec16 Update crafting guide 2013-04-15 08:28:17 +02:00
Vanessa Ezekowitz
17fbd2c335 remove aaa_recipeshook from unified inventory depends (it isn't needed anymore) 2013-04-14 03:40:34 -04:00
RealBadAngel
279776ff62 update 2013-03-30 11:36:45 +01:00
RealBadAngel
a4a3c2b69a Merged Unified Inventory into Technic modpack 2013-02-02 11:12:10 +01:00