Sync with indev branch, bump version to 0.4.7
authorRealBadAngel <mk@realbadangel.pl>
Sun, 30 Jun 2013 05:12:02 +0000 (07:12 +0200)
committerRealBadAngel <mk@realbadangel.pl>
Sun, 30 Jun 2013 05:12:02 +0000 (07:12 +0200)
commit8e03d7ded6441b26e9d44102c0cd2ee39f9e90bc
tree75cf6c14f37377fbfe12bec5ac0a4f48ffa488d9
parentc687e8cb7b9e624474353b0cc10acc5db14192f8
Sync with indev branch, bump version to 0.4.7
95 files changed:
aaa_recipeshook/depends.txt [deleted file]
aaa_recipeshook/init.lua [deleted file]
technic/alloy_furnaces_commons.lua
technic/battery_box.lua
technic/battery_box_hv.lua [new file with mode: 0644]
technic/battery_box_mv.lua
technic/chainsaw.lua
technic/cnc.lua [new file with mode: 0644]
technic/cnc_api.lua [new file with mode: 0644]
technic/cnc_nodes.lua [new file with mode: 0644]
technic/config.lua
technic/depends.txt
technic/down_converter_hv.lua [new file with mode: 0644]
technic/down_converter_mv.lua [new file with mode: 0644]
technic/geothermal.lua
technic/grinder.lua
technic/init.lua
technic/items.lua
technic/mining_drill.lua
technic/rubber.lua
technic/solar_array_hv.lua [new file with mode: 0644]
technic/solar_array_lv.lua [new file with mode: 0644]
technic/solar_array_mv.lua [new file with mode: 0644]
technic/solar_panel.lua
technic/sonic_screwdriver.lua
technic/textures/technic_cnc_bottom.png [new file with mode: 0644]
technic/textures/technic_cnc_cylinder.png [new file with mode: 0644]
technic/textures/technic_cnc_cylinder_horizontal.png [new file with mode: 0644]
technic/textures/technic_cnc_element_cross.png [new file with mode: 0644]
technic/textures/technic_cnc_element_edge.png [new file with mode: 0644]
technic/textures/technic_cnc_element_end.png [new file with mode: 0644]
technic/textures/technic_cnc_element_straight.png [new file with mode: 0644]
technic/textures/technic_cnc_element_t.png [new file with mode: 0644]
technic/textures/technic_cnc_front.png [new file with mode: 0644]
technic/textures/technic_cnc_front_active.png [new file with mode: 0644]
technic/textures/technic_cnc_full.png [new file with mode: 0644]
technic/textures/technic_cnc_half.png [new file with mode: 0644]
technic/textures/technic_cnc_milling_background.png [new file with mode: 0644]
technic/textures/technic_cnc_onecurvededge.png [new file with mode: 0644]
technic/textures/technic_cnc_pyramid.png [new file with mode: 0644]
technic/textures/technic_cnc_side.png [new file with mode: 0644]
technic/textures/technic_cnc_slope.png [new file with mode: 0644]
technic/textures/technic_cnc_slope_edge.png [new file with mode: 0644]
technic/textures/technic_cnc_slope_edge_upsdwn.png [new file with mode: 0644]
technic/textures/technic_cnc_slope_inner_edge.png [new file with mode: 0644]
technic/textures/technic_cnc_slope_inner_edge_upsdwn.png [new file with mode: 0644]
technic/textures/technic_cnc_slope_lying.png [new file with mode: 0644]
technic/textures/technic_cnc_slope_upsdwn.png [new file with mode: 0644]
technic/textures/technic_cnc_sphere.png [new file with mode: 0644]
technic/textures/technic_cnc_spike.png [new file with mode: 0644]
technic/textures/technic_cnc_stick.png [new file with mode: 0644]
technic/textures/technic_cnc_top.png [new file with mode: 0644]
technic/textures/technic_cnc_top_active.png [new file with mode: 0644]
technic/textures/technic_cnc_twocurvededge.png [new file with mode: 0644]
technic/textures/technic_hv_battery_box_bottom.png [new file with mode: 0644]
technic/textures/technic_hv_battery_box_side0.png [new file with mode: 0644]
technic/textures/technic_hv_battery_box_top.png [new file with mode: 0644]
technic/textures/technic_hv_cable.png [new file with mode: 0644]
technic/textures/technic_hv_cable_wield.png [new file with mode: 0644]
technic/textures/technic_hv_down_converter_bottom.png [new file with mode: 0644]
technic/textures/technic_hv_down_converter_side.png [new file with mode: 0644]
technic/textures/technic_hv_down_converter_top.png [new file with mode: 0644]
technic/textures/technic_hv_solar_array_bottom.png [new file with mode: 0644]
technic/textures/technic_hv_solar_array_side.png [new file with mode: 0644]
technic/textures/technic_hv_solar_array_top.png [new file with mode: 0644]
technic/textures/technic_hv_transformer.png [new file with mode: 0644]
technic/textures/technic_lv_solar_array_bottom.png [new file with mode: 0644]
technic/textures/technic_lv_solar_array_side.png [new file with mode: 0644]
technic/textures/technic_lv_solar_array_top.png [new file with mode: 0644]
technic/textures/technic_lv_transformer.png [new file with mode: 0644]
technic/textures/technic_mv_cable_wield.png
technic/textures/technic_mv_down_converter_bottom.png [new file with mode: 0644]
technic/textures/technic_mv_down_converter_side.png [new file with mode: 0644]
technic/textures/technic_mv_down_converter_top.png [new file with mode: 0644]
technic/textures/technic_mv_solar_array_bottom.png [new file with mode: 0644]
technic/textures/technic_mv_solar_array_side.png [new file with mode: 0644]
technic/textures/technic_mv_solar_array_top.png [new file with mode: 0644]
technic/textures/technicx32/technic_hv_solar_array_bottom.png [new file with mode: 0644]
technic/textures/technicx32/technic_hv_solar_array_side.png [new file with mode: 0644]
technic/textures/technicx32/technic_hv_solar_array_top.png [new file with mode: 0644]
technic/textures/technicx32/technic_hv_transformer.png [new file with mode: 0644]
technic/textures/technicx32/technic_lv_solar_array_bottom.png [new file with mode: 0644]
technic/textures/technicx32/technic_lv_solar_array_side.png [new file with mode: 0644]
technic/textures/technicx32/technic_lv_solar_array_top.png [new file with mode: 0644]
technic/textures/technicx32/technic_lv_transformer.png [new file with mode: 0644]
technic/textures/technicx32/technic_mv_solar_array_bottom.png [new file with mode: 0644]
technic/textures/technicx32/technic_mv_solar_array_side.png [new file with mode: 0644]
technic/textures/technicx32/technic_mv_solar_array_top.png [new file with mode: 0644]
technic/tree_tap.lua
technic/wires_hv.lua [new file with mode: 0644]
unified_inventory/api.lua
unified_inventory/depends.txt
unified_inventory/textures/ui_furnace_inventory.png [new file with mode: 0644]
unified_inventory/textures/ui_main_inventory.png [new file with mode: 0644]
unified_inventory/textures/ui_wooden_chest_inventory.png [new file with mode: 0644]