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

..

sounds

readded sounds

2013-02-02 09:39:39 +01:00

textures

Merge branch 'indev'

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

alloy_furnace_mv.lua

Changed power distribution method and streamlined the various existing machines.

2013-07-02 00:03:36 +02:00

alloy_furnace.lua

Merge branch 'indev'

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

alloy_furnaces_commons.lua

Merge branch 'indev'

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

alloy_furnaces_commons.lua~

Improved cross-compatibility with homedecor's brass ingots.

2013-07-04 23:33:04 -04:00

battery_box_hv.lua

Merge branch 'indev'

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

battery_box_mv.lua

Merge branch 'indev'

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

battery_box.lua

Merge branch 'indev'

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

cans.lua

Changed power distribution method and streamlined the various existing machines.

2013-07-02 00:03:36 +02:00

chainsaw.lua

Merge branch 'indev'

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

cnc_api.lua

Sync with indev branch, bump version to 0.4.7

2013-06-30 07:12:02 +02:00

cnc_nodes.lua

Sync with indev branch, bump version to 0.4.7

2013-06-30 07:12:02 +02:00

cnc.lua

Merge branch 'indev'

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

config.lua

Sync with indev branch, bump version to 0.4.7

2013-06-30 07:12:02 +02:00

constructor.lua

Deployers and constructors now able to "place" craftitems.

2013-06-21 00:20:20 -03:00

creative.lua

cleanup phase2

2013-01-27 14:03:47 +01:00

depends.txt

Sync with indev branch, bump version to 0.4.7

2013-06-30 07:12:02 +02:00

deployer.lua

Added fully functional MV electric furnace

2013-02-03 02:17:22 +01:00

down_converter_hv.lua

Removed down_converters as they are superseeded by the new supply converter.

2013-07-02 22:26:45 +02:00

down_converter_mv.lua

Removed down_converters as they are superseeded by the new supply converter.

2013-07-02 22:26:45 +02:00

electric_furnace_mv.lua

Changed power distribution method and streamlined the various existing machines.

2013-07-02 00:03:36 +02:00

electric_furnace.lua

Merge branch 'indev'

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

electric.lua

Merge changes made in technic_game

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

extractor.lua

Enriched Uranium.

2013-07-06 20:52:41 +07:00

flashlight_old.lua

cleanup phase2

2013-01-27 14:03:47 +01:00

flashlight.lua

Fix item wear.

2013-07-04 19:19:45 +02:00

forcefield.lua

Fix cycling power drain on the forcefield. Now it disables itself if no power.

2013-07-04 21:39:29 +02:00

frames.lua

Frames destroy liquids they should replace and are not blocked by them.

2013-06-05 16:22:45 +02:00

generator.lua

Merge branch 'indev'

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

geothermal.lua

Changed power distribution method and streamlined the various existing machines.

2013-07-02 00:03:36 +02:00

grinder_gloopores.lua

Changed power distribution method and streamlined the various existing machines.

2013-07-02 00:03:36 +02:00

grinder.lua

Merge branch 'indev'

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

grinder.lua~

Improved cross-compatibility with homedecor's brass ingots.

2013-07-04 23:33:04 -04:00

helpers.lua

Reworked power tools, new drills

2013-02-21 22:01:49 +01:00

init.lua

Merge branch 'indev'

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

injector1.lua

Added API functions to register LV and MV machines

2013-02-03 19:28:51 +01:00

injector.lua

Injector upgrade

2013-02-03 14:59:40 +01:00

items.lua

Merge branch 'indev'

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

lighting.lua

Fix a bug when digging up a small cube light.

2013-07-06 00:17:56 +02:00

mining_drill.lua

Merge branch 'indev'

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

mining_laser_mk1.lua

Merge branch 'indev'

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

music_player.lua

Merge branch 'indev'

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

node_breaker.lua

cleanup phase2

2013-01-27 14:03:47 +01:00

power_radiator.lua

Forgot to reset demand on power failure.

2013-07-06 00:22:12 +02:00

project_table.lua

cleanup phase2

2013-01-27 14:03:47 +01:00

register_machine_and_tool.lua

Changed power distribution method and streamlined the various existing machines.

2013-07-02 00:03:36 +02:00

rubber.lua

Sync with indev branch, bump version to 0.4.7

2013-06-30 07:12:02 +02:00

silver_chest.lua

cleanup phase2

2013-01-27 14:03:47 +01:00

solar_array_hv.lua

Merge branch 'indev'

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

solar_array_lv.lua

Merge branch 'indev'

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

solar_array_mv.lua

Merge branch 'indev'

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

solar_panel.lua

Merge branch 'indev'

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

sonic_screwdriver.lua

Fix item wear.

2013-07-04 19:19:45 +02:00

supply_converter.lua

Made the supply converter reset its supply and demand stats if the cabling is bad.

2013-07-06 00:31:48 +02:00

switching_station.lua

Textures. I really need help on some nice ones.

2013-07-04 20:29:38 +02:00

tetris.lua

cleanup phase2

2013-01-27 14:03:47 +01:00

tool_workshop.lua

Merge branch 'indev'

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

tree_tap.lua

Sync with indev branch, bump version to 0.4.7

2013-06-30 07:12:02 +02:00

water_mill.lua

Merge branch 'indev'

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

water.lua

Use ores from default instead of moreores

2013-07-05 01:57:45 -04:00

wires_hv.lua

Sync with indev branch, bump version to 0.4.7

2013-06-30 07:12:02 +02:00

wires_mv.lua

cleanup phase2

2013-01-27 14:03:47 +01:00

wires.lua

Use ores from default instead of moreores

2013-07-05 01:57:45 -04:00