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

..

textures

New textures for lumps and ingots.

2013-07-05 02:28:22 -04:00

crafts.lua

Merge changes made in technic_game

2013-07-06 10:35:48 +02:00

depends.txt

Store configuration in the world directory.

2013-04-27 13:53:12 -04:00

init.lua

Update 0.4.6-0

2013-04-04 01:17:39 +02:00

nodes.lua

Merge branch 'indev'

2013-07-08 16:57:56 -04:00

oregen.lua

Store configuration in the world directory.

2013-04-27 13:53:12 -04:00