Merge branch 'indev'

Browse Source

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

...

This commit is contained in:

ShadowNinja

2013-07-08 16:53:44 -04:00

parent 3a3700537b 79e8d26989

commit 19c9a0443b

72 changed files with 4755 additions and 3178 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

technic/textures/technic_enriched_uranium.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 301 B

BIN

technic/textures/technic_homedecor_glowlight_cube_white_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 255 B

BIN

technic/textures/technic_homedecor_glowlight_cube_white_sides_ceiling.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 258 B

BIN

technic/textures/technic_homedecor_glowlight_cube_white_tb.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 261 B

BIN

technic/textures/technic_homedecor_glowlight_cube_yellow_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 350 B

BIN

technic/textures/technic_homedecor_glowlight_cube_yellow_sides_ceiling.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 353 B

BIN

technic/textures/technic_homedecor_glowlight_cube_yellow_tb.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 352 B

BIN

technic/textures/technic_homedecor_glowlight_thick_white_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 264 B

BIN

technic/textures/technic_homedecor_glowlight_thick_white_wall_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 265 B

BIN

technic/textures/technic_homedecor_glowlight_thick_yellow_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 475 B

BIN

technic/textures/technic_homedecor_glowlight_thick_yellow_wall_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 478 B

BIN

technic/textures/technic_homedecor_glowlight_thin_white_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 225 B

BIN

technic/textures/technic_homedecor_glowlight_thin_white_wall_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 232 B

BIN

technic/textures/technic_homedecor_glowlight_thin_yellow_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 335 B

BIN

technic/textures/technic_homedecor_glowlight_thin_yellow_wall_sides.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 355 B

BIN

technic/textures/technic_homedecor_glowlight_white_tb.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 330 B

BIN

technic/textures/technic_homedecor_glowlight_yellow_tb.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 633 B

BIN

technic/textures/technic_mv_solar_panel_bottom.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 574 B

BIN

technic/textures/technic_mv_solar_panel_side.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 628 B

BIN

technic/textures/technic_mv_solar_panel_top.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 728 B

BIN

technic/textures/technic_mv_solarpanel_bottom.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 574 B

BIN

technic/textures/technic_mv_solarpanel_side.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 628 B

BIN

technic/textures/technic_mv_solarpanel_top.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 728 B

BIN

technic/textures/technic_supply_converter_bottom.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 738 B

BIN

technic/textures/technic_supply_converter_side.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 670 B

BIN

technic/textures/technic_supply_converter_top.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 738 B

BIN

technic/textures/technicx32/technic_mv_solar_panel_bottom.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

BIN

technic/textures/technicx32/technic_mv_solar_panel_side.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.7 KiB

BIN

technic/textures/technicx32/technic_mv_solar_panel_top.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.7 KiB