11 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
3a3700537b Merge changes made in technic_game 2013-07-06 10:35:48 +02:00
ShadowNinja
2d168e5afc Use ores from default instead of moreores 2013-07-05 01:57:45 -04:00
kpoppel
ee5c6c23fa Changed power distribution method and streamlined the various existing machines.
An electrical network now requires a switching station to work. This statin is the one
resolving the network collecting power and distributing it again.
Added up/down converter. It is kind of finished. It can be updated with a slot for an upgrade
but so far it works without by resolving the types of wires above and below the box.
Tool and machine registering changed to use a table with key+value instead of the iterative method it used to have.
The power radiator changed to be able to send up to 3000MV EUs in a radius of 6.

This update will most likely require existing networks to be dug up and placed again. Also the
switching station must be added.
2013-07-02 00:03:36 +02:00
RealBadAngel
8e03d7ded6 Sync with indev branch, bump version to 0.4.7 2013-06-30 07:12:02 +02:00
RealBadAngel
3d8b2a365d Bugfix 2013-04-15 07:54:00 +02:00
RealBadAngel
8f485a6ee2 bugfix 2013-03-06 21:51:45 +01:00
RealBadAngel
e23f87d20c Reworked power tools, new drills 2013-02-21 22:01:49 +01:00
RealBadAngel
82cba919fa cleanup phase2 2013-01-27 14:03:47 +01:00
RealBadAngel
887463d95f cleanup 2013-01-27 13:58:47 +01:00
RealBadAngel
a30f1db52d fix to mod directory structure 2013-01-27 13:55:14 +01:00