mod technic
parent: 3a3700 | patch | commitdiff
ShadowNinja
2013-07-08 19c9a0443b17176a27329b69ee16fe28d7be6fd8
refs
author ShadowNinja <noreply@gmail.com>
Monday, July 8, 2013 22:53 +0200
committer ShadowNinja <noreply@gmail.com>
Monday, July 8, 2013 22:57 +0200
commit19c9a0443b17176a27329b69ee16fe28d7be6fd8
tree 9125c9ca38798426a1bf01a247e98bb532ec9b6b tree | zip | gz
parent 3a3700537baa748e459258385d27bb79ab391546 view | diff
79e8d26989cf20108bc69cf3b1da32655d57735a view | diff 
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
26 files added
36 files modified
10 files deleted
7933 ■■■■■ changed files
.gitignore 4 ●●●●● diff | view | raw | blame | history
README.md 5 ●●●●● diff | view | raw | blame | history
technic/alloy_furnace.lua 507 ●●●●● diff | view | raw | blame | history
technic/alloy_furnace_mv.lua 641 ●●●●● diff | view | raw | blame | history
technic/alloy_furnaces_commons.lua 98 ●●●●● diff | view | raw | blame | history
technic/battery_box.lua 536 ●●●●● diff | view | raw | blame | history
technic/battery_box_hv.lua 404 ●●●●● diff | view | raw | blame | history
technic/battery_box_mv.lua 398 ●●●●● diff | view | raw | blame | history
technic/cans.lua 16 ●●●●● diff | view | raw | blame | history
technic/chainsaw.lua 9 ●●●●● diff | view | raw | blame | history
technic/cnc.lua 427 ●●●●● diff | view | raw | blame | history
technic/electric_furnace.lua 307 ●●●●● diff | view | raw | blame | history
technic/electric_furnace_mv.lua 551 ●●●●● diff | view | raw | blame | history
technic/extractor.lua 220 ●●●●● diff | view | raw | blame | history
technic/flashlight.lua 6 ●●●●● diff | view | raw | blame | history
technic/forcefield.lua 203 ●●●●● diff | view | raw | blame | history
technic/generator.lua 222 ●●●●● diff | view | raw | blame | history
technic/geothermal.lua 228 ●●●●● diff | view | raw | blame | history
technic/grinder.lua 583 ●●●●● diff | view | raw | blame | history
technic/grinder_gloopores.lua 10 ●●●●● diff | view | raw | blame | history
technic/init.lua 68 ●●●●● diff | view | raw | blame | history
technic/items.lua 21 ●●●●● diff | view | raw | blame | history
technic/lighting.lua 590 ●●●●● diff | view | raw | blame | history
technic/mining_drill.lua 28 ●●●●● diff | view | raw | blame | history
technic/mining_laser_mk1.lua 8 ●●●●● diff | view | raw | blame | history
technic/music_player.lua 246 ●●●●● diff | view | raw | blame | history
technic/power_radiator.lua 226 ●●●●● diff | view | raw | blame | history
technic/register_machine_and_tool.lua 70 ●●●●● diff | view | raw | blame | history
technic/solar_array_hv.lua 63 ●●●●● diff | view | raw | blame | history
technic/solar_array_lv.lua 78 ●●●●● diff | view | raw | blame | history
technic/solar_array_mv.lua 75 ●●●●● diff | view | raw | blame | history
technic/solar_panel.lua 27 ●●●●● diff | view | raw | blame | history
technic/solar_panel_mv.lua 78 ●●●●● diff | view | raw | blame | history
technic/sonic_screwdriver.lua 6 ●●●●● diff | view | raw | blame | history
technic/supply_converter.lua 232 ●●●●● diff | view | raw | blame | history
technic/switching_station.lua 352 ●●●●● diff | view | raw | blame | history
technic/textures/technic_enriched_uranium.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_cube_white_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_cube_white_sides_ceiling.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_cube_white_tb.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_cube_yellow_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_cube_yellow_sides_ceiling.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_cube_yellow_tb.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_thick_white_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_thick_white_wall_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_thick_yellow_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_thick_yellow_wall_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_thin_white_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_thin_white_wall_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_thin_yellow_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_thin_yellow_wall_sides.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_white_tb.png diff | view | raw | blame | history
technic/textures/technic_homedecor_glowlight_yellow_tb.png diff | view | raw | blame | history
technic/textures/technic_mv_solar_panel_bottom.png diff | view | raw | blame | history
technic/textures/technic_mv_solar_panel_side.png diff | view | raw | blame | history
technic/textures/technic_mv_solar_panel_top.png diff | view | raw | blame | history
technic/textures/technic_mv_solarpanel_bottom.png diff | view | raw | blame | history
technic/textures/technic_mv_solarpanel_side.png diff | view | raw | blame | history
technic/textures/technic_mv_solarpanel_top.png diff | view | raw | blame | history
technic/textures/technic_supply_converter_bottom.png diff | view | raw | blame | history
technic/textures/technic_supply_converter_side.png diff | view | raw | blame | history
technic/textures/technic_supply_converter_top.png diff | view | raw | blame | history
technic/textures/technicx32/technic_mv_solar_panel_bottom.png diff | view | raw | blame | history
technic/textures/technicx32/technic_mv_solar_panel_side.png diff | view | raw | blame | history
technic/textures/technicx32/technic_mv_solar_panel_top.png diff | view | raw | blame | history
technic/tool_workshop.lua 182 ●●●●● diff | view | raw | blame | history
technic/water_mill.lua 187 ●●●●● diff | view | raw | blame | history
technic_worldgen/depends.txt 1 ●●●●● diff | view | raw | blame | history
technic_worldgen/nodes.lua 2 ●●●●● diff | view | raw | blame | history
technic_worldgen/oregen.lua 4 ●●●●● diff | view | raw | blame | history
unified_inventory/api.lua 13 ●●●●● diff | view | raw | blame | history
unified_inventory/depends.txt 1 ●●●●● diff | view | raw | blame | history