Sync with indev branch, bump version to 0.4.7

Browse Source

...

This commit is contained in:

RealBadAngel

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

parent c687e8cb7b

commit 8e03d7ded6

95 changed files with 3397 additions and 970 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_cnc_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_cylinder.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_cylinder_horizontal.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_element_cross.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_element_edge.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_element_end.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_element_straight.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_element_t.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_front.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_front_active.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

technic/textures/technic_cnc_full.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_half.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_milling_background.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 77 KiB

BIN

technic/textures/technic_cnc_onecurvededge.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_pyramid.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_side.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

technic/textures/technic_cnc_slope.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_slope_edge.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_slope_edge_upsdwn.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_slope_inner_edge.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_slope_inner_edge_upsdwn.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_slope_lying.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_slope_upsdwn.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_sphere.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_spike.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_stick.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_cnc_top.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

technic/textures/technic_cnc_top_active.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

technic/textures/technic_cnc_twocurvededge.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_battery_box_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_battery_box_side0.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_battery_box_top.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_cable.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_cable_wield.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_down_converter_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_down_converter_side.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_down_converter_top.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_solar_array_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_solar_array_side.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_solar_array_top.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_hv_transformer.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

technic/textures/technic_lv_solar_array_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_lv_solar_array_side.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_lv_solar_array_top.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_lv_transformer.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

technic/textures/technic_mv_cable_wield.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 531 B

BIN

technic/textures/technic_mv_down_converter_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_mv_down_converter_side.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_mv_down_converter_top.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_mv_solar_array_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_mv_solar_array_side.png Normal file

Binary file not shown.

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

BIN

technic/textures/technic_mv_solar_array_top.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_hv_solar_array_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_hv_solar_array_side.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_hv_solar_array_top.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

technic/textures/technicx32/technic_hv_transformer.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_lv_solar_array_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_lv_solar_array_side.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_lv_solar_array_top.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_lv_transformer.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

technic/textures/technicx32/technic_mv_solar_array_bottom.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_mv_solar_array_side.png Normal file

Binary file not shown.

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

BIN

technic/textures/technicx32/technic_mv_solar_array_top.png Normal file

Binary file not shown.

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