RealBadAngel
2013-07-06 3a3700537baa748e459258385d27bb79ab391546
refs
author RealBadAngel <mk@realbadangel.pl>
Saturday, July 6, 2013 10:35 +0200
committer RealBadAngel <mk@realbadangel.pl>
Saturday, July 6, 2013 10:35 +0200
commit3a3700537baa748e459258385d27bb79ab391546
tree 2538bee6f5e4fc6c3dd2c64953b949604bd7bfae tree | zip | gz
parent b78b90d4223e01a5c8611105b125e91855bbf602 view | diff
Merge changes made in technic_game
27 files added
27 files modified
1179 ■■■■ changed files
item_drop/depends.txt 1 ●●●● diff | view | raw | blame | history
item_drop/init.lua 161 ●●●●● diff | view | raw | blame | history
item_drop/item_entity.lua 92 ●●●● diff | view | raw | blame | history
item_drop/item_entity_old.lua 126 ●●●●● diff | view | raw | blame | history
item_drop/sounds/item_drop_pickup.1.ogg diff | view | raw | blame | history
item_drop/sounds/item_drop_pickup.2.ogg diff | view | raw | blame | history
item_drop/sounds/item_drop_pickup.3.ogg diff | view | raw | blame | history
item_drop/sounds/item_drop_pickup.4.ogg diff | view | raw | blame | history
technic/alloy_furnace.lua 23 ●●●●● diff | view | raw | blame | history
technic/battery_box.lua 24 ●●●● diff | view | raw | blame | history
technic/chainsaw.lua 4 ●●●● diff | view | raw | blame | history
technic/electric.lua 12 ●●●● diff | view | raw | blame | history
technic/electric_furnace.lua 24 ●●●● diff | view | raw | blame | history
technic/generator.lua 4 ●●●● diff | view | raw | blame | history
technic/grinder.lua 26 ●●●●● diff | view | raw | blame | history
technic/mining_drill.lua 18 ●●●● diff | view | raw | blame | history
technic/mining_laser_mk1.lua 4 ●●●● diff | view | raw | blame | history
technic/music_player.lua 6 ●●●● diff | view | raw | blame | history
technic/tool_workshop.lua 4 ●●●● diff | view | raw | blame | history
technic/water_mill.lua 4 ●●●● diff | view | raw | blame | history
technic_chests/copper_chest.lua 32 ●●●●● diff | view | raw | blame | history
technic_chests/gold_chest.lua 473 ●●●●● diff | view | raw | blame | history
technic_chests/iron_chest.lua 22 ●●●●● diff | view | raw | blame | history
technic_chests/mithril_chest.lua 20 ●●●● diff | view | raw | blame | history
technic_chests/silver_chest.lua 92 ●●●●● diff | view | raw | blame | history
technic_worldgen/crafts.lua 7 ●●●●● diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton0.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton1.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton10.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton11.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton12.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton13.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton14.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton15.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton2.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton3.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton4.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton5.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton6.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton7.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton8.png diff | view | raw | blame | history
unified_inventory/textures/ui_colorbutton9.png diff | view | raw | blame | history
unified_inventory/textures/ui_copper_chest_inventory.png diff | view | raw | blame | history
unified_inventory/textures/ui_furnace_inventory.png diff | view | raw | blame | history
unified_inventory/textures/ui_gold_chest_inventory.png diff | view | raw | blame | history
unified_inventory/textures/ui_iron_chest_inventory.png diff | view | raw | blame | history
unified_inventory/textures/ui_lv_alloy_furnace.png diff | view | raw | blame | history
unified_inventory/textures/ui_lv_battery_box.png diff | view | raw | blame | history
unified_inventory/textures/ui_lv_electric_furnace.png diff | view | raw | blame | history
unified_inventory/textures/ui_lv_grinder.png diff | view | raw | blame | history
unified_inventory/textures/ui_main_inventory.png diff | view | raw | blame | history
unified_inventory/textures/ui_mithril_chest_inventory.png diff | view | raw | blame | history
unified_inventory/textures/ui_silver_chest_inventory.png diff | view | raw | blame | history
unified_inventory/textures/ui_wooden_chest_inventory.png diff | view | raw | blame | history