Merge changes made in technic_game
authorRealBadAngel <mk@realbadangel.pl>
Sat, 6 Jul 2013 08:35:48 +0000 (10:35 +0200)
committerRealBadAngel <mk@realbadangel.pl>
Sat, 6 Jul 2013 08:35:48 +0000 (10:35 +0200)
commit3a3700537baa748e459258385d27bb79ab391546
tree2538bee6f5e4fc6c3dd2c64953b949604bd7bfae
parentb78b90d4223e01a5c8611105b125e91855bbf602
Merge changes made in technic_game
54 files changed:
item_drop/depends.txt [new file with mode: 0644]
item_drop/init.lua
item_drop/item_entity.lua
item_drop/item_entity_old.lua [new file with mode: 0644]
item_drop/sounds/item_drop_pickup.1.ogg
item_drop/sounds/item_drop_pickup.2.ogg
item_drop/sounds/item_drop_pickup.3.ogg
item_drop/sounds/item_drop_pickup.4.ogg
technic/alloy_furnace.lua
technic/battery_box.lua
technic/chainsaw.lua
technic/electric.lua
technic/electric_furnace.lua
technic/generator.lua
technic/grinder.lua
technic/mining_drill.lua
technic/mining_laser_mk1.lua
technic/music_player.lua
technic/tool_workshop.lua
technic/water_mill.lua
technic_chests/copper_chest.lua
technic_chests/gold_chest.lua
technic_chests/iron_chest.lua
technic_chests/mithril_chest.lua
technic_chests/silver_chest.lua
technic_worldgen/crafts.lua
unified_inventory/textures/ui_colorbutton0.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton1.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton10.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton11.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton12.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton13.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton14.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton15.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton2.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton3.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton4.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton5.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton6.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton7.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton8.png [new file with mode: 0644]
unified_inventory/textures/ui_colorbutton9.png [new file with mode: 0644]
unified_inventory/textures/ui_copper_chest_inventory.png [new file with mode: 0644]
unified_inventory/textures/ui_furnace_inventory.png
unified_inventory/textures/ui_gold_chest_inventory.png [new file with mode: 0644]
unified_inventory/textures/ui_iron_chest_inventory.png [new file with mode: 0644]
unified_inventory/textures/ui_lv_alloy_furnace.png [new file with mode: 0644]
unified_inventory/textures/ui_lv_battery_box.png [new file with mode: 0644]
unified_inventory/textures/ui_lv_electric_furnace.png [new file with mode: 0644]
unified_inventory/textures/ui_lv_grinder.png [new file with mode: 0644]
unified_inventory/textures/ui_main_inventory.png
unified_inventory/textures/ui_mithril_chest_inventory.png [new file with mode: 0644]
unified_inventory/textures/ui_silver_chest_inventory.png [new file with mode: 0644]
unified_inventory/textures/ui_wooden_chest_inventory.png