From 7128c3d3f6b8ca01f1185ff565e7141650d0a00a Mon Sep 17 00:00:00 2001 From: Vincent Foulon Date: Sat, 10 Apr 2021 21:14:00 +0200 Subject: [PATCH] Asset reorganization + removed some unused and duplicates + reduce size of some images --- .../element/animation/buff_frame/1.png | 4 +- .../element/animation/buff_frame/2.png | 4 +- .../element/animation/buff_frame/3.png | 4 +- .../element/animation/buff_frame/4.png | 4 +- .../element/animation/buff_frame/5.png | 4 +- .../element/animation/buff_frame/6.png | 4 +- .../element/animation/buff_frame/7.png | 4 +- .../element/animation/buff_frame/8.png | 4 +- assets/voxygen/element/animation/gears/1.png | 3 - assets/voxygen/element/animation/gears/2.png | 3 - assets/voxygen/element/animation/gears/3.png | 3 - assets/voxygen/element/animation/gears/4.png | 3 - assets/voxygen/element/animation/gears/5.png | 3 - .../element/de_buffs/buff_campfire_heal_0.png | 3 + .../element/de_buffs/buff_damage_reduce_0.png | 3 + .../element/de_buffs/buff_energyplus_0.png | 3 + .../element/de_buffs/buff_healthplus_0.png | 3 + .../element/de_buffs/buff_invincibility_0.png | 3 + .../voxygen/element/de_buffs/buff_plus_0.png | 3 + .../element/de_buffs/buff_potion_0.png | 3 + .../element/de_buffs/buff_saturation_0.png | 3 + .../element/de_buffs/debuff_bleed_0.png | 3 + .../element/de_buffs/debuff_skull_0.png | 3 + assets/voxygen/element/icons/anvil.png | 3 - assets/voxygen/element/icons/axe.png | 3 - assets/voxygen/element/icons/bow.png | 3 - assets/voxygen/element/icons/bow_aoe.png | 3 - assets/voxygen/element/icons/daggers.png | 3 - .../icons/de_buffs/buff_campfire_heal_0.png | 3 - .../icons/de_buffs/buff_damage_reduce_0.png | 3 - .../icons/de_buffs/buff_energyplus_0.png | 3 - .../icons/de_buffs/buff_healthplus_0.png | 3 - .../icons/de_buffs/buff_invincibility_0.png | 3 - .../element/icons/de_buffs/buff_plus_0.png | 3 - .../element/icons/de_buffs/buff_potion_0.png | 3 - .../icons/de_buffs/buff_saturation_0.png | 3 - .../element/icons/de_buffs/debuff_bleed_0.png | 3 - .../element/icons/de_buffs/debuff_skull_0.png | 3 - assets/voxygen/element/icons/hammer.png | 3 - assets/voxygen/element/icons/heal_bomb.png | 3 - .../element/icons/item_bag_blue_face.png | 3 - .../element/icons/item_bag_brown_face.png | 3 - .../voxygen/element/icons/item_bag_large.png | 3 - .../element/icons/item_bag_leather_large.png | 3 - .../element/icons/item_bag_leather_small.png | 3 - assets/voxygen/element/icons/item_bag_med.png | 3 - .../element/icons/item_bag_red_face.png | 3 - .../voxygen/element/icons/item_bag_small.png | 3 - .../element/icons/item_bag_t1_purp.png | 3 - .../voxygen/element/icons/item_bag_tiny.png | 3 - assets/voxygen/element/icons/item_cloth0.png | 3 - .../voxygen/element/icons/item_cloth_red.png | 3 - .../element/icons/item_flayer_soul.png | 3 - .../voxygen/element/icons/item_ice_shard.png | 3 - .../voxygen/element/icons/item_leather0.png | 3 - .../voxygen/element/icons/item_leather1.png | 3 - .../element/icons/item_leather_green.png | 3 - .../element/icons/item_raptor_feather.png | 3 - .../element/icons/item_shroom_stick.png | 3 - .../element/icons/item_sunflower_tea.png | 3 - .../voxygen/element/icons/lantern_black-0.png | 3 - .../voxygen/element/icons/lantern_blue-0.png | 3 - .../voxygen/element/icons/lantern_green-0.png | 3 - .../voxygen/element/icons/lantern_grey-0.png | 3 - .../voxygen/element/icons/lantern_red-0.png | 3 - assets/voxygen/element/icons/lifesteal.png | 3 - assets/voxygen/element/icons/map.png | 3 - .../element/icons/missing_icon_grey.png | 3 - .../voxygen/element/icons/neck-seashell.png | 3 - assets/voxygen/element/icons/sceptre.png | 3 - .../voxygen/element/icons/skill_fire_aoe.png | 3 - .../element/icons/skill_flamethrower.png | 3 - assets/voxygen/element/icons/staff.png | 3 - assets/voxygen/element/icons/staff_m2.png | 3 - assets/voxygen/element/icons/sword.png | 3 - .../voxygen/element/icons/swords_crossed.png | 3 - assets/voxygen/element/icons/swordshield.png | 3 - assets/voxygen/element/icons/tabard_admin.png | 3 - .../voxygen/element/{icons => items}/coin.png | 0 .../element/{icons => items}/collar.png | 0 .../{icons => items}/head_leather-0.png | 0 .../element/{icons => items}/item_apple.png | 0 .../{icons => items}/item_apple_curry.png | 0 .../{icons => items}/item_apple_stick.png | 0 .../{icons => items}/item_bag_blue.png | 0 .../element/items/item_bag_blue_face.png | 3 + .../element/items/item_bag_brown_face.png | 3 + .../{icons => items}/item_bag_green_large.png | 0 .../{icons => items}/item_bag_green_mid.png | 0 .../voxygen/element/items/item_bag_large.png | 3 + .../element/items/item_bag_leather_large.png | 3 + .../element/items/item_bag_leather_small.png | 3 + assets/voxygen/element/items/item_bag_med.png | 3 + .../element/items/item_bag_red_face.png | 3 + .../{icons => items}/item_bag_skull.png | 0 .../voxygen/element/items/item_bag_small.png | 3 + .../element/items/item_bag_t1_purp.png | 3 + .../voxygen/element/items/item_bag_tiny.png | 3 + .../element/{icons => items}/item_cheese.png | 0 assets/voxygen/element/items/item_cloth0.png | 3 + .../voxygen/element/items/item_cloth_red.png | 3 + .../element/{icons => items}/item_coconut.png | 0 .../element/items/item_flayer_soul.png | 3 + .../element/{icons => items}/item_flower.vox | 0 .../element/{icons => items}/item_grass.vox | 0 .../element/{icons => items}/item_honey.png | 0 .../voxygen/element/items/item_ice_shard.png | 3 + .../voxygen/element/items/item_leather0.png | 3 + .../voxygen/element/items/item_leather1.png | 3 + .../element/items/item_leather_green.png | 3 + .../item_mortarpestlecoco.png | 0 .../element/items/item_raptor_feather.png | 3 + .../element/items/item_shroom_stick.png | 3 + .../element/items/item_sunflower_tea.png | 3 + .../voxygen/element/items/lantern_black-0.png | 3 + .../voxygen/element/items/lantern_blue-0.png | 3 + .../voxygen/element/items/lantern_green-0.png | 3 + .../voxygen/element/items/lantern_grey-0.png | 3 + .../voxygen/element/items/lantern_red-0.png | 3 + .../element/{icons => items}/neck-0.png | 0 .../element/{icons => items}/neck-1.png | 0 .../voxygen/element/items/neck-seashell.png | 3 + .../element/{icons => items}/ring-0.png | 0 .../element/{icons => items}/sewing_set.png | 0 assets/voxygen/element/items/tabard_admin.png | 3 + assets/voxygen/element/misc_bg/window.png | 3 - assets/voxygen/element/missing_icon_grey.png | 3 + assets/voxygen/element/not_found.png | 4 +- .../element/{icons => skills}/2haxe_m1.png | 0 .../element/{icons => skills}/2hhammer_m1.png | 0 .../element/{icons => skills}/2hsword_m1.png | 0 .../element/{icons => skills}/2hsword_m2.png | 0 .../element/{icons => skills}/bow_m1.png | 0 .../element/{icons => skills}/bow_m2.png | 0 .../element/{icons => skills}/bow_m2.vox | 0 .../{icons => skills}/debug_wand_m1.png | 0 .../{icons => skills}/debug_wand_m2.png | 0 .../element/{icons => skills}/heal_0.png | 0 assets/voxygen/element/skills/heal_bomb.png | 3 + assets/voxygen/element/skills/lifesteal.png | 3 + .../{icons => skills}/sceptre_protection.png | 0 .../skill_axe_leap_slash.png | 0 .../{icons => skills}/skill_axespin.png | 0 .../skill_bow_jump_burst.png | 0 .../voxygen/element/skills/skill_fire_aoe.png | 3 + .../element/skills/skill_flamethrower.png | 3 + .../{icons => skills}/skill_hammergolf.png | 0 .../{icons => skills}/skill_hammerleap.png | 0 .../{icons => skills}/skill_slice_2.png | 0 .../{icons => skills}/skill_sword_pierce.png | 0 .../skilltree/buff_amount.png | 0 .../skilltree/buff_combo.png | 0 .../{icons => skills}/skilltree/buff_cost.png | 0 .../skilltree/buff_damage.png | 0 .../skilltree/buff_distance.png | 0 .../skilltree/buff_duration.png | 0 .../skilltree/buff_energy_drain.png | 0 .../skilltree/buff_energy_regen.png | 0 .../skilltree/buff_explosion.png | 0 .../{icons => skills}/skilltree/buff_heal.png | 0 .../skilltree/buff_helicopter.png | 0 .../skilltree/buff_infinite.png | 0 .../skilltree/buff_knockback.png | 0 .../skilltree/buff_lifesteal.png | 0 .../skilltree/buff_projectile_speed.png | 0 .../skilltree/buff_radius.png | 0 .../skilltree/buff_speed.png | 0 .../skilltree/debuff_amount.png | 0 .../skilltree/debuff_combo.png | 0 .../skilltree/debuff_cost.png | 0 .../skilltree/debuff_damage.png | 0 .../skilltree/debuff_distance.png | 0 .../skilltree/debuff_duration.png | 0 .../skilltree/debuff_energy_drain.png | 0 .../skilltree/debuff_energy_regen.png | 0 .../skilltree/debuff_explosion.png | 0 .../skilltree/debuff_heal.png | 0 .../skilltree/debuff_helicopter.png | 0 .../skilltree/debuff_infinite.png | 0 .../skilltree/debuff_knockback.png | 0 .../skilltree/debuff_lifesteal.png | 0 .../skilltree/debuff_projectile_speed.png | 0 .../skilltree/debuff_radius.png | 0 .../skilltree/debuff_speed.png | 0 .../skilltree/heal_amount.png | 0 .../skilltree/heal_combo.png | 0 .../{icons => skills}/skilltree/heal_cost.png | 0 .../skilltree/heal_damage.png | 0 .../skilltree/heal_distance.png | 0 .../skilltree/heal_duration.png | 0 .../skilltree/heal_energy_drain.png | 0 .../skilltree/heal_energy_regen.png | 0 .../skilltree/heal_explosion.png | 0 .../{icons => skills}/skilltree/heal_heal.png | 0 .../skilltree/heal_helicopter.png | 0 .../skilltree/heal_infinite.png | 0 .../skilltree/heal_knockback.png | 0 .../skilltree/heal_lifesteal.png | 0 .../skilltree/heal_projectile_speed.png | 0 .../skilltree/heal_radius.png | 0 .../skilltree/heal_speed.png | 0 .../skilltree/health_plus.png | 0 .../skilltree/magic_amount.png | 0 .../skilltree/magic_combo.png | 0 .../skilltree/magic_cost.png | 0 .../skilltree/magic_damage.png | 0 .../skilltree/magic_distance.png | 0 .../skilltree/magic_duration.png | 0 .../skilltree/magic_energy_drain.png | 0 .../skilltree/magic_energy_regen.png | 0 .../skilltree/magic_explosion.png | 0 .../skilltree/magic_heal.png | 0 .../skilltree/magic_helicopter.png | 0 .../skilltree/magic_infinite.png | 0 .../skilltree/magic_knockback.png | 0 .../skilltree/magic_lifesteal.png | 0 .../skilltree/magic_projectile_speed.png | 0 .../skilltree/magic_radius.png | 0 .../skilltree/magic_speed.png | 0 .../skilltree/physical_amount.png | 0 .../skilltree/physical_combo.png | 0 .../skilltree/physical_cost.png | 0 .../skilltree/physical_damage.png | 0 .../skilltree/physical_distance.png | 0 .../skilltree/physical_duration.png | 0 .../skilltree/physical_energy_drain.png | 0 .../skilltree/physical_energy_regen.png | 0 .../skilltree/physical_explosion.png | 0 .../skilltree/physical_heal.png | 0 .../skilltree/physical_helicopter.png | 0 .../skilltree/physical_infinite.png | 0 .../skilltree/physical_knockback.png | 0 .../skilltree/physical_lifesteal.png | 0 .../skilltree/physical_projectile_speed.png | 0 .../skilltree/physical_radius.png | 0 .../skilltree/physical_speed.png | 0 .../skilltree/skill_climbing.png | 0 .../skilltree/skill_dodge.png | 0 .../skilltree/skill_swim.png | 0 .../skilltree/stamina_plus.png | 0 .../skilltree/unlock_axe.png | 0 .../skilltree/unlock_bow.png | 0 .../skilltree/unlock_hammer.png | 0 .../skilltree/unlock_sceptre.png | 0 .../skilltree/unlock_staff-0.png | 0 .../skilltree/unlock_sword.png | 0 .../skilltree/utility_amount.png | 0 .../skilltree/utility_combo.png | 0 .../skilltree/utility_cost.png | 0 .../skilltree/utility_damage.png | 0 .../skilltree/utility_distance.png | 0 .../skilltree/utility_duration.png | 0 .../skilltree/utility_energy_drain.png | 0 .../skilltree/utility_energy_regen.png | 0 .../skilltree/utility_explosion.png | 0 .../skilltree/utility_heal.png | 0 .../skilltree/utility_helicopter.png | 0 .../skilltree/utility_infinite.png | 0 .../skilltree/utility_knockback.png | 0 .../skilltree/utility_lifesteal.png | 0 .../skilltree/utility_projectile_speed.png | 0 .../skilltree/utility_radius.png | 0 .../skilltree/utility_speed.png | 0 .../element/{icons => skills}/snake.png | 0 .../element/{icons => skills}/snake_green.png | 0 .../element/{icons => skills}/staff_m1.png | 0 assets/voxygen/element/skills/staff_m2.png | 3 + .../{icons => skills}/sword_whirlwind.png | 0 .../{icons => ui/bag/backgrounds}/back.png | 0 .../{icons => ui/bag/backgrounds}/bag.png | 0 .../{icons => ui/bag/backgrounds}/belt.png | 0 .../{icons => ui/bag/backgrounds}/chest.png | 0 .../{icons => ui/bag/backgrounds}/feet.png | 0 .../{icons => ui/bag/backgrounds}/glider.png | 0 .../{icons => ui/bag/backgrounds}/hands.png | 0 .../{icons => ui/bag/backgrounds}/head.png | 0 .../{icons => ui/bag/backgrounds}/lantern.png | 0 .../{icons => ui/bag/backgrounds}/legs.png | 0 .../bag/backgrounds}/mainhand.png | 0 .../bag/backgrounds}/necklace.png | 0 .../{icons => ui/bag/backgrounds}/offhand.png | 0 .../{icons => ui/bag/backgrounds}/ring.png | 0 .../bag/backgrounds}/shoulders.png | 0 .../{icons => ui/bag/backgrounds}/tabard.png | 0 .../{ => ui/bag}/buttons/inv_collapse.png | 0 .../bag}/buttons/inv_collapse_hover.png | 0 .../bag}/buttons/inv_collapse_press.png | 0 .../{ => ui/bag}/buttons/inv_expand.png | 0 .../{ => ui/bag}/buttons/inv_expand_hover.png | 0 .../{ => ui/bag}/buttons/inv_expand_press.png | 0 .../element/{ => ui/bag}/buttons/inv_slot.png | 0 .../{ => ui/bag}/buttons/inv_slot_blue.png | 0 .../{ => ui/bag}/buttons/inv_slot_gold.png | 0 .../{ => ui/bag}/buttons/inv_slot_green.png | 0 .../{ => ui/bag}/buttons/inv_slot_grey.png | 0 .../{ => ui/bag}/buttons/inv_slot_orange.png | 0 .../{ => ui/bag}/buttons/inv_slot_purple.png | 0 .../{ => ui/bag}/buttons/inv_slot_red.png | 0 .../{ => ui/bag}/buttons/inv_slot_sel.png | 0 .../{ => ui/bag}/buttons/inv_tab_active.png | 0 .../{ => ui/bag}/buttons/inv_tab_inactive.png | 0 .../bag}/buttons/inv_tab_inactive_hover.png | 0 .../bag}/buttons/inv_tab_inactive_press.png | 0 .../element/{ => ui/bag}/icons/character.png | 0 .../{ => ui/bag}/icons/combat_rating.png | 0 .../bag}/icons/combat_rating_shadow.png | 0 .../element/{ => ui/bag}/icons/health.png | 0 .../element/{ => ui/bag}/icons/protection.png | 0 .../element/{ => ui/bag}/icons/stamina.png | 0 .../element/{ => ui/bag}/icons/stun_res.png | 0 .../element/{misc_bg => ui/bag}/inv_bg_0.png | 0 .../element/{misc_bg => ui/bag}/inv_bg_1.png | 0 .../{misc_bg => ui/bag}/inv_bg_bag.png | 0 .../element/{misc_bg => ui/bag}/inv_frame.png | 0 .../{misc_bg => ui/bag}/inv_frame_bag.png | 0 .../{ => ui/char_select}/icons/dice.png | 0 .../{ => ui/char_select}/icons/dice_hover.png | 0 .../{ => ui/char_select}/icons/dice_press.png | 0 .../char_select/portraits}/danari_f.png | 0 .../char_select/portraits}/danari_m.png | 0 .../char_select/portraits}/dwarf_f.png | 0 .../char_select/portraits}/dwarf_m.png | 0 .../char_select/portraits}/elf_f.png | 0 .../char_select/portraits}/elf_m.png | 0 .../char_select/portraits}/human_f.png | 0 .../char_select/portraits}/human_m.png | 0 .../char_select/portraits}/orc_f.png | 0 .../char_select/portraits}/orc_m.png | 0 .../char_select/portraits}/ud_f.png | 0 .../char_select/portraits}/ud_m.png | 0 .../chat/icons}/command_error_small.png | 0 .../chat/icons}/command_info_small.png | 0 .../{icons/chat => ui/chat/icons}/faction.png | 0 .../chat => ui/chat/icons}/faction_small.png | 0 .../{icons/chat => ui/chat/icons}/group.png | 0 .../chat => ui/chat/icons}/group_small.png | 0 .../chat => ui/chat/icons}/kill_small.png | 0 .../chat => ui/chat/icons}/loot_small.png | 0 .../chat => ui/chat/icons}/offline_small.png | 0 .../chat => ui/chat/icons}/online_small.png | 0 .../chat => ui/chat/icons}/private_small.png | 0 .../{icons/chat => ui/chat/icons}/region.png | 0 .../chat => ui/chat/icons}/region_small.png | 0 .../{icons/chat => ui/chat/icons}/say.png | 0 .../chat => ui/chat/icons}/say_small.png | 0 .../{icons/chat => ui/chat/icons}/tell.png | 0 .../chat => ui/chat/icons}/tell_small.png | 0 .../{icons/chat => ui/chat/icons}/world.png | 0 .../chat => ui/chat/icons}/world_small.png | 0 .../{misc_bg => ui/crafting}/crafting.png | 0 .../crafting}/crafting_frame.png | 0 .../{ => ui/crafting}/icons/armors.png | 0 .../crafting}/icons/crafting_tools.png | 0 .../{ => ui/crafting}/icons/dismantle.png | 0 .../element/{ => ui/crafting}/icons/foods.png | 0 .../{ => ui/crafting}/icons/gliders.png | 0 .../element/{ => ui/crafting}/icons/globe.png | 0 .../{ => ui/crafting}/icons/globe_2.png | 0 .../{ => ui/crafting}/icons/potions.png | 0 .../{ => ui/crafting}/icons/utilities.png | 0 .../{ => ui/crafting}/icons/weapons.png | 0 .../{ => ui/diary}/buttons/border_skills.png | 0 .../{icons => ui/diary/buttons}/lock.png | 0 .../{ => ui/diary}/buttons/slot_skilltree.png | 0 .../{misc_bg => ui/diary}/diary_bg.png | 0 .../{misc_bg => ui/diary}/diary_exp_bg.png | 0 .../{misc_bg => ui/diary}/diary_exp_frame.png | 0 .../{misc_bg => ui/diary}/diary_frame.png | 0 .../element/{misc_bg => ui/diary}/pixel.png | 0 .../{ => ui/generic}/buttons/anvil.png | 0 .../{ => ui/generic}/buttons/anvil_hover.png | 0 .../{ => ui/generic}/buttons/anvil_press.png | 0 .../{ => ui/generic}/buttons/armor_slot.png | 0 .../generic}/buttons/armor_slot_empty.png | 0 .../generic}/buttons/armor_slot_selected.png | 0 .../{ => ui/generic}/buttons/arrow_down.png | 0 .../{ => ui/generic}/buttons/arrow_down.vox | 0 .../generic}/buttons/arrow_down_gold.png | 0 .../generic}/buttons/arrow_down_hover.png | 0 .../generic}/buttons/arrow_down_hover.vox | 0 .../generic}/buttons/arrow_down_press.png | 0 .../generic}/buttons/arrow_down_press.vox | 0 .../{ => ui/generic}/buttons/bag/closed.png | 0 .../generic}/buttons/bag/closed_hover.png | 0 .../generic}/buttons/bag/closed_press.png | 0 .../{ => ui/generic}/buttons/bag/open.png | 0 .../generic}/buttons/bag/open_hover.png | 0 .../generic}/buttons/bag/open_press.png | 0 .../{ => ui/generic}/buttons/border.png | 0 .../{ => ui/generic}/buttons/border_mo.png | 0 .../{ => ui/generic}/buttons/border_press.png | 0 .../generic}/buttons/border_pressed.png | 0 .../{ => ui/generic}/buttons/button.png | 0 .../{ => ui/generic}/buttons/button_hover.png | 0 .../{ => ui/generic}/buttons/button_press.png | 0 .../generic}/buttons/checkbox/active.png | 0 .../generic}/buttons/checkbox/hover.png | 0 .../generic}/buttons/checkbox/inactive.png | 0 .../buttons/checkbox/inactive_hover.png | 0 .../generic}/buttons/checkbox/press.png | 0 .../{ => ui/generic}/buttons/close_btn.png | 0 .../generic}/buttons/close_btn_hover.png | 0 .../generic}/buttons/close_btn_press.png | 0 .../{ => ui/generic}/buttons/group.png | 0 .../{ => ui/generic}/buttons/group_hover.png | 0 .../{ => ui/generic}/buttons/group_press.png | 0 .../{ => ui/generic}/buttons/key_button.png | 0 .../generic}/buttons/key_button_press.png | 0 .../element/{ => ui/generic}/buttons/map.png | 0 .../{ => ui/generic}/buttons/map_hover.png | 0 .../{ => ui/generic}/buttons/map_press.png | 0 .../{ => ui/generic}/buttons/radio/active.png | 0 .../{ => ui/generic}/buttons/radio/hover.png | 0 .../generic}/buttons/radio/inactive.png | 0 .../generic}/buttons/radio/inactive_hover.png | 0 .../{ => ui/generic}/buttons/radio/press.png | 0 .../{ => ui/generic}/buttons/search_btn.png | 0 .../generic}/buttons/search_btn_hover.png | 0 .../generic}/buttons/search_btn_press.png | 0 .../{ => ui/generic}/buttons/settings.png | 0 .../generic}/buttons/settings_hover.png | 0 .../generic}/buttons/settings_press.png | 0 .../{ => ui/generic}/buttons/social.png | 0 .../{ => ui/generic}/buttons/social_hover.png | 0 .../{ => ui/generic}/buttons/social_press.png | 0 .../{ => ui/generic}/buttons/spellbook.png | 0 .../generic}/buttons/spellbook_hover.png | 0 .../generic}/buttons/spellbook_press.png | 0 .../{ => ui/generic}/buttons/x_red.png | 0 .../{ => ui/generic}/buttons/x_red_hover.png | 0 .../{ => ui/generic}/buttons/x_red_press.png | 0 .../{misc_bg => ui/generic}/fireplace.png | 0 .../{ => ui/generic}/frames/banner_bot.png | 0 .../frames/banner_gradient_bottom.png | 0 .../generic}/frames/banner_small_top.png | 0 .../{ => ui/generic}/frames/banner_top.png | 0 .../{ => ui/generic}/frames/bubble/bottom.png | 0 .../generic}/frames/bubble/bottom_left.png | 0 .../generic}/frames/bubble/bottom_right.png | 0 .../{ => ui/generic}/frames/bubble/left.png | 0 .../{ => ui/generic}/frames/bubble/mid.png | 0 .../{ => ui/generic}/frames/bubble/right.png | 0 .../{ => ui/generic}/frames/bubble/tail.png | 0 .../{ => ui/generic}/frames/bubble/top.png | 0 .../generic}/frames/bubble/top_left.png | 0 .../generic}/frames/bubble/top_right.png | 0 .../generic}/frames/bubble_dark/bottom.png | 0 .../frames/bubble_dark/bottom_left.png | 0 .../frames/bubble_dark/bottom_right.png | 0 .../frames/bubble_dark/icon_frame.png | 0 .../generic}/frames/bubble_dark/left.png | 0 .../generic}/frames/bubble_dark/mid.png | 0 .../generic}/frames/bubble_dark/right.png | 0 .../generic}/frames/bubble_dark/tail.png | 0 .../generic}/frames/bubble_dark/top.png | 0 .../generic}/frames/bubble_dark/top_left.png | 0 .../generic}/frames/bubble_dark/top_right.png | 0 .../{ => ui/generic}/frames/disclaimer.png | 0 .../{ => ui/generic}/frames/divider.vox | 0 .../generic}/frames/divider_charwindow.vox | 0 .../{ => ui/generic}/frames/enemybar.png | 0 .../{ => ui/generic}/frames/enemybar_1.png | 0 .../{ => ui/generic}/frames/enemybar_bg.png | 0 .../{ => ui/generic}/frames/enemybar_bg_1.png | 0 .../{ => ui/generic}/frames/esc_menu.png | 0 .../generic}/frames/frame_art/frame-b_l.vox | 0 .../generic}/frames/frame_art/frame-b_r.vox | 0 .../generic}/frames/frame_art/frame-t_l.vox | 0 .../generic}/frames/frame_art/frame-t_r.vox | 0 .../{ => ui/generic}/frames/info_frame.vox | 0 .../frames/loading_screen/loading_bg.png | 0 .../frames/loading_screen/loading_bg_l.png | 0 .../frames/loading_screen/loading_bg_r.png | 0 .../generic}/frames/prompt_dialog_bot.png | 0 .../generic}/frames/prompt_dialog_mid.png | 0 .../generic}/frames/prompt_dialog_top.png | 0 .../{ => ui/generic}/frames/selection.png | 0 .../generic}/frames/selection_frame.png | 0 .../generic}/frames/selection_hover.png | 0 .../generic}/frames/selection_press.png | 0 .../{ => ui/generic}/frames/social_frame.png | 0 .../generic}/frames/tooltip/corner.png | 0 .../{ => ui/generic}/frames/tooltip/edge.png | 0 .../generic}/frames/tt_test_corner_tr.png | 0 .../{ => ui/generic}/frames/tt_test_edge.png | 0 .../{ => ui/generic}/frames/window_3.png | 0 .../{ => ui/generic}/frames/xp_charwindow.vox | 0 .../element/{ => ui/generic}/icons/m1.png | 0 .../element/{ => ui/generic}/icons/m2.png | 0 .../element/{ => ui/generic}/icons/m_move.png | 0 .../{ => ui/generic}/icons/m_scroll.png | 0 .../element/{ => ui/generic}/icons/skull.png | 0 .../{ => ui/generic}/icons/skull_2.png | 0 .../{ => ui/generic}/slider/indicator.png | 0 .../generic}/slider/indicator_round.png | 0 .../{ => ui/generic}/slider/scrollbar.png | 0 .../{ => ui/generic}/slider/scrollbar_1.png | 0 .../element/{ => ui/generic}/slider/track.png | 0 .../{misc_bg => ui/generic}/textbox.png | 0 .../{frames => ui/groups}/group_member_bg.png | 0 .../groups}/group_member_frame.png | 0 .../{misc_bg => ui/invite}/progress.png | 0 .../{frames => ui/invite}/progress_bar.png | 0 .../{map => ui/map/buttons}/castle.png | 0 .../{map => ui/map/buttons}/castle_bg.png | 0 .../{map => ui/map/buttons}/castle_hover.png | 0 .../element/{map => ui/map/buttons}/cave.png | 0 .../{map => ui/map/buttons}/cave_bg.png | 0 .../{map => ui/map/buttons}/cave_hover.png | 0 .../{map => ui/map/buttons}/dungeon.png | 0 .../{map => ui/map/buttons}/dungeon_bg.png | 0 .../{map => ui/map/buttons}/dungeon_bg2.png | 0 .../{map => ui/map/buttons}/dungeon_hover.png | 0 .../element/{map => ui/map/buttons}/excl.png | 0 .../map/buttons}/group_indicator.png | 0 .../buttons}/group_indicator_arrow_down.png | 0 .../map/buttons}/group_indicator_arrow_up.png | 0 .../map/buttons}/group_indicator_hover.png | 0 .../{ => ui/map}/buttons/map_modes.png | 0 .../{map => ui/map/buttons}/topographic.png | 0 .../element/{map => ui/map/buttons}/town.png | 0 .../{map => ui/map/buttons}/town_bg.png | 0 .../{map => ui/map/buttons}/town_hover.png | 0 .../element/{map => ui/map/buttons}/tree.png | 0 .../{map => ui/map/buttons}/tree_hover.png | 0 .../element/{map => ui/map/icons}/dif_1.png | 0 .../element/{map => ui/map/icons}/dif_2.png | 0 .../element/{map => ui/map/icons}/dif_3.png | 0 .../element/{map => ui/map/icons}/dif_4.png | 0 .../element/{map => ui/map/icons}/dif_5.png | 0 .../element/{map => ui/map/icons}/dif_6.png | 0 .../element/{misc_bg => ui/map}/map_bg.png | 0 .../element/{misc_bg => ui/map}/map_frame.png | 0 .../{misc_bg => ui/map}/map_frame_art.png | 0 .../minimap}/buttons/button_mmap_closed.png | 0 .../buttons/button_mmap_closed_hover.png | 0 .../buttons/button_mmap_closed_press.png | 0 .../minimap}/buttons/button_mmap_open.png | 0 .../buttons/button_mmap_open_hover.png | 0 .../buttons/button_mmap_open_press.png | 0 .../minimap/buttons}/mmap_button-min.png | 0 .../buttons}/mmap_button-min_hover.png | 0 .../buttons}/mmap_button-min_press.png | 0 .../minimap/buttons}/mmap_button-north.png | 0 .../buttons}/mmap_button-north_hover.png | 0 .../buttons}/mmap_button-north_press.png | 0 .../mmap_button-north_press_hover.png | 0 .../minimap/buttons}/mmap_button-plus.png | 0 .../buttons}/mmap_button-plus_hover.png | 0 .../buttons}/mmap_button-plus_press.png | 0 .../minimap/icons}/indicator_mmap.png | 0 .../minimap/icons}/indicator_mmap_small.png | 0 .../element/{frames => ui/minimap}/mmap.png | 0 .../{frames => ui/minimap}/mmap_closed.png | 0 .../{frames => ui/minimap}/mmap_frame.png | 0 .../{misc_bg => ui/quests}/temp_quest_bg.png | 0 .../settings}/buttons/settings_button.png | 0 .../buttons/settings_button_hover.png | 0 .../buttons/settings_button_press.png | 0 .../buttons/settings_button_pressed.png | 0 .../settings/icons}/crosshair_bg.png | 0 .../settings/icons}/crosshair_bg_hover.png | 0 .../settings/icons}/crosshair_bg_press.png | 0 .../settings/icons}/crosshair_bg_pressed.png | 0 .../settings/icons}/crosshair_inner.png | 0 .../settings/icons}/crosshair_outer_1.png | 0 .../settings/icons}/crosshair_outer_2.png | 0 .../settings/icons}/crosshair_outer_3.png | 0 .../{misc_bg => ui/settings}/settings_bg.png | 0 .../settings}/settings_frame.png | 0 .../element/{ => ui}/skillbar/bar_content.png | 0 .../voxygen/element/{ => ui}/skillbar/bg.png | 0 .../element/{ => ui}/skillbar/decayed_bg.png | 0 .../{ => ui}/skillbar/enemy_bar_content.png | 0 .../element/{ => ui}/skillbar/frame.png | 0 .../element/{ => ui}/skillbar/health_bg.png | 0 .../{ => ui}/skillbar/health_frame.png | 0 .../{misc_bg => ui/skillbar}/level_up.png | 0 .../element/{ => ui}/skillbar/slot.png | 0 .../element/{ => ui}/skillbar/stamina_bg.png | 0 .../{ => ui}/skillbar/stamina_frame.png | 0 .../{misc_bg => ui/social}/social_bg.png | 0 .../{misc_bg => ui/social}/social_frame.png | 0 .../social}/social_tab_active.png | 0 .../social}/social_tab_inactive.png | 0 .../social}/social_tab_online.png | 0 assets/voxygen/element/weapons/axe.png | 3 + assets/voxygen/element/weapons/bow.png | 3 + assets/voxygen/element/weapons/daggers.png | 3 + assets/voxygen/element/weapons/hammer.png | 3 + assets/voxygen/element/weapons/sceptre.png | 3 + assets/voxygen/element/weapons/staff.png | 3 + assets/voxygen/element/weapons/sword.png | 3 + .../element/weapons/swords_crossed.png | 3 + .../voxygen/element/weapons/swordshield.png | 3 + assets/voxygen/item_image_manifest.ron | 78 +- list.txt | 554 +++++++++++ search-item.sh | 7 + voxygen/src/hud/img_ids.rs | 888 +++++++++--------- voxygen/src/menu/char_selection/ui/mod.rs | 80 +- voxygen/src/menu/main/ui/mod.rs | 24 +- voxygen/src/ui/img_ids.rs | 5 +- 602 files changed, 1274 insertions(+), 737 deletions(-) delete mode 100644 assets/voxygen/element/animation/gears/1.png delete mode 100644 assets/voxygen/element/animation/gears/2.png delete mode 100644 assets/voxygen/element/animation/gears/3.png delete mode 100644 assets/voxygen/element/animation/gears/4.png delete mode 100644 assets/voxygen/element/animation/gears/5.png create mode 100644 assets/voxygen/element/de_buffs/buff_campfire_heal_0.png create mode 100644 assets/voxygen/element/de_buffs/buff_damage_reduce_0.png create mode 100644 assets/voxygen/element/de_buffs/buff_energyplus_0.png create mode 100644 assets/voxygen/element/de_buffs/buff_healthplus_0.png create mode 100644 assets/voxygen/element/de_buffs/buff_invincibility_0.png create mode 100644 assets/voxygen/element/de_buffs/buff_plus_0.png create mode 100644 assets/voxygen/element/de_buffs/buff_potion_0.png create mode 100644 assets/voxygen/element/de_buffs/buff_saturation_0.png create mode 100644 assets/voxygen/element/de_buffs/debuff_bleed_0.png create mode 100644 assets/voxygen/element/de_buffs/debuff_skull_0.png delete mode 100644 assets/voxygen/element/icons/anvil.png delete mode 100644 assets/voxygen/element/icons/axe.png delete mode 100644 assets/voxygen/element/icons/bow.png delete mode 100644 assets/voxygen/element/icons/bow_aoe.png delete mode 100644 assets/voxygen/element/icons/daggers.png delete mode 100644 assets/voxygen/element/icons/de_buffs/buff_campfire_heal_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/buff_damage_reduce_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/buff_energyplus_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/buff_healthplus_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/buff_plus_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/buff_potion_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/buff_saturation_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/debuff_bleed_0.png delete mode 100644 assets/voxygen/element/icons/de_buffs/debuff_skull_0.png delete mode 100644 assets/voxygen/element/icons/hammer.png delete mode 100644 assets/voxygen/element/icons/heal_bomb.png delete mode 100644 assets/voxygen/element/icons/item_bag_blue_face.png delete mode 100644 assets/voxygen/element/icons/item_bag_brown_face.png delete mode 100644 assets/voxygen/element/icons/item_bag_large.png delete mode 100644 assets/voxygen/element/icons/item_bag_leather_large.png delete mode 100644 assets/voxygen/element/icons/item_bag_leather_small.png delete mode 100644 assets/voxygen/element/icons/item_bag_med.png delete mode 100644 assets/voxygen/element/icons/item_bag_red_face.png delete mode 100644 assets/voxygen/element/icons/item_bag_small.png delete mode 100644 assets/voxygen/element/icons/item_bag_t1_purp.png delete mode 100755 assets/voxygen/element/icons/item_bag_tiny.png delete mode 100644 assets/voxygen/element/icons/item_cloth0.png delete mode 100644 assets/voxygen/element/icons/item_cloth_red.png delete mode 100644 assets/voxygen/element/icons/item_flayer_soul.png delete mode 100644 assets/voxygen/element/icons/item_ice_shard.png delete mode 100644 assets/voxygen/element/icons/item_leather0.png delete mode 100644 assets/voxygen/element/icons/item_leather1.png delete mode 100644 assets/voxygen/element/icons/item_leather_green.png delete mode 100644 assets/voxygen/element/icons/item_raptor_feather.png delete mode 100644 assets/voxygen/element/icons/item_shroom_stick.png delete mode 100644 assets/voxygen/element/icons/item_sunflower_tea.png delete mode 100644 assets/voxygen/element/icons/lantern_black-0.png delete mode 100644 assets/voxygen/element/icons/lantern_blue-0.png delete mode 100644 assets/voxygen/element/icons/lantern_green-0.png delete mode 100644 assets/voxygen/element/icons/lantern_grey-0.png delete mode 100644 assets/voxygen/element/icons/lantern_red-0.png delete mode 100644 assets/voxygen/element/icons/lifesteal.png delete mode 100644 assets/voxygen/element/icons/map.png delete mode 100644 assets/voxygen/element/icons/missing_icon_grey.png delete mode 100644 assets/voxygen/element/icons/neck-seashell.png delete mode 100644 assets/voxygen/element/icons/sceptre.png delete mode 100644 assets/voxygen/element/icons/skill_fire_aoe.png delete mode 100644 assets/voxygen/element/icons/skill_flamethrower.png delete mode 100644 assets/voxygen/element/icons/staff.png delete mode 100644 assets/voxygen/element/icons/staff_m2.png delete mode 100644 assets/voxygen/element/icons/sword.png delete mode 100644 assets/voxygen/element/icons/swords_crossed.png delete mode 100644 assets/voxygen/element/icons/swordshield.png delete mode 100644 assets/voxygen/element/icons/tabard_admin.png rename assets/voxygen/element/{icons => items}/coin.png (100%) rename assets/voxygen/element/{icons => items}/collar.png (100%) rename assets/voxygen/element/{icons => items}/head_leather-0.png (100%) rename assets/voxygen/element/{icons => items}/item_apple.png (100%) rename assets/voxygen/element/{icons => items}/item_apple_curry.png (100%) rename assets/voxygen/element/{icons => items}/item_apple_stick.png (100%) rename assets/voxygen/element/{icons => items}/item_bag_blue.png (100%) create mode 100644 assets/voxygen/element/items/item_bag_blue_face.png create mode 100644 assets/voxygen/element/items/item_bag_brown_face.png rename assets/voxygen/element/{icons => items}/item_bag_green_large.png (100%) rename assets/voxygen/element/{icons => items}/item_bag_green_mid.png (100%) create mode 100644 assets/voxygen/element/items/item_bag_large.png create mode 100644 assets/voxygen/element/items/item_bag_leather_large.png create mode 100644 assets/voxygen/element/items/item_bag_leather_small.png create mode 100644 assets/voxygen/element/items/item_bag_med.png create mode 100644 assets/voxygen/element/items/item_bag_red_face.png rename assets/voxygen/element/{icons => items}/item_bag_skull.png (100%) create mode 100644 assets/voxygen/element/items/item_bag_small.png create mode 100644 assets/voxygen/element/items/item_bag_t1_purp.png create mode 100644 assets/voxygen/element/items/item_bag_tiny.png rename assets/voxygen/element/{icons => items}/item_cheese.png (100%) create mode 100644 assets/voxygen/element/items/item_cloth0.png create mode 100644 assets/voxygen/element/items/item_cloth_red.png rename assets/voxygen/element/{icons => items}/item_coconut.png (100%) create mode 100644 assets/voxygen/element/items/item_flayer_soul.png rename assets/voxygen/element/{icons => items}/item_flower.vox (100%) rename assets/voxygen/element/{icons => items}/item_grass.vox (100%) rename assets/voxygen/element/{icons => items}/item_honey.png (100%) create mode 100644 assets/voxygen/element/items/item_ice_shard.png create mode 100644 assets/voxygen/element/items/item_leather0.png create mode 100644 assets/voxygen/element/items/item_leather1.png create mode 100644 assets/voxygen/element/items/item_leather_green.png rename assets/voxygen/element/{icons => items}/item_mortarpestlecoco.png (100%) create mode 100644 assets/voxygen/element/items/item_raptor_feather.png create mode 100644 assets/voxygen/element/items/item_shroom_stick.png create mode 100644 assets/voxygen/element/items/item_sunflower_tea.png create mode 100644 assets/voxygen/element/items/lantern_black-0.png create mode 100644 assets/voxygen/element/items/lantern_blue-0.png create mode 100644 assets/voxygen/element/items/lantern_green-0.png create mode 100644 assets/voxygen/element/items/lantern_grey-0.png create mode 100644 assets/voxygen/element/items/lantern_red-0.png rename assets/voxygen/element/{icons => items}/neck-0.png (100%) rename assets/voxygen/element/{icons => items}/neck-1.png (100%) create mode 100644 assets/voxygen/element/items/neck-seashell.png rename assets/voxygen/element/{icons => items}/ring-0.png (100%) rename assets/voxygen/element/{icons => items}/sewing_set.png (100%) create mode 100644 assets/voxygen/element/items/tabard_admin.png delete mode 100644 assets/voxygen/element/misc_bg/window.png create mode 100644 assets/voxygen/element/missing_icon_grey.png rename assets/voxygen/element/{icons => skills}/2haxe_m1.png (100%) rename assets/voxygen/element/{icons => skills}/2hhammer_m1.png (100%) rename assets/voxygen/element/{icons => skills}/2hsword_m1.png (100%) rename assets/voxygen/element/{icons => skills}/2hsword_m2.png (100%) rename assets/voxygen/element/{icons => skills}/bow_m1.png (100%) rename assets/voxygen/element/{icons => skills}/bow_m2.png (100%) rename assets/voxygen/element/{icons => skills}/bow_m2.vox (100%) rename assets/voxygen/element/{icons => skills}/debug_wand_m1.png (100%) rename assets/voxygen/element/{icons => skills}/debug_wand_m2.png (100%) rename assets/voxygen/element/{icons => skills}/heal_0.png (100%) create mode 100644 assets/voxygen/element/skills/heal_bomb.png create mode 100644 assets/voxygen/element/skills/lifesteal.png rename assets/voxygen/element/{icons => skills}/sceptre_protection.png (100%) rename assets/voxygen/element/{icons => skills}/skill_axe_leap_slash.png (100%) rename assets/voxygen/element/{icons => skills}/skill_axespin.png (100%) rename assets/voxygen/element/{icons => skills}/skill_bow_jump_burst.png (100%) create mode 100644 assets/voxygen/element/skills/skill_fire_aoe.png create mode 100644 assets/voxygen/element/skills/skill_flamethrower.png rename assets/voxygen/element/{icons => skills}/skill_hammergolf.png (100%) rename assets/voxygen/element/{icons => skills}/skill_hammerleap.png (100%) rename assets/voxygen/element/{icons => skills}/skill_slice_2.png (100%) rename assets/voxygen/element/{icons => skills}/skill_sword_pierce.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_amount.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_combo.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_cost.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_damage.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_distance.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_duration.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_energy_drain.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_energy_regen.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_explosion.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_heal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_helicopter.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_infinite.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_knockback.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_lifesteal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_projectile_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_radius.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/buff_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_amount.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_combo.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_cost.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_damage.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_distance.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_duration.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_energy_drain.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_energy_regen.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_explosion.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_heal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_helicopter.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_infinite.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_knockback.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_lifesteal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_projectile_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_radius.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/debuff_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_amount.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_combo.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_cost.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_damage.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_distance.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_duration.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_energy_drain.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_energy_regen.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_explosion.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_heal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_helicopter.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_infinite.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_knockback.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_lifesteal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_projectile_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_radius.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/heal_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/health_plus.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_amount.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_combo.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_cost.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_damage.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_distance.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_duration.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_energy_drain.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_energy_regen.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_explosion.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_heal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_helicopter.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_infinite.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_knockback.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_lifesteal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_projectile_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_radius.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/magic_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_amount.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_combo.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_cost.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_damage.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_distance.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_duration.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_energy_drain.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_energy_regen.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_explosion.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_heal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_helicopter.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_infinite.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_knockback.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_lifesteal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_projectile_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_radius.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/physical_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/skill_climbing.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/skill_dodge.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/skill_swim.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/stamina_plus.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/unlock_axe.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/unlock_bow.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/unlock_hammer.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/unlock_sceptre.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/unlock_staff-0.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/unlock_sword.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_amount.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_combo.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_cost.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_damage.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_distance.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_duration.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_energy_drain.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_energy_regen.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_explosion.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_heal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_helicopter.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_infinite.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_knockback.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_lifesteal.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_projectile_speed.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_radius.png (100%) rename assets/voxygen/element/{icons => skills}/skilltree/utility_speed.png (100%) rename assets/voxygen/element/{icons => skills}/snake.png (100%) rename assets/voxygen/element/{icons => skills}/snake_green.png (100%) rename assets/voxygen/element/{icons => skills}/staff_m1.png (100%) create mode 100644 assets/voxygen/element/skills/staff_m2.png rename assets/voxygen/element/{icons => skills}/sword_whirlwind.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/back.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/bag.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/belt.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/chest.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/feet.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/glider.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/hands.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/head.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/lantern.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/legs.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/mainhand.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/necklace.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/offhand.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/ring.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/shoulders.png (100%) rename assets/voxygen/element/{icons => ui/bag/backgrounds}/tabard.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_collapse.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_collapse_hover.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_collapse_press.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_expand.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_expand_hover.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_expand_press.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot_blue.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot_gold.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot_green.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot_grey.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot_orange.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot_purple.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot_red.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_slot_sel.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_tab_active.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_tab_inactive.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_tab_inactive_hover.png (100%) rename assets/voxygen/element/{ => ui/bag}/buttons/inv_tab_inactive_press.png (100%) rename assets/voxygen/element/{ => ui/bag}/icons/character.png (100%) rename assets/voxygen/element/{ => ui/bag}/icons/combat_rating.png (100%) rename assets/voxygen/element/{ => ui/bag}/icons/combat_rating_shadow.png (100%) rename assets/voxygen/element/{ => ui/bag}/icons/health.png (100%) rename assets/voxygen/element/{ => ui/bag}/icons/protection.png (100%) rename assets/voxygen/element/{ => ui/bag}/icons/stamina.png (100%) rename assets/voxygen/element/{ => ui/bag}/icons/stun_res.png (100%) rename assets/voxygen/element/{misc_bg => ui/bag}/inv_bg_0.png (100%) rename assets/voxygen/element/{misc_bg => ui/bag}/inv_bg_1.png (100%) rename assets/voxygen/element/{misc_bg => ui/bag}/inv_bg_bag.png (100%) rename assets/voxygen/element/{misc_bg => ui/bag}/inv_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/bag}/inv_frame_bag.png (100%) rename assets/voxygen/element/{ => ui/char_select}/icons/dice.png (100%) rename assets/voxygen/element/{ => ui/char_select}/icons/dice_hover.png (100%) rename assets/voxygen/element/{ => ui/char_select}/icons/dice_press.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/danari_f.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/danari_m.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/dwarf_f.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/dwarf_m.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/elf_f.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/elf_m.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/human_f.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/human_m.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/orc_f.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/orc_m.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/ud_f.png (100%) rename assets/voxygen/element/{icons => ui/char_select/portraits}/ud_m.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/command_error_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/command_info_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/faction.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/faction_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/group.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/group_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/kill_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/loot_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/offline_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/online_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/private_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/region.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/region_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/say.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/say_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/tell.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/tell_small.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/world.png (100%) rename assets/voxygen/element/{icons/chat => ui/chat/icons}/world_small.png (100%) rename assets/voxygen/element/{misc_bg => ui/crafting}/crafting.png (100%) rename assets/voxygen/element/{misc_bg => ui/crafting}/crafting_frame.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/armors.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/crafting_tools.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/dismantle.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/foods.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/gliders.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/globe.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/globe_2.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/potions.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/utilities.png (100%) rename assets/voxygen/element/{ => ui/crafting}/icons/weapons.png (100%) rename assets/voxygen/element/{ => ui/diary}/buttons/border_skills.png (100%) rename assets/voxygen/element/{icons => ui/diary/buttons}/lock.png (100%) rename assets/voxygen/element/{ => ui/diary}/buttons/slot_skilltree.png (100%) rename assets/voxygen/element/{misc_bg => ui/diary}/diary_bg.png (100%) rename assets/voxygen/element/{misc_bg => ui/diary}/diary_exp_bg.png (100%) rename assets/voxygen/element/{misc_bg => ui/diary}/diary_exp_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/diary}/diary_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/diary}/pixel.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/anvil.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/anvil_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/anvil_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/armor_slot.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/armor_slot_empty.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/armor_slot_selected.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/arrow_down.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/arrow_down.vox (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/arrow_down_gold.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/arrow_down_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/arrow_down_hover.vox (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/arrow_down_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/arrow_down_press.vox (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/bag/closed.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/bag/closed_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/bag/closed_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/bag/open.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/bag/open_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/bag/open_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/border.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/border_mo.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/border_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/border_pressed.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/button.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/button_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/button_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/checkbox/active.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/checkbox/hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/checkbox/inactive.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/checkbox/inactive_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/checkbox/press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/close_btn.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/close_btn_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/close_btn_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/group.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/group_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/group_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/key_button.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/key_button_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/map.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/map_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/map_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/radio/active.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/radio/hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/radio/inactive.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/radio/inactive_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/radio/press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/search_btn.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/search_btn_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/search_btn_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/settings.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/settings_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/settings_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/social.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/social_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/social_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/spellbook.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/spellbook_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/spellbook_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/x_red.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/x_red_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/buttons/x_red_press.png (100%) rename assets/voxygen/element/{misc_bg => ui/generic}/fireplace.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/banner_bot.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/banner_gradient_bottom.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/banner_small_top.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/banner_top.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/bottom.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/bottom_left.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/bottom_right.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/left.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/mid.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/right.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/tail.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/top.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/top_left.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble/top_right.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/bottom.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/bottom_left.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/bottom_right.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/icon_frame.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/left.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/mid.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/right.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/tail.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/top.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/top_left.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/bubble_dark/top_right.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/disclaimer.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/divider.vox (100%) rename assets/voxygen/element/{ => ui/generic}/frames/divider_charwindow.vox (100%) rename assets/voxygen/element/{ => ui/generic}/frames/enemybar.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/enemybar_1.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/enemybar_bg.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/enemybar_bg_1.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/esc_menu.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/frame_art/frame-b_l.vox (100%) rename assets/voxygen/element/{ => ui/generic}/frames/frame_art/frame-b_r.vox (100%) rename assets/voxygen/element/{ => ui/generic}/frames/frame_art/frame-t_l.vox (100%) rename assets/voxygen/element/{ => ui/generic}/frames/frame_art/frame-t_r.vox (100%) rename assets/voxygen/element/{ => ui/generic}/frames/info_frame.vox (100%) rename assets/voxygen/element/{ => ui/generic}/frames/loading_screen/loading_bg.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/loading_screen/loading_bg_l.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/loading_screen/loading_bg_r.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/prompt_dialog_bot.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/prompt_dialog_mid.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/prompt_dialog_top.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/selection.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/selection_frame.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/selection_hover.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/selection_press.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/social_frame.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/tooltip/corner.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/tooltip/edge.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/tt_test_corner_tr.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/tt_test_edge.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/window_3.png (100%) rename assets/voxygen/element/{ => ui/generic}/frames/xp_charwindow.vox (100%) rename assets/voxygen/element/{ => ui/generic}/icons/m1.png (100%) rename assets/voxygen/element/{ => ui/generic}/icons/m2.png (100%) rename assets/voxygen/element/{ => ui/generic}/icons/m_move.png (100%) rename assets/voxygen/element/{ => ui/generic}/icons/m_scroll.png (100%) rename assets/voxygen/element/{ => ui/generic}/icons/skull.png (100%) rename assets/voxygen/element/{ => ui/generic}/icons/skull_2.png (100%) rename assets/voxygen/element/{ => ui/generic}/slider/indicator.png (100%) rename assets/voxygen/element/{ => ui/generic}/slider/indicator_round.png (100%) rename assets/voxygen/element/{ => ui/generic}/slider/scrollbar.png (100%) rename assets/voxygen/element/{ => ui/generic}/slider/scrollbar_1.png (100%) rename assets/voxygen/element/{ => ui/generic}/slider/track.png (100%) rename assets/voxygen/element/{misc_bg => ui/generic}/textbox.png (100%) rename assets/voxygen/element/{frames => ui/groups}/group_member_bg.png (100%) rename assets/voxygen/element/{frames => ui/groups}/group_member_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/invite}/progress.png (100%) rename assets/voxygen/element/{frames => ui/invite}/progress_bar.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/castle.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/castle_bg.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/castle_hover.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/cave.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/cave_bg.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/cave_hover.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/dungeon.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/dungeon_bg.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/dungeon_bg2.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/dungeon_hover.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/excl.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/group_indicator.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/group_indicator_arrow_down.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/group_indicator_arrow_up.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/group_indicator_hover.png (100%) rename assets/voxygen/element/{ => ui/map}/buttons/map_modes.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/topographic.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/town.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/town_bg.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/town_hover.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/tree.png (100%) rename assets/voxygen/element/{map => ui/map/buttons}/tree_hover.png (100%) rename assets/voxygen/element/{map => ui/map/icons}/dif_1.png (100%) rename assets/voxygen/element/{map => ui/map/icons}/dif_2.png (100%) rename assets/voxygen/element/{map => ui/map/icons}/dif_3.png (100%) rename assets/voxygen/element/{map => ui/map/icons}/dif_4.png (100%) rename assets/voxygen/element/{map => ui/map/icons}/dif_5.png (100%) rename assets/voxygen/element/{map => ui/map/icons}/dif_6.png (100%) rename assets/voxygen/element/{misc_bg => ui/map}/map_bg.png (100%) rename assets/voxygen/element/{misc_bg => ui/map}/map_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/map}/map_frame_art.png (100%) rename assets/voxygen/element/{ => ui/minimap}/buttons/button_mmap_closed.png (100%) rename assets/voxygen/element/{ => ui/minimap}/buttons/button_mmap_closed_hover.png (100%) rename assets/voxygen/element/{ => ui/minimap}/buttons/button_mmap_closed_press.png (100%) rename assets/voxygen/element/{ => ui/minimap}/buttons/button_mmap_open.png (100%) rename assets/voxygen/element/{ => ui/minimap}/buttons/button_mmap_open_hover.png (100%) rename assets/voxygen/element/{ => ui/minimap}/buttons/button_mmap_open_press.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-min.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-min_hover.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-min_press.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-north.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-north_hover.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-north_press.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-north_press_hover.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-plus.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-plus_hover.png (100%) rename assets/voxygen/element/{buttons/min_plus => ui/minimap/buttons}/mmap_button-plus_press.png (100%) rename assets/voxygen/element/{buttons => ui/minimap/icons}/indicator_mmap.png (100%) rename assets/voxygen/element/{buttons => ui/minimap/icons}/indicator_mmap_small.png (100%) rename assets/voxygen/element/{frames => ui/minimap}/mmap.png (100%) rename assets/voxygen/element/{frames => ui/minimap}/mmap_closed.png (100%) rename assets/voxygen/element/{frames => ui/minimap}/mmap_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/quests}/temp_quest_bg.png (100%) rename assets/voxygen/element/{ => ui/settings}/buttons/settings_button.png (100%) rename assets/voxygen/element/{ => ui/settings}/buttons/settings_button_hover.png (100%) rename assets/voxygen/element/{ => ui/settings}/buttons/settings_button_press.png (100%) rename assets/voxygen/element/{ => ui/settings}/buttons/settings_button_pressed.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings/icons}/crosshair_bg.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings/icons}/crosshair_bg_hover.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings/icons}/crosshair_bg_press.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings/icons}/crosshair_bg_pressed.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings/icons}/crosshair_inner.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings/icons}/crosshair_outer_1.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings/icons}/crosshair_outer_2.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings/icons}/crosshair_outer_3.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings}/settings_bg.png (100%) rename assets/voxygen/element/{misc_bg => ui/settings}/settings_frame.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/bar_content.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/bg.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/decayed_bg.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/enemy_bar_content.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/frame.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/health_bg.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/health_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/skillbar}/level_up.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/slot.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/stamina_bg.png (100%) rename assets/voxygen/element/{ => ui}/skillbar/stamina_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/social}/social_bg.png (100%) rename assets/voxygen/element/{misc_bg => ui/social}/social_frame.png (100%) rename assets/voxygen/element/{misc_bg => ui/social}/social_tab_active.png (100%) rename assets/voxygen/element/{misc_bg => ui/social}/social_tab_inactive.png (100%) rename assets/voxygen/element/{misc_bg => ui/social}/social_tab_online.png (100%) create mode 100644 assets/voxygen/element/weapons/axe.png create mode 100644 assets/voxygen/element/weapons/bow.png create mode 100644 assets/voxygen/element/weapons/daggers.png create mode 100644 assets/voxygen/element/weapons/hammer.png create mode 100644 assets/voxygen/element/weapons/sceptre.png create mode 100644 assets/voxygen/element/weapons/staff.png create mode 100644 assets/voxygen/element/weapons/sword.png create mode 100644 assets/voxygen/element/weapons/swords_crossed.png create mode 100644 assets/voxygen/element/weapons/swordshield.png create mode 100644 list.txt create mode 100644 search-item.sh diff --git a/assets/voxygen/element/animation/buff_frame/1.png b/assets/voxygen/element/animation/buff_frame/1.png index a24001fb70..90ba93a0e4 100644 --- a/assets/voxygen/element/animation/buff_frame/1.png +++ b/assets/voxygen/element/animation/buff_frame/1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d200bee90f69148c6030519edd073be21a00d6a4cc5826cee02d5dbce91389d -size 2149 +oid sha256:8979ecf48f6faa9c9f2caf917977445d93c0e6024ac818384577eaac598d1691 +size 159 diff --git a/assets/voxygen/element/animation/buff_frame/2.png b/assets/voxygen/element/animation/buff_frame/2.png index 11deee1484..4d08b9f1b8 100644 --- a/assets/voxygen/element/animation/buff_frame/2.png +++ b/assets/voxygen/element/animation/buff_frame/2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f009e91766913969bcf0e6eea72d6693f3f991eff8053d4f96ba3b9297848e4 -size 2131 +oid sha256:caa7bd35d3d151087e9c12d432f0c70f2031e39d28b686a5f73287e2f832c935 +size 119 diff --git a/assets/voxygen/element/animation/buff_frame/3.png b/assets/voxygen/element/animation/buff_frame/3.png index 875dedb176..510a7aacf8 100644 --- a/assets/voxygen/element/animation/buff_frame/3.png +++ b/assets/voxygen/element/animation/buff_frame/3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5966a3188e42ce63f0a8bb17310c4fdac01a5e1f914ccf526817a6fcbb521b95 -size 2145 +oid sha256:82e057934af5ba9d83a0465378042fe72bf74f418e31715018f9fdbb2da4b9ee +size 149 diff --git a/assets/voxygen/element/animation/buff_frame/4.png b/assets/voxygen/element/animation/buff_frame/4.png index d87a52441e..786961e9de 100644 --- a/assets/voxygen/element/animation/buff_frame/4.png +++ b/assets/voxygen/element/animation/buff_frame/4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58a97680aa257eaef249f8a58c41a8450317eb1250fa9364d9bb5e03cfe5f38f -size 2128 +oid sha256:fe517003a38ee91798c047bc41c22480e77070c541ffce26280cd2627260e427 +size 111 diff --git a/assets/voxygen/element/animation/buff_frame/5.png b/assets/voxygen/element/animation/buff_frame/5.png index 157fe55b35..e82f596235 100644 --- a/assets/voxygen/element/animation/buff_frame/5.png +++ b/assets/voxygen/element/animation/buff_frame/5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72003fc0b0ac82a10a43a96760ed91286060ff771048e2ddfc7f2c5f1f08a722 -size 2145 +oid sha256:7def57ebfcf0bb5c1c414b6f5c1814975d55f5fb92569af3f486623a8c0656bf +size 149 diff --git a/assets/voxygen/element/animation/buff_frame/6.png b/assets/voxygen/element/animation/buff_frame/6.png index 89dc265c65..2b955d380d 100644 --- a/assets/voxygen/element/animation/buff_frame/6.png +++ b/assets/voxygen/element/animation/buff_frame/6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2375ab99e061c055ebebe39496a19d0a6328c8ae67dfd71a8ace7082293b19aa -size 2117 +oid sha256:5869ee6242e474aac80f048e0d530b1add7569fdecfec80de0d93dc3bae67919 +size 114 diff --git a/assets/voxygen/element/animation/buff_frame/7.png b/assets/voxygen/element/animation/buff_frame/7.png index fe73e60c91..8d76551a65 100644 --- a/assets/voxygen/element/animation/buff_frame/7.png +++ b/assets/voxygen/element/animation/buff_frame/7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2505a7d5e0819aaef3726958feef41efe00fbd200f74ffb420a698fdcac0ffa0 -size 2147 +oid sha256:a089c11861a5f9775beff8f9c4bdca481ad1d18adf31ae3eb9ccef3307471e89 +size 144 diff --git a/assets/voxygen/element/animation/buff_frame/8.png b/assets/voxygen/element/animation/buff_frame/8.png index b448f115ac..aa8e1d27c1 100644 --- a/assets/voxygen/element/animation/buff_frame/8.png +++ b/assets/voxygen/element/animation/buff_frame/8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75c54e9f8f7ec83842ba317e5532e4d17686bc178a8b85c0d490172d200a9a54 -size 2123 +oid sha256:376225ed50d0438644557ed776e901c8dfe65ebd1a5564bfac5aba02e902c704 +size 104 diff --git a/assets/voxygen/element/animation/gears/1.png b/assets/voxygen/element/animation/gears/1.png deleted file mode 100644 index fd1946be6b..0000000000 --- a/assets/voxygen/element/animation/gears/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:798293778955ec9bfe8ae9a2fb6de33adff8a1ba457d693689de644f71bc8f9e -size 843 diff --git a/assets/voxygen/element/animation/gears/2.png b/assets/voxygen/element/animation/gears/2.png deleted file mode 100644 index d248a4b4cf..0000000000 --- a/assets/voxygen/element/animation/gears/2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63da1eb3c7663a921ef7f0995c8a5beee3121fa8cb2d4d3f50d6c5d8ade6ef64 -size 2067 diff --git a/assets/voxygen/element/animation/gears/3.png b/assets/voxygen/element/animation/gears/3.png deleted file mode 100644 index f4f76e1fea..0000000000 --- a/assets/voxygen/element/animation/gears/3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5336ccfb5c8668959f376475dd32c48b5850c527da56a7924140027dd904a921 -size 2066 diff --git a/assets/voxygen/element/animation/gears/4.png b/assets/voxygen/element/animation/gears/4.png deleted file mode 100644 index b70867e7a0..0000000000 --- a/assets/voxygen/element/animation/gears/4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cb70f05b0e179d1c99f9878148a8a93f7347e8610a74348e5a3d7100f0303d0 -size 2073 diff --git a/assets/voxygen/element/animation/gears/5.png b/assets/voxygen/element/animation/gears/5.png deleted file mode 100644 index 7652f808cb..0000000000 --- a/assets/voxygen/element/animation/gears/5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ca60d03c82bc855cfda2e1fb61273f00a355e2c80cc7882c5f79c56c7de67c8 -size 2101 diff --git a/assets/voxygen/element/de_buffs/buff_campfire_heal_0.png b/assets/voxygen/element/de_buffs/buff_campfire_heal_0.png new file mode 100644 index 0000000000..a022b98500 --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_campfire_heal_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c4292272dff6e040d61e582c6ecfbdfd7ad420e6ce2ad5f439f3266b6f438e4 +size 280 diff --git a/assets/voxygen/element/de_buffs/buff_damage_reduce_0.png b/assets/voxygen/element/de_buffs/buff_damage_reduce_0.png new file mode 100644 index 0000000000..fd2494b026 --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_damage_reduce_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71274ecaf54c4ba4cf13b69c1e2342261cae997f4dcc71687569325ec4371b66 +size 197 diff --git a/assets/voxygen/element/de_buffs/buff_energyplus_0.png b/assets/voxygen/element/de_buffs/buff_energyplus_0.png new file mode 100644 index 0000000000..84ec0a7338 --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_energyplus_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f0ec3d3c5340a65daada77584d0c47160e7b63a086c6a1103db9c59120d5131 +size 197 diff --git a/assets/voxygen/element/de_buffs/buff_healthplus_0.png b/assets/voxygen/element/de_buffs/buff_healthplus_0.png new file mode 100644 index 0000000000..a87bce26ce --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_healthplus_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d90450c3fd70ff44f30204069487577456d713fb0dfe5251daf079810cb8e507 +size 204 diff --git a/assets/voxygen/element/de_buffs/buff_invincibility_0.png b/assets/voxygen/element/de_buffs/buff_invincibility_0.png new file mode 100644 index 0000000000..1e27354d5c --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_invincibility_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68489f644276b6495dd939d70f3cf796464939d86f0bdb78e8ec5224eeaba596 +size 207 diff --git a/assets/voxygen/element/de_buffs/buff_plus_0.png b/assets/voxygen/element/de_buffs/buff_plus_0.png new file mode 100644 index 0000000000..3ec68e1ed4 --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_plus_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9488a54bd0246258b43740c53edaa6009ec25dc30993e178c219b15fb51475c0 +size 250 diff --git a/assets/voxygen/element/de_buffs/buff_potion_0.png b/assets/voxygen/element/de_buffs/buff_potion_0.png new file mode 100644 index 0000000000..8c23cfbe47 --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_potion_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:860aa56f406387d5724952f4ba65cd5c1e9605b6b39cd6f0db0e94bca2573184 +size 254 diff --git a/assets/voxygen/element/de_buffs/buff_saturation_0.png b/assets/voxygen/element/de_buffs/buff_saturation_0.png new file mode 100644 index 0000000000..9f7b2e40fe --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_saturation_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:def8214271578978049b87b902e8c43b853a0c27e01c0c4880e9e6f4725bd8d9 +size 263 diff --git a/assets/voxygen/element/de_buffs/debuff_bleed_0.png b/assets/voxygen/element/de_buffs/debuff_bleed_0.png new file mode 100644 index 0000000000..a60bf37125 --- /dev/null +++ b/assets/voxygen/element/de_buffs/debuff_bleed_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cff6e0e3861a0642cc825e2b36ca10aff325c01415934cbb92e42d787aa2754 +size 241 diff --git a/assets/voxygen/element/de_buffs/debuff_skull_0.png b/assets/voxygen/element/de_buffs/debuff_skull_0.png new file mode 100644 index 0000000000..62c9201ad0 --- /dev/null +++ b/assets/voxygen/element/de_buffs/debuff_skull_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64b5d1e8a309ab5f4fdf2544a084878efa15691fe5e568499bcd7c5a9e3e2ac4 +size 247 diff --git a/assets/voxygen/element/icons/anvil.png b/assets/voxygen/element/icons/anvil.png deleted file mode 100644 index d65e6c43d5..0000000000 --- a/assets/voxygen/element/icons/anvil.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7f9c7eecc22a0be5add0a17f7bdfb0967c7d44b605fd3de1ad29ae07a69851a -size 355 diff --git a/assets/voxygen/element/icons/axe.png b/assets/voxygen/element/icons/axe.png deleted file mode 100644 index 5b54c694ac..0000000000 --- a/assets/voxygen/element/icons/axe.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02f2023183427408081b95f208c6808e5f0929edfc5972d0efbc21aef395acf8 -size 1753 diff --git a/assets/voxygen/element/icons/bow.png b/assets/voxygen/element/icons/bow.png deleted file mode 100644 index 162b496290..0000000000 --- a/assets/voxygen/element/icons/bow.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ac39560ea8797f57ffa6c9462845e2b6f860e14588a3f6fb23bb1918bd81d10 -size 1757 diff --git a/assets/voxygen/element/icons/bow_aoe.png b/assets/voxygen/element/icons/bow_aoe.png deleted file mode 100644 index 9fd92299ab..0000000000 --- a/assets/voxygen/element/icons/bow_aoe.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05080ad4fdb4ad813e7fc21bac32a18a93f5c0cd049b457844ebedca527ae80b -size 248 diff --git a/assets/voxygen/element/icons/daggers.png b/assets/voxygen/element/icons/daggers.png deleted file mode 100644 index b316c0e1fd..0000000000 --- a/assets/voxygen/element/icons/daggers.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40bd670cbd50a15b2f889982af3539c16b12f399bf6b76757ecbbc7284ea4083 -size 1784 diff --git a/assets/voxygen/element/icons/de_buffs/buff_campfire_heal_0.png b/assets/voxygen/element/icons/de_buffs/buff_campfire_heal_0.png deleted file mode 100644 index 8dc6f9b259..0000000000 --- a/assets/voxygen/element/icons/de_buffs/buff_campfire_heal_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff33d0955f01a5153f0fbab0aef19d7a9b584ec6c2d33581a983fe2024ae61f3 -size 1525 diff --git a/assets/voxygen/element/icons/de_buffs/buff_damage_reduce_0.png b/assets/voxygen/element/icons/de_buffs/buff_damage_reduce_0.png deleted file mode 100644 index 6ba084d2ff..0000000000 --- a/assets/voxygen/element/icons/de_buffs/buff_damage_reduce_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4b1e1dc6f09c4d8e114bfb4b6c0c2f3dedddf7754a5c6c6da46ac04a6f9ddd3 -size 2145 diff --git a/assets/voxygen/element/icons/de_buffs/buff_energyplus_0.png b/assets/voxygen/element/icons/de_buffs/buff_energyplus_0.png deleted file mode 100644 index bf56b25469..0000000000 --- a/assets/voxygen/element/icons/de_buffs/buff_energyplus_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87705dc2fc08918cdaac8293263f5637cdfa3bd4660300aa0870cc55571c858a -size 2060 diff --git a/assets/voxygen/element/icons/de_buffs/buff_healthplus_0.png b/assets/voxygen/element/icons/de_buffs/buff_healthplus_0.png deleted file mode 100644 index 6c0ccc0ad4..0000000000 --- a/assets/voxygen/element/icons/de_buffs/buff_healthplus_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3df73821732d229507b9c19f0f83e76452603a3d466ddfd2fb9598b349a45e85 -size 2066 diff --git a/assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png b/assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png deleted file mode 100644 index 1a411d1ab8..0000000000 --- a/assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d535544809197d5d3611f106c4316aaab1e72176361f94eeab7e7d94e101c394 -size 2068 diff --git a/assets/voxygen/element/icons/de_buffs/buff_plus_0.png b/assets/voxygen/element/icons/de_buffs/buff_plus_0.png deleted file mode 100644 index 5ec2e5b94f..0000000000 --- a/assets/voxygen/element/icons/de_buffs/buff_plus_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b8697b8660d4e627082047da2689dbd96d2adec791f80f96ac9ae2f218ef895 -size 1870 diff --git a/assets/voxygen/element/icons/de_buffs/buff_potion_0.png b/assets/voxygen/element/icons/de_buffs/buff_potion_0.png deleted file mode 100644 index 7841b4d6ed..0000000000 --- a/assets/voxygen/element/icons/de_buffs/buff_potion_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e61d80856e9aa65dbc042fa4744918eb93ffac385b7850d7bcfc588438b1d095 -size 2139 diff --git a/assets/voxygen/element/icons/de_buffs/buff_saturation_0.png b/assets/voxygen/element/icons/de_buffs/buff_saturation_0.png deleted file mode 100644 index 31ccab8c08..0000000000 --- a/assets/voxygen/element/icons/de_buffs/buff_saturation_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be3c24efae2f8e2f2ce3ca4fd25a91be850bb3fa51141f3c33c2f94193fb80d5 -size 1517 diff --git a/assets/voxygen/element/icons/de_buffs/debuff_bleed_0.png b/assets/voxygen/element/icons/de_buffs/debuff_bleed_0.png deleted file mode 100644 index 2dfaf3e910..0000000000 --- a/assets/voxygen/element/icons/de_buffs/debuff_bleed_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bd580950fc40f6d2e0b3b02859592eb7ac8522db96af49817feb14133ee4fa0 -size 228 diff --git a/assets/voxygen/element/icons/de_buffs/debuff_skull_0.png b/assets/voxygen/element/icons/de_buffs/debuff_skull_0.png deleted file mode 100644 index 1ec941cf73..0000000000 --- a/assets/voxygen/element/icons/de_buffs/debuff_skull_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be0b0f843a06787ec2f8920ae05df8a093d5cac7d89a06e6bb419e610a801294 -size 1878 diff --git a/assets/voxygen/element/icons/hammer.png b/assets/voxygen/element/icons/hammer.png deleted file mode 100644 index 091292cf06..0000000000 --- a/assets/voxygen/element/icons/hammer.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1dd28a78fcf8dab0129da20526b197e5aa7076a8aa19a4f9b125f07c4b1fd0d -size 1744 diff --git a/assets/voxygen/element/icons/heal_bomb.png b/assets/voxygen/element/icons/heal_bomb.png deleted file mode 100644 index 68c85804fe..0000000000 --- a/assets/voxygen/element/icons/heal_bomb.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:961b1b86b1440836d29948102ed993d19a2e5edd6c58496256781eacd5075db0 -size 1866 diff --git a/assets/voxygen/element/icons/item_bag_blue_face.png b/assets/voxygen/element/icons/item_bag_blue_face.png deleted file mode 100644 index dd8b3139bf..0000000000 --- a/assets/voxygen/element/icons/item_bag_blue_face.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24fdd98f9a0dfb29fdfc7dd7bed8429ec262678b6df24aa186579afe6d9e6da2 -size 2199 diff --git a/assets/voxygen/element/icons/item_bag_brown_face.png b/assets/voxygen/element/icons/item_bag_brown_face.png deleted file mode 100644 index 6b01bdb816..0000000000 --- a/assets/voxygen/element/icons/item_bag_brown_face.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf9f7f2df335956e1be9e9b9b4b94a5b81fc75316c94212ccf8672c53fe5fed7 -size 2189 diff --git a/assets/voxygen/element/icons/item_bag_large.png b/assets/voxygen/element/icons/item_bag_large.png deleted file mode 100644 index a13a8f1554..0000000000 --- a/assets/voxygen/element/icons/item_bag_large.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:452f544cad372598d1ccb3e7ced467664ba37fc6a02114536f5274916048babf -size 2947 diff --git a/assets/voxygen/element/icons/item_bag_leather_large.png b/assets/voxygen/element/icons/item_bag_leather_large.png deleted file mode 100644 index 03f02a176a..0000000000 --- a/assets/voxygen/element/icons/item_bag_leather_large.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc301726cf2dfd3b19b72642f4e86eb802ec4b71c1b9d16484c10b8dfd371d7d -size 3152 diff --git a/assets/voxygen/element/icons/item_bag_leather_small.png b/assets/voxygen/element/icons/item_bag_leather_small.png deleted file mode 100644 index bd89fa04c1..0000000000 --- a/assets/voxygen/element/icons/item_bag_leather_small.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da89743de807e2cbd24a7fee4c84b755965dbd701f7b4ec92cd8ef9bcaaf3fd8 -size 3110 diff --git a/assets/voxygen/element/icons/item_bag_med.png b/assets/voxygen/element/icons/item_bag_med.png deleted file mode 100644 index 5ded13db29..0000000000 --- a/assets/voxygen/element/icons/item_bag_med.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:741389518d51db25905c3e387850122b7bef26b13a0d26cc9a7521fe815b0c21 -size 2947 diff --git a/assets/voxygen/element/icons/item_bag_red_face.png b/assets/voxygen/element/icons/item_bag_red_face.png deleted file mode 100644 index 2128e1a943..0000000000 --- a/assets/voxygen/element/icons/item_bag_red_face.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12699ed4a1164c903d6351ef82ac18212e48892d5b8f60a428ea900d7807fa23 -size 2199 diff --git a/assets/voxygen/element/icons/item_bag_small.png b/assets/voxygen/element/icons/item_bag_small.png deleted file mode 100644 index 7f2e342631..0000000000 --- a/assets/voxygen/element/icons/item_bag_small.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:766c327c22f7848de0c5753a18de7b544d0349706c6359030632570b56be47a3 -size 2911 diff --git a/assets/voxygen/element/icons/item_bag_t1_purp.png b/assets/voxygen/element/icons/item_bag_t1_purp.png deleted file mode 100644 index 5e499e7b19..0000000000 --- a/assets/voxygen/element/icons/item_bag_t1_purp.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f6977aededdb94985460586778a62a46b5f8fcd6aa2669e64c9bd7ab0577e59 -size 3116 diff --git a/assets/voxygen/element/icons/item_bag_tiny.png b/assets/voxygen/element/icons/item_bag_tiny.png deleted file mode 100755 index 4954c6aeed..0000000000 --- a/assets/voxygen/element/icons/item_bag_tiny.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9afdfd8afc347d8b93957c780eb703470f34a49ccdcd94b1a0d1dfd09082a51 -size 2927 diff --git a/assets/voxygen/element/icons/item_cloth0.png b/assets/voxygen/element/icons/item_cloth0.png deleted file mode 100644 index 6784ed182b..0000000000 --- a/assets/voxygen/element/icons/item_cloth0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41ca6ddc5db6f1963fad391c79864a5fa6a22c15b729418f265ccf5e02f7a7eb -size 2081 diff --git a/assets/voxygen/element/icons/item_cloth_red.png b/assets/voxygen/element/icons/item_cloth_red.png deleted file mode 100644 index 11c9fcb98c..0000000000 --- a/assets/voxygen/element/icons/item_cloth_red.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f9df22679e58becae6b3996a0c8fcf36bf2d1090b47815e029ef9742469aca7 -size 2086 diff --git a/assets/voxygen/element/icons/item_flayer_soul.png b/assets/voxygen/element/icons/item_flayer_soul.png deleted file mode 100644 index f8348f97fa..0000000000 --- a/assets/voxygen/element/icons/item_flayer_soul.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:696be55d4971a9cdaecd6e1474b879612fd32b3a8298af32003a6af1c7f66042 -size 1941 diff --git a/assets/voxygen/element/icons/item_ice_shard.png b/assets/voxygen/element/icons/item_ice_shard.png deleted file mode 100644 index 7d9dc61f8d..0000000000 --- a/assets/voxygen/element/icons/item_ice_shard.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b96116c246f96a6fcc7508340dc941fbcf27ed7d905c58b254a8530551d47921 -size 1857 diff --git a/assets/voxygen/element/icons/item_leather0.png b/assets/voxygen/element/icons/item_leather0.png deleted file mode 100644 index f8f60e9180..0000000000 --- a/assets/voxygen/element/icons/item_leather0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec7cc129c46d1daeee085366798f9df2d7d4525d7ccbd21087466d6d1a25a2bc -size 416 diff --git a/assets/voxygen/element/icons/item_leather1.png b/assets/voxygen/element/icons/item_leather1.png deleted file mode 100644 index a96818e076..0000000000 --- a/assets/voxygen/element/icons/item_leather1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea821ab4ee7dd73c59a7300b213d8515265dcca290fa4e2532a8009c7ce741d1 -size 1739 diff --git a/assets/voxygen/element/icons/item_leather_green.png b/assets/voxygen/element/icons/item_leather_green.png deleted file mode 100644 index 03c833d7fa..0000000000 --- a/assets/voxygen/element/icons/item_leather_green.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edd9640fc01addbd9cae5c33d71f95c63afdc5083afbe91b18774a74930c6243 -size 1749 diff --git a/assets/voxygen/element/icons/item_raptor_feather.png b/assets/voxygen/element/icons/item_raptor_feather.png deleted file mode 100644 index e9bda5bd96..0000000000 --- a/assets/voxygen/element/icons/item_raptor_feather.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12ca29078bb8388e9cdcc09edd726aae8c67df4c9622ef1aa683dfe1e13b37f1 -size 691 diff --git a/assets/voxygen/element/icons/item_shroom_stick.png b/assets/voxygen/element/icons/item_shroom_stick.png deleted file mode 100644 index e152d4cb6a..0000000000 --- a/assets/voxygen/element/icons/item_shroom_stick.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b213392e6df9d7e45c576aa7a6ce846156beae0777b05852fc87c79eaf307d49 -size 348 diff --git a/assets/voxygen/element/icons/item_sunflower_tea.png b/assets/voxygen/element/icons/item_sunflower_tea.png deleted file mode 100644 index 6cdfbfa655..0000000000 --- a/assets/voxygen/element/icons/item_sunflower_tea.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f36773e16de04f8a26953c9c64b358a2a2ba0833d1d8413c4c963bd706f9adf -size 1994 diff --git a/assets/voxygen/element/icons/lantern_black-0.png b/assets/voxygen/element/icons/lantern_black-0.png deleted file mode 100644 index a7bcf612ab..0000000000 --- a/assets/voxygen/element/icons/lantern_black-0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e538baa8be2c32aa45d0d62063823e94f25e21526089ca09ccbbd9a2878d0f8 -size 8703 diff --git a/assets/voxygen/element/icons/lantern_blue-0.png b/assets/voxygen/element/icons/lantern_blue-0.png deleted file mode 100644 index 160cfd1996..0000000000 --- a/assets/voxygen/element/icons/lantern_blue-0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:819bf7f4f33eff3d1f0ca26d4eb5218e5f146aecc3c05199987b83bdd2657008 -size 1248 diff --git a/assets/voxygen/element/icons/lantern_green-0.png b/assets/voxygen/element/icons/lantern_green-0.png deleted file mode 100644 index fe92d008bb..0000000000 --- a/assets/voxygen/element/icons/lantern_green-0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5eb64fa4e321b9e9d357d3fccd59ba269821684ace9b182f60c3c438e2288d2 -size 1207 diff --git a/assets/voxygen/element/icons/lantern_grey-0.png b/assets/voxygen/element/icons/lantern_grey-0.png deleted file mode 100644 index c60f08633a..0000000000 --- a/assets/voxygen/element/icons/lantern_grey-0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1a87140fb1df927fdea819a72e67bd974847da5165eb24ccd3696bcfc461480 -size 1135 diff --git a/assets/voxygen/element/icons/lantern_red-0.png b/assets/voxygen/element/icons/lantern_red-0.png deleted file mode 100644 index 95eaf78064..0000000000 --- a/assets/voxygen/element/icons/lantern_red-0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45271d0c26b56ac4cf9a0442ef46e0d2047d6f40b3cb1085c953faebde05fc6b -size 1252 diff --git a/assets/voxygen/element/icons/lifesteal.png b/assets/voxygen/element/icons/lifesteal.png deleted file mode 100644 index 3e17b59a45..0000000000 --- a/assets/voxygen/element/icons/lifesteal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a36f4708b16630ef1a148db1742d41cd517411b39bc95ee0d4e90ac6e2b7015 -size 2285 diff --git a/assets/voxygen/element/icons/map.png b/assets/voxygen/element/icons/map.png deleted file mode 100644 index 988d642d8b..0000000000 --- a/assets/voxygen/element/icons/map.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f3e51c8690da8bde9b59fef25b3530c2861a39242806bee663c7c435aab2717 -size 933 diff --git a/assets/voxygen/element/icons/missing_icon_grey.png b/assets/voxygen/element/icons/missing_icon_grey.png deleted file mode 100644 index 04e2b76a78..0000000000 --- a/assets/voxygen/element/icons/missing_icon_grey.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15afc4cf127e0b9301d1666694c47556d4e2c5ad7bcb3bd362d1de3bcbb28b1c -size 5376 diff --git a/assets/voxygen/element/icons/neck-seashell.png b/assets/voxygen/element/icons/neck-seashell.png deleted file mode 100644 index 09622d4553..0000000000 --- a/assets/voxygen/element/icons/neck-seashell.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8baf1a1da09e77cfaca57dca12fed103b35d3806d89d58acab1aaf246530c33d -size 1428 diff --git a/assets/voxygen/element/icons/sceptre.png b/assets/voxygen/element/icons/sceptre.png deleted file mode 100644 index 809becfebc..0000000000 --- a/assets/voxygen/element/icons/sceptre.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3712cc033b1c3178abee7ecc808651fd149d9d0e2385e4a3d40f9f1c25372a1b -size 2048 diff --git a/assets/voxygen/element/icons/skill_fire_aoe.png b/assets/voxygen/element/icons/skill_fire_aoe.png deleted file mode 100644 index e19e94274c..0000000000 --- a/assets/voxygen/element/icons/skill_fire_aoe.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b8429f074d96e2d7c72730cb179a729fb540940aa5425bbb8ef1d0410740f19 -size 1840 diff --git a/assets/voxygen/element/icons/skill_flamethrower.png b/assets/voxygen/element/icons/skill_flamethrower.png deleted file mode 100644 index d1440ca267..0000000000 --- a/assets/voxygen/element/icons/skill_flamethrower.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2fe43f96c3caaf224cc3efd3a314862e7ac6ee3c67937943842dc66a7b50f3d -size 1891 diff --git a/assets/voxygen/element/icons/staff.png b/assets/voxygen/element/icons/staff.png deleted file mode 100644 index 9c906a1540..0000000000 --- a/assets/voxygen/element/icons/staff.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a426e3e15e67c4df4f3d575216e7aeeaa34f19675ce7ece82c72dc1c39371914 -size 1746 diff --git a/assets/voxygen/element/icons/staff_m2.png b/assets/voxygen/element/icons/staff_m2.png deleted file mode 100644 index e47bd16d95..0000000000 --- a/assets/voxygen/element/icons/staff_m2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eea29732f952e43ca6ee9c9a5ddaba97a4ad52e582d59175ba4ba7d66b43898b -size 1810 diff --git a/assets/voxygen/element/icons/sword.png b/assets/voxygen/element/icons/sword.png deleted file mode 100644 index 7bee8f2858..0000000000 --- a/assets/voxygen/element/icons/sword.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9db5daa9ed74a4fee302b34c0aa2f460a074ea8bf5b0c49456a270509d497a46 -size 1957 diff --git a/assets/voxygen/element/icons/swords_crossed.png b/assets/voxygen/element/icons/swords_crossed.png deleted file mode 100644 index c1d791e6c6..0000000000 --- a/assets/voxygen/element/icons/swords_crossed.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79eb6661aa3e26aabd7b08540562cc5d290eb1d9dcd268e6f6233875b0ed7f7c -size 2163 diff --git a/assets/voxygen/element/icons/swordshield.png b/assets/voxygen/element/icons/swordshield.png deleted file mode 100644 index b3181fd9bc..0000000000 --- a/assets/voxygen/element/icons/swordshield.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7161b427cba179dc2695076578383801e50b079df15287a45294142629018595 -size 1718 diff --git a/assets/voxygen/element/icons/tabard_admin.png b/assets/voxygen/element/icons/tabard_admin.png deleted file mode 100644 index 2061bd402e..0000000000 --- a/assets/voxygen/element/icons/tabard_admin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e4c27c15fdb78ecc91d3f7635bbb5f6db6ad8d7d550ded9d454f5e2955ec2e7 -size 662 diff --git a/assets/voxygen/element/icons/coin.png b/assets/voxygen/element/items/coin.png similarity index 100% rename from assets/voxygen/element/icons/coin.png rename to assets/voxygen/element/items/coin.png diff --git a/assets/voxygen/element/icons/collar.png b/assets/voxygen/element/items/collar.png similarity index 100% rename from assets/voxygen/element/icons/collar.png rename to assets/voxygen/element/items/collar.png diff --git a/assets/voxygen/element/icons/head_leather-0.png b/assets/voxygen/element/items/head_leather-0.png similarity index 100% rename from assets/voxygen/element/icons/head_leather-0.png rename to assets/voxygen/element/items/head_leather-0.png diff --git a/assets/voxygen/element/icons/item_apple.png b/assets/voxygen/element/items/item_apple.png similarity index 100% rename from assets/voxygen/element/icons/item_apple.png rename to assets/voxygen/element/items/item_apple.png diff --git a/assets/voxygen/element/icons/item_apple_curry.png b/assets/voxygen/element/items/item_apple_curry.png similarity index 100% rename from assets/voxygen/element/icons/item_apple_curry.png rename to assets/voxygen/element/items/item_apple_curry.png diff --git a/assets/voxygen/element/icons/item_apple_stick.png b/assets/voxygen/element/items/item_apple_stick.png similarity index 100% rename from assets/voxygen/element/icons/item_apple_stick.png rename to assets/voxygen/element/items/item_apple_stick.png diff --git a/assets/voxygen/element/icons/item_bag_blue.png b/assets/voxygen/element/items/item_bag_blue.png similarity index 100% rename from assets/voxygen/element/icons/item_bag_blue.png rename to assets/voxygen/element/items/item_bag_blue.png diff --git a/assets/voxygen/element/items/item_bag_blue_face.png b/assets/voxygen/element/items/item_bag_blue_face.png new file mode 100644 index 0000000000..512fe57982 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_blue_face.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f711cbba9e546408118fe1a7e5d861d15288f3fd61bf01be68aeae1136823819 +size 331 diff --git a/assets/voxygen/element/items/item_bag_brown_face.png b/assets/voxygen/element/items/item_bag_brown_face.png new file mode 100644 index 0000000000..8121051530 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_brown_face.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c66405f7312f7ea3e0085e52e61f8c23ede33439c3422fd7c5696a3a3d4e0f15 +size 340 diff --git a/assets/voxygen/element/icons/item_bag_green_large.png b/assets/voxygen/element/items/item_bag_green_large.png similarity index 100% rename from assets/voxygen/element/icons/item_bag_green_large.png rename to assets/voxygen/element/items/item_bag_green_large.png diff --git a/assets/voxygen/element/icons/item_bag_green_mid.png b/assets/voxygen/element/items/item_bag_green_mid.png similarity index 100% rename from assets/voxygen/element/icons/item_bag_green_mid.png rename to assets/voxygen/element/items/item_bag_green_mid.png diff --git a/assets/voxygen/element/items/item_bag_large.png b/assets/voxygen/element/items/item_bag_large.png new file mode 100644 index 0000000000..fc81638f20 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c8e41918ef422b2bb9d22c468ffddf1ea0fdd58dcca5469ec0731ac32e2f158 +size 401 diff --git a/assets/voxygen/element/items/item_bag_leather_large.png b/assets/voxygen/element/items/item_bag_leather_large.png new file mode 100644 index 0000000000..2b7c6ef898 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_leather_large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:920b50367ad90d94fa16194ea7af8cc55b1ec34b9424839a32db6af9f9a4a323 +size 419 diff --git a/assets/voxygen/element/items/item_bag_leather_small.png b/assets/voxygen/element/items/item_bag_leather_small.png new file mode 100644 index 0000000000..eb6dd3ac39 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_leather_small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74b1e5821960822d45192568f54ffb78988f390eda8e3100fe81387759626b70 +size 336 diff --git a/assets/voxygen/element/items/item_bag_med.png b/assets/voxygen/element/items/item_bag_med.png new file mode 100644 index 0000000000..2620beb990 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_med.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ddadb17814feca1ba0d44d80fb54276a6198427b36c7c3f60d609533a299c6a +size 403 diff --git a/assets/voxygen/element/items/item_bag_red_face.png b/assets/voxygen/element/items/item_bag_red_face.png new file mode 100644 index 0000000000..302d05ece6 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_red_face.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9314bc97fff9b240073d0fdcdd3b1684cc49432716177d9061e6f69c2fd91e45 +size 360 diff --git a/assets/voxygen/element/icons/item_bag_skull.png b/assets/voxygen/element/items/item_bag_skull.png similarity index 100% rename from assets/voxygen/element/icons/item_bag_skull.png rename to assets/voxygen/element/items/item_bag_skull.png diff --git a/assets/voxygen/element/items/item_bag_small.png b/assets/voxygen/element/items/item_bag_small.png new file mode 100644 index 0000000000..c3b8c7e852 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30d4b0d96f09166a86d830e09d19d122f20ced2932271ed14e09495418a0e739 +size 325 diff --git a/assets/voxygen/element/items/item_bag_t1_purp.png b/assets/voxygen/element/items/item_bag_t1_purp.png new file mode 100644 index 0000000000..4d32305aaa --- /dev/null +++ b/assets/voxygen/element/items/item_bag_t1_purp.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f51066278d458fdc1d88907c943d92de41e6d42a66fe30a868508d0e8cd7ca76 +size 335 diff --git a/assets/voxygen/element/items/item_bag_tiny.png b/assets/voxygen/element/items/item_bag_tiny.png new file mode 100644 index 0000000000..7cfb07ec01 --- /dev/null +++ b/assets/voxygen/element/items/item_bag_tiny.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ba4e33a0747e78e755298723b07b6d80bb3918eba23a5e7a8d6d5c5a2f52c0f +size 338 diff --git a/assets/voxygen/element/icons/item_cheese.png b/assets/voxygen/element/items/item_cheese.png similarity index 100% rename from assets/voxygen/element/icons/item_cheese.png rename to assets/voxygen/element/items/item_cheese.png diff --git a/assets/voxygen/element/items/item_cloth0.png b/assets/voxygen/element/items/item_cloth0.png new file mode 100644 index 0000000000..3c8fb19a4d --- /dev/null +++ b/assets/voxygen/element/items/item_cloth0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:055de9dd0fc4d5d0b9dd30681954cfd24d211d31c0d6ad4bfc30b4f1ec453d32 +size 227 diff --git a/assets/voxygen/element/items/item_cloth_red.png b/assets/voxygen/element/items/item_cloth_red.png new file mode 100644 index 0000000000..b4031351de --- /dev/null +++ b/assets/voxygen/element/items/item_cloth_red.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:212ee8493905ecf36026bb334f6e27c9e5cb614269fe6ced563ebb077b8654df +size 235 diff --git a/assets/voxygen/element/icons/item_coconut.png b/assets/voxygen/element/items/item_coconut.png similarity index 100% rename from assets/voxygen/element/icons/item_coconut.png rename to assets/voxygen/element/items/item_coconut.png diff --git a/assets/voxygen/element/items/item_flayer_soul.png b/assets/voxygen/element/items/item_flayer_soul.png new file mode 100644 index 0000000000..33edbf3a98 --- /dev/null +++ b/assets/voxygen/element/items/item_flayer_soul.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ebf346831681919586933d1f1fb8d5de7632f56a98dd3532914b0b9bc683d8d +size 263 diff --git a/assets/voxygen/element/icons/item_flower.vox b/assets/voxygen/element/items/item_flower.vox similarity index 100% rename from assets/voxygen/element/icons/item_flower.vox rename to assets/voxygen/element/items/item_flower.vox diff --git a/assets/voxygen/element/icons/item_grass.vox b/assets/voxygen/element/items/item_grass.vox similarity index 100% rename from assets/voxygen/element/icons/item_grass.vox rename to assets/voxygen/element/items/item_grass.vox diff --git a/assets/voxygen/element/icons/item_honey.png b/assets/voxygen/element/items/item_honey.png similarity index 100% rename from assets/voxygen/element/icons/item_honey.png rename to assets/voxygen/element/items/item_honey.png diff --git a/assets/voxygen/element/items/item_ice_shard.png b/assets/voxygen/element/items/item_ice_shard.png new file mode 100644 index 0000000000..c869417aa3 --- /dev/null +++ b/assets/voxygen/element/items/item_ice_shard.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:425396319cf7ec83ae8d79b662670d5b1633b3d6edf4f9fee9cf7bf4e9af9e32 +size 200 diff --git a/assets/voxygen/element/items/item_leather0.png b/assets/voxygen/element/items/item_leather0.png new file mode 100644 index 0000000000..e9940e10e0 --- /dev/null +++ b/assets/voxygen/element/items/item_leather0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82a8524fe4fcdd557ff7e675113e094966542b89f48235385404dd6dd91194c4 +size 362 diff --git a/assets/voxygen/element/items/item_leather1.png b/assets/voxygen/element/items/item_leather1.png new file mode 100644 index 0000000000..4c4a01297b --- /dev/null +++ b/assets/voxygen/element/items/item_leather1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcae193ebd8c3397dfb81fa9a8dd03cfa3bea91f272c80bb327cb6dcc0eeea88 +size 296 diff --git a/assets/voxygen/element/items/item_leather_green.png b/assets/voxygen/element/items/item_leather_green.png new file mode 100644 index 0000000000..7c4b561c6e --- /dev/null +++ b/assets/voxygen/element/items/item_leather_green.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edcaae3772da991fd400f576329bcecf1348e2db08772a92220ac1027d0237c5 +size 277 diff --git a/assets/voxygen/element/icons/item_mortarpestlecoco.png b/assets/voxygen/element/items/item_mortarpestlecoco.png similarity index 100% rename from assets/voxygen/element/icons/item_mortarpestlecoco.png rename to assets/voxygen/element/items/item_mortarpestlecoco.png diff --git a/assets/voxygen/element/items/item_raptor_feather.png b/assets/voxygen/element/items/item_raptor_feather.png new file mode 100644 index 0000000000..eb440916bf --- /dev/null +++ b/assets/voxygen/element/items/item_raptor_feather.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70f4c5ce07a478bd31b041fa6d586c49e76be00c3bbfbebc868f5a60978372ef +size 673 diff --git a/assets/voxygen/element/items/item_shroom_stick.png b/assets/voxygen/element/items/item_shroom_stick.png new file mode 100644 index 0000000000..a8a8e9cccc --- /dev/null +++ b/assets/voxygen/element/items/item_shroom_stick.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11d399a9a4bd6fd9f09243ff762ffe95c77df1206ec209789886a19d0f336fe3 +size 298 diff --git a/assets/voxygen/element/items/item_sunflower_tea.png b/assets/voxygen/element/items/item_sunflower_tea.png new file mode 100644 index 0000000000..d7ff24ba82 --- /dev/null +++ b/assets/voxygen/element/items/item_sunflower_tea.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20dbe8e9bea367652940a9bb982ba1c9bf3713cc606df663d94a610a2127244d +size 429 diff --git a/assets/voxygen/element/items/lantern_black-0.png b/assets/voxygen/element/items/lantern_black-0.png new file mode 100644 index 0000000000..a21f8b8ff0 --- /dev/null +++ b/assets/voxygen/element/items/lantern_black-0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc678ae6e56fcd366babecaa0059d9366352bf5a671eab9877dc4600bf92d1c1 +size 8954 diff --git a/assets/voxygen/element/items/lantern_blue-0.png b/assets/voxygen/element/items/lantern_blue-0.png new file mode 100644 index 0000000000..3ef2071553 --- /dev/null +++ b/assets/voxygen/element/items/lantern_blue-0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:478988fcf8b5a19e7d8a40577117927ec03c199f8376f871db6798d88f8faf7a +size 1330 diff --git a/assets/voxygen/element/items/lantern_green-0.png b/assets/voxygen/element/items/lantern_green-0.png new file mode 100644 index 0000000000..19c04effab --- /dev/null +++ b/assets/voxygen/element/items/lantern_green-0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd81336062f09071dbd0bf56942bb81f550fc6d985761a9443a5b8c70facd285 +size 1253 diff --git a/assets/voxygen/element/items/lantern_grey-0.png b/assets/voxygen/element/items/lantern_grey-0.png new file mode 100644 index 0000000000..8497146183 --- /dev/null +++ b/assets/voxygen/element/items/lantern_grey-0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3396968bb8fbc36b19381ccb1dd2552a836488735ccb7c34f24eaac90b2a1291 +size 1184 diff --git a/assets/voxygen/element/items/lantern_red-0.png b/assets/voxygen/element/items/lantern_red-0.png new file mode 100644 index 0000000000..f85cdb3dbb --- /dev/null +++ b/assets/voxygen/element/items/lantern_red-0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:327fcd0be2285c9022ed6ab64cc8a9bcc2a87be9169a56af5dc3b4fadf7a2bba +size 1351 diff --git a/assets/voxygen/element/icons/neck-0.png b/assets/voxygen/element/items/neck-0.png similarity index 100% rename from assets/voxygen/element/icons/neck-0.png rename to assets/voxygen/element/items/neck-0.png diff --git a/assets/voxygen/element/icons/neck-1.png b/assets/voxygen/element/items/neck-1.png similarity index 100% rename from assets/voxygen/element/icons/neck-1.png rename to assets/voxygen/element/items/neck-1.png diff --git a/assets/voxygen/element/items/neck-seashell.png b/assets/voxygen/element/items/neck-seashell.png new file mode 100644 index 0000000000..39b352d920 --- /dev/null +++ b/assets/voxygen/element/items/neck-seashell.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d86cdeb2e665896e54c77f4a8efe8fdb7e681663548aec67e2f03acfdc3b4dd3 +size 1554 diff --git a/assets/voxygen/element/icons/ring-0.png b/assets/voxygen/element/items/ring-0.png similarity index 100% rename from assets/voxygen/element/icons/ring-0.png rename to assets/voxygen/element/items/ring-0.png diff --git a/assets/voxygen/element/icons/sewing_set.png b/assets/voxygen/element/items/sewing_set.png similarity index 100% rename from assets/voxygen/element/icons/sewing_set.png rename to assets/voxygen/element/items/sewing_set.png diff --git a/assets/voxygen/element/items/tabard_admin.png b/assets/voxygen/element/items/tabard_admin.png new file mode 100644 index 0000000000..474a5398c3 --- /dev/null +++ b/assets/voxygen/element/items/tabard_admin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f97c7a69588f12566567c847759f6df453f50cf18b50172a9d06b0b80dbcd00 +size 685 diff --git a/assets/voxygen/element/misc_bg/window.png b/assets/voxygen/element/misc_bg/window.png deleted file mode 100644 index a3f9d7fca5..0000000000 --- a/assets/voxygen/element/misc_bg/window.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4aeb912ea4143418b5d90026d094733f442241b6a1e80a9417e5c969778adb3d -size 6415 diff --git a/assets/voxygen/element/missing_icon_grey.png b/assets/voxygen/element/missing_icon_grey.png new file mode 100644 index 0000000000..72d2be8a1b --- /dev/null +++ b/assets/voxygen/element/missing_icon_grey.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec423620aed433181dde227cabec82b5351b29defe3832e485f3fff7bcbd99ac +size 6241 diff --git a/assets/voxygen/element/not_found.png b/assets/voxygen/element/not_found.png index b412f97549..95aa942d23 100644 --- a/assets/voxygen/element/not_found.png +++ b/assets/voxygen/element/not_found.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fd63baa91714e5ca052d141e0c717b260196a8e4bc4cb7584fff53157a4cbf0 -size 5100 +oid sha256:423349d12e719c1d4ca2cdfd55956a0e427384b6e643fbfb614f2a1aee4ffe5f +size 4681 diff --git a/assets/voxygen/element/icons/2haxe_m1.png b/assets/voxygen/element/skills/2haxe_m1.png similarity index 100% rename from assets/voxygen/element/icons/2haxe_m1.png rename to assets/voxygen/element/skills/2haxe_m1.png diff --git a/assets/voxygen/element/icons/2hhammer_m1.png b/assets/voxygen/element/skills/2hhammer_m1.png similarity index 100% rename from assets/voxygen/element/icons/2hhammer_m1.png rename to assets/voxygen/element/skills/2hhammer_m1.png diff --git a/assets/voxygen/element/icons/2hsword_m1.png b/assets/voxygen/element/skills/2hsword_m1.png similarity index 100% rename from assets/voxygen/element/icons/2hsword_m1.png rename to assets/voxygen/element/skills/2hsword_m1.png diff --git a/assets/voxygen/element/icons/2hsword_m2.png b/assets/voxygen/element/skills/2hsword_m2.png similarity index 100% rename from assets/voxygen/element/icons/2hsword_m2.png rename to assets/voxygen/element/skills/2hsword_m2.png diff --git a/assets/voxygen/element/icons/bow_m1.png b/assets/voxygen/element/skills/bow_m1.png similarity index 100% rename from assets/voxygen/element/icons/bow_m1.png rename to assets/voxygen/element/skills/bow_m1.png diff --git a/assets/voxygen/element/icons/bow_m2.png b/assets/voxygen/element/skills/bow_m2.png similarity index 100% rename from assets/voxygen/element/icons/bow_m2.png rename to assets/voxygen/element/skills/bow_m2.png diff --git a/assets/voxygen/element/icons/bow_m2.vox b/assets/voxygen/element/skills/bow_m2.vox similarity index 100% rename from assets/voxygen/element/icons/bow_m2.vox rename to assets/voxygen/element/skills/bow_m2.vox diff --git a/assets/voxygen/element/icons/debug_wand_m1.png b/assets/voxygen/element/skills/debug_wand_m1.png similarity index 100% rename from assets/voxygen/element/icons/debug_wand_m1.png rename to assets/voxygen/element/skills/debug_wand_m1.png diff --git a/assets/voxygen/element/icons/debug_wand_m2.png b/assets/voxygen/element/skills/debug_wand_m2.png similarity index 100% rename from assets/voxygen/element/icons/debug_wand_m2.png rename to assets/voxygen/element/skills/debug_wand_m2.png diff --git a/assets/voxygen/element/icons/heal_0.png b/assets/voxygen/element/skills/heal_0.png similarity index 100% rename from assets/voxygen/element/icons/heal_0.png rename to assets/voxygen/element/skills/heal_0.png diff --git a/assets/voxygen/element/skills/heal_bomb.png b/assets/voxygen/element/skills/heal_bomb.png new file mode 100644 index 0000000000..2d2b1c1547 --- /dev/null +++ b/assets/voxygen/element/skills/heal_bomb.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb2b0c4e384443a213bd0804782c8ddd847f80aa05c2311d99529589085e4c8d +size 465 diff --git a/assets/voxygen/element/skills/lifesteal.png b/assets/voxygen/element/skills/lifesteal.png new file mode 100644 index 0000000000..9a8cc76ab0 --- /dev/null +++ b/assets/voxygen/element/skills/lifesteal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f2ef799f93a347c16818d8460ff1aaffdafa37999fd90709a97fe9ca274ee51 +size 926 diff --git a/assets/voxygen/element/icons/sceptre_protection.png b/assets/voxygen/element/skills/sceptre_protection.png similarity index 100% rename from assets/voxygen/element/icons/sceptre_protection.png rename to assets/voxygen/element/skills/sceptre_protection.png diff --git a/assets/voxygen/element/icons/skill_axe_leap_slash.png b/assets/voxygen/element/skills/skill_axe_leap_slash.png similarity index 100% rename from assets/voxygen/element/icons/skill_axe_leap_slash.png rename to assets/voxygen/element/skills/skill_axe_leap_slash.png diff --git a/assets/voxygen/element/icons/skill_axespin.png b/assets/voxygen/element/skills/skill_axespin.png similarity index 100% rename from assets/voxygen/element/icons/skill_axespin.png rename to assets/voxygen/element/skills/skill_axespin.png diff --git a/assets/voxygen/element/icons/skill_bow_jump_burst.png b/assets/voxygen/element/skills/skill_bow_jump_burst.png similarity index 100% rename from assets/voxygen/element/icons/skill_bow_jump_burst.png rename to assets/voxygen/element/skills/skill_bow_jump_burst.png diff --git a/assets/voxygen/element/skills/skill_fire_aoe.png b/assets/voxygen/element/skills/skill_fire_aoe.png new file mode 100644 index 0000000000..29360935b0 --- /dev/null +++ b/assets/voxygen/element/skills/skill_fire_aoe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:373dd341a5d0f75157b11c4562d2f2527aa23a191b660c4538d201ef08f45986 +size 543 diff --git a/assets/voxygen/element/skills/skill_flamethrower.png b/assets/voxygen/element/skills/skill_flamethrower.png new file mode 100644 index 0000000000..c60b453903 --- /dev/null +++ b/assets/voxygen/element/skills/skill_flamethrower.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b91718bbcd728f1d8e71cb513db50caf7ce98579492ea316977053c09015b12 +size 637 diff --git a/assets/voxygen/element/icons/skill_hammergolf.png b/assets/voxygen/element/skills/skill_hammergolf.png similarity index 100% rename from assets/voxygen/element/icons/skill_hammergolf.png rename to assets/voxygen/element/skills/skill_hammergolf.png diff --git a/assets/voxygen/element/icons/skill_hammerleap.png b/assets/voxygen/element/skills/skill_hammerleap.png similarity index 100% rename from assets/voxygen/element/icons/skill_hammerleap.png rename to assets/voxygen/element/skills/skill_hammerleap.png diff --git a/assets/voxygen/element/icons/skill_slice_2.png b/assets/voxygen/element/skills/skill_slice_2.png similarity index 100% rename from assets/voxygen/element/icons/skill_slice_2.png rename to assets/voxygen/element/skills/skill_slice_2.png diff --git a/assets/voxygen/element/icons/skill_sword_pierce.png b/assets/voxygen/element/skills/skill_sword_pierce.png similarity index 100% rename from assets/voxygen/element/icons/skill_sword_pierce.png rename to assets/voxygen/element/skills/skill_sword_pierce.png diff --git a/assets/voxygen/element/icons/skilltree/buff_amount.png b/assets/voxygen/element/skills/skilltree/buff_amount.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_amount.png rename to assets/voxygen/element/skills/skilltree/buff_amount.png diff --git a/assets/voxygen/element/icons/skilltree/buff_combo.png b/assets/voxygen/element/skills/skilltree/buff_combo.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_combo.png rename to assets/voxygen/element/skills/skilltree/buff_combo.png diff --git a/assets/voxygen/element/icons/skilltree/buff_cost.png b/assets/voxygen/element/skills/skilltree/buff_cost.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_cost.png rename to assets/voxygen/element/skills/skilltree/buff_cost.png diff --git a/assets/voxygen/element/icons/skilltree/buff_damage.png b/assets/voxygen/element/skills/skilltree/buff_damage.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_damage.png rename to assets/voxygen/element/skills/skilltree/buff_damage.png diff --git a/assets/voxygen/element/icons/skilltree/buff_distance.png b/assets/voxygen/element/skills/skilltree/buff_distance.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_distance.png rename to assets/voxygen/element/skills/skilltree/buff_distance.png diff --git a/assets/voxygen/element/icons/skilltree/buff_duration.png b/assets/voxygen/element/skills/skilltree/buff_duration.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_duration.png rename to assets/voxygen/element/skills/skilltree/buff_duration.png diff --git a/assets/voxygen/element/icons/skilltree/buff_energy_drain.png b/assets/voxygen/element/skills/skilltree/buff_energy_drain.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_energy_drain.png rename to assets/voxygen/element/skills/skilltree/buff_energy_drain.png diff --git a/assets/voxygen/element/icons/skilltree/buff_energy_regen.png b/assets/voxygen/element/skills/skilltree/buff_energy_regen.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_energy_regen.png rename to assets/voxygen/element/skills/skilltree/buff_energy_regen.png diff --git a/assets/voxygen/element/icons/skilltree/buff_explosion.png b/assets/voxygen/element/skills/skilltree/buff_explosion.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_explosion.png rename to assets/voxygen/element/skills/skilltree/buff_explosion.png diff --git a/assets/voxygen/element/icons/skilltree/buff_heal.png b/assets/voxygen/element/skills/skilltree/buff_heal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_heal.png rename to assets/voxygen/element/skills/skilltree/buff_heal.png diff --git a/assets/voxygen/element/icons/skilltree/buff_helicopter.png b/assets/voxygen/element/skills/skilltree/buff_helicopter.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_helicopter.png rename to assets/voxygen/element/skills/skilltree/buff_helicopter.png diff --git a/assets/voxygen/element/icons/skilltree/buff_infinite.png b/assets/voxygen/element/skills/skilltree/buff_infinite.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_infinite.png rename to assets/voxygen/element/skills/skilltree/buff_infinite.png diff --git a/assets/voxygen/element/icons/skilltree/buff_knockback.png b/assets/voxygen/element/skills/skilltree/buff_knockback.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_knockback.png rename to assets/voxygen/element/skills/skilltree/buff_knockback.png diff --git a/assets/voxygen/element/icons/skilltree/buff_lifesteal.png b/assets/voxygen/element/skills/skilltree/buff_lifesteal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_lifesteal.png rename to assets/voxygen/element/skills/skilltree/buff_lifesteal.png diff --git a/assets/voxygen/element/icons/skilltree/buff_projectile_speed.png b/assets/voxygen/element/skills/skilltree/buff_projectile_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_projectile_speed.png rename to assets/voxygen/element/skills/skilltree/buff_projectile_speed.png diff --git a/assets/voxygen/element/icons/skilltree/buff_radius.png b/assets/voxygen/element/skills/skilltree/buff_radius.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_radius.png rename to assets/voxygen/element/skills/skilltree/buff_radius.png diff --git a/assets/voxygen/element/icons/skilltree/buff_speed.png b/assets/voxygen/element/skills/skilltree/buff_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/buff_speed.png rename to assets/voxygen/element/skills/skilltree/buff_speed.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_amount.png b/assets/voxygen/element/skills/skilltree/debuff_amount.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_amount.png rename to assets/voxygen/element/skills/skilltree/debuff_amount.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_combo.png b/assets/voxygen/element/skills/skilltree/debuff_combo.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_combo.png rename to assets/voxygen/element/skills/skilltree/debuff_combo.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_cost.png b/assets/voxygen/element/skills/skilltree/debuff_cost.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_cost.png rename to assets/voxygen/element/skills/skilltree/debuff_cost.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_damage.png b/assets/voxygen/element/skills/skilltree/debuff_damage.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_damage.png rename to assets/voxygen/element/skills/skilltree/debuff_damage.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_distance.png b/assets/voxygen/element/skills/skilltree/debuff_distance.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_distance.png rename to assets/voxygen/element/skills/skilltree/debuff_distance.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_duration.png b/assets/voxygen/element/skills/skilltree/debuff_duration.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_duration.png rename to assets/voxygen/element/skills/skilltree/debuff_duration.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_energy_drain.png b/assets/voxygen/element/skills/skilltree/debuff_energy_drain.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_energy_drain.png rename to assets/voxygen/element/skills/skilltree/debuff_energy_drain.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_energy_regen.png b/assets/voxygen/element/skills/skilltree/debuff_energy_regen.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_energy_regen.png rename to assets/voxygen/element/skills/skilltree/debuff_energy_regen.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_explosion.png b/assets/voxygen/element/skills/skilltree/debuff_explosion.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_explosion.png rename to assets/voxygen/element/skills/skilltree/debuff_explosion.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_heal.png b/assets/voxygen/element/skills/skilltree/debuff_heal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_heal.png rename to assets/voxygen/element/skills/skilltree/debuff_heal.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_helicopter.png b/assets/voxygen/element/skills/skilltree/debuff_helicopter.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_helicopter.png rename to assets/voxygen/element/skills/skilltree/debuff_helicopter.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_infinite.png b/assets/voxygen/element/skills/skilltree/debuff_infinite.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_infinite.png rename to assets/voxygen/element/skills/skilltree/debuff_infinite.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_knockback.png b/assets/voxygen/element/skills/skilltree/debuff_knockback.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_knockback.png rename to assets/voxygen/element/skills/skilltree/debuff_knockback.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_lifesteal.png b/assets/voxygen/element/skills/skilltree/debuff_lifesteal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_lifesteal.png rename to assets/voxygen/element/skills/skilltree/debuff_lifesteal.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_projectile_speed.png b/assets/voxygen/element/skills/skilltree/debuff_projectile_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_projectile_speed.png rename to assets/voxygen/element/skills/skilltree/debuff_projectile_speed.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_radius.png b/assets/voxygen/element/skills/skilltree/debuff_radius.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_radius.png rename to assets/voxygen/element/skills/skilltree/debuff_radius.png diff --git a/assets/voxygen/element/icons/skilltree/debuff_speed.png b/assets/voxygen/element/skills/skilltree/debuff_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/debuff_speed.png rename to assets/voxygen/element/skills/skilltree/debuff_speed.png diff --git a/assets/voxygen/element/icons/skilltree/heal_amount.png b/assets/voxygen/element/skills/skilltree/heal_amount.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_amount.png rename to assets/voxygen/element/skills/skilltree/heal_amount.png diff --git a/assets/voxygen/element/icons/skilltree/heal_combo.png b/assets/voxygen/element/skills/skilltree/heal_combo.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_combo.png rename to assets/voxygen/element/skills/skilltree/heal_combo.png diff --git a/assets/voxygen/element/icons/skilltree/heal_cost.png b/assets/voxygen/element/skills/skilltree/heal_cost.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_cost.png rename to assets/voxygen/element/skills/skilltree/heal_cost.png diff --git a/assets/voxygen/element/icons/skilltree/heal_damage.png b/assets/voxygen/element/skills/skilltree/heal_damage.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_damage.png rename to assets/voxygen/element/skills/skilltree/heal_damage.png diff --git a/assets/voxygen/element/icons/skilltree/heal_distance.png b/assets/voxygen/element/skills/skilltree/heal_distance.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_distance.png rename to assets/voxygen/element/skills/skilltree/heal_distance.png diff --git a/assets/voxygen/element/icons/skilltree/heal_duration.png b/assets/voxygen/element/skills/skilltree/heal_duration.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_duration.png rename to assets/voxygen/element/skills/skilltree/heal_duration.png diff --git a/assets/voxygen/element/icons/skilltree/heal_energy_drain.png b/assets/voxygen/element/skills/skilltree/heal_energy_drain.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_energy_drain.png rename to assets/voxygen/element/skills/skilltree/heal_energy_drain.png diff --git a/assets/voxygen/element/icons/skilltree/heal_energy_regen.png b/assets/voxygen/element/skills/skilltree/heal_energy_regen.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_energy_regen.png rename to assets/voxygen/element/skills/skilltree/heal_energy_regen.png diff --git a/assets/voxygen/element/icons/skilltree/heal_explosion.png b/assets/voxygen/element/skills/skilltree/heal_explosion.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_explosion.png rename to assets/voxygen/element/skills/skilltree/heal_explosion.png diff --git a/assets/voxygen/element/icons/skilltree/heal_heal.png b/assets/voxygen/element/skills/skilltree/heal_heal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_heal.png rename to assets/voxygen/element/skills/skilltree/heal_heal.png diff --git a/assets/voxygen/element/icons/skilltree/heal_helicopter.png b/assets/voxygen/element/skills/skilltree/heal_helicopter.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_helicopter.png rename to assets/voxygen/element/skills/skilltree/heal_helicopter.png diff --git a/assets/voxygen/element/icons/skilltree/heal_infinite.png b/assets/voxygen/element/skills/skilltree/heal_infinite.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_infinite.png rename to assets/voxygen/element/skills/skilltree/heal_infinite.png diff --git a/assets/voxygen/element/icons/skilltree/heal_knockback.png b/assets/voxygen/element/skills/skilltree/heal_knockback.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_knockback.png rename to assets/voxygen/element/skills/skilltree/heal_knockback.png diff --git a/assets/voxygen/element/icons/skilltree/heal_lifesteal.png b/assets/voxygen/element/skills/skilltree/heal_lifesteal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_lifesteal.png rename to assets/voxygen/element/skills/skilltree/heal_lifesteal.png diff --git a/assets/voxygen/element/icons/skilltree/heal_projectile_speed.png b/assets/voxygen/element/skills/skilltree/heal_projectile_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_projectile_speed.png rename to assets/voxygen/element/skills/skilltree/heal_projectile_speed.png diff --git a/assets/voxygen/element/icons/skilltree/heal_radius.png b/assets/voxygen/element/skills/skilltree/heal_radius.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_radius.png rename to assets/voxygen/element/skills/skilltree/heal_radius.png diff --git a/assets/voxygen/element/icons/skilltree/heal_speed.png b/assets/voxygen/element/skills/skilltree/heal_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/heal_speed.png rename to assets/voxygen/element/skills/skilltree/heal_speed.png diff --git a/assets/voxygen/element/icons/skilltree/health_plus.png b/assets/voxygen/element/skills/skilltree/health_plus.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/health_plus.png rename to assets/voxygen/element/skills/skilltree/health_plus.png diff --git a/assets/voxygen/element/icons/skilltree/magic_amount.png b/assets/voxygen/element/skills/skilltree/magic_amount.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_amount.png rename to assets/voxygen/element/skills/skilltree/magic_amount.png diff --git a/assets/voxygen/element/icons/skilltree/magic_combo.png b/assets/voxygen/element/skills/skilltree/magic_combo.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_combo.png rename to assets/voxygen/element/skills/skilltree/magic_combo.png diff --git a/assets/voxygen/element/icons/skilltree/magic_cost.png b/assets/voxygen/element/skills/skilltree/magic_cost.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_cost.png rename to assets/voxygen/element/skills/skilltree/magic_cost.png diff --git a/assets/voxygen/element/icons/skilltree/magic_damage.png b/assets/voxygen/element/skills/skilltree/magic_damage.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_damage.png rename to assets/voxygen/element/skills/skilltree/magic_damage.png diff --git a/assets/voxygen/element/icons/skilltree/magic_distance.png b/assets/voxygen/element/skills/skilltree/magic_distance.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_distance.png rename to assets/voxygen/element/skills/skilltree/magic_distance.png diff --git a/assets/voxygen/element/icons/skilltree/magic_duration.png b/assets/voxygen/element/skills/skilltree/magic_duration.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_duration.png rename to assets/voxygen/element/skills/skilltree/magic_duration.png diff --git a/assets/voxygen/element/icons/skilltree/magic_energy_drain.png b/assets/voxygen/element/skills/skilltree/magic_energy_drain.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_energy_drain.png rename to assets/voxygen/element/skills/skilltree/magic_energy_drain.png diff --git a/assets/voxygen/element/icons/skilltree/magic_energy_regen.png b/assets/voxygen/element/skills/skilltree/magic_energy_regen.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_energy_regen.png rename to assets/voxygen/element/skills/skilltree/magic_energy_regen.png diff --git a/assets/voxygen/element/icons/skilltree/magic_explosion.png b/assets/voxygen/element/skills/skilltree/magic_explosion.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_explosion.png rename to assets/voxygen/element/skills/skilltree/magic_explosion.png diff --git a/assets/voxygen/element/icons/skilltree/magic_heal.png b/assets/voxygen/element/skills/skilltree/magic_heal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_heal.png rename to assets/voxygen/element/skills/skilltree/magic_heal.png diff --git a/assets/voxygen/element/icons/skilltree/magic_helicopter.png b/assets/voxygen/element/skills/skilltree/magic_helicopter.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_helicopter.png rename to assets/voxygen/element/skills/skilltree/magic_helicopter.png diff --git a/assets/voxygen/element/icons/skilltree/magic_infinite.png b/assets/voxygen/element/skills/skilltree/magic_infinite.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_infinite.png rename to assets/voxygen/element/skills/skilltree/magic_infinite.png diff --git a/assets/voxygen/element/icons/skilltree/magic_knockback.png b/assets/voxygen/element/skills/skilltree/magic_knockback.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_knockback.png rename to assets/voxygen/element/skills/skilltree/magic_knockback.png diff --git a/assets/voxygen/element/icons/skilltree/magic_lifesteal.png b/assets/voxygen/element/skills/skilltree/magic_lifesteal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_lifesteal.png rename to assets/voxygen/element/skills/skilltree/magic_lifesteal.png diff --git a/assets/voxygen/element/icons/skilltree/magic_projectile_speed.png b/assets/voxygen/element/skills/skilltree/magic_projectile_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_projectile_speed.png rename to assets/voxygen/element/skills/skilltree/magic_projectile_speed.png diff --git a/assets/voxygen/element/icons/skilltree/magic_radius.png b/assets/voxygen/element/skills/skilltree/magic_radius.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_radius.png rename to assets/voxygen/element/skills/skilltree/magic_radius.png diff --git a/assets/voxygen/element/icons/skilltree/magic_speed.png b/assets/voxygen/element/skills/skilltree/magic_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/magic_speed.png rename to assets/voxygen/element/skills/skilltree/magic_speed.png diff --git a/assets/voxygen/element/icons/skilltree/physical_amount.png b/assets/voxygen/element/skills/skilltree/physical_amount.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_amount.png rename to assets/voxygen/element/skills/skilltree/physical_amount.png diff --git a/assets/voxygen/element/icons/skilltree/physical_combo.png b/assets/voxygen/element/skills/skilltree/physical_combo.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_combo.png rename to assets/voxygen/element/skills/skilltree/physical_combo.png diff --git a/assets/voxygen/element/icons/skilltree/physical_cost.png b/assets/voxygen/element/skills/skilltree/physical_cost.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_cost.png rename to assets/voxygen/element/skills/skilltree/physical_cost.png diff --git a/assets/voxygen/element/icons/skilltree/physical_damage.png b/assets/voxygen/element/skills/skilltree/physical_damage.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_damage.png rename to assets/voxygen/element/skills/skilltree/physical_damage.png diff --git a/assets/voxygen/element/icons/skilltree/physical_distance.png b/assets/voxygen/element/skills/skilltree/physical_distance.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_distance.png rename to assets/voxygen/element/skills/skilltree/physical_distance.png diff --git a/assets/voxygen/element/icons/skilltree/physical_duration.png b/assets/voxygen/element/skills/skilltree/physical_duration.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_duration.png rename to assets/voxygen/element/skills/skilltree/physical_duration.png diff --git a/assets/voxygen/element/icons/skilltree/physical_energy_drain.png b/assets/voxygen/element/skills/skilltree/physical_energy_drain.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_energy_drain.png rename to assets/voxygen/element/skills/skilltree/physical_energy_drain.png diff --git a/assets/voxygen/element/icons/skilltree/physical_energy_regen.png b/assets/voxygen/element/skills/skilltree/physical_energy_regen.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_energy_regen.png rename to assets/voxygen/element/skills/skilltree/physical_energy_regen.png diff --git a/assets/voxygen/element/icons/skilltree/physical_explosion.png b/assets/voxygen/element/skills/skilltree/physical_explosion.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_explosion.png rename to assets/voxygen/element/skills/skilltree/physical_explosion.png diff --git a/assets/voxygen/element/icons/skilltree/physical_heal.png b/assets/voxygen/element/skills/skilltree/physical_heal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_heal.png rename to assets/voxygen/element/skills/skilltree/physical_heal.png diff --git a/assets/voxygen/element/icons/skilltree/physical_helicopter.png b/assets/voxygen/element/skills/skilltree/physical_helicopter.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_helicopter.png rename to assets/voxygen/element/skills/skilltree/physical_helicopter.png diff --git a/assets/voxygen/element/icons/skilltree/physical_infinite.png b/assets/voxygen/element/skills/skilltree/physical_infinite.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_infinite.png rename to assets/voxygen/element/skills/skilltree/physical_infinite.png diff --git a/assets/voxygen/element/icons/skilltree/physical_knockback.png b/assets/voxygen/element/skills/skilltree/physical_knockback.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_knockback.png rename to assets/voxygen/element/skills/skilltree/physical_knockback.png diff --git a/assets/voxygen/element/icons/skilltree/physical_lifesteal.png b/assets/voxygen/element/skills/skilltree/physical_lifesteal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_lifesteal.png rename to assets/voxygen/element/skills/skilltree/physical_lifesteal.png diff --git a/assets/voxygen/element/icons/skilltree/physical_projectile_speed.png b/assets/voxygen/element/skills/skilltree/physical_projectile_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_projectile_speed.png rename to assets/voxygen/element/skills/skilltree/physical_projectile_speed.png diff --git a/assets/voxygen/element/icons/skilltree/physical_radius.png b/assets/voxygen/element/skills/skilltree/physical_radius.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_radius.png rename to assets/voxygen/element/skills/skilltree/physical_radius.png diff --git a/assets/voxygen/element/icons/skilltree/physical_speed.png b/assets/voxygen/element/skills/skilltree/physical_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/physical_speed.png rename to assets/voxygen/element/skills/skilltree/physical_speed.png diff --git a/assets/voxygen/element/icons/skilltree/skill_climbing.png b/assets/voxygen/element/skills/skilltree/skill_climbing.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/skill_climbing.png rename to assets/voxygen/element/skills/skilltree/skill_climbing.png diff --git a/assets/voxygen/element/icons/skilltree/skill_dodge.png b/assets/voxygen/element/skills/skilltree/skill_dodge.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/skill_dodge.png rename to assets/voxygen/element/skills/skilltree/skill_dodge.png diff --git a/assets/voxygen/element/icons/skilltree/skill_swim.png b/assets/voxygen/element/skills/skilltree/skill_swim.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/skill_swim.png rename to assets/voxygen/element/skills/skilltree/skill_swim.png diff --git a/assets/voxygen/element/icons/skilltree/stamina_plus.png b/assets/voxygen/element/skills/skilltree/stamina_plus.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/stamina_plus.png rename to assets/voxygen/element/skills/skilltree/stamina_plus.png diff --git a/assets/voxygen/element/icons/skilltree/unlock_axe.png b/assets/voxygen/element/skills/skilltree/unlock_axe.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/unlock_axe.png rename to assets/voxygen/element/skills/skilltree/unlock_axe.png diff --git a/assets/voxygen/element/icons/skilltree/unlock_bow.png b/assets/voxygen/element/skills/skilltree/unlock_bow.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/unlock_bow.png rename to assets/voxygen/element/skills/skilltree/unlock_bow.png diff --git a/assets/voxygen/element/icons/skilltree/unlock_hammer.png b/assets/voxygen/element/skills/skilltree/unlock_hammer.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/unlock_hammer.png rename to assets/voxygen/element/skills/skilltree/unlock_hammer.png diff --git a/assets/voxygen/element/icons/skilltree/unlock_sceptre.png b/assets/voxygen/element/skills/skilltree/unlock_sceptre.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/unlock_sceptre.png rename to assets/voxygen/element/skills/skilltree/unlock_sceptre.png diff --git a/assets/voxygen/element/icons/skilltree/unlock_staff-0.png b/assets/voxygen/element/skills/skilltree/unlock_staff-0.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/unlock_staff-0.png rename to assets/voxygen/element/skills/skilltree/unlock_staff-0.png diff --git a/assets/voxygen/element/icons/skilltree/unlock_sword.png b/assets/voxygen/element/skills/skilltree/unlock_sword.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/unlock_sword.png rename to assets/voxygen/element/skills/skilltree/unlock_sword.png diff --git a/assets/voxygen/element/icons/skilltree/utility_amount.png b/assets/voxygen/element/skills/skilltree/utility_amount.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_amount.png rename to assets/voxygen/element/skills/skilltree/utility_amount.png diff --git a/assets/voxygen/element/icons/skilltree/utility_combo.png b/assets/voxygen/element/skills/skilltree/utility_combo.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_combo.png rename to assets/voxygen/element/skills/skilltree/utility_combo.png diff --git a/assets/voxygen/element/icons/skilltree/utility_cost.png b/assets/voxygen/element/skills/skilltree/utility_cost.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_cost.png rename to assets/voxygen/element/skills/skilltree/utility_cost.png diff --git a/assets/voxygen/element/icons/skilltree/utility_damage.png b/assets/voxygen/element/skills/skilltree/utility_damage.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_damage.png rename to assets/voxygen/element/skills/skilltree/utility_damage.png diff --git a/assets/voxygen/element/icons/skilltree/utility_distance.png b/assets/voxygen/element/skills/skilltree/utility_distance.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_distance.png rename to assets/voxygen/element/skills/skilltree/utility_distance.png diff --git a/assets/voxygen/element/icons/skilltree/utility_duration.png b/assets/voxygen/element/skills/skilltree/utility_duration.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_duration.png rename to assets/voxygen/element/skills/skilltree/utility_duration.png diff --git a/assets/voxygen/element/icons/skilltree/utility_energy_drain.png b/assets/voxygen/element/skills/skilltree/utility_energy_drain.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_energy_drain.png rename to assets/voxygen/element/skills/skilltree/utility_energy_drain.png diff --git a/assets/voxygen/element/icons/skilltree/utility_energy_regen.png b/assets/voxygen/element/skills/skilltree/utility_energy_regen.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_energy_regen.png rename to assets/voxygen/element/skills/skilltree/utility_energy_regen.png diff --git a/assets/voxygen/element/icons/skilltree/utility_explosion.png b/assets/voxygen/element/skills/skilltree/utility_explosion.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_explosion.png rename to assets/voxygen/element/skills/skilltree/utility_explosion.png diff --git a/assets/voxygen/element/icons/skilltree/utility_heal.png b/assets/voxygen/element/skills/skilltree/utility_heal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_heal.png rename to assets/voxygen/element/skills/skilltree/utility_heal.png diff --git a/assets/voxygen/element/icons/skilltree/utility_helicopter.png b/assets/voxygen/element/skills/skilltree/utility_helicopter.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_helicopter.png rename to assets/voxygen/element/skills/skilltree/utility_helicopter.png diff --git a/assets/voxygen/element/icons/skilltree/utility_infinite.png b/assets/voxygen/element/skills/skilltree/utility_infinite.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_infinite.png rename to assets/voxygen/element/skills/skilltree/utility_infinite.png diff --git a/assets/voxygen/element/icons/skilltree/utility_knockback.png b/assets/voxygen/element/skills/skilltree/utility_knockback.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_knockback.png rename to assets/voxygen/element/skills/skilltree/utility_knockback.png diff --git a/assets/voxygen/element/icons/skilltree/utility_lifesteal.png b/assets/voxygen/element/skills/skilltree/utility_lifesteal.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_lifesteal.png rename to assets/voxygen/element/skills/skilltree/utility_lifesteal.png diff --git a/assets/voxygen/element/icons/skilltree/utility_projectile_speed.png b/assets/voxygen/element/skills/skilltree/utility_projectile_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_projectile_speed.png rename to assets/voxygen/element/skills/skilltree/utility_projectile_speed.png diff --git a/assets/voxygen/element/icons/skilltree/utility_radius.png b/assets/voxygen/element/skills/skilltree/utility_radius.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_radius.png rename to assets/voxygen/element/skills/skilltree/utility_radius.png diff --git a/assets/voxygen/element/icons/skilltree/utility_speed.png b/assets/voxygen/element/skills/skilltree/utility_speed.png similarity index 100% rename from assets/voxygen/element/icons/skilltree/utility_speed.png rename to assets/voxygen/element/skills/skilltree/utility_speed.png diff --git a/assets/voxygen/element/icons/snake.png b/assets/voxygen/element/skills/snake.png similarity index 100% rename from assets/voxygen/element/icons/snake.png rename to assets/voxygen/element/skills/snake.png diff --git a/assets/voxygen/element/icons/snake_green.png b/assets/voxygen/element/skills/snake_green.png similarity index 100% rename from assets/voxygen/element/icons/snake_green.png rename to assets/voxygen/element/skills/snake_green.png diff --git a/assets/voxygen/element/icons/staff_m1.png b/assets/voxygen/element/skills/staff_m1.png similarity index 100% rename from assets/voxygen/element/icons/staff_m1.png rename to assets/voxygen/element/skills/staff_m1.png diff --git a/assets/voxygen/element/skills/staff_m2.png b/assets/voxygen/element/skills/staff_m2.png new file mode 100644 index 0000000000..830b0455d9 --- /dev/null +++ b/assets/voxygen/element/skills/staff_m2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e0ade1c26eb0401f9b99963b84c80072705e05d104935b936d9252bffd014db +size 425 diff --git a/assets/voxygen/element/icons/sword_whirlwind.png b/assets/voxygen/element/skills/sword_whirlwind.png similarity index 100% rename from assets/voxygen/element/icons/sword_whirlwind.png rename to assets/voxygen/element/skills/sword_whirlwind.png diff --git a/assets/voxygen/element/icons/back.png b/assets/voxygen/element/ui/bag/backgrounds/back.png similarity index 100% rename from assets/voxygen/element/icons/back.png rename to assets/voxygen/element/ui/bag/backgrounds/back.png diff --git a/assets/voxygen/element/icons/bag.png b/assets/voxygen/element/ui/bag/backgrounds/bag.png similarity index 100% rename from assets/voxygen/element/icons/bag.png rename to assets/voxygen/element/ui/bag/backgrounds/bag.png diff --git a/assets/voxygen/element/icons/belt.png b/assets/voxygen/element/ui/bag/backgrounds/belt.png similarity index 100% rename from assets/voxygen/element/icons/belt.png rename to assets/voxygen/element/ui/bag/backgrounds/belt.png diff --git a/assets/voxygen/element/icons/chest.png b/assets/voxygen/element/ui/bag/backgrounds/chest.png similarity index 100% rename from assets/voxygen/element/icons/chest.png rename to assets/voxygen/element/ui/bag/backgrounds/chest.png diff --git a/assets/voxygen/element/icons/feet.png b/assets/voxygen/element/ui/bag/backgrounds/feet.png similarity index 100% rename from assets/voxygen/element/icons/feet.png rename to assets/voxygen/element/ui/bag/backgrounds/feet.png diff --git a/assets/voxygen/element/icons/glider.png b/assets/voxygen/element/ui/bag/backgrounds/glider.png similarity index 100% rename from assets/voxygen/element/icons/glider.png rename to assets/voxygen/element/ui/bag/backgrounds/glider.png diff --git a/assets/voxygen/element/icons/hands.png b/assets/voxygen/element/ui/bag/backgrounds/hands.png similarity index 100% rename from assets/voxygen/element/icons/hands.png rename to assets/voxygen/element/ui/bag/backgrounds/hands.png diff --git a/assets/voxygen/element/icons/head.png b/assets/voxygen/element/ui/bag/backgrounds/head.png similarity index 100% rename from assets/voxygen/element/icons/head.png rename to assets/voxygen/element/ui/bag/backgrounds/head.png diff --git a/assets/voxygen/element/icons/lantern.png b/assets/voxygen/element/ui/bag/backgrounds/lantern.png similarity index 100% rename from assets/voxygen/element/icons/lantern.png rename to assets/voxygen/element/ui/bag/backgrounds/lantern.png diff --git a/assets/voxygen/element/icons/legs.png b/assets/voxygen/element/ui/bag/backgrounds/legs.png similarity index 100% rename from assets/voxygen/element/icons/legs.png rename to assets/voxygen/element/ui/bag/backgrounds/legs.png diff --git a/assets/voxygen/element/icons/mainhand.png b/assets/voxygen/element/ui/bag/backgrounds/mainhand.png similarity index 100% rename from assets/voxygen/element/icons/mainhand.png rename to assets/voxygen/element/ui/bag/backgrounds/mainhand.png diff --git a/assets/voxygen/element/icons/necklace.png b/assets/voxygen/element/ui/bag/backgrounds/necklace.png similarity index 100% rename from assets/voxygen/element/icons/necklace.png rename to assets/voxygen/element/ui/bag/backgrounds/necklace.png diff --git a/assets/voxygen/element/icons/offhand.png b/assets/voxygen/element/ui/bag/backgrounds/offhand.png similarity index 100% rename from assets/voxygen/element/icons/offhand.png rename to assets/voxygen/element/ui/bag/backgrounds/offhand.png diff --git a/assets/voxygen/element/icons/ring.png b/assets/voxygen/element/ui/bag/backgrounds/ring.png similarity index 100% rename from assets/voxygen/element/icons/ring.png rename to assets/voxygen/element/ui/bag/backgrounds/ring.png diff --git a/assets/voxygen/element/icons/shoulders.png b/assets/voxygen/element/ui/bag/backgrounds/shoulders.png similarity index 100% rename from assets/voxygen/element/icons/shoulders.png rename to assets/voxygen/element/ui/bag/backgrounds/shoulders.png diff --git a/assets/voxygen/element/icons/tabard.png b/assets/voxygen/element/ui/bag/backgrounds/tabard.png similarity index 100% rename from assets/voxygen/element/icons/tabard.png rename to assets/voxygen/element/ui/bag/backgrounds/tabard.png diff --git a/assets/voxygen/element/buttons/inv_collapse.png b/assets/voxygen/element/ui/bag/buttons/inv_collapse.png similarity index 100% rename from assets/voxygen/element/buttons/inv_collapse.png rename to assets/voxygen/element/ui/bag/buttons/inv_collapse.png diff --git a/assets/voxygen/element/buttons/inv_collapse_hover.png b/assets/voxygen/element/ui/bag/buttons/inv_collapse_hover.png similarity index 100% rename from assets/voxygen/element/buttons/inv_collapse_hover.png rename to assets/voxygen/element/ui/bag/buttons/inv_collapse_hover.png diff --git a/assets/voxygen/element/buttons/inv_collapse_press.png b/assets/voxygen/element/ui/bag/buttons/inv_collapse_press.png similarity index 100% rename from assets/voxygen/element/buttons/inv_collapse_press.png rename to assets/voxygen/element/ui/bag/buttons/inv_collapse_press.png diff --git a/assets/voxygen/element/buttons/inv_expand.png b/assets/voxygen/element/ui/bag/buttons/inv_expand.png similarity index 100% rename from assets/voxygen/element/buttons/inv_expand.png rename to assets/voxygen/element/ui/bag/buttons/inv_expand.png diff --git a/assets/voxygen/element/buttons/inv_expand_hover.png b/assets/voxygen/element/ui/bag/buttons/inv_expand_hover.png similarity index 100% rename from assets/voxygen/element/buttons/inv_expand_hover.png rename to assets/voxygen/element/ui/bag/buttons/inv_expand_hover.png diff --git a/assets/voxygen/element/buttons/inv_expand_press.png b/assets/voxygen/element/ui/bag/buttons/inv_expand_press.png similarity index 100% rename from assets/voxygen/element/buttons/inv_expand_press.png rename to assets/voxygen/element/ui/bag/buttons/inv_expand_press.png diff --git a/assets/voxygen/element/buttons/inv_slot.png b/assets/voxygen/element/ui/bag/buttons/inv_slot.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot.png diff --git a/assets/voxygen/element/buttons/inv_slot_blue.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_blue.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot_blue.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot_blue.png diff --git a/assets/voxygen/element/buttons/inv_slot_gold.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_gold.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot_gold.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot_gold.png diff --git a/assets/voxygen/element/buttons/inv_slot_green.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_green.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot_green.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot_green.png diff --git a/assets/voxygen/element/buttons/inv_slot_grey.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_grey.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot_grey.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot_grey.png diff --git a/assets/voxygen/element/buttons/inv_slot_orange.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_orange.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot_orange.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot_orange.png diff --git a/assets/voxygen/element/buttons/inv_slot_purple.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_purple.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot_purple.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot_purple.png diff --git a/assets/voxygen/element/buttons/inv_slot_red.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_red.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot_red.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot_red.png diff --git a/assets/voxygen/element/buttons/inv_slot_sel.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_sel.png similarity index 100% rename from assets/voxygen/element/buttons/inv_slot_sel.png rename to assets/voxygen/element/ui/bag/buttons/inv_slot_sel.png diff --git a/assets/voxygen/element/buttons/inv_tab_active.png b/assets/voxygen/element/ui/bag/buttons/inv_tab_active.png similarity index 100% rename from assets/voxygen/element/buttons/inv_tab_active.png rename to assets/voxygen/element/ui/bag/buttons/inv_tab_active.png diff --git a/assets/voxygen/element/buttons/inv_tab_inactive.png b/assets/voxygen/element/ui/bag/buttons/inv_tab_inactive.png similarity index 100% rename from assets/voxygen/element/buttons/inv_tab_inactive.png rename to assets/voxygen/element/ui/bag/buttons/inv_tab_inactive.png diff --git a/assets/voxygen/element/buttons/inv_tab_inactive_hover.png b/assets/voxygen/element/ui/bag/buttons/inv_tab_inactive_hover.png similarity index 100% rename from assets/voxygen/element/buttons/inv_tab_inactive_hover.png rename to assets/voxygen/element/ui/bag/buttons/inv_tab_inactive_hover.png diff --git a/assets/voxygen/element/buttons/inv_tab_inactive_press.png b/assets/voxygen/element/ui/bag/buttons/inv_tab_inactive_press.png similarity index 100% rename from assets/voxygen/element/buttons/inv_tab_inactive_press.png rename to assets/voxygen/element/ui/bag/buttons/inv_tab_inactive_press.png diff --git a/assets/voxygen/element/icons/character.png b/assets/voxygen/element/ui/bag/icons/character.png similarity index 100% rename from assets/voxygen/element/icons/character.png rename to assets/voxygen/element/ui/bag/icons/character.png diff --git a/assets/voxygen/element/icons/combat_rating.png b/assets/voxygen/element/ui/bag/icons/combat_rating.png similarity index 100% rename from assets/voxygen/element/icons/combat_rating.png rename to assets/voxygen/element/ui/bag/icons/combat_rating.png diff --git a/assets/voxygen/element/icons/combat_rating_shadow.png b/assets/voxygen/element/ui/bag/icons/combat_rating_shadow.png similarity index 100% rename from assets/voxygen/element/icons/combat_rating_shadow.png rename to assets/voxygen/element/ui/bag/icons/combat_rating_shadow.png diff --git a/assets/voxygen/element/icons/health.png b/assets/voxygen/element/ui/bag/icons/health.png similarity index 100% rename from assets/voxygen/element/icons/health.png rename to assets/voxygen/element/ui/bag/icons/health.png diff --git a/assets/voxygen/element/icons/protection.png b/assets/voxygen/element/ui/bag/icons/protection.png similarity index 100% rename from assets/voxygen/element/icons/protection.png rename to assets/voxygen/element/ui/bag/icons/protection.png diff --git a/assets/voxygen/element/icons/stamina.png b/assets/voxygen/element/ui/bag/icons/stamina.png similarity index 100% rename from assets/voxygen/element/icons/stamina.png rename to assets/voxygen/element/ui/bag/icons/stamina.png diff --git a/assets/voxygen/element/icons/stun_res.png b/assets/voxygen/element/ui/bag/icons/stun_res.png similarity index 100% rename from assets/voxygen/element/icons/stun_res.png rename to assets/voxygen/element/ui/bag/icons/stun_res.png diff --git a/assets/voxygen/element/misc_bg/inv_bg_0.png b/assets/voxygen/element/ui/bag/inv_bg_0.png similarity index 100% rename from assets/voxygen/element/misc_bg/inv_bg_0.png rename to assets/voxygen/element/ui/bag/inv_bg_0.png diff --git a/assets/voxygen/element/misc_bg/inv_bg_1.png b/assets/voxygen/element/ui/bag/inv_bg_1.png similarity index 100% rename from assets/voxygen/element/misc_bg/inv_bg_1.png rename to assets/voxygen/element/ui/bag/inv_bg_1.png diff --git a/assets/voxygen/element/misc_bg/inv_bg_bag.png b/assets/voxygen/element/ui/bag/inv_bg_bag.png similarity index 100% rename from assets/voxygen/element/misc_bg/inv_bg_bag.png rename to assets/voxygen/element/ui/bag/inv_bg_bag.png diff --git a/assets/voxygen/element/misc_bg/inv_frame.png b/assets/voxygen/element/ui/bag/inv_frame.png similarity index 100% rename from assets/voxygen/element/misc_bg/inv_frame.png rename to assets/voxygen/element/ui/bag/inv_frame.png diff --git a/assets/voxygen/element/misc_bg/inv_frame_bag.png b/assets/voxygen/element/ui/bag/inv_frame_bag.png similarity index 100% rename from assets/voxygen/element/misc_bg/inv_frame_bag.png rename to assets/voxygen/element/ui/bag/inv_frame_bag.png diff --git a/assets/voxygen/element/icons/dice.png b/assets/voxygen/element/ui/char_select/icons/dice.png similarity index 100% rename from assets/voxygen/element/icons/dice.png rename to assets/voxygen/element/ui/char_select/icons/dice.png diff --git a/assets/voxygen/element/icons/dice_hover.png b/assets/voxygen/element/ui/char_select/icons/dice_hover.png similarity index 100% rename from assets/voxygen/element/icons/dice_hover.png rename to assets/voxygen/element/ui/char_select/icons/dice_hover.png diff --git a/assets/voxygen/element/icons/dice_press.png b/assets/voxygen/element/ui/char_select/icons/dice_press.png similarity index 100% rename from assets/voxygen/element/icons/dice_press.png rename to assets/voxygen/element/ui/char_select/icons/dice_press.png diff --git a/assets/voxygen/element/icons/danari_f.png b/assets/voxygen/element/ui/char_select/portraits/danari_f.png similarity index 100% rename from assets/voxygen/element/icons/danari_f.png rename to assets/voxygen/element/ui/char_select/portraits/danari_f.png diff --git a/assets/voxygen/element/icons/danari_m.png b/assets/voxygen/element/ui/char_select/portraits/danari_m.png similarity index 100% rename from assets/voxygen/element/icons/danari_m.png rename to assets/voxygen/element/ui/char_select/portraits/danari_m.png diff --git a/assets/voxygen/element/icons/dwarf_f.png b/assets/voxygen/element/ui/char_select/portraits/dwarf_f.png similarity index 100% rename from assets/voxygen/element/icons/dwarf_f.png rename to assets/voxygen/element/ui/char_select/portraits/dwarf_f.png diff --git a/assets/voxygen/element/icons/dwarf_m.png b/assets/voxygen/element/ui/char_select/portraits/dwarf_m.png similarity index 100% rename from assets/voxygen/element/icons/dwarf_m.png rename to assets/voxygen/element/ui/char_select/portraits/dwarf_m.png diff --git a/assets/voxygen/element/icons/elf_f.png b/assets/voxygen/element/ui/char_select/portraits/elf_f.png similarity index 100% rename from assets/voxygen/element/icons/elf_f.png rename to assets/voxygen/element/ui/char_select/portraits/elf_f.png diff --git a/assets/voxygen/element/icons/elf_m.png b/assets/voxygen/element/ui/char_select/portraits/elf_m.png similarity index 100% rename from assets/voxygen/element/icons/elf_m.png rename to assets/voxygen/element/ui/char_select/portraits/elf_m.png diff --git a/assets/voxygen/element/icons/human_f.png b/assets/voxygen/element/ui/char_select/portraits/human_f.png similarity index 100% rename from assets/voxygen/element/icons/human_f.png rename to assets/voxygen/element/ui/char_select/portraits/human_f.png diff --git a/assets/voxygen/element/icons/human_m.png b/assets/voxygen/element/ui/char_select/portraits/human_m.png similarity index 100% rename from assets/voxygen/element/icons/human_m.png rename to assets/voxygen/element/ui/char_select/portraits/human_m.png diff --git a/assets/voxygen/element/icons/orc_f.png b/assets/voxygen/element/ui/char_select/portraits/orc_f.png similarity index 100% rename from assets/voxygen/element/icons/orc_f.png rename to assets/voxygen/element/ui/char_select/portraits/orc_f.png diff --git a/assets/voxygen/element/icons/orc_m.png b/assets/voxygen/element/ui/char_select/portraits/orc_m.png similarity index 100% rename from assets/voxygen/element/icons/orc_m.png rename to assets/voxygen/element/ui/char_select/portraits/orc_m.png diff --git a/assets/voxygen/element/icons/ud_f.png b/assets/voxygen/element/ui/char_select/portraits/ud_f.png similarity index 100% rename from assets/voxygen/element/icons/ud_f.png rename to assets/voxygen/element/ui/char_select/portraits/ud_f.png diff --git a/assets/voxygen/element/icons/ud_m.png b/assets/voxygen/element/ui/char_select/portraits/ud_m.png similarity index 100% rename from assets/voxygen/element/icons/ud_m.png rename to assets/voxygen/element/ui/char_select/portraits/ud_m.png diff --git a/assets/voxygen/element/icons/chat/command_error_small.png b/assets/voxygen/element/ui/chat/icons/command_error_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/command_error_small.png rename to assets/voxygen/element/ui/chat/icons/command_error_small.png diff --git a/assets/voxygen/element/icons/chat/command_info_small.png b/assets/voxygen/element/ui/chat/icons/command_info_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/command_info_small.png rename to assets/voxygen/element/ui/chat/icons/command_info_small.png diff --git a/assets/voxygen/element/icons/chat/faction.png b/assets/voxygen/element/ui/chat/icons/faction.png similarity index 100% rename from assets/voxygen/element/icons/chat/faction.png rename to assets/voxygen/element/ui/chat/icons/faction.png diff --git a/assets/voxygen/element/icons/chat/faction_small.png b/assets/voxygen/element/ui/chat/icons/faction_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/faction_small.png rename to assets/voxygen/element/ui/chat/icons/faction_small.png diff --git a/assets/voxygen/element/icons/chat/group.png b/assets/voxygen/element/ui/chat/icons/group.png similarity index 100% rename from assets/voxygen/element/icons/chat/group.png rename to assets/voxygen/element/ui/chat/icons/group.png diff --git a/assets/voxygen/element/icons/chat/group_small.png b/assets/voxygen/element/ui/chat/icons/group_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/group_small.png rename to assets/voxygen/element/ui/chat/icons/group_small.png diff --git a/assets/voxygen/element/icons/chat/kill_small.png b/assets/voxygen/element/ui/chat/icons/kill_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/kill_small.png rename to assets/voxygen/element/ui/chat/icons/kill_small.png diff --git a/assets/voxygen/element/icons/chat/loot_small.png b/assets/voxygen/element/ui/chat/icons/loot_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/loot_small.png rename to assets/voxygen/element/ui/chat/icons/loot_small.png diff --git a/assets/voxygen/element/icons/chat/offline_small.png b/assets/voxygen/element/ui/chat/icons/offline_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/offline_small.png rename to assets/voxygen/element/ui/chat/icons/offline_small.png diff --git a/assets/voxygen/element/icons/chat/online_small.png b/assets/voxygen/element/ui/chat/icons/online_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/online_small.png rename to assets/voxygen/element/ui/chat/icons/online_small.png diff --git a/assets/voxygen/element/icons/chat/private_small.png b/assets/voxygen/element/ui/chat/icons/private_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/private_small.png rename to assets/voxygen/element/ui/chat/icons/private_small.png diff --git a/assets/voxygen/element/icons/chat/region.png b/assets/voxygen/element/ui/chat/icons/region.png similarity index 100% rename from assets/voxygen/element/icons/chat/region.png rename to assets/voxygen/element/ui/chat/icons/region.png diff --git a/assets/voxygen/element/icons/chat/region_small.png b/assets/voxygen/element/ui/chat/icons/region_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/region_small.png rename to assets/voxygen/element/ui/chat/icons/region_small.png diff --git a/assets/voxygen/element/icons/chat/say.png b/assets/voxygen/element/ui/chat/icons/say.png similarity index 100% rename from assets/voxygen/element/icons/chat/say.png rename to assets/voxygen/element/ui/chat/icons/say.png diff --git a/assets/voxygen/element/icons/chat/say_small.png b/assets/voxygen/element/ui/chat/icons/say_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/say_small.png rename to assets/voxygen/element/ui/chat/icons/say_small.png diff --git a/assets/voxygen/element/icons/chat/tell.png b/assets/voxygen/element/ui/chat/icons/tell.png similarity index 100% rename from assets/voxygen/element/icons/chat/tell.png rename to assets/voxygen/element/ui/chat/icons/tell.png diff --git a/assets/voxygen/element/icons/chat/tell_small.png b/assets/voxygen/element/ui/chat/icons/tell_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/tell_small.png rename to assets/voxygen/element/ui/chat/icons/tell_small.png diff --git a/assets/voxygen/element/icons/chat/world.png b/assets/voxygen/element/ui/chat/icons/world.png similarity index 100% rename from assets/voxygen/element/icons/chat/world.png rename to assets/voxygen/element/ui/chat/icons/world.png diff --git a/assets/voxygen/element/icons/chat/world_small.png b/assets/voxygen/element/ui/chat/icons/world_small.png similarity index 100% rename from assets/voxygen/element/icons/chat/world_small.png rename to assets/voxygen/element/ui/chat/icons/world_small.png diff --git a/assets/voxygen/element/misc_bg/crafting.png b/assets/voxygen/element/ui/crafting/crafting.png similarity index 100% rename from assets/voxygen/element/misc_bg/crafting.png rename to assets/voxygen/element/ui/crafting/crafting.png diff --git a/assets/voxygen/element/misc_bg/crafting_frame.png b/assets/voxygen/element/ui/crafting/crafting_frame.png similarity index 100% rename from assets/voxygen/element/misc_bg/crafting_frame.png rename to assets/voxygen/element/ui/crafting/crafting_frame.png diff --git a/assets/voxygen/element/icons/armors.png b/assets/voxygen/element/ui/crafting/icons/armors.png similarity index 100% rename from assets/voxygen/element/icons/armors.png rename to assets/voxygen/element/ui/crafting/icons/armors.png diff --git a/assets/voxygen/element/icons/crafting_tools.png b/assets/voxygen/element/ui/crafting/icons/crafting_tools.png similarity index 100% rename from assets/voxygen/element/icons/crafting_tools.png rename to assets/voxygen/element/ui/crafting/icons/crafting_tools.png diff --git a/assets/voxygen/element/icons/dismantle.png b/assets/voxygen/element/ui/crafting/icons/dismantle.png similarity index 100% rename from assets/voxygen/element/icons/dismantle.png rename to assets/voxygen/element/ui/crafting/icons/dismantle.png diff --git a/assets/voxygen/element/icons/foods.png b/assets/voxygen/element/ui/crafting/icons/foods.png similarity index 100% rename from assets/voxygen/element/icons/foods.png rename to assets/voxygen/element/ui/crafting/icons/foods.png diff --git a/assets/voxygen/element/icons/gliders.png b/assets/voxygen/element/ui/crafting/icons/gliders.png similarity index 100% rename from assets/voxygen/element/icons/gliders.png rename to assets/voxygen/element/ui/crafting/icons/gliders.png diff --git a/assets/voxygen/element/icons/globe.png b/assets/voxygen/element/ui/crafting/icons/globe.png similarity index 100% rename from assets/voxygen/element/icons/globe.png rename to assets/voxygen/element/ui/crafting/icons/globe.png diff --git a/assets/voxygen/element/icons/globe_2.png b/assets/voxygen/element/ui/crafting/icons/globe_2.png similarity index 100% rename from assets/voxygen/element/icons/globe_2.png rename to assets/voxygen/element/ui/crafting/icons/globe_2.png diff --git a/assets/voxygen/element/icons/potions.png b/assets/voxygen/element/ui/crafting/icons/potions.png similarity index 100% rename from assets/voxygen/element/icons/potions.png rename to assets/voxygen/element/ui/crafting/icons/potions.png diff --git a/assets/voxygen/element/icons/utilities.png b/assets/voxygen/element/ui/crafting/icons/utilities.png similarity index 100% rename from assets/voxygen/element/icons/utilities.png rename to assets/voxygen/element/ui/crafting/icons/utilities.png diff --git a/assets/voxygen/element/icons/weapons.png b/assets/voxygen/element/ui/crafting/icons/weapons.png similarity index 100% rename from assets/voxygen/element/icons/weapons.png rename to assets/voxygen/element/ui/crafting/icons/weapons.png diff --git a/assets/voxygen/element/buttons/border_skills.png b/assets/voxygen/element/ui/diary/buttons/border_skills.png similarity index 100% rename from assets/voxygen/element/buttons/border_skills.png rename to assets/voxygen/element/ui/diary/buttons/border_skills.png diff --git a/assets/voxygen/element/icons/lock.png b/assets/voxygen/element/ui/diary/buttons/lock.png similarity index 100% rename from assets/voxygen/element/icons/lock.png rename to assets/voxygen/element/ui/diary/buttons/lock.png diff --git a/assets/voxygen/element/buttons/slot_skilltree.png b/assets/voxygen/element/ui/diary/buttons/slot_skilltree.png similarity index 100% rename from assets/voxygen/element/buttons/slot_skilltree.png rename to assets/voxygen/element/ui/diary/buttons/slot_skilltree.png diff --git a/assets/voxygen/element/misc_bg/diary_bg.png b/assets/voxygen/element/ui/diary/diary_bg.png similarity index 100% rename from assets/voxygen/element/misc_bg/diary_bg.png rename to assets/voxygen/element/ui/diary/diary_bg.png diff --git a/assets/voxygen/element/misc_bg/diary_exp_bg.png b/assets/voxygen/element/ui/diary/diary_exp_bg.png similarity index 100% rename from assets/voxygen/element/misc_bg/diary_exp_bg.png rename to assets/voxygen/element/ui/diary/diary_exp_bg.png diff --git a/assets/voxygen/element/misc_bg/diary_exp_frame.png b/assets/voxygen/element/ui/diary/diary_exp_frame.png similarity index 100% rename from assets/voxygen/element/misc_bg/diary_exp_frame.png rename to assets/voxygen/element/ui/diary/diary_exp_frame.png diff --git a/assets/voxygen/element/misc_bg/diary_frame.png b/assets/voxygen/element/ui/diary/diary_frame.png similarity index 100% rename from assets/voxygen/element/misc_bg/diary_frame.png rename to assets/voxygen/element/ui/diary/diary_frame.png diff --git a/assets/voxygen/element/misc_bg/pixel.png b/assets/voxygen/element/ui/diary/pixel.png similarity index 100% rename from assets/voxygen/element/misc_bg/pixel.png rename to assets/voxygen/element/ui/diary/pixel.png diff --git a/assets/voxygen/element/buttons/anvil.png b/assets/voxygen/element/ui/generic/buttons/anvil.png similarity index 100% rename from assets/voxygen/element/buttons/anvil.png rename to assets/voxygen/element/ui/generic/buttons/anvil.png diff --git a/assets/voxygen/element/buttons/anvil_hover.png b/assets/voxygen/element/ui/generic/buttons/anvil_hover.png similarity index 100% rename from assets/voxygen/element/buttons/anvil_hover.png rename to assets/voxygen/element/ui/generic/buttons/anvil_hover.png diff --git a/assets/voxygen/element/buttons/anvil_press.png b/assets/voxygen/element/ui/generic/buttons/anvil_press.png similarity index 100% rename from assets/voxygen/element/buttons/anvil_press.png rename to assets/voxygen/element/ui/generic/buttons/anvil_press.png diff --git a/assets/voxygen/element/buttons/armor_slot.png b/assets/voxygen/element/ui/generic/buttons/armor_slot.png similarity index 100% rename from assets/voxygen/element/buttons/armor_slot.png rename to assets/voxygen/element/ui/generic/buttons/armor_slot.png diff --git a/assets/voxygen/element/buttons/armor_slot_empty.png b/assets/voxygen/element/ui/generic/buttons/armor_slot_empty.png similarity index 100% rename from assets/voxygen/element/buttons/armor_slot_empty.png rename to assets/voxygen/element/ui/generic/buttons/armor_slot_empty.png diff --git a/assets/voxygen/element/buttons/armor_slot_selected.png b/assets/voxygen/element/ui/generic/buttons/armor_slot_selected.png similarity index 100% rename from assets/voxygen/element/buttons/armor_slot_selected.png rename to assets/voxygen/element/ui/generic/buttons/armor_slot_selected.png diff --git a/assets/voxygen/element/buttons/arrow_down.png b/assets/voxygen/element/ui/generic/buttons/arrow_down.png similarity index 100% rename from assets/voxygen/element/buttons/arrow_down.png rename to assets/voxygen/element/ui/generic/buttons/arrow_down.png diff --git a/assets/voxygen/element/buttons/arrow_down.vox b/assets/voxygen/element/ui/generic/buttons/arrow_down.vox similarity index 100% rename from assets/voxygen/element/buttons/arrow_down.vox rename to assets/voxygen/element/ui/generic/buttons/arrow_down.vox diff --git a/assets/voxygen/element/buttons/arrow_down_gold.png b/assets/voxygen/element/ui/generic/buttons/arrow_down_gold.png similarity index 100% rename from assets/voxygen/element/buttons/arrow_down_gold.png rename to assets/voxygen/element/ui/generic/buttons/arrow_down_gold.png diff --git a/assets/voxygen/element/buttons/arrow_down_hover.png b/assets/voxygen/element/ui/generic/buttons/arrow_down_hover.png similarity index 100% rename from assets/voxygen/element/buttons/arrow_down_hover.png rename to assets/voxygen/element/ui/generic/buttons/arrow_down_hover.png diff --git a/assets/voxygen/element/buttons/arrow_down_hover.vox b/assets/voxygen/element/ui/generic/buttons/arrow_down_hover.vox similarity index 100% rename from assets/voxygen/element/buttons/arrow_down_hover.vox rename to assets/voxygen/element/ui/generic/buttons/arrow_down_hover.vox diff --git a/assets/voxygen/element/buttons/arrow_down_press.png b/assets/voxygen/element/ui/generic/buttons/arrow_down_press.png similarity index 100% rename from assets/voxygen/element/buttons/arrow_down_press.png rename to assets/voxygen/element/ui/generic/buttons/arrow_down_press.png diff --git a/assets/voxygen/element/buttons/arrow_down_press.vox b/assets/voxygen/element/ui/generic/buttons/arrow_down_press.vox similarity index 100% rename from assets/voxygen/element/buttons/arrow_down_press.vox rename to assets/voxygen/element/ui/generic/buttons/arrow_down_press.vox diff --git a/assets/voxygen/element/buttons/bag/closed.png b/assets/voxygen/element/ui/generic/buttons/bag/closed.png similarity index 100% rename from assets/voxygen/element/buttons/bag/closed.png rename to assets/voxygen/element/ui/generic/buttons/bag/closed.png diff --git a/assets/voxygen/element/buttons/bag/closed_hover.png b/assets/voxygen/element/ui/generic/buttons/bag/closed_hover.png similarity index 100% rename from assets/voxygen/element/buttons/bag/closed_hover.png rename to assets/voxygen/element/ui/generic/buttons/bag/closed_hover.png diff --git a/assets/voxygen/element/buttons/bag/closed_press.png b/assets/voxygen/element/ui/generic/buttons/bag/closed_press.png similarity index 100% rename from assets/voxygen/element/buttons/bag/closed_press.png rename to assets/voxygen/element/ui/generic/buttons/bag/closed_press.png diff --git a/assets/voxygen/element/buttons/bag/open.png b/assets/voxygen/element/ui/generic/buttons/bag/open.png similarity index 100% rename from assets/voxygen/element/buttons/bag/open.png rename to assets/voxygen/element/ui/generic/buttons/bag/open.png diff --git a/assets/voxygen/element/buttons/bag/open_hover.png b/assets/voxygen/element/ui/generic/buttons/bag/open_hover.png similarity index 100% rename from assets/voxygen/element/buttons/bag/open_hover.png rename to assets/voxygen/element/ui/generic/buttons/bag/open_hover.png diff --git a/assets/voxygen/element/buttons/bag/open_press.png b/assets/voxygen/element/ui/generic/buttons/bag/open_press.png similarity index 100% rename from assets/voxygen/element/buttons/bag/open_press.png rename to assets/voxygen/element/ui/generic/buttons/bag/open_press.png diff --git a/assets/voxygen/element/buttons/border.png b/assets/voxygen/element/ui/generic/buttons/border.png similarity index 100% rename from assets/voxygen/element/buttons/border.png rename to assets/voxygen/element/ui/generic/buttons/border.png diff --git a/assets/voxygen/element/buttons/border_mo.png b/assets/voxygen/element/ui/generic/buttons/border_mo.png similarity index 100% rename from assets/voxygen/element/buttons/border_mo.png rename to assets/voxygen/element/ui/generic/buttons/border_mo.png diff --git a/assets/voxygen/element/buttons/border_press.png b/assets/voxygen/element/ui/generic/buttons/border_press.png similarity index 100% rename from assets/voxygen/element/buttons/border_press.png rename to assets/voxygen/element/ui/generic/buttons/border_press.png diff --git a/assets/voxygen/element/buttons/border_pressed.png b/assets/voxygen/element/ui/generic/buttons/border_pressed.png similarity index 100% rename from assets/voxygen/element/buttons/border_pressed.png rename to assets/voxygen/element/ui/generic/buttons/border_pressed.png diff --git a/assets/voxygen/element/buttons/button.png b/assets/voxygen/element/ui/generic/buttons/button.png similarity index 100% rename from assets/voxygen/element/buttons/button.png rename to assets/voxygen/element/ui/generic/buttons/button.png diff --git a/assets/voxygen/element/buttons/button_hover.png b/assets/voxygen/element/ui/generic/buttons/button_hover.png similarity index 100% rename from assets/voxygen/element/buttons/button_hover.png rename to assets/voxygen/element/ui/generic/buttons/button_hover.png diff --git a/assets/voxygen/element/buttons/button_press.png b/assets/voxygen/element/ui/generic/buttons/button_press.png similarity index 100% rename from assets/voxygen/element/buttons/button_press.png rename to assets/voxygen/element/ui/generic/buttons/button_press.png diff --git a/assets/voxygen/element/buttons/checkbox/active.png b/assets/voxygen/element/ui/generic/buttons/checkbox/active.png similarity index 100% rename from assets/voxygen/element/buttons/checkbox/active.png rename to assets/voxygen/element/ui/generic/buttons/checkbox/active.png diff --git a/assets/voxygen/element/buttons/checkbox/hover.png b/assets/voxygen/element/ui/generic/buttons/checkbox/hover.png similarity index 100% rename from assets/voxygen/element/buttons/checkbox/hover.png rename to assets/voxygen/element/ui/generic/buttons/checkbox/hover.png diff --git a/assets/voxygen/element/buttons/checkbox/inactive.png b/assets/voxygen/element/ui/generic/buttons/checkbox/inactive.png similarity index 100% rename from assets/voxygen/element/buttons/checkbox/inactive.png rename to assets/voxygen/element/ui/generic/buttons/checkbox/inactive.png diff --git a/assets/voxygen/element/buttons/checkbox/inactive_hover.png b/assets/voxygen/element/ui/generic/buttons/checkbox/inactive_hover.png similarity index 100% rename from assets/voxygen/element/buttons/checkbox/inactive_hover.png rename to assets/voxygen/element/ui/generic/buttons/checkbox/inactive_hover.png diff --git a/assets/voxygen/element/buttons/checkbox/press.png b/assets/voxygen/element/ui/generic/buttons/checkbox/press.png similarity index 100% rename from assets/voxygen/element/buttons/checkbox/press.png rename to assets/voxygen/element/ui/generic/buttons/checkbox/press.png diff --git a/assets/voxygen/element/buttons/close_btn.png b/assets/voxygen/element/ui/generic/buttons/close_btn.png similarity index 100% rename from assets/voxygen/element/buttons/close_btn.png rename to assets/voxygen/element/ui/generic/buttons/close_btn.png diff --git a/assets/voxygen/element/buttons/close_btn_hover.png b/assets/voxygen/element/ui/generic/buttons/close_btn_hover.png similarity index 100% rename from assets/voxygen/element/buttons/close_btn_hover.png rename to assets/voxygen/element/ui/generic/buttons/close_btn_hover.png diff --git a/assets/voxygen/element/buttons/close_btn_press.png b/assets/voxygen/element/ui/generic/buttons/close_btn_press.png similarity index 100% rename from assets/voxygen/element/buttons/close_btn_press.png rename to assets/voxygen/element/ui/generic/buttons/close_btn_press.png diff --git a/assets/voxygen/element/buttons/group.png b/assets/voxygen/element/ui/generic/buttons/group.png similarity index 100% rename from assets/voxygen/element/buttons/group.png rename to assets/voxygen/element/ui/generic/buttons/group.png diff --git a/assets/voxygen/element/buttons/group_hover.png b/assets/voxygen/element/ui/generic/buttons/group_hover.png similarity index 100% rename from assets/voxygen/element/buttons/group_hover.png rename to assets/voxygen/element/ui/generic/buttons/group_hover.png diff --git a/assets/voxygen/element/buttons/group_press.png b/assets/voxygen/element/ui/generic/buttons/group_press.png similarity index 100% rename from assets/voxygen/element/buttons/group_press.png rename to assets/voxygen/element/ui/generic/buttons/group_press.png diff --git a/assets/voxygen/element/buttons/key_button.png b/assets/voxygen/element/ui/generic/buttons/key_button.png similarity index 100% rename from assets/voxygen/element/buttons/key_button.png rename to assets/voxygen/element/ui/generic/buttons/key_button.png diff --git a/assets/voxygen/element/buttons/key_button_press.png b/assets/voxygen/element/ui/generic/buttons/key_button_press.png similarity index 100% rename from assets/voxygen/element/buttons/key_button_press.png rename to assets/voxygen/element/ui/generic/buttons/key_button_press.png diff --git a/assets/voxygen/element/buttons/map.png b/assets/voxygen/element/ui/generic/buttons/map.png similarity index 100% rename from assets/voxygen/element/buttons/map.png rename to assets/voxygen/element/ui/generic/buttons/map.png diff --git a/assets/voxygen/element/buttons/map_hover.png b/assets/voxygen/element/ui/generic/buttons/map_hover.png similarity index 100% rename from assets/voxygen/element/buttons/map_hover.png rename to assets/voxygen/element/ui/generic/buttons/map_hover.png diff --git a/assets/voxygen/element/buttons/map_press.png b/assets/voxygen/element/ui/generic/buttons/map_press.png similarity index 100% rename from assets/voxygen/element/buttons/map_press.png rename to assets/voxygen/element/ui/generic/buttons/map_press.png diff --git a/assets/voxygen/element/buttons/radio/active.png b/assets/voxygen/element/ui/generic/buttons/radio/active.png similarity index 100% rename from assets/voxygen/element/buttons/radio/active.png rename to assets/voxygen/element/ui/generic/buttons/radio/active.png diff --git a/assets/voxygen/element/buttons/radio/hover.png b/assets/voxygen/element/ui/generic/buttons/radio/hover.png similarity index 100% rename from assets/voxygen/element/buttons/radio/hover.png rename to assets/voxygen/element/ui/generic/buttons/radio/hover.png diff --git a/assets/voxygen/element/buttons/radio/inactive.png b/assets/voxygen/element/ui/generic/buttons/radio/inactive.png similarity index 100% rename from assets/voxygen/element/buttons/radio/inactive.png rename to assets/voxygen/element/ui/generic/buttons/radio/inactive.png diff --git a/assets/voxygen/element/buttons/radio/inactive_hover.png b/assets/voxygen/element/ui/generic/buttons/radio/inactive_hover.png similarity index 100% rename from assets/voxygen/element/buttons/radio/inactive_hover.png rename to assets/voxygen/element/ui/generic/buttons/radio/inactive_hover.png diff --git a/assets/voxygen/element/buttons/radio/press.png b/assets/voxygen/element/ui/generic/buttons/radio/press.png similarity index 100% rename from assets/voxygen/element/buttons/radio/press.png rename to assets/voxygen/element/ui/generic/buttons/radio/press.png diff --git a/assets/voxygen/element/buttons/search_btn.png b/assets/voxygen/element/ui/generic/buttons/search_btn.png similarity index 100% rename from assets/voxygen/element/buttons/search_btn.png rename to assets/voxygen/element/ui/generic/buttons/search_btn.png diff --git a/assets/voxygen/element/buttons/search_btn_hover.png b/assets/voxygen/element/ui/generic/buttons/search_btn_hover.png similarity index 100% rename from assets/voxygen/element/buttons/search_btn_hover.png rename to assets/voxygen/element/ui/generic/buttons/search_btn_hover.png diff --git a/assets/voxygen/element/buttons/search_btn_press.png b/assets/voxygen/element/ui/generic/buttons/search_btn_press.png similarity index 100% rename from assets/voxygen/element/buttons/search_btn_press.png rename to assets/voxygen/element/ui/generic/buttons/search_btn_press.png diff --git a/assets/voxygen/element/buttons/settings.png b/assets/voxygen/element/ui/generic/buttons/settings.png similarity index 100% rename from assets/voxygen/element/buttons/settings.png rename to assets/voxygen/element/ui/generic/buttons/settings.png diff --git a/assets/voxygen/element/buttons/settings_hover.png b/assets/voxygen/element/ui/generic/buttons/settings_hover.png similarity index 100% rename from assets/voxygen/element/buttons/settings_hover.png rename to assets/voxygen/element/ui/generic/buttons/settings_hover.png diff --git a/assets/voxygen/element/buttons/settings_press.png b/assets/voxygen/element/ui/generic/buttons/settings_press.png similarity index 100% rename from assets/voxygen/element/buttons/settings_press.png rename to assets/voxygen/element/ui/generic/buttons/settings_press.png diff --git a/assets/voxygen/element/buttons/social.png b/assets/voxygen/element/ui/generic/buttons/social.png similarity index 100% rename from assets/voxygen/element/buttons/social.png rename to assets/voxygen/element/ui/generic/buttons/social.png diff --git a/assets/voxygen/element/buttons/social_hover.png b/assets/voxygen/element/ui/generic/buttons/social_hover.png similarity index 100% rename from assets/voxygen/element/buttons/social_hover.png rename to assets/voxygen/element/ui/generic/buttons/social_hover.png diff --git a/assets/voxygen/element/buttons/social_press.png b/assets/voxygen/element/ui/generic/buttons/social_press.png similarity index 100% rename from assets/voxygen/element/buttons/social_press.png rename to assets/voxygen/element/ui/generic/buttons/social_press.png diff --git a/assets/voxygen/element/buttons/spellbook.png b/assets/voxygen/element/ui/generic/buttons/spellbook.png similarity index 100% rename from assets/voxygen/element/buttons/spellbook.png rename to assets/voxygen/element/ui/generic/buttons/spellbook.png diff --git a/assets/voxygen/element/buttons/spellbook_hover.png b/assets/voxygen/element/ui/generic/buttons/spellbook_hover.png similarity index 100% rename from assets/voxygen/element/buttons/spellbook_hover.png rename to assets/voxygen/element/ui/generic/buttons/spellbook_hover.png diff --git a/assets/voxygen/element/buttons/spellbook_press.png b/assets/voxygen/element/ui/generic/buttons/spellbook_press.png similarity index 100% rename from assets/voxygen/element/buttons/spellbook_press.png rename to assets/voxygen/element/ui/generic/buttons/spellbook_press.png diff --git a/assets/voxygen/element/buttons/x_red.png b/assets/voxygen/element/ui/generic/buttons/x_red.png similarity index 100% rename from assets/voxygen/element/buttons/x_red.png rename to assets/voxygen/element/ui/generic/buttons/x_red.png diff --git a/assets/voxygen/element/buttons/x_red_hover.png b/assets/voxygen/element/ui/generic/buttons/x_red_hover.png similarity index 100% rename from assets/voxygen/element/buttons/x_red_hover.png rename to assets/voxygen/element/ui/generic/buttons/x_red_hover.png diff --git a/assets/voxygen/element/buttons/x_red_press.png b/assets/voxygen/element/ui/generic/buttons/x_red_press.png similarity index 100% rename from assets/voxygen/element/buttons/x_red_press.png rename to assets/voxygen/element/ui/generic/buttons/x_red_press.png diff --git a/assets/voxygen/element/misc_bg/fireplace.png b/assets/voxygen/element/ui/generic/fireplace.png similarity index 100% rename from assets/voxygen/element/misc_bg/fireplace.png rename to assets/voxygen/element/ui/generic/fireplace.png diff --git a/assets/voxygen/element/frames/banner_bot.png b/assets/voxygen/element/ui/generic/frames/banner_bot.png similarity index 100% rename from assets/voxygen/element/frames/banner_bot.png rename to assets/voxygen/element/ui/generic/frames/banner_bot.png diff --git a/assets/voxygen/element/frames/banner_gradient_bottom.png b/assets/voxygen/element/ui/generic/frames/banner_gradient_bottom.png similarity index 100% rename from assets/voxygen/element/frames/banner_gradient_bottom.png rename to assets/voxygen/element/ui/generic/frames/banner_gradient_bottom.png diff --git a/assets/voxygen/element/frames/banner_small_top.png b/assets/voxygen/element/ui/generic/frames/banner_small_top.png similarity index 100% rename from assets/voxygen/element/frames/banner_small_top.png rename to assets/voxygen/element/ui/generic/frames/banner_small_top.png diff --git a/assets/voxygen/element/frames/banner_top.png b/assets/voxygen/element/ui/generic/frames/banner_top.png similarity index 100% rename from assets/voxygen/element/frames/banner_top.png rename to assets/voxygen/element/ui/generic/frames/banner_top.png diff --git a/assets/voxygen/element/frames/bubble/bottom.png b/assets/voxygen/element/ui/generic/frames/bubble/bottom.png similarity index 100% rename from assets/voxygen/element/frames/bubble/bottom.png rename to assets/voxygen/element/ui/generic/frames/bubble/bottom.png diff --git a/assets/voxygen/element/frames/bubble/bottom_left.png b/assets/voxygen/element/ui/generic/frames/bubble/bottom_left.png similarity index 100% rename from assets/voxygen/element/frames/bubble/bottom_left.png rename to assets/voxygen/element/ui/generic/frames/bubble/bottom_left.png diff --git a/assets/voxygen/element/frames/bubble/bottom_right.png b/assets/voxygen/element/ui/generic/frames/bubble/bottom_right.png similarity index 100% rename from assets/voxygen/element/frames/bubble/bottom_right.png rename to assets/voxygen/element/ui/generic/frames/bubble/bottom_right.png diff --git a/assets/voxygen/element/frames/bubble/left.png b/assets/voxygen/element/ui/generic/frames/bubble/left.png similarity index 100% rename from assets/voxygen/element/frames/bubble/left.png rename to assets/voxygen/element/ui/generic/frames/bubble/left.png diff --git a/assets/voxygen/element/frames/bubble/mid.png b/assets/voxygen/element/ui/generic/frames/bubble/mid.png similarity index 100% rename from assets/voxygen/element/frames/bubble/mid.png rename to assets/voxygen/element/ui/generic/frames/bubble/mid.png diff --git a/assets/voxygen/element/frames/bubble/right.png b/assets/voxygen/element/ui/generic/frames/bubble/right.png similarity index 100% rename from assets/voxygen/element/frames/bubble/right.png rename to assets/voxygen/element/ui/generic/frames/bubble/right.png diff --git a/assets/voxygen/element/frames/bubble/tail.png b/assets/voxygen/element/ui/generic/frames/bubble/tail.png similarity index 100% rename from assets/voxygen/element/frames/bubble/tail.png rename to assets/voxygen/element/ui/generic/frames/bubble/tail.png diff --git a/assets/voxygen/element/frames/bubble/top.png b/assets/voxygen/element/ui/generic/frames/bubble/top.png similarity index 100% rename from assets/voxygen/element/frames/bubble/top.png rename to assets/voxygen/element/ui/generic/frames/bubble/top.png diff --git a/assets/voxygen/element/frames/bubble/top_left.png b/assets/voxygen/element/ui/generic/frames/bubble/top_left.png similarity index 100% rename from assets/voxygen/element/frames/bubble/top_left.png rename to assets/voxygen/element/ui/generic/frames/bubble/top_left.png diff --git a/assets/voxygen/element/frames/bubble/top_right.png b/assets/voxygen/element/ui/generic/frames/bubble/top_right.png similarity index 100% rename from assets/voxygen/element/frames/bubble/top_right.png rename to assets/voxygen/element/ui/generic/frames/bubble/top_right.png diff --git a/assets/voxygen/element/frames/bubble_dark/bottom.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/bottom.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/bottom.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/bottom.png diff --git a/assets/voxygen/element/frames/bubble_dark/bottom_left.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/bottom_left.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/bottom_left.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/bottom_left.png diff --git a/assets/voxygen/element/frames/bubble_dark/bottom_right.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/bottom_right.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/bottom_right.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/bottom_right.png diff --git a/assets/voxygen/element/frames/bubble_dark/icon_frame.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/icon_frame.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/icon_frame.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/icon_frame.png diff --git a/assets/voxygen/element/frames/bubble_dark/left.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/left.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/left.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/left.png diff --git a/assets/voxygen/element/frames/bubble_dark/mid.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/mid.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/mid.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/mid.png diff --git a/assets/voxygen/element/frames/bubble_dark/right.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/right.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/right.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/right.png diff --git a/assets/voxygen/element/frames/bubble_dark/tail.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/tail.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/tail.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/tail.png diff --git a/assets/voxygen/element/frames/bubble_dark/top.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/top.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/top.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/top.png diff --git a/assets/voxygen/element/frames/bubble_dark/top_left.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/top_left.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/top_left.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/top_left.png diff --git a/assets/voxygen/element/frames/bubble_dark/top_right.png b/assets/voxygen/element/ui/generic/frames/bubble_dark/top_right.png similarity index 100% rename from assets/voxygen/element/frames/bubble_dark/top_right.png rename to assets/voxygen/element/ui/generic/frames/bubble_dark/top_right.png diff --git a/assets/voxygen/element/frames/disclaimer.png b/assets/voxygen/element/ui/generic/frames/disclaimer.png similarity index 100% rename from assets/voxygen/element/frames/disclaimer.png rename to assets/voxygen/element/ui/generic/frames/disclaimer.png diff --git a/assets/voxygen/element/frames/divider.vox b/assets/voxygen/element/ui/generic/frames/divider.vox similarity index 100% rename from assets/voxygen/element/frames/divider.vox rename to assets/voxygen/element/ui/generic/frames/divider.vox diff --git a/assets/voxygen/element/frames/divider_charwindow.vox b/assets/voxygen/element/ui/generic/frames/divider_charwindow.vox similarity index 100% rename from assets/voxygen/element/frames/divider_charwindow.vox rename to assets/voxygen/element/ui/generic/frames/divider_charwindow.vox diff --git a/assets/voxygen/element/frames/enemybar.png b/assets/voxygen/element/ui/generic/frames/enemybar.png similarity index 100% rename from assets/voxygen/element/frames/enemybar.png rename to assets/voxygen/element/ui/generic/frames/enemybar.png diff --git a/assets/voxygen/element/frames/enemybar_1.png b/assets/voxygen/element/ui/generic/frames/enemybar_1.png similarity index 100% rename from assets/voxygen/element/frames/enemybar_1.png rename to assets/voxygen/element/ui/generic/frames/enemybar_1.png diff --git a/assets/voxygen/element/frames/enemybar_bg.png b/assets/voxygen/element/ui/generic/frames/enemybar_bg.png similarity index 100% rename from assets/voxygen/element/frames/enemybar_bg.png rename to assets/voxygen/element/ui/generic/frames/enemybar_bg.png diff --git a/assets/voxygen/element/frames/enemybar_bg_1.png b/assets/voxygen/element/ui/generic/frames/enemybar_bg_1.png similarity index 100% rename from assets/voxygen/element/frames/enemybar_bg_1.png rename to assets/voxygen/element/ui/generic/frames/enemybar_bg_1.png diff --git a/assets/voxygen/element/frames/esc_menu.png b/assets/voxygen/element/ui/generic/frames/esc_menu.png similarity index 100% rename from assets/voxygen/element/frames/esc_menu.png rename to assets/voxygen/element/ui/generic/frames/esc_menu.png diff --git a/assets/voxygen/element/frames/frame_art/frame-b_l.vox b/assets/voxygen/element/ui/generic/frames/frame_art/frame-b_l.vox similarity index 100% rename from assets/voxygen/element/frames/frame_art/frame-b_l.vox rename to assets/voxygen/element/ui/generic/frames/frame_art/frame-b_l.vox diff --git a/assets/voxygen/element/frames/frame_art/frame-b_r.vox b/assets/voxygen/element/ui/generic/frames/frame_art/frame-b_r.vox similarity index 100% rename from assets/voxygen/element/frames/frame_art/frame-b_r.vox rename to assets/voxygen/element/ui/generic/frames/frame_art/frame-b_r.vox diff --git a/assets/voxygen/element/frames/frame_art/frame-t_l.vox b/assets/voxygen/element/ui/generic/frames/frame_art/frame-t_l.vox similarity index 100% rename from assets/voxygen/element/frames/frame_art/frame-t_l.vox rename to assets/voxygen/element/ui/generic/frames/frame_art/frame-t_l.vox diff --git a/assets/voxygen/element/frames/frame_art/frame-t_r.vox b/assets/voxygen/element/ui/generic/frames/frame_art/frame-t_r.vox similarity index 100% rename from assets/voxygen/element/frames/frame_art/frame-t_r.vox rename to assets/voxygen/element/ui/generic/frames/frame_art/frame-t_r.vox diff --git a/assets/voxygen/element/frames/info_frame.vox b/assets/voxygen/element/ui/generic/frames/info_frame.vox similarity index 100% rename from assets/voxygen/element/frames/info_frame.vox rename to assets/voxygen/element/ui/generic/frames/info_frame.vox diff --git a/assets/voxygen/element/frames/loading_screen/loading_bg.png b/assets/voxygen/element/ui/generic/frames/loading_screen/loading_bg.png similarity index 100% rename from assets/voxygen/element/frames/loading_screen/loading_bg.png rename to assets/voxygen/element/ui/generic/frames/loading_screen/loading_bg.png diff --git a/assets/voxygen/element/frames/loading_screen/loading_bg_l.png b/assets/voxygen/element/ui/generic/frames/loading_screen/loading_bg_l.png similarity index 100% rename from assets/voxygen/element/frames/loading_screen/loading_bg_l.png rename to assets/voxygen/element/ui/generic/frames/loading_screen/loading_bg_l.png diff --git a/assets/voxygen/element/frames/loading_screen/loading_bg_r.png b/assets/voxygen/element/ui/generic/frames/loading_screen/loading_bg_r.png similarity index 100% rename from assets/voxygen/element/frames/loading_screen/loading_bg_r.png rename to assets/voxygen/element/ui/generic/frames/loading_screen/loading_bg_r.png diff --git a/assets/voxygen/element/frames/prompt_dialog_bot.png b/assets/voxygen/element/ui/generic/frames/prompt_dialog_bot.png similarity index 100% rename from assets/voxygen/element/frames/prompt_dialog_bot.png rename to assets/voxygen/element/ui/generic/frames/prompt_dialog_bot.png diff --git a/assets/voxygen/element/frames/prompt_dialog_mid.png b/assets/voxygen/element/ui/generic/frames/prompt_dialog_mid.png similarity index 100% rename from assets/voxygen/element/frames/prompt_dialog_mid.png rename to assets/voxygen/element/ui/generic/frames/prompt_dialog_mid.png diff --git a/assets/voxygen/element/frames/prompt_dialog_top.png b/assets/voxygen/element/ui/generic/frames/prompt_dialog_top.png similarity index 100% rename from assets/voxygen/element/frames/prompt_dialog_top.png rename to assets/voxygen/element/ui/generic/frames/prompt_dialog_top.png diff --git a/assets/voxygen/element/frames/selection.png b/assets/voxygen/element/ui/generic/frames/selection.png similarity index 100% rename from assets/voxygen/element/frames/selection.png rename to assets/voxygen/element/ui/generic/frames/selection.png diff --git a/assets/voxygen/element/frames/selection_frame.png b/assets/voxygen/element/ui/generic/frames/selection_frame.png similarity index 100% rename from assets/voxygen/element/frames/selection_frame.png rename to assets/voxygen/element/ui/generic/frames/selection_frame.png diff --git a/assets/voxygen/element/frames/selection_hover.png b/assets/voxygen/element/ui/generic/frames/selection_hover.png similarity index 100% rename from assets/voxygen/element/frames/selection_hover.png rename to assets/voxygen/element/ui/generic/frames/selection_hover.png diff --git a/assets/voxygen/element/frames/selection_press.png b/assets/voxygen/element/ui/generic/frames/selection_press.png similarity index 100% rename from assets/voxygen/element/frames/selection_press.png rename to assets/voxygen/element/ui/generic/frames/selection_press.png diff --git a/assets/voxygen/element/frames/social_frame.png b/assets/voxygen/element/ui/generic/frames/social_frame.png similarity index 100% rename from assets/voxygen/element/frames/social_frame.png rename to assets/voxygen/element/ui/generic/frames/social_frame.png diff --git a/assets/voxygen/element/frames/tooltip/corner.png b/assets/voxygen/element/ui/generic/frames/tooltip/corner.png similarity index 100% rename from assets/voxygen/element/frames/tooltip/corner.png rename to assets/voxygen/element/ui/generic/frames/tooltip/corner.png diff --git a/assets/voxygen/element/frames/tooltip/edge.png b/assets/voxygen/element/ui/generic/frames/tooltip/edge.png similarity index 100% rename from assets/voxygen/element/frames/tooltip/edge.png rename to assets/voxygen/element/ui/generic/frames/tooltip/edge.png diff --git a/assets/voxygen/element/frames/tt_test_corner_tr.png b/assets/voxygen/element/ui/generic/frames/tt_test_corner_tr.png similarity index 100% rename from assets/voxygen/element/frames/tt_test_corner_tr.png rename to assets/voxygen/element/ui/generic/frames/tt_test_corner_tr.png diff --git a/assets/voxygen/element/frames/tt_test_edge.png b/assets/voxygen/element/ui/generic/frames/tt_test_edge.png similarity index 100% rename from assets/voxygen/element/frames/tt_test_edge.png rename to assets/voxygen/element/ui/generic/frames/tt_test_edge.png diff --git a/assets/voxygen/element/frames/window_3.png b/assets/voxygen/element/ui/generic/frames/window_3.png similarity index 100% rename from assets/voxygen/element/frames/window_3.png rename to assets/voxygen/element/ui/generic/frames/window_3.png diff --git a/assets/voxygen/element/frames/xp_charwindow.vox b/assets/voxygen/element/ui/generic/frames/xp_charwindow.vox similarity index 100% rename from assets/voxygen/element/frames/xp_charwindow.vox rename to assets/voxygen/element/ui/generic/frames/xp_charwindow.vox diff --git a/assets/voxygen/element/icons/m1.png b/assets/voxygen/element/ui/generic/icons/m1.png similarity index 100% rename from assets/voxygen/element/icons/m1.png rename to assets/voxygen/element/ui/generic/icons/m1.png diff --git a/assets/voxygen/element/icons/m2.png b/assets/voxygen/element/ui/generic/icons/m2.png similarity index 100% rename from assets/voxygen/element/icons/m2.png rename to assets/voxygen/element/ui/generic/icons/m2.png diff --git a/assets/voxygen/element/icons/m_move.png b/assets/voxygen/element/ui/generic/icons/m_move.png similarity index 100% rename from assets/voxygen/element/icons/m_move.png rename to assets/voxygen/element/ui/generic/icons/m_move.png diff --git a/assets/voxygen/element/icons/m_scroll.png b/assets/voxygen/element/ui/generic/icons/m_scroll.png similarity index 100% rename from assets/voxygen/element/icons/m_scroll.png rename to assets/voxygen/element/ui/generic/icons/m_scroll.png diff --git a/assets/voxygen/element/icons/skull.png b/assets/voxygen/element/ui/generic/icons/skull.png similarity index 100% rename from assets/voxygen/element/icons/skull.png rename to assets/voxygen/element/ui/generic/icons/skull.png diff --git a/assets/voxygen/element/icons/skull_2.png b/assets/voxygen/element/ui/generic/icons/skull_2.png similarity index 100% rename from assets/voxygen/element/icons/skull_2.png rename to assets/voxygen/element/ui/generic/icons/skull_2.png diff --git a/assets/voxygen/element/slider/indicator.png b/assets/voxygen/element/ui/generic/slider/indicator.png similarity index 100% rename from assets/voxygen/element/slider/indicator.png rename to assets/voxygen/element/ui/generic/slider/indicator.png diff --git a/assets/voxygen/element/slider/indicator_round.png b/assets/voxygen/element/ui/generic/slider/indicator_round.png similarity index 100% rename from assets/voxygen/element/slider/indicator_round.png rename to assets/voxygen/element/ui/generic/slider/indicator_round.png diff --git a/assets/voxygen/element/slider/scrollbar.png b/assets/voxygen/element/ui/generic/slider/scrollbar.png similarity index 100% rename from assets/voxygen/element/slider/scrollbar.png rename to assets/voxygen/element/ui/generic/slider/scrollbar.png diff --git a/assets/voxygen/element/slider/scrollbar_1.png b/assets/voxygen/element/ui/generic/slider/scrollbar_1.png similarity index 100% rename from assets/voxygen/element/slider/scrollbar_1.png rename to assets/voxygen/element/ui/generic/slider/scrollbar_1.png diff --git a/assets/voxygen/element/slider/track.png b/assets/voxygen/element/ui/generic/slider/track.png similarity index 100% rename from assets/voxygen/element/slider/track.png rename to assets/voxygen/element/ui/generic/slider/track.png diff --git a/assets/voxygen/element/misc_bg/textbox.png b/assets/voxygen/element/ui/generic/textbox.png similarity index 100% rename from assets/voxygen/element/misc_bg/textbox.png rename to assets/voxygen/element/ui/generic/textbox.png diff --git a/assets/voxygen/element/frames/group_member_bg.png b/assets/voxygen/element/ui/groups/group_member_bg.png similarity index 100% rename from assets/voxygen/element/frames/group_member_bg.png rename to assets/voxygen/element/ui/groups/group_member_bg.png diff --git a/assets/voxygen/element/frames/group_member_frame.png b/assets/voxygen/element/ui/groups/group_member_frame.png similarity index 100% rename from assets/voxygen/element/frames/group_member_frame.png rename to assets/voxygen/element/ui/groups/group_member_frame.png diff --git a/assets/voxygen/element/misc_bg/progress.png b/assets/voxygen/element/ui/invite/progress.png similarity index 100% rename from assets/voxygen/element/misc_bg/progress.png rename to assets/voxygen/element/ui/invite/progress.png diff --git a/assets/voxygen/element/frames/progress_bar.png b/assets/voxygen/element/ui/invite/progress_bar.png similarity index 100% rename from assets/voxygen/element/frames/progress_bar.png rename to assets/voxygen/element/ui/invite/progress_bar.png diff --git a/assets/voxygen/element/map/castle.png b/assets/voxygen/element/ui/map/buttons/castle.png similarity index 100% rename from assets/voxygen/element/map/castle.png rename to assets/voxygen/element/ui/map/buttons/castle.png diff --git a/assets/voxygen/element/map/castle_bg.png b/assets/voxygen/element/ui/map/buttons/castle_bg.png similarity index 100% rename from assets/voxygen/element/map/castle_bg.png rename to assets/voxygen/element/ui/map/buttons/castle_bg.png diff --git a/assets/voxygen/element/map/castle_hover.png b/assets/voxygen/element/ui/map/buttons/castle_hover.png similarity index 100% rename from assets/voxygen/element/map/castle_hover.png rename to assets/voxygen/element/ui/map/buttons/castle_hover.png diff --git a/assets/voxygen/element/map/cave.png b/assets/voxygen/element/ui/map/buttons/cave.png similarity index 100% rename from assets/voxygen/element/map/cave.png rename to assets/voxygen/element/ui/map/buttons/cave.png diff --git a/assets/voxygen/element/map/cave_bg.png b/assets/voxygen/element/ui/map/buttons/cave_bg.png similarity index 100% rename from assets/voxygen/element/map/cave_bg.png rename to assets/voxygen/element/ui/map/buttons/cave_bg.png diff --git a/assets/voxygen/element/map/cave_hover.png b/assets/voxygen/element/ui/map/buttons/cave_hover.png similarity index 100% rename from assets/voxygen/element/map/cave_hover.png rename to assets/voxygen/element/ui/map/buttons/cave_hover.png diff --git a/assets/voxygen/element/map/dungeon.png b/assets/voxygen/element/ui/map/buttons/dungeon.png similarity index 100% rename from assets/voxygen/element/map/dungeon.png rename to assets/voxygen/element/ui/map/buttons/dungeon.png diff --git a/assets/voxygen/element/map/dungeon_bg.png b/assets/voxygen/element/ui/map/buttons/dungeon_bg.png similarity index 100% rename from assets/voxygen/element/map/dungeon_bg.png rename to assets/voxygen/element/ui/map/buttons/dungeon_bg.png diff --git a/assets/voxygen/element/map/dungeon_bg2.png b/assets/voxygen/element/ui/map/buttons/dungeon_bg2.png similarity index 100% rename from assets/voxygen/element/map/dungeon_bg2.png rename to assets/voxygen/element/ui/map/buttons/dungeon_bg2.png diff --git a/assets/voxygen/element/map/dungeon_hover.png b/assets/voxygen/element/ui/map/buttons/dungeon_hover.png similarity index 100% rename from assets/voxygen/element/map/dungeon_hover.png rename to assets/voxygen/element/ui/map/buttons/dungeon_hover.png diff --git a/assets/voxygen/element/map/excl.png b/assets/voxygen/element/ui/map/buttons/excl.png similarity index 100% rename from assets/voxygen/element/map/excl.png rename to assets/voxygen/element/ui/map/buttons/excl.png diff --git a/assets/voxygen/element/map/group_indicator.png b/assets/voxygen/element/ui/map/buttons/group_indicator.png similarity index 100% rename from assets/voxygen/element/map/group_indicator.png rename to assets/voxygen/element/ui/map/buttons/group_indicator.png diff --git a/assets/voxygen/element/map/group_indicator_arrow_down.png b/assets/voxygen/element/ui/map/buttons/group_indicator_arrow_down.png similarity index 100% rename from assets/voxygen/element/map/group_indicator_arrow_down.png rename to assets/voxygen/element/ui/map/buttons/group_indicator_arrow_down.png diff --git a/assets/voxygen/element/map/group_indicator_arrow_up.png b/assets/voxygen/element/ui/map/buttons/group_indicator_arrow_up.png similarity index 100% rename from assets/voxygen/element/map/group_indicator_arrow_up.png rename to assets/voxygen/element/ui/map/buttons/group_indicator_arrow_up.png diff --git a/assets/voxygen/element/map/group_indicator_hover.png b/assets/voxygen/element/ui/map/buttons/group_indicator_hover.png similarity index 100% rename from assets/voxygen/element/map/group_indicator_hover.png rename to assets/voxygen/element/ui/map/buttons/group_indicator_hover.png diff --git a/assets/voxygen/element/buttons/map_modes.png b/assets/voxygen/element/ui/map/buttons/map_modes.png similarity index 100% rename from assets/voxygen/element/buttons/map_modes.png rename to assets/voxygen/element/ui/map/buttons/map_modes.png diff --git a/assets/voxygen/element/map/topographic.png b/assets/voxygen/element/ui/map/buttons/topographic.png similarity index 100% rename from assets/voxygen/element/map/topographic.png rename to assets/voxygen/element/ui/map/buttons/topographic.png diff --git a/assets/voxygen/element/map/town.png b/assets/voxygen/element/ui/map/buttons/town.png similarity index 100% rename from assets/voxygen/element/map/town.png rename to assets/voxygen/element/ui/map/buttons/town.png diff --git a/assets/voxygen/element/map/town_bg.png b/assets/voxygen/element/ui/map/buttons/town_bg.png similarity index 100% rename from assets/voxygen/element/map/town_bg.png rename to assets/voxygen/element/ui/map/buttons/town_bg.png diff --git a/assets/voxygen/element/map/town_hover.png b/assets/voxygen/element/ui/map/buttons/town_hover.png similarity index 100% rename from assets/voxygen/element/map/town_hover.png rename to assets/voxygen/element/ui/map/buttons/town_hover.png diff --git a/assets/voxygen/element/map/tree.png b/assets/voxygen/element/ui/map/buttons/tree.png similarity index 100% rename from assets/voxygen/element/map/tree.png rename to assets/voxygen/element/ui/map/buttons/tree.png diff --git a/assets/voxygen/element/map/tree_hover.png b/assets/voxygen/element/ui/map/buttons/tree_hover.png similarity index 100% rename from assets/voxygen/element/map/tree_hover.png rename to assets/voxygen/element/ui/map/buttons/tree_hover.png diff --git a/assets/voxygen/element/map/dif_1.png b/assets/voxygen/element/ui/map/icons/dif_1.png similarity index 100% rename from assets/voxygen/element/map/dif_1.png rename to assets/voxygen/element/ui/map/icons/dif_1.png diff --git a/assets/voxygen/element/map/dif_2.png b/assets/voxygen/element/ui/map/icons/dif_2.png similarity index 100% rename from assets/voxygen/element/map/dif_2.png rename to assets/voxygen/element/ui/map/icons/dif_2.png diff --git a/assets/voxygen/element/map/dif_3.png b/assets/voxygen/element/ui/map/icons/dif_3.png similarity index 100% rename from assets/voxygen/element/map/dif_3.png rename to assets/voxygen/element/ui/map/icons/dif_3.png diff --git a/assets/voxygen/element/map/dif_4.png b/assets/voxygen/element/ui/map/icons/dif_4.png similarity index 100% rename from assets/voxygen/element/map/dif_4.png rename to assets/voxygen/element/ui/map/icons/dif_4.png diff --git a/assets/voxygen/element/map/dif_5.png b/assets/voxygen/element/ui/map/icons/dif_5.png similarity index 100% rename from assets/voxygen/element/map/dif_5.png rename to assets/voxygen/element/ui/map/icons/dif_5.png diff --git a/assets/voxygen/element/map/dif_6.png b/assets/voxygen/element/ui/map/icons/dif_6.png similarity index 100% rename from assets/voxygen/element/map/dif_6.png rename to assets/voxygen/element/ui/map/icons/dif_6.png diff --git a/assets/voxygen/element/misc_bg/map_bg.png b/assets/voxygen/element/ui/map/map_bg.png similarity index 100% rename from assets/voxygen/element/misc_bg/map_bg.png rename to assets/voxygen/element/ui/map/map_bg.png diff --git a/assets/voxygen/element/misc_bg/map_frame.png b/assets/voxygen/element/ui/map/map_frame.png similarity index 100% rename from assets/voxygen/element/misc_bg/map_frame.png rename to assets/voxygen/element/ui/map/map_frame.png diff --git a/assets/voxygen/element/misc_bg/map_frame_art.png b/assets/voxygen/element/ui/map/map_frame_art.png similarity index 100% rename from assets/voxygen/element/misc_bg/map_frame_art.png rename to assets/voxygen/element/ui/map/map_frame_art.png diff --git a/assets/voxygen/element/buttons/button_mmap_closed.png b/assets/voxygen/element/ui/minimap/buttons/button_mmap_closed.png similarity index 100% rename from assets/voxygen/element/buttons/button_mmap_closed.png rename to assets/voxygen/element/ui/minimap/buttons/button_mmap_closed.png diff --git a/assets/voxygen/element/buttons/button_mmap_closed_hover.png b/assets/voxygen/element/ui/minimap/buttons/button_mmap_closed_hover.png similarity index 100% rename from assets/voxygen/element/buttons/button_mmap_closed_hover.png rename to assets/voxygen/element/ui/minimap/buttons/button_mmap_closed_hover.png diff --git a/assets/voxygen/element/buttons/button_mmap_closed_press.png b/assets/voxygen/element/ui/minimap/buttons/button_mmap_closed_press.png similarity index 100% rename from assets/voxygen/element/buttons/button_mmap_closed_press.png rename to assets/voxygen/element/ui/minimap/buttons/button_mmap_closed_press.png diff --git a/assets/voxygen/element/buttons/button_mmap_open.png b/assets/voxygen/element/ui/minimap/buttons/button_mmap_open.png similarity index 100% rename from assets/voxygen/element/buttons/button_mmap_open.png rename to assets/voxygen/element/ui/minimap/buttons/button_mmap_open.png diff --git a/assets/voxygen/element/buttons/button_mmap_open_hover.png b/assets/voxygen/element/ui/minimap/buttons/button_mmap_open_hover.png similarity index 100% rename from assets/voxygen/element/buttons/button_mmap_open_hover.png rename to assets/voxygen/element/ui/minimap/buttons/button_mmap_open_hover.png diff --git a/assets/voxygen/element/buttons/button_mmap_open_press.png b/assets/voxygen/element/ui/minimap/buttons/button_mmap_open_press.png similarity index 100% rename from assets/voxygen/element/buttons/button_mmap_open_press.png rename to assets/voxygen/element/ui/minimap/buttons/button_mmap_open_press.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-min.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-min.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-min.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-min.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-min_hover.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-min_hover.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-min_press.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-min_press.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-north.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-north.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-north.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-north.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-north_hover.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-north_hover.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-north_hover.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-north_hover.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-north_press.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-north_press.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-north_press.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-north_press.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-north_press_hover.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-north_press_hover.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-north_press_hover.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-north_press_hover.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-plus.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-plus.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-plus.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-plus.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-plus_hover.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-plus_hover.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-plus_hover.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-plus_hover.png diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-plus_press.png b/assets/voxygen/element/ui/minimap/buttons/mmap_button-plus_press.png similarity index 100% rename from assets/voxygen/element/buttons/min_plus/mmap_button-plus_press.png rename to assets/voxygen/element/ui/minimap/buttons/mmap_button-plus_press.png diff --git a/assets/voxygen/element/buttons/indicator_mmap.png b/assets/voxygen/element/ui/minimap/icons/indicator_mmap.png similarity index 100% rename from assets/voxygen/element/buttons/indicator_mmap.png rename to assets/voxygen/element/ui/minimap/icons/indicator_mmap.png diff --git a/assets/voxygen/element/buttons/indicator_mmap_small.png b/assets/voxygen/element/ui/minimap/icons/indicator_mmap_small.png similarity index 100% rename from assets/voxygen/element/buttons/indicator_mmap_small.png rename to assets/voxygen/element/ui/minimap/icons/indicator_mmap_small.png diff --git a/assets/voxygen/element/frames/mmap.png b/assets/voxygen/element/ui/minimap/mmap.png similarity index 100% rename from assets/voxygen/element/frames/mmap.png rename to assets/voxygen/element/ui/minimap/mmap.png diff --git a/assets/voxygen/element/frames/mmap_closed.png b/assets/voxygen/element/ui/minimap/mmap_closed.png similarity index 100% rename from assets/voxygen/element/frames/mmap_closed.png rename to assets/voxygen/element/ui/minimap/mmap_closed.png diff --git a/assets/voxygen/element/frames/mmap_frame.png b/assets/voxygen/element/ui/minimap/mmap_frame.png similarity index 100% rename from assets/voxygen/element/frames/mmap_frame.png rename to assets/voxygen/element/ui/minimap/mmap_frame.png diff --git a/assets/voxygen/element/misc_bg/temp_quest_bg.png b/assets/voxygen/element/ui/quests/temp_quest_bg.png similarity index 100% rename from assets/voxygen/element/misc_bg/temp_quest_bg.png rename to assets/voxygen/element/ui/quests/temp_quest_bg.png diff --git a/assets/voxygen/element/buttons/settings_button.png b/assets/voxygen/element/ui/settings/buttons/settings_button.png similarity index 100% rename from assets/voxygen/element/buttons/settings_button.png rename to assets/voxygen/element/ui/settings/buttons/settings_button.png diff --git a/assets/voxygen/element/buttons/settings_button_hover.png b/assets/voxygen/element/ui/settings/buttons/settings_button_hover.png similarity index 100% rename from assets/voxygen/element/buttons/settings_button_hover.png rename to assets/voxygen/element/ui/settings/buttons/settings_button_hover.png diff --git a/assets/voxygen/element/buttons/settings_button_press.png b/assets/voxygen/element/ui/settings/buttons/settings_button_press.png similarity index 100% rename from assets/voxygen/element/buttons/settings_button_press.png rename to assets/voxygen/element/ui/settings/buttons/settings_button_press.png diff --git a/assets/voxygen/element/buttons/settings_button_pressed.png b/assets/voxygen/element/ui/settings/buttons/settings_button_pressed.png similarity index 100% rename from assets/voxygen/element/buttons/settings_button_pressed.png rename to assets/voxygen/element/ui/settings/buttons/settings_button_pressed.png diff --git a/assets/voxygen/element/misc_bg/crosshair_bg.png b/assets/voxygen/element/ui/settings/icons/crosshair_bg.png similarity index 100% rename from assets/voxygen/element/misc_bg/crosshair_bg.png rename to assets/voxygen/element/ui/settings/icons/crosshair_bg.png diff --git a/assets/voxygen/element/misc_bg/crosshair_bg_hover.png b/assets/voxygen/element/ui/settings/icons/crosshair_bg_hover.png similarity index 100% rename from assets/voxygen/element/misc_bg/crosshair_bg_hover.png rename to assets/voxygen/element/ui/settings/icons/crosshair_bg_hover.png diff --git a/assets/voxygen/element/misc_bg/crosshair_bg_press.png b/assets/voxygen/element/ui/settings/icons/crosshair_bg_press.png similarity index 100% rename from assets/voxygen/element/misc_bg/crosshair_bg_press.png rename to assets/voxygen/element/ui/settings/icons/crosshair_bg_press.png diff --git a/assets/voxygen/element/misc_bg/crosshair_bg_pressed.png b/assets/voxygen/element/ui/settings/icons/crosshair_bg_pressed.png similarity index 100% rename from assets/voxygen/element/misc_bg/crosshair_bg_pressed.png rename to assets/voxygen/element/ui/settings/icons/crosshair_bg_pressed.png diff --git a/assets/voxygen/element/misc_bg/crosshair_inner.png b/assets/voxygen/element/ui/settings/icons/crosshair_inner.png similarity index 100% rename from assets/voxygen/element/misc_bg/crosshair_inner.png rename to assets/voxygen/element/ui/settings/icons/crosshair_inner.png diff --git a/assets/voxygen/element/misc_bg/crosshair_outer_1.png b/assets/voxygen/element/ui/settings/icons/crosshair_outer_1.png similarity index 100% rename from assets/voxygen/element/misc_bg/crosshair_outer_1.png rename to assets/voxygen/element/ui/settings/icons/crosshair_outer_1.png diff --git a/assets/voxygen/element/misc_bg/crosshair_outer_2.png b/assets/voxygen/element/ui/settings/icons/crosshair_outer_2.png similarity index 100% rename from assets/voxygen/element/misc_bg/crosshair_outer_2.png rename to assets/voxygen/element/ui/settings/icons/crosshair_outer_2.png diff --git a/assets/voxygen/element/misc_bg/crosshair_outer_3.png b/assets/voxygen/element/ui/settings/icons/crosshair_outer_3.png similarity index 100% rename from assets/voxygen/element/misc_bg/crosshair_outer_3.png rename to assets/voxygen/element/ui/settings/icons/crosshair_outer_3.png diff --git a/assets/voxygen/element/misc_bg/settings_bg.png b/assets/voxygen/element/ui/settings/settings_bg.png similarity index 100% rename from assets/voxygen/element/misc_bg/settings_bg.png rename to assets/voxygen/element/ui/settings/settings_bg.png diff --git a/assets/voxygen/element/misc_bg/settings_frame.png b/assets/voxygen/element/ui/settings/settings_frame.png similarity index 100% rename from assets/voxygen/element/misc_bg/settings_frame.png rename to assets/voxygen/element/ui/settings/settings_frame.png diff --git a/assets/voxygen/element/skillbar/bar_content.png b/assets/voxygen/element/ui/skillbar/bar_content.png similarity index 100% rename from assets/voxygen/element/skillbar/bar_content.png rename to assets/voxygen/element/ui/skillbar/bar_content.png diff --git a/assets/voxygen/element/skillbar/bg.png b/assets/voxygen/element/ui/skillbar/bg.png similarity index 100% rename from assets/voxygen/element/skillbar/bg.png rename to assets/voxygen/element/ui/skillbar/bg.png diff --git a/assets/voxygen/element/skillbar/decayed_bg.png b/assets/voxygen/element/ui/skillbar/decayed_bg.png similarity index 100% rename from assets/voxygen/element/skillbar/decayed_bg.png rename to assets/voxygen/element/ui/skillbar/decayed_bg.png diff --git a/assets/voxygen/element/skillbar/enemy_bar_content.png b/assets/voxygen/element/ui/skillbar/enemy_bar_content.png similarity index 100% rename from assets/voxygen/element/skillbar/enemy_bar_content.png rename to assets/voxygen/element/ui/skillbar/enemy_bar_content.png diff --git a/assets/voxygen/element/skillbar/frame.png b/assets/voxygen/element/ui/skillbar/frame.png similarity index 100% rename from assets/voxygen/element/skillbar/frame.png rename to assets/voxygen/element/ui/skillbar/frame.png diff --git a/assets/voxygen/element/skillbar/health_bg.png b/assets/voxygen/element/ui/skillbar/health_bg.png similarity index 100% rename from assets/voxygen/element/skillbar/health_bg.png rename to assets/voxygen/element/ui/skillbar/health_bg.png diff --git a/assets/voxygen/element/skillbar/health_frame.png b/assets/voxygen/element/ui/skillbar/health_frame.png similarity index 100% rename from assets/voxygen/element/skillbar/health_frame.png rename to assets/voxygen/element/ui/skillbar/health_frame.png diff --git a/assets/voxygen/element/misc_bg/level_up.png b/assets/voxygen/element/ui/skillbar/level_up.png similarity index 100% rename from assets/voxygen/element/misc_bg/level_up.png rename to assets/voxygen/element/ui/skillbar/level_up.png diff --git a/assets/voxygen/element/skillbar/slot.png b/assets/voxygen/element/ui/skillbar/slot.png similarity index 100% rename from assets/voxygen/element/skillbar/slot.png rename to assets/voxygen/element/ui/skillbar/slot.png diff --git a/assets/voxygen/element/skillbar/stamina_bg.png b/assets/voxygen/element/ui/skillbar/stamina_bg.png similarity index 100% rename from assets/voxygen/element/skillbar/stamina_bg.png rename to assets/voxygen/element/ui/skillbar/stamina_bg.png diff --git a/assets/voxygen/element/skillbar/stamina_frame.png b/assets/voxygen/element/ui/skillbar/stamina_frame.png similarity index 100% rename from assets/voxygen/element/skillbar/stamina_frame.png rename to assets/voxygen/element/ui/skillbar/stamina_frame.png diff --git a/assets/voxygen/element/misc_bg/social_bg.png b/assets/voxygen/element/ui/social/social_bg.png similarity index 100% rename from assets/voxygen/element/misc_bg/social_bg.png rename to assets/voxygen/element/ui/social/social_bg.png diff --git a/assets/voxygen/element/misc_bg/social_frame.png b/assets/voxygen/element/ui/social/social_frame.png similarity index 100% rename from assets/voxygen/element/misc_bg/social_frame.png rename to assets/voxygen/element/ui/social/social_frame.png diff --git a/assets/voxygen/element/misc_bg/social_tab_active.png b/assets/voxygen/element/ui/social/social_tab_active.png similarity index 100% rename from assets/voxygen/element/misc_bg/social_tab_active.png rename to assets/voxygen/element/ui/social/social_tab_active.png diff --git a/assets/voxygen/element/misc_bg/social_tab_inactive.png b/assets/voxygen/element/ui/social/social_tab_inactive.png similarity index 100% rename from assets/voxygen/element/misc_bg/social_tab_inactive.png rename to assets/voxygen/element/ui/social/social_tab_inactive.png diff --git a/assets/voxygen/element/misc_bg/social_tab_online.png b/assets/voxygen/element/ui/social/social_tab_online.png similarity index 100% rename from assets/voxygen/element/misc_bg/social_tab_online.png rename to assets/voxygen/element/ui/social/social_tab_online.png diff --git a/assets/voxygen/element/weapons/axe.png b/assets/voxygen/element/weapons/axe.png new file mode 100644 index 0000000000..cf3b2fb7aa --- /dev/null +++ b/assets/voxygen/element/weapons/axe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3cef9b42717c9ce1101ad03d8321f028ae5c5f1a7b0b7fc3f664ddb41bd5fd4 +size 328 diff --git a/assets/voxygen/element/weapons/bow.png b/assets/voxygen/element/weapons/bow.png new file mode 100644 index 0000000000..dc7a7dd2a8 --- /dev/null +++ b/assets/voxygen/element/weapons/bow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a64ef7b316348f90d4828d0b5e8aabcd746ab4c2fc09170da78fa2dd310fe3b2 +size 335 diff --git a/assets/voxygen/element/weapons/daggers.png b/assets/voxygen/element/weapons/daggers.png new file mode 100644 index 0000000000..451368b9a1 --- /dev/null +++ b/assets/voxygen/element/weapons/daggers.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3d97ec647e187bae0867fc0ce86f892cc4a837d243489ec56aeb7aa5c857ade +size 384 diff --git a/assets/voxygen/element/weapons/hammer.png b/assets/voxygen/element/weapons/hammer.png new file mode 100644 index 0000000000..d8065919b9 --- /dev/null +++ b/assets/voxygen/element/weapons/hammer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd835cb611616ae5e33baa93a5ef6771a3b823e4aa6292aa883022853317ae05 +size 283 diff --git a/assets/voxygen/element/weapons/sceptre.png b/assets/voxygen/element/weapons/sceptre.png new file mode 100644 index 0000000000..b7b064d24e --- /dev/null +++ b/assets/voxygen/element/weapons/sceptre.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd37274f93d2dcba7c392e3c2ca375615a0502e437f18ed75155d30809d56f1a +size 414 diff --git a/assets/voxygen/element/weapons/staff.png b/assets/voxygen/element/weapons/staff.png new file mode 100644 index 0000000000..a3fcc70183 --- /dev/null +++ b/assets/voxygen/element/weapons/staff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d59fc2748bf81daeb694b227647003d398da2c28b22198dc023d844f2215c9f +size 276 diff --git a/assets/voxygen/element/weapons/sword.png b/assets/voxygen/element/weapons/sword.png new file mode 100644 index 0000000000..4712a25094 --- /dev/null +++ b/assets/voxygen/element/weapons/sword.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8e89c61cb6c6127d72960c1efb642e9eef1004b311246384ef66179763c8b65 +size 326 diff --git a/assets/voxygen/element/weapons/swords_crossed.png b/assets/voxygen/element/weapons/swords_crossed.png new file mode 100644 index 0000000000..f8b969d85c --- /dev/null +++ b/assets/voxygen/element/weapons/swords_crossed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16cf85123361d4422ee14e72e93be6df297fcf0d3e779ddaa5b3fcebd3bb6092 +size 409 diff --git a/assets/voxygen/element/weapons/swordshield.png b/assets/voxygen/element/weapons/swordshield.png new file mode 100644 index 0000000000..d4280adf50 --- /dev/null +++ b/assets/voxygen/element/weapons/swordshield.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e8aeba790666112543e81823eba8a1dc4251b17bda3583c0605ade901a2730a +size 734 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 9b67da9859..c863e6abbc 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1021,16 +1021,16 @@ ), // Lanterns Lantern("Black0"): Png( - "element.icons.lantern_black-0", + "element.items.lantern_black-0", ), Lantern("Green0"): Png( - "element.icons.lantern_green-0", + "element.items.lantern_green-0", ), Lantern("Blue0"): Png( - "element.icons.lantern_blue-0", + "element.items.lantern_blue-0", ), Lantern("Red0"): Png( - "element.icons.lantern_red-0", + "element.items.lantern_red-0", ), Lantern("GeodePurp"): VoxTrans( "voxel.lantern.geode_purp", @@ -1080,7 +1080,7 @@ (0.0, 0.0, 0.0), (-10.0, 15.0, 0.0), 0.8, ), Utility(Collar): Png( - "element.icons.collar", + "element.items.collar", ), // Armor // Starter Parts @@ -1747,18 +1747,18 @@ // Necks Armor(Neck("Plain0")): Png( - "element.icons.neck-0", + "element.items.neck-0", ), Armor(Neck("Plain1")): Png( - "element.icons.neck-1", + "element.items.neck-1", ), Armor(Neck("Shell")): Png( - "element.icons.neck-seashell", + "element.items.neck-seashell", ), // Tabards Armor(Tabard("Admin")): Png( - "element.icons.tabard_admin", + "element.items.tabard_admin", ), // Heads Armor(Head("Swift")): VoxTrans( @@ -1771,50 +1771,50 @@ ), // Bags Armor(Bag("RedFace")): Png ( - "element.icons.item_bag_red_face", + "element.items.item_bag_red_face", ), Armor(Bag("BlackHole")): Png ( - "element.icons.item_bag_brown_face", + "element.items.item_bag_brown_face", ), Armor(Bag("BlueFace")): Png ( - "element.icons.item_bag_blue_face", + "element.items.item_bag_blue_face", ), Armor(Bag("PurpleSkull")): Png ( - "element.icons.item_bag_skull", + "element.items.item_bag_skull", ), Armor(Bag("GreenLarge")): Png ( - "element.icons.item_bag_green_large", + "element.items.item_bag_green_large", ), Armor(Bag("LeatherLarge")): Png ( - "element.icons.item_bag_leather_large", + "element.items.item_bag_leather_large", ), Armor(Bag("GreenMid")): Png ( - "element.icons.item_bag_green_mid", + "element.items.item_bag_green_mid", ), Armor(Bag("LeatherSmall")): Png ( - "element.icons.item_bag_leather_small", + "element.items.item_bag_leather_small", ), Armor(Bag("RedLarge")): Png ( - "element.icons.item_bag_large", + "element.items.item_bag_large", ), Armor(Bag("RedMed")): Png ( - "element.icons.item_bag_med", + "element.items.item_bag_med", ), Armor(Bag("RedSmall")): Png ( - "element.icons.item_bag_small", + "element.items.item_bag_small", ), Armor(Bag("RedTiny")): Png ( - "element.icons.item_bag_tiny", + "element.items.item_bag_tiny", ), Armor(Bag("BluePouch")): Png ( - "element.icons.item_bag_blue", + "element.items.item_bag_blue", ), // Consumables Consumable("Apple"): Png( - "element.icons.item_apple", + "element.items.item_apple", ), Consumable("Coconut"): Png( - "element.icons.item_coconut", + "element.items.item_coconut", ), Consumable("PotionMed"): VoxTrans( "voxel.object.potion_red", @@ -1833,7 +1833,7 @@ (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), Consumable("Cheese"): Png( - "element.icons.item_cheese", + "element.items.item_cheese", ), Consumable("Potion"): VoxTrans( "voxel.object.potion_red", @@ -1852,16 +1852,16 @@ (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), Consumable("AppleShroomCurry"): Png( - "element.icons.item_apple_curry", + "element.items.item_apple_curry", ), Consumable("AppleStick"): Png( - "element.icons.item_apple_stick", + "element.items.item_apple_stick", ), Consumable("MushroomStick"): Png( - "element.icons.item_shroom_stick", + "element.items.item_shroom_stick", ), Consumable("SunflowerTea"): Png( - "element.icons.item_sunflower_tea", + "element.items.item_sunflower_tea", ), Consumable("Carrot"): VoxTrans( "voxel.sprite.carrot.carrot", @@ -1926,7 +1926,7 @@ (1.0, 1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Ingredient("SewingSet"): Png( - "element.icons.sewing_set", + "element.items.sewing_set", ), Ingredient("Flower"): VoxTrans( "voxel.sprite.flowers.sunflower_1", @@ -1953,13 +1953,13 @@ (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), Ingredient("IcyShard"): Png( - "element.icons.item_ice_shard", + "element.items.item_ice_shard", ), Ingredient("FlayerBagDamaged"): Png( - "element.icons.item_flayer_soul", + "element.items.item_flayer_soul", ), Ingredient("RaptorFeather"): Png( - "element.icons.item_raptor_feather", + "element.items.item_raptor_feather", ), Ingredient("Twigs"): VoxTrans( "voxel.sprite.twigs.twigs-0", @@ -1974,22 +1974,22 @@ (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), Ingredient("Honey"): Png( - "element.icons.item_honey", + "element.items.item_honey", ), Ingredient("LeatherScraps"): Png( - "element.icons.item_leather0", + "element.items.item_leather0", ), Ingredient("TrollLeather"): Png( - "element.icons.item_leather_green", + "element.items.item_leather_green", ), Ingredient("ClothScraps"): Png( - "element.icons.item_cloth0", + "element.items.item_cloth0", ), Ingredient("ClothScrapsRed"): Png( - "element.icons.item_cloth_red", + "element.items.item_cloth_red", ), Ingredient("MortarPestle"): Png( - "element.icons.item_mortarpestlecoco", + "element.items.item_mortarpestlecoco", ), Ingredient("EmptyVial"): VoxTrans( "voxel.object.potion_empty", diff --git a/list.txt b/list.txt new file mode 100644 index 0000000000..d9e201656b --- /dev/null +++ b/list.txt @@ -0,0 +1,554 @@ +element.0_1_knight +element.animation.buff_frame.1 +element.animation.buff_frame.2 +element.animation.buff_frame.3 +element.animation.buff_frame.4 +element.animation.buff_frame.5 +element.animation.buff_frame.6 +element.animation.buff_frame.7 +element.animation.buff_frame.8 +element.animation.gears.1 +element.animation.gears.2 +element.animation.gears.3 +element.animation.gears.4 +element.animation.gears.5 +element.animation.loaders.cauldron1 +element.animation.loaders.cauldron2 +element.animation.loaders.cauldron3 +element.animation.loaders.cauldron4 +element.animation.loaders.cauldron5 +element.animation.loaders.cheese1 +element.animation.loaders.cheese2 +element.animation.loaders.cheese3 +element.animation.loaders.cheese4 +element.animation.loaders.cheese5 +element.animation.loaders.coins1 +element.animation.loaders.coins2 +element.animation.loaders.coins3 +element.animation.loaders.coins4 +element.animation.loaders.coins5 +element.animation.loaders.house1 +element.animation.loaders.house2 +element.animation.loaders.house3 +element.animation.loaders.house4 +element.animation.loaders.house5 +element.animation.loaders.ship1 +element.animation.loaders.ship2 +element.animation.loaders.ship3 +element.animation.loaders.ship4 +element.animation.loaders.ship5 +element.icons.character +element.icons.de_buffs.buff_campfire_heal_0 +element.icons.de_buffs.buff_damage_reduce_0 +element.icons.de_buffs.buff_energyplus_0 +element.icons.de_buffs.buff_healthplus_0 +element.icons.de_buffs.buff_invincibility_0 +element.icons.de_buffs.buff_plus_0 +element.icons.de_buffs.buff_potion_0 +element.icons.de_buffs.buff_saturation_0 +element.icons.de_buffs.debuff_bleed_0 +element.icons.de_buffs.debuff_skull_0 +element.icons.gem +element.icons.indicator_bubble +element.icons.m1 +element.icons.m2 +element.icons.missing_icon_grey +element.icons.m_move +element.icons.m_scroll +element.icons.skull +element.icons.skull_2 +element.icons.snake_arrow +element.items.coin +element.items.collar +element.items.head_leather-0 +element.items.item_apple +element.items.item_apple_curry +element.items.item_apple_stick +element.items.item_bag_blue +element.items.item_bag_blue_face +element.items.item_bag_brown_face +element.items.item_bag_green_large +element.items.item_bag_green_mid +element.items.item_bag_large +element.items.item_bag_leather_large +element.items.item_bag_leather_small +element.items.item_bag_med +element.items.item_bag_red_face +element.items.item_bag_skull +element.items.item_bag_small +element.items.item_bag_t1_purp +element.items.item_bag_tiny +element.items.item_cheese +element.items.item_cloth0 +element.items.item_cloth_red +element.items.item_coconut +element.items.item_flayer_soul +element.items.item_honey +element.items.item_ice_shard +element.items.item_leather0 +element.items.item_leather1 +element.items.item_leather_green +element.items.item_mortarpestlecoco +element.items.item_raptor_feather +element.items.item_shroom_stick +element.items.item_sunflower_tea +element.items.lantern_black-0 +element.items.lantern_blue-0 +element.items.lantern_green-0 +element.items.lantern_grey-0 +element.items.lantern_red-0 +element.items.neck-0 +element.items.neck-1 +element.items.neck-seashell +element.items.ring-0 +element.items.sewing_set +element.items.tabard_admin +element.not_found +element.skills.2haxe_m1 +element.skills.2hhammer_m1 +element.skills.2hsword_m1 +element.skills.2hsword_m2 +element.skills.bow_aoe +element.skills.bow_m1 +element.skills.bow_m2 +element.skills.debug_wand_m1 +element.skills.debug_wand_m2 +element.skills.heal_0 +element.skills.heal_bomb +element.skills.lifesteal +element.skills.sceptre_protection +element.skills.skilltree.buff_amount +element.skills.skilltree.buff_combo +element.skills.skilltree.buff_cost +element.skills.skilltree.buff_damage +element.skills.skilltree.buff_distance +element.skills.skilltree.buff_duration +element.skills.skilltree.buff_energy_drain +element.skills.skilltree.buff_energy_regen +element.skills.skilltree.buff_explosion +element.skills.skilltree.buff_heal +element.skills.skilltree.buff_helicopter +element.skills.skilltree.buff_infinite +element.skills.skilltree.buff_knockback +element.skills.skilltree.buff_lifesteal +element.skills.skilltree.buff_projectile_speed +element.skills.skilltree.buff_radius +element.skills.skilltree.buff_speed +element.skills.skilltree.debuff_amount +element.skills.skilltree.debuff_combo +element.skills.skilltree.debuff_cost +element.skills.skilltree.debuff_damage +element.skills.skilltree.debuff_distance +element.skills.skilltree.debuff_duration +element.skills.skilltree.debuff_energy_drain +element.skills.skilltree.debuff_energy_regen +element.skills.skilltree.debuff_explosion +element.skills.skilltree.debuff_heal +element.skills.skilltree.debuff_helicopter +element.skills.skilltree.debuff_infinite +element.skills.skilltree.debuff_knockback +element.skills.skilltree.debuff_lifesteal +element.skills.skilltree.debuff_projectile_speed +element.skills.skilltree.debuff_radius +element.skills.skilltree.debuff_speed +element.skills.skilltree.health_plus +element.skills.skilltree.heal_amount +element.skills.skilltree.heal_combo +element.skills.skilltree.heal_cost +element.skills.skilltree.heal_damage +element.skills.skilltree.heal_distance +element.skills.skilltree.heal_duration +element.skills.skilltree.heal_energy_drain +element.skills.skilltree.heal_energy_regen +element.skills.skilltree.heal_explosion +element.skills.skilltree.heal_heal +element.skills.skilltree.heal_helicopter +element.skills.skilltree.heal_infinite +element.skills.skilltree.heal_knockback +element.skills.skilltree.heal_lifesteal +element.skills.skilltree.heal_projectile_speed +element.skills.skilltree.heal_radius +element.skills.skilltree.heal_speed +element.skills.skilltree.magic_amount +element.skills.skilltree.magic_combo +element.skills.skilltree.magic_cost +element.skills.skilltree.magic_damage +element.skills.skilltree.magic_distance +element.skills.skilltree.magic_duration +element.skills.skilltree.magic_energy_drain +element.skills.skilltree.magic_energy_regen +element.skills.skilltree.magic_explosion +element.skills.skilltree.magic_heal +element.skills.skilltree.magic_helicopter +element.skills.skilltree.magic_infinite +element.skills.skilltree.magic_knockback +element.skills.skilltree.magic_lifesteal +element.skills.skilltree.magic_projectile_speed +element.skills.skilltree.magic_radius +element.skills.skilltree.magic_speed +element.skills.skilltree.physical_amount +element.skills.skilltree.physical_combo +element.skills.skilltree.physical_cost +element.skills.skilltree.physical_damage +element.skills.skilltree.physical_distance +element.skills.skilltree.physical_duration +element.skills.skilltree.physical_energy_drain +element.skills.skilltree.physical_energy_regen +element.skills.skilltree.physical_explosion +element.skills.skilltree.physical_heal +element.skills.skilltree.physical_helicopter +element.skills.skilltree.physical_infinite +element.skills.skilltree.physical_knockback +element.skills.skilltree.physical_lifesteal +element.skills.skilltree.physical_projectile_speed +element.skills.skilltree.physical_radius +element.skills.skilltree.physical_speed +element.skills.skilltree.skill_climbing +element.skills.skilltree.skill_dodge +element.skills.skilltree.skill_swim +element.skills.skilltree.stamina_plus +element.skills.skilltree.unlock_axe +element.skills.skilltree.unlock_bow +element.skills.skilltree.unlock_hammer +element.skills.skilltree.unlock_sceptre +element.skills.skilltree.unlock_staff-0 +element.skills.skilltree.unlock_sword +element.skills.skilltree.utility_amount +element.skills.skilltree.utility_combo +element.skills.skilltree.utility_cost +element.skills.skilltree.utility_damage +element.skills.skilltree.utility_distance +element.skills.skilltree.utility_duration +element.skills.skilltree.utility_energy_drain +element.skills.skilltree.utility_energy_regen +element.skills.skilltree.utility_explosion +element.skills.skilltree.utility_heal +element.skills.skilltree.utility_helicopter +element.skills.skilltree.utility_infinite +element.skills.skilltree.utility_knockback +element.skills.skilltree.utility_lifesteal +element.skills.skilltree.utility_projectile_speed +element.skills.skilltree.utility_radius +element.skills.skilltree.utility_speed +element.skills.skill_axespin +element.skills.skill_axe_leap_slash +element.skills.skill_bow_jump_burst +element.skills.skill_fire_aoe +element.skills.skill_flamethrower +element.skills.skill_hammergolf +element.skills.skill_hammerleap +element.skills.skill_slice_2 +element.skills.skill_sword_pierce +element.skills.snake +element.skills.snake_green +element.skills.staff_m1 +element.skills.staff_m2 +element.skills.sword_whirlwind +element.ui.bag.backgrounds.back +element.ui.bag.backgrounds.bag +element.ui.bag.backgrounds.belt +element.ui.bag.backgrounds.chest +element.ui.bag.backgrounds.feet +element.ui.bag.backgrounds.glider +element.ui.bag.backgrounds.hands +element.ui.bag.backgrounds.head +element.ui.bag.backgrounds.lantern +element.ui.bag.backgrounds.legs +element.ui.bag.backgrounds.mainhand +element.ui.bag.backgrounds.necklace +element.ui.bag.backgrounds.offhand +element.ui.bag.backgrounds.ring +element.ui.bag.backgrounds.shoulders +element.ui.bag.backgrounds.tabard +element.ui.bag.buttons.inv_collapse +element.ui.bag.buttons.inv_collapse_hover +element.ui.bag.buttons.inv_collapse_press +element.ui.bag.buttons.inv_expand +element.ui.bag.buttons.inv_expand_hover +element.ui.bag.buttons.inv_expand_press +element.ui.bag.buttons.inv_slot +element.ui.bag.buttons.inv_slot_blue +element.ui.bag.buttons.inv_slot_gold +element.ui.bag.buttons.inv_slot_green +element.ui.bag.buttons.inv_slot_grey +element.ui.bag.buttons.inv_slot_orange +element.ui.bag.buttons.inv_slot_purple +element.ui.bag.buttons.inv_slot_red +element.ui.bag.buttons.inv_slot_sel +element.ui.bag.buttons.inv_tab_active +element.ui.bag.buttons.inv_tab_inactive +element.ui.bag.buttons.inv_tab_inactive_hover +element.ui.bag.buttons.inv_tab_inactive_press +element.ui.bag.icons.combat_rating +element.ui.bag.icons.combat_rating_shadow +element.ui.bag.icons.health +element.ui.bag.icons.protection +element.ui.bag.icons.stamina +element.ui.bag.inv_bg_0 +element.ui.bag.inv_bg_1 +element.ui.bag.inv_bg_bag +element.ui.bag.inv_frame +element.ui.bag.inv_frame_bag +element.ui.char_select.icons.dice +element.ui.char_select.icons.dice_hover +element.ui.char_select.icons.dice_press +element.ui.char_select.portraits.danari_f +element.ui.char_select.portraits.danari_m +element.ui.char_select.portraits.dwarf_f +element.ui.char_select.portraits.dwarf_m +element.ui.char_select.portraits.elf_f +element.ui.char_select.portraits.elf_m +element.ui.char_select.portraits.human_f +element.ui.char_select.portraits.human_m +element.ui.char_select.portraits.orc_f +element.ui.char_select.portraits.orc_m +element.ui.char_select.portraits.ud_f +element.ui.char_select.portraits.ud_m +element.ui.chat.icons.command_error_small +element.ui.chat.icons.command_info_small +element.ui.chat.icons.faction +element.ui.chat.icons.faction_small +element.ui.chat.icons.group +element.ui.chat.icons.group_small +element.ui.chat.icons.kill_small +element.ui.chat.icons.loot_small +element.ui.chat.icons.offline_small +element.ui.chat.icons.online_small +element.ui.chat.icons.private_small +element.ui.chat.icons.region +element.ui.chat.icons.region_small +element.ui.chat.icons.say +element.ui.chat.icons.say_small +element.ui.chat.icons.tell +element.ui.chat.icons.tell_small +element.ui.chat.icons.world +element.ui.chat.icons.world_small +element.ui.crafting.crafting +element.ui.crafting.crafting_frame +element.ui.crafting.icons.armors +element.ui.crafting.icons.crafting_tools +element.ui.crafting.icons.dismantle +element.ui.crafting.icons.foods +element.ui.crafting.icons.gliders +element.ui.crafting.icons.globe +element.ui.crafting.icons.globe_2 +element.ui.crafting.icons.potions +element.ui.crafting.icons.utilities +element.ui.crafting.icons.weapons +element.ui.diary.buttons.border_skills +element.ui.diary.buttons.lock +element.ui.diary.buttons.slot_skilltree +element.ui.diary.diary_bg +element.ui.diary.diary_exp_bg +element.ui.diary.diary_exp_frame +element.ui.diary.diary_frame +element.ui.diary.pixel +element.ui.generic.buttons.anvil +element.ui.generic.buttons.anvil_hover +element.ui.generic.buttons.anvil_press +element.ui.generic.buttons.armor_slot +element.ui.generic.buttons.armor_slot_empty +element.ui.generic.buttons.armor_slot_selected +element.ui.generic.buttons.arrow_down +element.ui.generic.buttons.arrow_down_gold +element.ui.generic.buttons.arrow_down_hover +element.ui.generic.buttons.arrow_down_press +element.ui.generic.buttons.bag.closed +element.ui.generic.buttons.bag.closed_hover +element.ui.generic.buttons.bag.closed_press +element.ui.generic.buttons.bag.open +element.ui.generic.buttons.bag.open_hover +element.ui.generic.buttons.bag.open_press +element.ui.generic.buttons.border +element.ui.generic.buttons.border_mo +element.ui.generic.buttons.border_press +element.ui.generic.buttons.border_pressed +element.ui.generic.buttons.button +element.ui.generic.buttons.button_hover +element.ui.generic.buttons.button_press +element.ui.generic.buttons.checkbox.active +element.ui.generic.buttons.checkbox.hover +element.ui.generic.buttons.checkbox.inactive +element.ui.generic.buttons.checkbox.inactive_hover +element.ui.generic.buttons.checkbox.press +element.ui.generic.buttons.close_btn +element.ui.generic.buttons.close_btn_hover +element.ui.generic.buttons.close_btn_press +element.ui.generic.buttons.group +element.ui.generic.buttons.group_hover +element.ui.generic.buttons.group_press +element.ui.generic.buttons.key_button +element.ui.generic.buttons.key_button_press +element.ui.generic.buttons.map +element.ui.generic.buttons.map_hover +element.ui.generic.buttons.map_press +element.ui.generic.buttons.radio.active +element.ui.generic.buttons.radio.hover +element.ui.generic.buttons.radio.inactive +element.ui.generic.buttons.radio.inactive_hover +element.ui.generic.buttons.radio.press +element.ui.generic.buttons.search_btn +element.ui.generic.buttons.search_btn_hover +element.ui.generic.buttons.search_btn_press +element.ui.generic.buttons.settings +element.ui.generic.buttons.settings_hover +element.ui.generic.buttons.settings_press +element.ui.generic.buttons.social +element.ui.generic.buttons.social_hover +element.ui.generic.buttons.social_press +element.ui.generic.buttons.spellbook +element.ui.generic.buttons.spellbook_hover +element.ui.generic.buttons.spellbook_press +element.ui.generic.buttons.x_red +element.ui.generic.buttons.x_red_hover +element.ui.generic.buttons.x_red_press +element.ui.generic.fireplace +element.ui.generic.frames.banner_bot +element.ui.generic.frames.banner_gradient_bottom +element.ui.generic.frames.banner_small_top +element.ui.generic.frames.banner_top +element.ui.generic.frames.bubble.bottom +element.ui.generic.frames.bubble.bottom_left +element.ui.generic.frames.bubble.bottom_right +element.ui.generic.frames.bubble.left +element.ui.generic.frames.bubble.mid +element.ui.generic.frames.bubble.right +element.ui.generic.frames.bubble.tail +element.ui.generic.frames.bubble.top +element.ui.generic.frames.bubble.top_left +element.ui.generic.frames.bubble.top_right +element.ui.generic.frames.bubble_dark.bottom +element.ui.generic.frames.bubble_dark.bottom_left +element.ui.generic.frames.bubble_dark.bottom_right +element.ui.generic.frames.bubble_dark.icon_frame +element.ui.generic.frames.bubble_dark.left +element.ui.generic.frames.bubble_dark.mid +element.ui.generic.frames.bubble_dark.right +element.ui.generic.frames.bubble_dark.tail +element.ui.generic.frames.bubble_dark.top +element.ui.generic.frames.bubble_dark.top_left +element.ui.generic.frames.bubble_dark.top_right +element.ui.generic.frames.disclaimer +element.ui.generic.frames.enemybar +element.ui.generic.frames.enemybar_1 +element.ui.generic.frames.enemybar_bg +element.ui.generic.frames.enemybar_bg_1 +element.ui.generic.frames.esc_menu +element.ui.generic.frames.loading_screen.loading_bg +element.ui.generic.frames.loading_screen.loading_bg_l +element.ui.generic.frames.loading_screen.loading_bg_r +element.ui.generic.frames.prompt_dialog_bot +element.ui.generic.frames.prompt_dialog_mid +element.ui.generic.frames.prompt_dialog_top +element.ui.generic.frames.selection +element.ui.generic.frames.selection_frame +element.ui.generic.frames.selection_hover +element.ui.generic.frames.selection_press +element.ui.generic.frames.social_frame +element.ui.generic.frames.tooltip.corner +element.ui.generic.frames.tooltip.edge +element.ui.generic.frames.tt_test_corner_tr +element.ui.generic.frames.tt_test_edge +element.ui.generic.frames.window_3 +element.ui.generic.slider.indicator +element.ui.generic.slider.indicator_round +element.ui.generic.slider.scrollbar +element.ui.generic.slider.scrollbar_1 +element.ui.generic.slider.track +element.ui.generic.textbox +element.ui.groups.group_member_bg +element.ui.groups.group_member_frame +element.ui.invite.progress +element.ui.invite.progress_bar +element.ui.map.buttons.castle +element.ui.map.buttons.castle_bg +element.ui.map.buttons.castle_hover +element.ui.map.buttons.cave +element.ui.map.buttons.cave_bg +element.ui.map.buttons.cave_hover +element.ui.map.buttons.dungeon +element.ui.map.buttons.dungeon_bg +element.ui.map.buttons.dungeon_bg2 +element.ui.map.buttons.dungeon_hover +element.ui.map.buttons.excl +element.ui.map.buttons.group_indicator +element.ui.map.buttons.group_indicator_arrow_down +element.ui.map.buttons.group_indicator_arrow_up +element.ui.map.buttons.group_indicator_hover +element.ui.map.buttons.topographic +element.ui.map.buttons.town +element.ui.map.buttons.town_bg +element.ui.map.buttons.town_hover +element.ui.map.buttons.tree +element.ui.map.buttons.tree_hover +element.ui.map.icons.dif_1 +element.ui.map.icons.dif_2 +element.ui.map.icons.dif_3 +element.ui.map.icons.dif_4 +element.ui.map.icons.dif_5 +element.ui.map.icons.dif_6 +element.ui.map.map_bg +element.ui.map.map_frame +element.ui.map.map_frame_art +element.ui.minimap.buttons.button_mmap_closed +element.ui.minimap.buttons.button_mmap_closed_hover +element.ui.minimap.buttons.button_mmap_closed_press +element.ui.minimap.buttons.button_mmap_open +element.ui.minimap.buttons.button_mmap_open_hover +element.ui.minimap.buttons.button_mmap_open_press +element.ui.minimap.buttons.mmap_button-min +element.ui.minimap.buttons.mmap_button-min_hover +element.ui.minimap.buttons.mmap_button-min_press +element.ui.minimap.buttons.mmap_button-north +element.ui.minimap.buttons.mmap_button-north_hover +element.ui.minimap.buttons.mmap_button-north_press +element.ui.minimap.buttons.mmap_button-north_press_hover +element.ui.minimap.buttons.mmap_button-plus +element.ui.minimap.buttons.mmap_button-plus_hover +element.ui.minimap.buttons.mmap_button-plus_press +element.ui.minimap.icons.indicator_mmap +element.ui.minimap.icons.indicator_mmap_small +element.ui.minimap.mmap +element.ui.minimap.mmap_closed +element.ui.minimap.mmap_frame +element.ui.quests.temp_quest_bg +element.ui.settings.buttons.settings_button +element.ui.settings.buttons.settings_button_hover +element.ui.settings.buttons.settings_button_press +element.ui.settings.buttons.settings_button_pressed +element.ui.settings.icons.crosshair_bg +element.ui.settings.icons.crosshair_bg_hover +element.ui.settings.icons.crosshair_bg_press +element.ui.settings.icons.crosshair_bg_pressed +element.ui.settings.icons.crosshair_inner +element.ui.settings.icons.crosshair_outer_1 +element.ui.settings.icons.crosshair_outer_2 +element.ui.settings.icons.crosshair_outer_3 +element.ui.settings.settings_bg +element.ui.settings.settings_frame +element.ui.skillbar.bar_content +element.ui.skillbar.bg +element.ui.skillbar.decayed_bg +element.ui.skillbar.enemy_bar_content +element.ui.skillbar.frame +element.ui.skillbar.health_bg +element.ui.skillbar.health_frame +element.ui.skillbar.level_up +element.ui.skillbar.slot +element.ui.skillbar.stamina_bg +element.ui.skillbar.stamina_frame +element.ui.social.social_bg +element.ui.social.social_frame +element.ui.social.social_tab_active +element.ui.social.social_tab_inactive +element.ui.social.social_tab_online +element.v_logo +element.weapons.axe +element.weapons.bow +element.weapons.daggers +element.weapons.hammer +element.weapons.sceptre +element.weapons.staff +element.weapons.sword +element.weapons.swordshield +element.weapons.swords_crossed diff --git a/search-item.sh b/search-item.sh new file mode 100644 index 0000000000..b236ae724c --- /dev/null +++ b/search-item.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +for item in $(cat list.txt);do + if [ -z "$(grep -RIin --exclude-dir=\.git --exclude=list.txt $item)" ]; then + echo $item + fi +done diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 6b1b246273..33c6cabf6a 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -6,10 +6,10 @@ rotation_image_ids! { - indicator_mmap_small: "voxygen.element.buttons.indicator_mmap", + indicator_mmap_small: "voxygen.element.ui.minimap.icons.indicator_mmap", // Tooltip Test - tt_side: "voxygen.element.frames.tt_test_edge", - tt_corner: "voxygen.element.frames.tt_test_corner_tr", + tt_side: "voxygen.element.ui.generic.frames.tt_test_edge", + tt_corner: "voxygen.element.ui.generic.frames.tt_test_corner_tr", ////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -23,8 +23,8 @@ image_ids! { //////////////////////////////////////////////////////////////////////// // Icons - flower: "voxygen.element.icons.item_flower", - grass: "voxygen.element.icons.item_grass", + flower: "voxygen.element.items.item_flower", + grass: "voxygen.element.items.item_grass", // Items potion_red: "voxygen.voxel.object.potion_red", @@ -39,533 +39,533 @@ image_ids! { // Checkboxes and Radio buttons - check: "voxygen.element.buttons.radio.inactive", - check_mo: "voxygen.element.buttons.radio.inactive_hover", - check_press: "voxygen.element.buttons.radio.press", - check_checked: "voxygen.element.buttons.radio.active", - check_checked_mo: "voxygen.element.buttons.radio.hover", - checkbox: "voxygen.element.buttons.checkbox.inactive", - checkbox_mo: "voxygen.element.buttons.checkbox.inactive_hover", - checkbox_press: "voxygen.element.buttons.checkbox.press", - checkbox_checked: "voxygen.element.buttons.checkbox.active", - checkbox_checked_mo: "voxygen.element.buttons.checkbox.hover", + check: "voxygen.element.ui.generic.buttons.radio.inactive", + check_mo: "voxygen.element.ui.generic.buttons.radio.inactive_hover", + check_press: "voxygen.element.ui.generic.buttons.radio.press", + check_checked: "voxygen.element.ui.generic.buttons.radio.active", + check_checked_mo: "voxygen.element.ui.generic.buttons.radio.hover", + checkbox: "voxygen.element.ui.generic.buttons.checkbox.inactive", + checkbox_mo: "voxygen.element.ui.generic.buttons.checkbox.inactive_hover", + checkbox_press: "voxygen.element.ui.generic.buttons.checkbox.press", + checkbox_checked: "voxygen.element.ui.generic.buttons.checkbox.active", + checkbox_checked_mo: "voxygen.element.ui.generic.buttons.checkbox.hover", // Selection Frame - selection: "voxygen.element.frames.selection", - selection_hover: "voxygen.element.frames.selection_hover", - selection_press: "voxygen.element.frames.selection_press", + selection: "voxygen.element.ui.generic.frames.selection", + selection_hover: "voxygen.element.ui.generic.frames.selection_hover", + selection_press: "voxygen.element.ui.generic.frames.selection_press", // Prompt Dialog - prompt_top: "voxygen.element.frames.prompt_dialog_top", - prompt_mid: "voxygen.element.frames.prompt_dialog_mid", - prompt_bot: "voxygen.element.frames.prompt_dialog_bot", - key_button: "voxygen.element.buttons.key_button", - key_button_press: "voxygen.element.buttons.key_button_press", + prompt_top: "voxygen.element.ui.generic.frames.prompt_dialog_top", + prompt_mid: "voxygen.element.ui.generic.frames.prompt_dialog_mid", + prompt_bot: "voxygen.element.ui.generic.frames.prompt_dialog_bot", + key_button: "voxygen.element.ui.generic.buttons.key_button", + key_button_press: "voxygen.element.ui.generic.buttons.key_button_press", // Diary Window - diary_bg: "voxygen.element.misc_bg.diary_bg", - diary_frame: "voxygen.element.misc_bg.diary_frame", - diary_exp_bg: "voxygen.element.misc_bg.diary_exp_bg", - diary_exp_frame: "voxygen.element.misc_bg.diary_exp_frame", - pixel: "voxygen.element.misc_bg.pixel", + diary_bg: "voxygen.element.ui.diary.diary_bg", + diary_frame: "voxygen.element.ui.diary.diary_frame", + diary_exp_bg: "voxygen.element.ui.diary.diary_exp_bg", + diary_exp_frame: "voxygen.element.ui.diary.diary_exp_frame", + pixel: "voxygen.element.ui.diary.pixel", // Skill Trees - slot_skills: "voxygen.element.buttons.slot_skilltree", - swords_crossed: "voxygen.element.icons.swords_crossed", - sceptre: "voxygen.element.icons.sceptre", - sword: "voxygen.element.icons.sword", - axe: "voxygen.element.icons.axe", - hammer: "voxygen.element.icons.hammer", - bow: "voxygen.element.icons.bow", - staff: "voxygen.element.icons.staff", - lock: "voxygen.element.icons.lock", - wpn_icon_border_skills: "voxygen.element.buttons.border_skills", - wpn_icon_border: "voxygen.element.buttons.border", - wpn_icon_border_mo: "voxygen.element.buttons.border_mo", - wpn_icon_border_press: "voxygen.element.buttons.border_press", - wpn_icon_border_pressed: "voxygen.element.buttons.border_pressed", + slot_skills: "voxygen.element.ui.diary.buttons.slot_skilltree", + swords_crossed: "voxygen.element.weapons.swords_crossed", + sceptre: "voxygen.element.weapons.sceptre", + sword: "voxygen.element.weapons.sword", + axe: "voxygen.element.weapons.axe", + hammer: "voxygen.element.weapons.hammer", + bow: "voxygen.element.weapons.bow", + staff: "voxygen.element.weapons.staff", + lock: "voxygen.element.ui.diary.buttons.lock", + wpn_icon_border_skills: "voxygen.element.ui.diary.buttons.border_skills", + wpn_icon_border: "voxygen.element.ui.generic.buttons.border", + wpn_icon_border_mo: "voxygen.element.ui.generic.buttons.border_mo", + wpn_icon_border_press: "voxygen.element.ui.generic.buttons.border_press", + wpn_icon_border_pressed: "voxygen.element.ui.generic.buttons.border_pressed", // Social Window - social_frame_on: "voxygen.element.misc_bg.social_frame", - social_bg_on: "voxygen.element.misc_bg.social_bg", + social_frame_on: "voxygen.element.ui.social.social_frame", + social_bg_on: "voxygen.element.ui.social.social_bg", // Crafting Window - crafting_window: "voxygen.element.misc_bg.crafting", - crafting_frame: "voxygen.element.misc_bg.crafting_frame", - crafting_icon_bordered: "voxygen.element.icons.anvil", - crafting_icon: "voxygen.element.buttons.anvil", - crafting_icon_hover: "voxygen.element.buttons.anvil_hover", - crafting_icon_press: "voxygen.element.buttons.anvil_press", - icon_armor: "voxygen.element.icons.armors", - icon_tools: "voxygen.element.icons.crafting_tools", - icon_dismantle: "voxygen.element.icons.dismantle", - icon_food: "voxygen.element.icons.foods", - icon_glider: "voxygen.element.icons.gliders", - icon_globe: "voxygen.element.icons.globe", - icon_potion: "voxygen.element.icons.potions", - icon_utility: "voxygen.element.icons.utilities", - icon_weapon: "voxygen.element.icons.weapons", - icon_bag: "voxygen.element.icons.item_bag_leather_large", + crafting_window: "voxygen.element.ui.crafting.crafting", + crafting_frame: "voxygen.element.ui.crafting.crafting_frame", + crafting_icon_bordered: "voxygen.element.ui.generic.buttons.anvil", + crafting_icon: "voxygen.element.ui.generic.buttons.anvil", + crafting_icon_hover: "voxygen.element.ui.generic.buttons.anvil_hover", + crafting_icon_press: "voxygen.element.ui.generic.buttons.anvil_press", + icon_armor: "voxygen.element.ui.crafting.icons.armors", + icon_tools: "voxygen.element.ui.crafting.icons.crafting_tools", + icon_dismantle: "voxygen.element.ui.crafting.icons.dismantle", + icon_food: "voxygen.element.ui.crafting.icons.foods", + icon_glider: "voxygen.element.ui.crafting.icons.gliders", + icon_globe: "voxygen.element.ui.crafting.icons.globe", + icon_potion: "voxygen.element.ui.crafting.icons.potions", + icon_utility: "voxygen.element.ui.crafting.icons.utilities", + icon_weapon: "voxygen.element.ui.crafting.icons.weapons", + icon_bag: "voxygen.element.items.item_bag_leather_large", // Group Window - member_frame: "voxygen.element.frames.group_member_frame", - member_bg: "voxygen.element.frames.group_member_bg", + member_frame: "voxygen.element.ui.groups.group_member_frame", + member_bg: "voxygen.element.ui.groups.group_member_bg", // Chat-Arrows - chat_arrow: "voxygen.element.buttons.arrow_down", - chat_arrow_mo: "voxygen.element.buttons.arrow_down_hover", - chat_arrow_press: "voxygen.element.buttons.arrow_down_press", + chat_arrow: "voxygen.element.ui.generic.buttons.arrow_down", + chat_arrow_mo: "voxygen.element.ui.generic.buttons.arrow_down_hover", + chat_arrow_press: "voxygen.element.ui.generic.buttons.arrow_down_press", // Settings Window - settings_button: "voxygen.element.buttons.settings_button", - settings_button_pressed: "voxygen.element.buttons.settings_button_pressed", - settings_button_hover: "voxygen.element.buttons.settings_button_hover", - settings_button_press: "voxygen.element.buttons.settings_button_press", + settings_button: "voxygen.element.ui.settings.buttons.settings_button", + settings_button_pressed: "voxygen.element.ui.settings.buttons.settings_button_pressed", + settings_button_hover: "voxygen.element.ui.settings.buttons.settings_button_hover", + settings_button_press: "voxygen.element.ui.settings.buttons.settings_button_press", - quest_bg: "voxygen.element.misc_bg.temp_quest_bg", + quest_bg: "voxygen.element.ui.quests.temp_quest_bg", // Slider - slider: "voxygen.element.slider.track", - slider_indicator: "voxygen.element.slider.indicator", - slider_indicator_small: "voxygen.element.slider.indicator_round", + slider: "voxygen.element.ui.generic.slider.track", + slider_indicator: "voxygen.element.ui.generic.slider.indicator", + slider_indicator_small: "voxygen.element.ui.generic.slider.indicator_round", // Buttons - settings: "voxygen.element.buttons.settings", - settings_hover: "voxygen.element.buttons.settings_hover", - settings_press: "voxygen.element.buttons.settings_press", + settings: "voxygen.element.ui.generic.buttons.settings", + settings_hover: "voxygen.element.ui.generic.buttons.settings_hover", + settings_press: "voxygen.element.ui.generic.buttons.settings_press", - social: "voxygen.element.buttons.social", - social_hover: "voxygen.element.buttons.social_hover", - social_press: "voxygen.element.buttons.social_press", + social: "voxygen.element.ui.generic.buttons.social", + social_hover: "voxygen.element.ui.generic.buttons.social_hover", + social_press: "voxygen.element.ui.generic.buttons.social_press", - map_button: "voxygen.element.buttons.map", - map_hover: "voxygen.element.buttons.map_hover", - map_press: "voxygen.element.buttons.map_press", + map_button: "voxygen.element.ui.generic.buttons.map", + map_hover: "voxygen.element.ui.generic.buttons.map_hover", + map_press: "voxygen.element.ui.generic.buttons.map_press", - spellbook_button: "voxygen.element.buttons.spellbook", - spellbook_hover: "voxygen.element.buttons.spellbook_hover", - spellbook_press: "voxygen.element.buttons.spellbook_press", + spellbook_button: "voxygen.element.ui.generic.buttons.spellbook", + spellbook_hover: "voxygen.element.ui.generic.buttons.spellbook_hover", + spellbook_press: "voxygen.element.ui.generic.buttons.spellbook_press", - group_icon: "voxygen.element.buttons.group", - group_icon_hover: "voxygen.element.buttons.group_hover", - group_icon_press: "voxygen.element.buttons.group_press", + group_icon: "voxygen.element.ui.generic.buttons.group", + group_icon_hover: "voxygen.element.ui.generic.buttons.group_hover", + group_icon_press: "voxygen.element.ui.generic.buttons.group_press", - sp_indicator_arrow: "voxygen.element.buttons.arrow_down_gold", + sp_indicator_arrow: "voxygen.element.ui.generic.buttons.arrow_down_gold", // Skill Icons - twohsword_m1: "voxygen.element.icons.2hsword_m1", - twohsword_m2: "voxygen.element.icons.2hsword_m2", - onehdagger_m1: "voxygen.element.icons.daggers", - onehdagger_m2: "voxygen.element.icons.skill_slice_2", - onehshield_m1: "voxygen.element.icons.swordshield", - onehshield_m2: "voxygen.element.icons.character", - twohhammer_m1: "voxygen.element.icons.2hhammer_m1", - twohaxe_m1: "voxygen.element.icons.2haxe_m1", - bow_m1: "voxygen.element.icons.bow_m1", - bow_m2: "voxygen.element.icons.bow_m2", - staff_melee: "voxygen.element.icons.staff_m1", - fireball: "voxygen.element.icons.staff_m2", - flyingrod_m1: "voxygen.element.icons.debug_wand_m1", - flyingrod_m2: "voxygen.element.icons.debug_wand_m2", - sword_pierce: "voxygen.element.icons.skill_sword_pierce", - hammergolf: "voxygen.element.icons.skill_hammergolf", - axespin: "voxygen.element.icons.skill_axespin", - fire_aoe: "voxygen.element.icons.skill_fire_aoe", - flamethrower: "voxygen.element.icons.skill_flamethrower", + twohsword_m1: "voxygen.element.skills.2hsword_m1", + twohsword_m2: "voxygen.element.skills.2hsword_m2", + onehdagger_m1: "voxygen.element.weapons.daggers", + onehdagger_m2: "voxygen.element.skills.skill_slice_2", + onehshield_m1: "voxygen.element.weapons.swordshield", + onehshield_m2: "voxygen.element.weapons.swordshield", + twohhammer_m1: "voxygen.element.skills.2hhammer_m1", + twohaxe_m1: "voxygen.element.skills.2haxe_m1", + bow_m1: "voxygen.element.skills.bow_m1", + bow_m2: "voxygen.element.skills.bow_m2", + staff_melee: "voxygen.element.skills.staff_m1", + fireball: "voxygen.element.skills.staff_m2", + flyingrod_m1: "voxygen.element.skills.debug_wand_m1", + flyingrod_m2: "voxygen.element.skills.debug_wand_m2", + sword_pierce: "voxygen.element.skills.skill_sword_pierce", + hammergolf: "voxygen.element.skills.skill_hammergolf", + axespin: "voxygen.element.skills.skill_axespin", + fire_aoe: "voxygen.element.skills.skill_fire_aoe", + flamethrower: "voxygen.element.skills.skill_flamethrower", // Skilltree Icons - health_plus_skill: "voxygen.element.icons.skilltree.health_plus", - stamina_plus_skill: "voxygen.element.icons.skilltree.stamina_plus", - unlock_axe_skill: "voxygen.element.icons.skilltree.unlock_axe", - unlock_bow_skill: "voxygen.element.icons.skilltree.unlock_bow", - unlock_hammer_skill: "voxygen.element.icons.skilltree.unlock_hammer", - unlock_sceptre_skill: "voxygen.element.icons.skilltree.unlock_sceptre", - unlock_staff_skill0: "voxygen.element.icons.skilltree.unlock_staff-0", - unlock_sword_skill: "voxygen.element.icons.skilltree.unlock_sword", - skill_dodge_skill: "voxygen.element.icons.skilltree.skill_dodge", - skill_climbing_skill: "voxygen.element.icons.skilltree.skill_climbing", - skill_swim_skill: "voxygen.element.icons.skilltree.skill_swim", + health_plus_skill: "voxygen.element.skills.skilltree.health_plus", + stamina_plus_skill: "voxygen.element.skills.skilltree.stamina_plus", + unlock_axe_skill: "voxygen.element.skills.skilltree.unlock_axe", + unlock_bow_skill: "voxygen.element.skills.skilltree.unlock_bow", + unlock_hammer_skill: "voxygen.element.skills.skilltree.unlock_hammer", + unlock_sceptre_skill: "voxygen.element.skills.skilltree.unlock_sceptre", + unlock_staff_skill0: "voxygen.element.skills.skilltree.unlock_staff-0", + unlock_sword_skill: "voxygen.element.skills.skilltree.unlock_sword", + skill_dodge_skill: "voxygen.element.skills.skilltree.skill_dodge", + skill_climbing_skill: "voxygen.element.skills.skilltree.skill_climbing", + skill_swim_skill: "voxygen.element.skills.skilltree.skill_swim", - buff_amount_skill: "voxygen.element.icons.skilltree.buff_amount", - buff_combo_skill: "voxygen.element.icons.skilltree.buff_combo", - buff_cost_skill: "voxygen.element.icons.skilltree.buff_cost", - buff_damage_skill: "voxygen.element.icons.skilltree.buff_damage", - buff_distance_skill: "voxygen.element.icons.skilltree.buff_distance", - buff_energy_drain_skill: "voxygen.element.icons.skilltree.buff_energy_drain", - buff_energy_regen_skill: "voxygen.element.icons.skilltree.buff_energy_regen", - buff_explosion_skill: "voxygen.element.icons.skilltree.buff_explosion", - buff_heal_skill: "voxygen.element.icons.skilltree.buff_heal", - buff_helicopter_skill: "voxygen.element.icons.skilltree.buff_helicopter", - buff_infinite_skill: "voxygen.element.icons.skilltree.buff_infinite", - buff_knockback_skill: "voxygen.element.icons.skilltree.buff_knockback", - buff_lifesteal_skill: "voxygen.element.icons.skilltree.buff_lifesteal", - buff_projectile_speed_skill: "voxygen.element.icons.skilltree.buff_projectile_speed", - buff_radius_skill: "voxygen.element.icons.skilltree.buff_radius", - buff_speed_skill: "voxygen.element.icons.skilltree.buff_speed", - buff_duration_skill: "voxygen.element.icons.skilltree.buff_duration", + buff_amount_skill: "voxygen.element.skills.skilltree.buff_amount", + buff_combo_skill: "voxygen.element.skills.skilltree.buff_combo", + buff_cost_skill: "voxygen.element.skills.skilltree.buff_cost", + buff_damage_skill: "voxygen.element.skills.skilltree.buff_damage", + buff_distance_skill: "voxygen.element.skills.skilltree.buff_distance", + buff_energy_drain_skill: "voxygen.element.skills.skilltree.buff_energy_drain", + buff_energy_regen_skill: "voxygen.element.skills.skilltree.buff_energy_regen", + buff_explosion_skill: "voxygen.element.skills.skilltree.buff_explosion", + buff_heal_skill: "voxygen.element.skills.skilltree.buff_heal", + buff_helicopter_skill: "voxygen.element.skills.skilltree.buff_helicopter", + buff_infinite_skill: "voxygen.element.skills.skilltree.buff_infinite", + buff_knockback_skill: "voxygen.element.skills.skilltree.buff_knockback", + buff_lifesteal_skill: "voxygen.element.skills.skilltree.buff_lifesteal", + buff_projectile_speed_skill: "voxygen.element.skills.skilltree.buff_projectile_speed", + buff_radius_skill: "voxygen.element.skills.skilltree.buff_radius", + buff_speed_skill: "voxygen.element.skills.skilltree.buff_speed", + buff_duration_skill: "voxygen.element.skills.skilltree.buff_duration", - debuff_amount_skill: "voxygen.element.icons.skilltree.debuff_amount", - debuff_combo_skill: "voxygen.element.icons.skilltree.debuff_combo", - debuff_cost_skill: "voxygen.element.icons.skilltree.debuff_cost", - debuff_damage_skill: "voxygen.element.icons.skilltree.debuff_damage", - debuff_distance_skill: "voxygen.element.icons.skilltree.debuff_distance", - debuff_energy_drain_skill: "voxygen.element.icons.skilltree.debuff_energy_drain", - debuff_energy_regen_skill: "voxygen.element.icons.skilltree.debuff_energy_regen", - debuff_explosion_skill: "voxygen.element.icons.skilltree.debuff_explosion", - debuff_heal_skill: "voxygen.element.icons.skilltree.debuff_heal", - debuff_helicopter_skill: "voxygen.element.icons.skilltree.debuff_helicopter", - debuff_infinite_skill: "voxygen.element.icons.skilltree.debuff_infinite", - debuff_knockback_skill: "voxygen.element.icons.skilltree.debuff_knockback", - debuff_lifesteal_skill: "voxygen.element.icons.skilltree.debuff_lifesteal", - debuff_projectile_speed_skill: "voxygen.element.icons.skilltree.debuff_projectile_speed", - debuff_radius_skill: "voxygen.element.icons.skilltree.debuff_radius", - debuff_speed_skill: "voxygen.element.icons.skilltree.debuff_speed", - debuff_duration_skill: "voxygen.element.icons.skilltree.debuff_duration", + debuff_amount_skill: "voxygen.element.skills.skilltree.debuff_amount", + debuff_combo_skill: "voxygen.element.skills.skilltree.debuff_combo", + debuff_cost_skill: "voxygen.element.skills.skilltree.debuff_cost", + debuff_damage_skill: "voxygen.element.skills.skilltree.debuff_damage", + debuff_distance_skill: "voxygen.element.skills.skilltree.debuff_distance", + debuff_energy_drain_skill: "voxygen.element.skills.skilltree.debuff_energy_drain", + debuff_energy_regen_skill: "voxygen.element.skills.skilltree.debuff_energy_regen", + debuff_explosion_skill: "voxygen.element.skills.skilltree.debuff_explosion", + debuff_heal_skill: "voxygen.element.skills.skilltree.debuff_heal", + debuff_helicopter_skill: "voxygen.element.skills.skilltree.debuff_helicopter", + debuff_infinite_skill: "voxygen.element.skills.skilltree.debuff_infinite", + debuff_knockback_skill: "voxygen.element.skills.skilltree.debuff_knockback", + debuff_lifesteal_skill: "voxygen.element.skills.skilltree.debuff_lifesteal", + debuff_projectile_speed_skill: "voxygen.element.skills.skilltree.debuff_projectile_speed", + debuff_radius_skill: "voxygen.element.skills.skilltree.debuff_radius", + debuff_speed_skill: "voxygen.element.skills.skilltree.debuff_speed", + debuff_duration_skill: "voxygen.element.skills.skilltree.debuff_duration", - heal_amount_skill: "voxygen.element.icons.skilltree.heal_amount", - heal_combo_skill: "voxygen.element.icons.skilltree.heal_combo", - heal_cost_skill: "voxygen.element.icons.skilltree.heal_cost", - heal_damage_skill: "voxygen.element.icons.skilltree.heal_damage", - heal_distance_skill: "voxygen.element.icons.skilltree.heal_distance", - heal_energy_drain_skill: "voxygen.element.icons.skilltree.heal_energy_drain", - heal_energy_regen_skill: "voxygen.element.icons.skilltree.heal_energy_regen", - heal_explosion_skill: "voxygen.element.icons.skilltree.heal_explosion", - heal_heal_skill: "voxygen.element.icons.skilltree.heal_heal", - heal_helicopter_skill: "voxygen.element.icons.skilltree.heal_helicopter", - heal_infinite_skill: "voxygen.element.icons.skilltree.heal_infinite", - heal_knockback_skill: "voxygen.element.icons.skilltree.heal_knockback", - heal_lifesteal_skill: "voxygen.element.icons.skilltree.heal_lifesteal", - heal_projectile_speed_skill: "voxygen.element.icons.skilltree.heal_projectile_speed", - heal_radius_skill: "voxygen.element.icons.skilltree.heal_radius", - heal_speed_skill: "voxygen.element.icons.skilltree.heal_speed", - heal_duration_skill: "voxygen.element.icons.skilltree.heal_duration", + heal_amount_skill: "voxygen.element.skills.skilltree.heal_amount", + heal_combo_skill: "voxygen.element.skills.skilltree.heal_combo", + heal_cost_skill: "voxygen.element.skills.skilltree.heal_cost", + heal_damage_skill: "voxygen.element.skills.skilltree.heal_damage", + heal_distance_skill: "voxygen.element.skills.skilltree.heal_distance", + heal_energy_drain_skill: "voxygen.element.skills.skilltree.heal_energy_drain", + heal_energy_regen_skill: "voxygen.element.skills.skilltree.heal_energy_regen", + heal_explosion_skill: "voxygen.element.skills.skilltree.heal_explosion", + heal_heal_skill: "voxygen.element.skills.skilltree.heal_heal", + heal_helicopter_skill: "voxygen.element.skills.skilltree.heal_helicopter", + heal_infinite_skill: "voxygen.element.skills.skilltree.heal_infinite", + heal_knockback_skill: "voxygen.element.skills.skilltree.heal_knockback", + heal_lifesteal_skill: "voxygen.element.skills.skilltree.heal_lifesteal", + heal_projectile_speed_skill: "voxygen.element.skills.skilltree.heal_projectile_speed", + heal_radius_skill: "voxygen.element.skills.skilltree.heal_radius", + heal_speed_skill: "voxygen.element.skills.skilltree.heal_speed", + heal_duration_skill: "voxygen.element.skills.skilltree.heal_duration", - magic_amount_skill: "voxygen.element.icons.skilltree.magic_amount", - magic_combo_skill: "voxygen.element.icons.skilltree.magic_combo", - magic_cost_skill: "voxygen.element.icons.skilltree.magic_cost", - magic_damage_skill: "voxygen.element.icons.skilltree.magic_damage", - magic_distance_skill: "voxygen.element.icons.skilltree.magic_distance", - magic_energy_drain_skill: "voxygen.element.icons.skilltree.magic_energy_drain", - magic_energy_regen_skill: "voxygen.element.icons.skilltree.magic_energy_regen", - magic_explosion_skill: "voxygen.element.icons.skilltree.magic_explosion", - magic_heal_skill: "voxygen.element.icons.skilltree.magic_heal", - magic_helicopter_skill: "voxygen.element.icons.skilltree.magic_helicopter", - magic_infinite_skill: "voxygen.element.icons.skilltree.magic_infinite", - magic_knockback_skill: "voxygen.element.icons.skilltree.magic_knockback", - magic_lifesteal_skill: "voxygen.element.icons.skilltree.magic_lifesteal", - magic_projectile_speed_skill: "voxygen.element.icons.skilltree.magic_projectile_speed", - magic_radius_skill: "voxygen.element.icons.skilltree.magic_radius", - magic_speed_skill: "voxygen.element.icons.skilltree.magic_speed", - magic_duration_skill: "voxygen.element.icons.skilltree.magic_duration", + magic_amount_skill: "voxygen.element.skills.skilltree.magic_amount", + magic_combo_skill: "voxygen.element.skills.skilltree.magic_combo", + magic_cost_skill: "voxygen.element.skills.skilltree.magic_cost", + magic_damage_skill: "voxygen.element.skills.skilltree.magic_damage", + magic_distance_skill: "voxygen.element.skills.skilltree.magic_distance", + magic_energy_drain_skill: "voxygen.element.skills.skilltree.magic_energy_drain", + magic_energy_regen_skill: "voxygen.element.skills.skilltree.magic_energy_regen", + magic_explosion_skill: "voxygen.element.skills.skilltree.magic_explosion", + magic_heal_skill: "voxygen.element.skills.skilltree.magic_heal", + magic_helicopter_skill: "voxygen.element.skills.skilltree.magic_helicopter", + magic_infinite_skill: "voxygen.element.skills.skilltree.magic_infinite", + magic_knockback_skill: "voxygen.element.skills.skilltree.magic_knockback", + magic_lifesteal_skill: "voxygen.element.skills.skilltree.magic_lifesteal", + magic_projectile_speed_skill: "voxygen.element.skills.skilltree.magic_projectile_speed", + magic_radius_skill: "voxygen.element.skills.skilltree.magic_radius", + magic_speed_skill: "voxygen.element.skills.skilltree.magic_speed", + magic_duration_skill: "voxygen.element.skills.skilltree.magic_duration", - physical_amount_skill: "voxygen.element.icons.skilltree.physical_amount", - physical_combo_skill: "voxygen.element.icons.skilltree.physical_combo", - physical_cost_skill: "voxygen.element.icons.skilltree.physical_cost", - physical_damage_skill: "voxygen.element.icons.skilltree.physical_damage", - physical_distance_skill: "voxygen.element.icons.skilltree.physical_distance", - physical_energy_drain_skill: "voxygen.element.icons.skilltree.physical_energy_drain", - physical_energy_regen_skill: "voxygen.element.icons.skilltree.physical_energy_regen", - physical_explosion_skill: "voxygen.element.icons.skilltree.physical_explosion", - physical_heal_skill: "voxygen.element.icons.skilltree.physical_heal", - physical_helicopter_skill: "voxygen.element.icons.skilltree.physical_helicopter", - physical_infinite_skill: "voxygen.element.icons.skilltree.physical_infinite", - physical_knockback_skill: "voxygen.element.icons.skilltree.physical_knockback", - physical_lifesteal_skill: "voxygen.element.icons.skilltree.physical_lifesteal", - physical_projectile_speed_skill: "voxygen.element.icons.skilltree.physical_projectile_speed", - physical_radius_skill: "voxygen.element.icons.skilltree.physical_radius", - physical_speed_skill: "voxygen.element.icons.skilltree.physical_speed", - physical_duration_skill: "voxygen.element.icons.skilltree.physical_duration", + physical_amount_skill: "voxygen.element.skills.skilltree.physical_amount", + physical_combo_skill: "voxygen.element.skills.skilltree.physical_combo", + physical_cost_skill: "voxygen.element.skills.skilltree.physical_cost", + physical_damage_skill: "voxygen.element.skills.skilltree.physical_damage", + physical_distance_skill: "voxygen.element.skills.skilltree.physical_distance", + physical_energy_drain_skill: "voxygen.element.skills.skilltree.physical_energy_drain", + physical_energy_regen_skill: "voxygen.element.skills.skilltree.physical_energy_regen", + physical_explosion_skill: "voxygen.element.skills.skilltree.physical_explosion", + physical_heal_skill: "voxygen.element.skills.skilltree.physical_heal", + physical_helicopter_skill: "voxygen.element.skills.skilltree.physical_helicopter", + physical_infinite_skill: "voxygen.element.skills.skilltree.physical_infinite", + physical_knockback_skill: "voxygen.element.skills.skilltree.physical_knockback", + physical_lifesteal_skill: "voxygen.element.skills.skilltree.physical_lifesteal", + physical_projectile_speed_skill: "voxygen.element.skills.skilltree.physical_projectile_speed", + physical_radius_skill: "voxygen.element.skills.skilltree.physical_radius", + physical_speed_skill: "voxygen.element.skills.skilltree.physical_speed", + physical_duration_skill: "voxygen.element.skills.skilltree.physical_duration", - utility_amount_skill: "voxygen.element.icons.skilltree.utility_amount", - utility_combo_skill: "voxygen.element.icons.skilltree.utility_combo", - utility_cost_skill: "voxygen.element.icons.skilltree.utility_cost", - utility_damage_skill: "voxygen.element.icons.skilltree.utility_damage", - utility_distance_skill: "voxygen.element.icons.skilltree.utility_distance", - utility_energy_drain_skill: "voxygen.element.icons.skilltree.utility_energy_drain", - utility_energy_regen_skill: "voxygen.element.icons.skilltree.utility_energy_regen", - utility_explosion_skill: "voxygen.element.icons.skilltree.utility_explosion", - utility_heal_skill: "voxygen.element.icons.skilltree.utility_heal", - utility_helicopter_skill: "voxygen.element.icons.skilltree.utility_helicopter", - utility_infinite_skill: "voxygen.element.icons.skilltree.utility_infinite", - utility_knockback_skill: "voxygen.element.icons.skilltree.utility_knockback", - utility_lifesteal_skill: "voxygen.element.icons.skilltree.utility_lifesteal", - utility_projectile_speed_skill: "voxygen.element.icons.skilltree.utility_projectile_speed", - utility_radius_skill: "voxygen.element.icons.skilltree.utility_radius", - utility_speed_skill: "voxygen.element.icons.skilltree.utility_speed", - utility_duration_skill: "voxygen.element.icons.skilltree.utility_duration", + utility_amount_skill: "voxygen.element.skills.skilltree.utility_amount", + utility_combo_skill: "voxygen.element.skills.skilltree.utility_combo", + utility_cost_skill: "voxygen.element.skills.skilltree.utility_cost", + utility_damage_skill: "voxygen.element.skills.skilltree.utility_damage", + utility_distance_skill: "voxygen.element.skills.skilltree.utility_distance", + utility_energy_drain_skill: "voxygen.element.skills.skilltree.utility_energy_drain", + utility_energy_regen_skill: "voxygen.element.skills.skilltree.utility_energy_regen", + utility_explosion_skill: "voxygen.element.skills.skilltree.utility_explosion", + utility_heal_skill: "voxygen.element.skills.skilltree.utility_heal", + utility_helicopter_skill: "voxygen.element.skills.skilltree.utility_helicopter", + utility_infinite_skill: "voxygen.element.skills.skilltree.utility_infinite", + utility_knockback_skill: "voxygen.element.skills.skilltree.utility_knockback", + utility_lifesteal_skill: "voxygen.element.skills.skilltree.utility_lifesteal", + utility_projectile_speed_skill: "voxygen.element.skills.skilltree.utility_projectile_speed", + utility_radius_skill: "voxygen.element.skills.skilltree.utility_radius", + utility_speed_skill: "voxygen.element.skills.skilltree.utility_speed", + utility_duration_skill: "voxygen.element.skills.skilltree.utility_duration", // Skillbar - level_up: "voxygen.element.misc_bg.level_up", - bar_content: "voxygen.element.skillbar.bar_content", - skillbar_bg: "voxygen.element.skillbar.bg", - skillbar_frame: "voxygen.element.skillbar.frame", - health_bg: "voxygen.element.skillbar.health_bg", - health_frame: "voxygen.element.skillbar.health_frame", - decayed_bg: "voxygen.element.skillbar.decayed_bg", - stamina_bg: "voxygen.element.skillbar.stamina_bg", - stamina_frame: "voxygen.element.skillbar.stamina_frame", - m1_ico: "voxygen.element.icons.m1", - m2_ico: "voxygen.element.icons.m2", - m_scroll_ico: "voxygen.element.icons.m_scroll", - m_move_ico: "voxygen.element.icons.m_move", - skillbar_slot: "voxygen.element.skillbar.slot", + level_up: "voxygen.element.ui.skillbar.level_up", + bar_content: "voxygen.element.ui.skillbar.bar_content", + skillbar_bg: "voxygen.element.ui.skillbar.bg", + skillbar_frame: "voxygen.element.ui.skillbar.frame", + health_bg: "voxygen.element.ui.skillbar.health_bg", + health_frame: "voxygen.element.ui.skillbar.health_frame", + decayed_bg: "voxygen.element.ui.skillbar.decayed_bg", + stamina_bg: "voxygen.element.ui.skillbar.stamina_bg", + stamina_frame: "voxygen.element.ui.skillbar.stamina_frame", + m1_ico: "voxygen.element.ui.generic.icons.m1", + m2_ico: "voxygen.element.ui.generic.icons.m2", + m_scroll_ico: "voxygen.element.ui.generic.icons.m_scroll", + m_move_ico: "voxygen.element.ui.generic.icons.m_move", + skillbar_slot: "voxygen.element.ui.skillbar.slot", // Other Icons/Art - skull: "voxygen.element.icons.skull", - skull_2: "voxygen.element.icons.skull_2", - fireplace: "voxygen.element.misc_bg.fireplace", + skull: "voxygen.element.ui.generic.icons.skull", + skull_2: "voxygen.element.ui.generic.icons.skull_2", + fireplace: "voxygen.element.ui.generic.fireplace", // Crosshair - crosshair_inner: "voxygen.element.misc_bg.crosshair_inner", + crosshair_inner: "voxygen.element.ui.settings.icons.crosshair_inner", - crosshair_outer_round: "voxygen.element.misc_bg.crosshair_outer_1", - crosshair_outer_round_edges: "voxygen.element.misc_bg.crosshair_outer_2", - crosshair_outer_edges: "voxygen.element.misc_bg.crosshair_outer_3", + crosshair_outer_round: "voxygen.element.ui.settings.icons.crosshair_outer_1", + crosshair_outer_round_edges: "voxygen.element.ui.settings.icons.crosshair_outer_2", + crosshair_outer_edges: "voxygen.element.ui.settings.icons.crosshair_outer_3", - crosshair_bg: "voxygen.element.misc_bg.crosshair_bg", - crosshair_bg_hover: "voxygen.element.misc_bg.crosshair_bg_hover", - crosshair_bg_press: "voxygen.element.misc_bg.crosshair_bg_press", - crosshair_bg_pressed: "voxygen.element.misc_bg.crosshair_bg_pressed", + crosshair_bg: "voxygen.element.ui.settings.icons.crosshair_bg", + crosshair_bg_hover: "voxygen.element.ui.settings.icons.crosshair_bg_hover", + crosshair_bg_press: "voxygen.element.ui.settings.icons.crosshair_bg_press", + crosshair_bg_pressed: "voxygen.element.ui.settings.icons.crosshair_bg_pressed", // Map - map_topo: "voxygen.element.map.topographic", - map_bg: "voxygen.element.misc_bg.map_bg", - map_frame: "voxygen.element.misc_bg.map_frame", - map_frame_art: "voxygen.element.misc_bg.map_frame_art", - indicator_mmap: "voxygen.element.buttons.indicator_mmap", - indicator_map_overlay: "voxygen.element.buttons.indicator_mmap_small", - indicator_group: "voxygen.element.map.group_indicator", - indicator_group_up: "voxygen.element.map.group_indicator_arrow_up", - indicator_group_down: "voxygen.element.map.group_indicator_arrow_down", - map_mode_overlay: "voxygen.element.buttons.map_modes", + map_topo: "voxygen.element.ui.map.buttons.topographic", + map_bg: "voxygen.element.ui.map.map_bg", + map_frame: "voxygen.element.ui.map.map_frame", + map_frame_art: "voxygen.element.ui.map.map_frame_art", + indicator_mmap: "voxygen.element.ui.minimap.icons.indicator_mmap", + indicator_map_overlay: "voxygen.element.ui.minimap.icons.indicator_mmap_small", + indicator_group: "voxygen.element.ui.map.buttons.group_indicator", + indicator_group_up: "voxygen.element.ui.map.buttons.group_indicator_arrow_up", + indicator_group_down: "voxygen.element.ui.map.buttons.group_indicator_arrow_down", + map_mode_overlay: "voxygen.element.ui.map.buttons.map_modes", // MiniMap - mmap_frame: "voxygen.element.frames.mmap", - mmap_frame_2: "voxygen.element.frames.mmap_frame", - mmap_frame_closed: "voxygen.element.frames.mmap_closed", - mmap_closed: "voxygen.element.buttons.button_mmap_closed", - mmap_closed_hover: "voxygen.element.buttons.button_mmap_closed_hover", - mmap_closed_press: "voxygen.element.buttons.button_mmap_closed_press", - mmap_open: "voxygen.element.buttons.button_mmap_open", - mmap_open_hover: "voxygen.element.buttons.button_mmap_open_hover", - mmap_open_press: "voxygen.element.buttons.button_mmap_open_press", - mmap_plus: "voxygen.element.buttons.min_plus.mmap_button-plus", - mmap_plus_hover: "voxygen.element.buttons.min_plus.mmap_button-plus_hover", - mmap_plus_press: "voxygen.element.buttons.min_plus.mmap_button-plus_press", - mmap_minus: "voxygen.element.buttons.min_plus.mmap_button-min", - mmap_minus_hover: "voxygen.element.buttons.min_plus.mmap_button-min_hover", - mmap_minus_press: "voxygen.element.buttons.min_plus.mmap_button-min_press", - mmap_north: "voxygen.element.buttons.min_plus.mmap_button-north", - mmap_north_hover: "voxygen.element.buttons.min_plus.mmap_button-north_hover", - mmap_north_press: "voxygen.element.buttons.min_plus.mmap_button-north_press", - mmap_north_press_hover: "voxygen.element.buttons.min_plus.mmap_button-north_press_hover", - map_dif_1: "voxygen.element.map.dif_1", - map_dif_2: "voxygen.element.map.dif_2", - map_dif_3: "voxygen.element.map.dif_3", - map_dif_4: "voxygen.element.map.dif_4", - map_dif_5: "voxygen.element.map.dif_5", - map_dif_6: "voxygen.element.map.dif_6", - mmap_site_town: "voxygen.element.map.town", - mmap_site_town_hover: "voxygen.element.map.town_hover", - mmap_site_town_bg: "voxygen.element.map.town_bg", - mmap_site_dungeon: "voxygen.element.map.dungeon", - mmap_site_dungeon_hover: "voxygen.element.map.dungeon_hover", - mmap_site_dungeon_bg: "voxygen.element.map.dungeon_bg", - mmap_site_castle: "voxygen.element.map.castle", - mmap_site_castle_hover: "voxygen.element.map.castle_hover", - mmap_site_castle_bg: "voxygen.element.map.castle_bg", - mmap_site_cave_bg: "voxygen.element.map.cave_bg", - mmap_site_cave_hover: "voxygen.element.map.cave_hover", - mmap_site_cave: "voxygen.element.map.cave", - mmap_site_excl: "voxygen.element.map.excl", - mmap_site_tree: "voxygen.element.map.tree", - mmap_site_tree_hover: "voxygen.element.map.tree_hover", + mmap_frame: "voxygen.element.ui.minimap.mmap", + mmap_frame_2: "voxygen.element.ui.minimap.mmap_frame", + mmap_frame_closed: "voxygen.element.ui.minimap.mmap_closed", + mmap_closed: "voxygen.element.ui.minimap.buttons.button_mmap_closed", + mmap_closed_hover: "voxygen.element.ui.minimap.buttons.button_mmap_closed_hover", + mmap_closed_press: "voxygen.element.ui.minimap.buttons.button_mmap_closed_press", + mmap_open: "voxygen.element.ui.minimap.buttons.button_mmap_open", + mmap_open_hover: "voxygen.element.ui.minimap.buttons.button_mmap_open_hover", + mmap_open_press: "voxygen.element.ui.minimap.buttons.button_mmap_open_press", + mmap_plus: "voxygen.element.ui.minimap.buttons.mmap_button-plus", + mmap_plus_hover: "voxygen.element.ui.minimap.buttons.mmap_button-plus_hover", + mmap_plus_press: "voxygen.element.ui.minimap.buttons.mmap_button-plus_press", + mmap_minus: "voxygen.element.ui.minimap.buttons.mmap_button-min", + mmap_minus_hover: "voxygen.element.ui.minimap.buttons.mmap_button-min_hover", + mmap_minus_press: "voxygen.element.ui.minimap.buttons.mmap_button-min_press", + mmap_north: "voxygen.element.ui.minimap.buttons.mmap_button-north", + mmap_north_hover: "voxygen.element.ui.minimap.buttons.mmap_button-north_hover", + mmap_north_press: "voxygen.element.ui.minimap.buttons.mmap_button-north_press", + mmap_north_press_hover: "voxygen.element.ui.minimap.buttons.mmap_button-north_press_hover", + map_dif_1: "voxygen.element.ui.map.icons.dif_1", + map_dif_2: "voxygen.element.ui.map.icons.dif_2", + map_dif_3: "voxygen.element.ui.map.icons.dif_3", + map_dif_4: "voxygen.element.ui.map.icons.dif_4", + map_dif_5: "voxygen.element.ui.map.icons.dif_5", + map_dif_6: "voxygen.element.ui.map.icons.dif_6", + mmap_site_town: "voxygen.element.ui.map.buttons.town", + mmap_site_town_hover: "voxygen.element.ui.map.buttons.town_hover", + mmap_site_town_bg: "voxygen.element.ui.map.buttons.town_bg", + mmap_site_dungeon: "voxygen.element.ui.map.buttons.dungeon", + mmap_site_dungeon_hover: "voxygen.element.ui.map.buttons.dungeon_hover", + mmap_site_dungeon_bg: "voxygen.element.ui.map.buttons.dungeon_bg", + mmap_site_castle: "voxygen.element.ui.map.buttons.castle", + mmap_site_castle_hover: "voxygen.element.ui.map.buttons.castle_hover", + mmap_site_castle_bg: "voxygen.element.ui.map.buttons.castle_bg", + mmap_site_cave_bg: "voxygen.element.ui.map.buttons.cave_bg", + mmap_site_cave_hover: "voxygen.element.ui.map.buttons.cave_hover", + mmap_site_cave: "voxygen.element.ui.map.buttons.cave", + mmap_site_excl: "voxygen.element.ui.map.buttons.excl", + mmap_site_tree: "voxygen.element.ui.map.buttons.tree", + mmap_site_tree_hover: "voxygen.element.ui.map.buttons.tree_hover", // Window Parts - window_3: "voxygen.element.frames.window_3", - esc_frame: "voxygen.element.frames.esc_menu", + window_3: "voxygen.element.ui.generic.frames.window_3", + esc_frame: "voxygen.element.ui.generic.frames.esc_menu", // Settings - settings_bg: "voxygen.element.misc_bg.settings_bg", - settings_frame: "voxygen.element.misc_bg.settings_frame", + settings_bg: "voxygen.element.ui.settings.settings_bg", + settings_frame: "voxygen.element.ui.settings.settings_frame", // Close-Button - close_btn: "voxygen.element.buttons.close_btn", - close_btn_hover: "voxygen.element.buttons.close_btn_hover", - close_btn_press: "voxygen.element.buttons.close_btn_press", - close_button: "voxygen.element.buttons.close_btn", - close_button_hover: "voxygen.element.buttons.close_btn_hover", - close_button_press: "voxygen.element.buttons.close_btn_press", + close_btn: "voxygen.element.ui.generic.buttons.close_btn", + close_btn_hover: "voxygen.element.ui.generic.buttons.close_btn_hover", + close_btn_press: "voxygen.element.ui.generic.buttons.close_btn_press", + close_button: "voxygen.element.ui.generic.buttons.close_btn", + close_button_hover: "voxygen.element.ui.generic.buttons.close_btn_hover", + close_button_press: "voxygen.element.ui.generic.buttons.close_btn_press", // Search-button - search_btn: "voxygen.element.buttons.search_btn", - search_btn_hover: "voxygen.element.buttons.search_btn_hover", - search_btn_press: "voxygen.element.buttons.search_btn_press", + search_btn: "voxygen.element.ui.generic.buttons.search_btn", + search_btn_hover: "voxygen.element.ui.generic.buttons.search_btn_hover", + search_btn_press: "voxygen.element.ui.generic.buttons.search_btn_press", // Inventory - collapse_btn: "voxygen.element.buttons.inv_collapse", - collapse_btn_hover: "voxygen.element.buttons.inv_collapse_hover", - collapse_btn_press: "voxygen.element.buttons.inv_collapse_press", - expand_btn: "voxygen.element.buttons.inv_expand", - expand_btn_hover: "voxygen.element.buttons.inv_expand_hover", - expand_btn_press: "voxygen.element.buttons.inv_expand_press", - coin_ico: "voxygen.element.icons.coin", - cheese_ico: "voxygen.element.icons.item_cheese", - inv_bg_armor: "voxygen.element.misc_bg.inv_bg_0", - inv_bg_stats: "voxygen.element.misc_bg.inv_bg_1", - inv_frame: "voxygen.element.misc_bg.inv_frame", - inv_frame_bag: "voxygen.element.misc_bg.inv_frame_bag", - inv_bg_bag: "voxygen.element.misc_bg.inv_bg_bag", - char_art: "voxygen.element.icons.character", - inv_slot: "voxygen.element.buttons.inv_slot", - inv_slot_grey: "voxygen.element.buttons.inv_slot_grey", - inv_slot_green: "voxygen.element.buttons.inv_slot_green", - inv_slot_blue: "voxygen.element.buttons.inv_slot_blue", - inv_slot_purple: "voxygen.element.buttons.inv_slot_purple", - inv_slot_gold: "voxygen.element.buttons.inv_slot_gold", - inv_slot_orange: "voxygen.element.buttons.inv_slot_orange", - inv_slot_red: "voxygen.element.buttons.inv_slot_red", - inv_slot_sel: "voxygen.element.buttons.inv_slot_sel", - scrollbar_bg: "voxygen.element.slider.scrollbar", - scrollbar_bg_big: "voxygen.element.slider.scrollbar_1", - inv_tab_active: "voxygen.element.buttons.inv_tab_active", - inv_tab_inactive: "voxygen.element.buttons.inv_tab_inactive", - inv_tab_inactive_hover: "voxygen.element.buttons.inv_tab_inactive", - inv_tab_inactive_press: "voxygen.element.buttons.inv_tab_inactive", - armor_slot: "voxygen.element.buttons.armor_slot", - armor_slot_sel: "voxygen.element.buttons.armor_slot_selected", - armor_slot_empty: "voxygen.element.buttons.armor_slot_empty", - head_bg: "voxygen.element.icons.head", - shoulders_bg: "voxygen.element.icons.shoulders", - hands_bg: "voxygen.element.icons.hands", - belt_bg: "voxygen.element.icons.belt", - legs_bg: "voxygen.element.icons.legs", - feet_bg: "voxygen.element.icons.feet", - ring_bg: "voxygen.element.icons.ring", - tabard_bg: "voxygen.element.icons.tabard", - glider_bg: "voxygen.element.icons.glider", - chest_bg: "voxygen.element.icons.chest", - back_bg: "voxygen.element.icons.back", - lantern_bg: "voxygen.element.icons.lantern", - necklace_bg: "voxygen.element.icons.necklace", - mainhand_bg: "voxygen.element.icons.mainhand", - bag_bg: "voxygen.element.icons.bag", - offhand_bg: "voxygen.element.icons.offhand", - stamina_ico: "voxygen.element.icons.stamina", - health_ico: "voxygen.element.icons.health", - protection_ico: "voxygen.element.icons.protection", - combat_rating_ico: "voxygen.element.icons.combat_rating", - stun_res_ico: "voxygen.element.icons.stun_res", - combat_rating_ico_shadow: "voxygen.element.icons.combat_rating_shadow", + collapse_btn: "voxygen.element.ui.bag.buttons.inv_collapse", + collapse_btn_hover: "voxygen.element.ui.bag.buttons.inv_collapse_hover", + collapse_btn_press: "voxygen.element.ui.bag.buttons.inv_collapse_press", + expand_btn: "voxygen.element.ui.bag.buttons.inv_expand", + expand_btn_hover: "voxygen.element.ui.bag.buttons.inv_expand_hover", + expand_btn_press: "voxygen.element.ui.bag.buttons.inv_expand_press", + coin_ico: "voxygen.element.items.coin", + cheese_ico: "voxygen.element.items.item_cheese", + inv_bg_armor: "voxygen.element.ui.bag.inv_bg_0", + inv_bg_stats: "voxygen.element.ui.bag.inv_bg_1", + inv_frame: "voxygen.element.ui.bag.inv_frame", + inv_frame_bag: "voxygen.element.ui.bag.inv_frame_bag", + inv_bg_bag: "voxygen.element.ui.bag.inv_bg_bag", + char_art: "voxygen.element.ui.bag.icons.character", + inv_slot: "voxygen.element.ui.bag.buttons.inv_slot", + inv_slot_grey: "voxygen.element.ui.bag.buttons.inv_slot_grey", + inv_slot_green: "voxygen.element.ui.bag.buttons.inv_slot_green", + inv_slot_blue: "voxygen.element.ui.bag.buttons.inv_slot_blue", + inv_slot_purple: "voxygen.element.ui.bag.buttons.inv_slot_purple", + inv_slot_gold: "voxygen.element.ui.bag.buttons.inv_slot_gold", + inv_slot_orange: "voxygen.element.ui.bag.buttons.inv_slot_orange", + inv_slot_red: "voxygen.element.ui.bag.buttons.inv_slot_red", + inv_slot_sel: "voxygen.element.ui.bag.buttons.inv_slot_sel", + scrollbar_bg: "voxygen.element.ui.generic.slider.scrollbar", + scrollbar_bg_big: "voxygen.element.ui.generic.slider.scrollbar_1", + inv_tab_active: "voxygen.element.ui.bag.buttons.inv_tab_active", + inv_tab_inactive: "voxygen.element.ui.bag.buttons.inv_tab_inactive", + inv_tab_inactive_hover: "voxygen.element.ui.bag.buttons.inv_tab_inactive", + inv_tab_inactive_press: "voxygen.element.ui.bag.buttons.inv_tab_inactive", + armor_slot: "voxygen.element.ui.generic.buttons.armor_slot", + armor_slot_sel: "voxygen.element.ui.generic.buttons.armor_slot_selected", + armor_slot_empty: "voxygen.element.ui.generic.buttons.armor_slot_empty", + head_bg: "voxygen.element.ui.bag.backgrounds.head", + shoulders_bg: "voxygen.element.ui.bag.backgrounds.shoulders", + hands_bg: "voxygen.element.ui.bag.backgrounds.hands", + belt_bg: "voxygen.element.ui.bag.backgrounds.belt", + legs_bg: "voxygen.element.ui.bag.backgrounds.legs", + feet_bg: "voxygen.element.ui.bag.backgrounds.feet", + ring_bg: "voxygen.element.ui.bag.backgrounds.ring", + tabard_bg: "voxygen.element.ui.bag.backgrounds.tabard", + glider_bg: "voxygen.element.ui.bag.backgrounds.glider", + chest_bg: "voxygen.element.ui.bag.backgrounds.chest", + back_bg: "voxygen.element.ui.bag.backgrounds.back", + lantern_bg: "voxygen.element.ui.bag.backgrounds.lantern", + necklace_bg: "voxygen.element.ui.bag.backgrounds.necklace", + mainhand_bg: "voxygen.element.ui.bag.backgrounds.mainhand", + bag_bg: "voxygen.element.ui.bag.backgrounds.bag", + offhand_bg: "voxygen.element.ui.bag.backgrounds.offhand", + stamina_ico: "voxygen.element.ui.bag.icons.stamina", + health_ico: "voxygen.element.ui.bag.icons.health", + protection_ico: "voxygen.element.ui.bag.icons.protection", + stun_res_ico: "voxygen.element.ui.bag.icons.stun_res", + combat_rating_ico: "voxygen.element.ui.bag.icons.combat_rating", + combat_rating_ico_shadow: "voxygen.element.ui.bag.icons.combat_rating_shadow", not_found: "voxygen.element.not_found", death_bg: "voxygen.background.death", hurt_bg: "voxygen.background.hurt", - banner_top: "voxygen.element.frames.banner_top", + banner_top: "voxygen.element.ui.generic.frames.banner_top", // Icons - snake_arrow_0: "voxygen.element.icons.snake", - skill_sceptre_lifesteal: "voxygen.element.icons.lifesteal", - sword_whirlwind: "voxygen.element.icons.sword_whirlwind", - skill_sceptre_heal: "voxygen.element.icons.heal_0", - hammerleap: "voxygen.element.icons.skill_hammerleap", - skill_axe_leap_slash: "voxygen.element.icons.skill_axe_leap_slash", - skill_bow_jump_burst: "voxygen.element.icons.skill_bow_jump_burst", - skill_sceptre_aura: "voxygen.element.icons.sceptre_protection", - missing_icon: "voxygen.element.icons.missing_icon_grey", + snake_arrow_0: "voxygen.element.skills.snake", + skill_sceptre_lifesteal: "voxygen.element.skills.lifesteal", + sword_whirlwind: "voxygen.element.skills.sword_whirlwind", + skill_sceptre_heal: "voxygen.element.skills.heal_0", + hammerleap: "voxygen.element.skills.skill_hammerleap", + skill_axe_leap_slash: "voxygen.element.skills.skill_axe_leap_slash", + skill_bow_jump_burst: "voxygen.element.skills.skill_bow_jump_burst", + skill_sceptre_aura: "voxygen.element.skills.sceptre_protection", + missing_icon: "voxygen.element.missing_icon_grey", // Buttons - button: "voxygen.element.buttons.button", - button_hover: "voxygen.element.buttons.button_hover", - button_press: "voxygen.element.buttons.button_press", + button: "voxygen.element.ui.generic.buttons.button", + button_hover: "voxygen.element.ui.generic.buttons.button_hover", + button_press: "voxygen.element.ui.generic.buttons.button_press", // Enemy Healthbar - enemy_health: "voxygen.element.frames.enemybar", - enemy_health_bg: "voxygen.element.frames.enemybar_bg", - health_bar_group: "voxygen.element.frames.enemybar_1", - health_bar_group_bg: "voxygen.element.frames.enemybar_bg_1", + enemy_health: "voxygen.element.ui.generic.frames.enemybar", + enemy_health_bg: "voxygen.element.ui.generic.frames.enemybar_bg", + health_bar_group: "voxygen.element.ui.generic.frames.enemybar_1", + health_bar_group_bg: "voxygen.element.ui.generic.frames.enemybar_bg_1", // Enemy Bar Content: - enemy_bar: "voxygen.element.skillbar.enemy_bar_content", + enemy_bar: "voxygen.element.ui.skillbar.enemy_bar_content", // Bag - bag: "voxygen.element.buttons.bag.closed", - bag_hover: "voxygen.element.buttons.bag.closed_hover", - bag_press: "voxygen.element.buttons.bag.closed_press", - bag_open: "voxygen.element.buttons.bag.open", - bag_open_hover: "voxygen.element.buttons.bag.open_hover", - bag_open_press: "voxygen.element.buttons.bag.open_press", + bag: "voxygen.element.ui.generic.buttons.bag.closed", + bag_hover: "voxygen.element.ui.generic.buttons.bag.closed_hover", + bag_press: "voxygen.element.ui.generic.buttons.bag.closed_press", + bag_open: "voxygen.element.ui.generic.buttons.bag.open", + bag_open_hover: "voxygen.element.ui.generic.buttons.bag.open_hover", + bag_open_press: "voxygen.element.ui.generic.buttons.bag.open_press", - map_icon: "voxygen.element.icons.map", + map_icon: "voxygen.element.ui.generic.buttons.map", - grid_button: "voxygen.element.buttons.border", - grid_button_hover: "voxygen.element.buttons.border_mo", - grid_button_press: "voxygen.element.buttons.border_press", - grid_button_open: "voxygen.element.buttons.border_pressed", + grid_button: "voxygen.element.ui.generic.buttons.border", + grid_button_hover: "voxygen.element.ui.generic.buttons.border_mo", + grid_button_press: "voxygen.element.ui.generic.buttons.border_press", + grid_button_open: "voxygen.element.ui.generic.buttons.border_pressed", // Char Window - progress_frame: "voxygen.element.frames.progress_bar", - progress: "voxygen.element.misc_bg.progress", + progress_frame: "voxygen.element.ui.invite.progress_bar", + progress: "voxygen.element.ui.invite.progress", // Speech bubbles - speech_bubble_top_left: "voxygen.element.frames.bubble.top_left", - speech_bubble_top: "voxygen.element.frames.bubble.top", - speech_bubble_top_right: "voxygen.element.frames.bubble.top_right", - speech_bubble_left: "voxygen.element.frames.bubble.left", - speech_bubble_mid: "voxygen.element.frames.bubble.mid", - speech_bubble_right: "voxygen.element.frames.bubble.right", - speech_bubble_bottom_left: "voxygen.element.frames.bubble.bottom_left", - speech_bubble_bottom: "voxygen.element.frames.bubble.bottom", - speech_bubble_bottom_right: "voxygen.element.frames.bubble.bottom_right", - speech_bubble_tail: "voxygen.element.frames.bubble.tail", - speech_bubble_icon_frame: "voxygen.element.frames.bubble_dark.icon_frame", + speech_bubble_top_left: "voxygen.element.ui.generic.frames.bubble.top_left", + speech_bubble_top: "voxygen.element.ui.generic.frames.bubble.top", + speech_bubble_top_right: "voxygen.element.ui.generic.frames.bubble.top_right", + speech_bubble_left: "voxygen.element.ui.generic.frames.bubble.left", + speech_bubble_mid: "voxygen.element.ui.generic.frames.bubble.mid", + speech_bubble_right: "voxygen.element.ui.generic.frames.bubble.right", + speech_bubble_bottom_left: "voxygen.element.ui.generic.frames.bubble.bottom_left", + speech_bubble_bottom: "voxygen.element.ui.generic.frames.bubble.bottom", + speech_bubble_bottom_right: "voxygen.element.ui.generic.frames.bubble.bottom_right", + speech_bubble_tail: "voxygen.element.ui.generic.frames.bubble.tail", + speech_bubble_icon_frame: "voxygen.element.ui.generic.frames.bubble_dark.icon_frame", - dark_bubble_top_left: "voxygen.element.frames.bubble_dark.top_left", - dark_bubble_top: "voxygen.element.frames.bubble_dark.top", - dark_bubble_top_right: "voxygen.element.frames.bubble_dark.top_right", - dark_bubble_left: "voxygen.element.frames.bubble_dark.left", - dark_bubble_mid: "voxygen.element.frames.bubble_dark.mid", - dark_bubble_right: "voxygen.element.frames.bubble_dark.right", - dark_bubble_bottom_left: "voxygen.element.frames.bubble_dark.bottom_left", - dark_bubble_bottom: "voxygen.element.frames.bubble_dark.bottom", - dark_bubble_bottom_right: "voxygen.element.frames.bubble_dark.bottom_right", - dark_bubble_tail: "voxygen.element.frames.bubble_dark.tail", - dark_bubble_icon_frame: "voxygen.element.frames.bubble_dark.icon_frame", + dark_bubble_top_left: "voxygen.element.ui.generic.frames.bubble_dark.top_left", + dark_bubble_top: "voxygen.element.ui.generic.frames.bubble_dark.top", + dark_bubble_top_right: "voxygen.element.ui.generic.frames.bubble_dark.top_right", + dark_bubble_left: "voxygen.element.ui.generic.frames.bubble_dark.left", + dark_bubble_mid: "voxygen.element.ui.generic.frames.bubble_dark.mid", + dark_bubble_right: "voxygen.element.ui.generic.frames.bubble_dark.right", + dark_bubble_bottom_left: "voxygen.element.ui.generic.frames.bubble_dark.bottom_left", + dark_bubble_bottom: "voxygen.element.ui.generic.frames.bubble_dark.bottom", + dark_bubble_bottom_right: "voxygen.element.ui.generic.frames.bubble_dark.bottom_right", + dark_bubble_tail: "voxygen.element.ui.generic.frames.bubble_dark.tail", + dark_bubble_icon_frame: "voxygen.element.ui.generic.frames.bubble_dark.icon_frame", // Chat icons - chat_faction_small: "voxygen.element.icons.chat.faction_small", - chat_group_small: "voxygen.element.icons.chat.group_small", - chat_kill_small: "voxygen.element.icons.chat.kill_small", - chat_region_small: "voxygen.element.icons.chat.region_small", - chat_say_small: "voxygen.element.icons.chat.say_small", - chat_tell_small: "voxygen.element.icons.chat.tell_small", - chat_world_small: "voxygen.element.icons.chat.world_small", - chat_command_error_small: "voxygen.element.icons.chat.command_error_small", - chat_command_info_small: "voxygen.element.icons.chat.command_info_small", - chat_online_small: "voxygen.element.icons.chat.online_small", - chat_offline_small: "voxygen.element.icons.chat.offline_small", - chat_loot_small: "voxygen.element.icons.chat.loot_small", + chat_faction_small: "voxygen.element.ui.chat.icons.faction_small", + chat_group_small: "voxygen.element.ui.chat.icons.group_small", + chat_kill_small: "voxygen.element.ui.chat.icons.kill_small", + chat_region_small: "voxygen.element.ui.chat.icons.region_small", + chat_say_small: "voxygen.element.ui.chat.icons.say_small", + chat_tell_small: "voxygen.element.ui.chat.icons.tell_small", + chat_world_small: "voxygen.element.ui.chat.icons.world_small", + chat_command_error_small: "voxygen.element.ui.chat.icons.command_error_small", + chat_command_info_small: "voxygen.element.ui.chat.icons.command_info_small", + chat_online_small: "voxygen.element.ui.chat.icons.online_small", + chat_offline_small: "voxygen.element.ui.chat.icons.offline_small", + chat_loot_small: "voxygen.element.ui.chat.icons.loot_small", - chat_faction: "voxygen.element.icons.chat.faction", - chat_group: "voxygen.element.icons.chat.group", - chat_region: "voxygen.element.icons.chat.region", - chat_say: "voxygen.element.icons.chat.say", - chat_tell: "voxygen.element.icons.chat.tell", - chat_world: "voxygen.element.icons.chat.world", + chat_faction: "voxygen.element.ui.chat.icons.faction", + chat_group: "voxygen.element.ui.chat.icons.group", + chat_region: "voxygen.element.ui.chat.icons.region", + chat_say: "voxygen.element.ui.chat.icons.say", + chat_tell: "voxygen.element.ui.chat.icons.tell", + chat_world: "voxygen.element.ui.chat.icons.world", // Buffs - buff_plus_0: "voxygen.element.icons.de_buffs.buff_plus_0", - buff_saturation_0: "voxygen.element.icons.de_buffs.buff_saturation_0", - buff_potion_0: "voxygen.element.icons.de_buffs.buff_potion_0", - buff_campfire_heal_0: "voxygen.element.icons.de_buffs.buff_campfire_heal_0", - buff_energyplus_0: "voxygen.element.icons.de_buffs.buff_energyplus_0", - buff_healthplus_0: "voxygen.element.icons.de_buffs.buff_healthplus_0", - buff_invincibility_0: "voxygen.element.icons.de_buffs.buff_invincibility_0", - buff_dmg_red_0: "voxygen.element.icons.de_buffs.buff_damage_reduce_0", + buff_plus_0: "voxygen.element.de_buffs.buff_plus_0", + buff_saturation_0: "voxygen.element.de_buffs.buff_saturation_0", + buff_potion_0: "voxygen.element.de_buffs.buff_potion_0", + buff_campfire_heal_0: "voxygen.element.de_buffs.buff_campfire_heal_0", + buff_energyplus_0: "voxygen.element.de_buffs.buff_energyplus_0", + buff_healthplus_0: "voxygen.element.de_buffs.buff_healthplus_0", + buff_invincibility_0: "voxygen.element.de_buffs.buff_invincibility_0", + buff_dmg_red_0: "voxygen.element.de_buffs.buff_damage_reduce_0", // Debuffs - debuff_skull_0: "voxygen.element.icons.de_buffs.debuff_skull_0", - debuff_bleed_0: "voxygen.element.icons.de_buffs.debuff_bleed_0", + debuff_skull_0: "voxygen.element.de_buffs.debuff_skull_0", + debuff_bleed_0: "voxygen.element.de_buffs.debuff_bleed_0", // Animation Frames // Buff Frame diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs index b3f0e5ce05..e0380c325d 100644 --- a/voxygen/src/menu/char_selection/ui/mod.rs +++ b/voxygen/src/menu/char_selection/ui/mod.rs @@ -63,60 +63,60 @@ const UI_MAIN: Rgba = Rgba::new(156, 179, 179, 255); // Greenish Blue image_ids_ice! { struct Imgs { - frame_bottom: "voxygen.element.frames.banner_bot", + frame_bottom: "voxygen.element.ui.generic.frames.banner_bot", - slider_range: "voxygen.element.slider.track", - slider_indicator: "voxygen.element.slider.indicator", + slider_range: "voxygen.element.ui.generic.slider.track", + slider_indicator: "voxygen.element.ui.generic.slider.indicator", - selection: "voxygen.element.frames.selection", - selection_hover: "voxygen.element.frames.selection_hover", - selection_press: "voxygen.element.frames.selection_press", + selection: "voxygen.element.ui.generic.frames.selection", + selection_hover: "voxygen.element.ui.generic.frames.selection_hover", + selection_press: "voxygen.element.ui.generic.frames.selection_press", - delete_button: "voxygen.element.buttons.x_red", - delete_button_hover: "voxygen.element.buttons.x_red_hover", - delete_button_press: "voxygen.element.buttons.x_red_press", + delete_button: "voxygen.element.ui.generic.buttons.x_red", + delete_button_hover: "voxygen.element.ui.generic.buttons.x_red_hover", + delete_button_press: "voxygen.element.ui.generic.buttons.x_red_press", - name_input: "voxygen.element.misc_bg.textbox", + name_input: "voxygen.element.ui.generic.textbox", // Tool Icons - sceptre: "voxygen.element.icons.sceptre", - sword: "voxygen.element.icons.sword", - axe: "voxygen.element.icons.axe", - hammer: "voxygen.element.icons.hammer", - bow: "voxygen.element.icons.bow", - staff: "voxygen.element.icons.staff", + sceptre: "voxygen.element.weapons.sceptre", + sword: "voxygen.element.weapons.sword", + axe: "voxygen.element.weapons.axe", + hammer: "voxygen.element.weapons.hammer", + bow: "voxygen.element.weapons.bow", + staff: "voxygen.element.weapons.staff", // Dice icons - dice: "voxygen.element.icons.dice", - dice_hover: "voxygen.element.icons.dice_hover", - dice_press: "voxygen.element.icons.dice_press", + dice: "voxygen.element.ui.char_select.icons.dice", + dice_hover: "voxygen.element.ui.char_select.icons.dice_hover", + dice_press: "voxygen.element.ui.char_select.icons.dice_press", // Species Icons - human_m: "voxygen.element.icons.human_m", - human_f: "voxygen.element.icons.human_f", - orc_m: "voxygen.element.icons.orc_m", - orc_f: "voxygen.element.icons.orc_f", - dwarf_m: "voxygen.element.icons.dwarf_m", - dwarf_f: "voxygen.element.icons.dwarf_f", - undead_m: "voxygen.element.icons.ud_m", - undead_f: "voxygen.element.icons.ud_f", - elf_m: "voxygen.element.icons.elf_m", - elf_f: "voxygen.element.icons.elf_f", - danari_m: "voxygen.element.icons.danari_m", - danari_f: "voxygen.element.icons.danari_f", + human_m: "voxygen.element.ui.char_select.portraits.human_m", + human_f: "voxygen.element.ui.char_select.portraits.human_f", + orc_m: "voxygen.element.ui.char_select.portraits.orc_m", + orc_f: "voxygen.element.ui.char_select.portraits.orc_f", + dwarf_m: "voxygen.element.ui.char_select.portraits.dwarf_m", + dwarf_f: "voxygen.element.ui.char_select.portraits.dwarf_f", + undead_m: "voxygen.element.ui.char_select.portraits.ud_m", + undead_f: "voxygen.element.ui.char_select.portraits.ud_f", + elf_m: "voxygen.element.ui.char_select.portraits.elf_m", + elf_f: "voxygen.element.ui.char_select.portraits.elf_f", + danari_m: "voxygen.element.ui.char_select.portraits.danari_m", + danari_f: "voxygen.element.ui.char_select.portraits.danari_f", // Icon Borders - icon_border: "voxygen.element.buttons.border", - icon_border_mo: "voxygen.element.buttons.border_mo", - icon_border_press: "voxygen.element.buttons.border_press", - icon_border_pressed: "voxygen.element.buttons.border_pressed", + icon_border: "voxygen.element.ui.generic.buttons.border", + icon_border_mo: "voxygen.element.ui.generic.buttons.border_mo", + icon_border_press: "voxygen.element.ui.generic.buttons.border_press", + icon_border_pressed: "voxygen.element.ui.generic.buttons.border_pressed", - button: "voxygen.element.buttons.button", - button_hover: "voxygen.element.buttons.button_hover", - button_press: "voxygen.element.buttons.button_press", + button: "voxygen.element.ui.generic.buttons.button", + button_hover: "voxygen.element.ui.generic.buttons.button_hover", + button_press: "voxygen.element.ui.generic.buttons.button_press", // Tooltips - tt_edge: "voxygen.element.frames.tooltip.edge", - tt_corner: "voxygen.element.frames.tooltip.corner", + tt_edge: "voxygen.element.ui.generic.frames.tooltip.edge", + tt_corner: "voxygen.element.ui.generic.frames.tooltip.corner", } } diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs index 761cc8a77c..24d04cde1f 100644 --- a/voxygen/src/menu/main/ui/mod.rs +++ b/voxygen/src/menu/main/ui/mod.rs @@ -39,18 +39,18 @@ image_ids_ice! { bg: "voxygen.background.bg_main", - banner_top: "voxygen.element.frames.banner_top", - banner_gradient_bottom: "voxygen.element.frames.banner_gradient_bottom", - button: "voxygen.element.buttons.button", - button_hover: "voxygen.element.buttons.button_hover", - button_press: "voxygen.element.buttons.button_press", - input_bg: "voxygen.element.misc_bg.textbox", - loading_art: "voxygen.element.frames.loading_screen.loading_bg", - loading_art_l: "voxygen.element.frames.loading_screen.loading_bg_l", - loading_art_r: "voxygen.element.frames.loading_screen.loading_bg_r", - selection: "voxygen.element.frames.selection", - selection_hover: "voxygen.element.frames.selection_hover", - selection_press: "voxygen.element.frames.selection_press", + banner_top: "voxygen.element.ui.generic.frames.banner_top", + banner_gradient_bottom: "voxygen.element.ui.generic.frames.banner_gradient_bottom", + button: "voxygen.element.ui.generic.buttons.button", + button_hover: "voxygen.element.ui.generic.buttons.button_hover", + button_press: "voxygen.element.ui.generic.buttons.button_press", + input_bg: "voxygen.element.ui.generic.textbox", + loading_art: "voxygen.element.ui.generic.frames.loading_screen.loading_bg", + loading_art_l: "voxygen.element.ui.generic.frames.loading_screen.loading_bg_l", + loading_art_r: "voxygen.element.ui.generic.frames.loading_screen.loading_bg_r", + selection: "voxygen.element.ui.generic.frames.selection", + selection_hover: "voxygen.element.ui.generic.frames.selection_hover", + selection_press: "voxygen.element.ui.generic.frames.selection_press", } } diff --git a/voxygen/src/ui/img_ids.rs b/voxygen/src/ui/img_ids.rs index 660675dc07..7d18586782 100644 --- a/voxygen/src/ui/img_ids.rs +++ b/voxygen/src/ui/img_ids.rs @@ -157,7 +157,10 @@ macro_rules! image_ids { pub fn load(ui: &mut crate::ui::Ui) -> Result { use crate::ui::img_ids::GraphicCreator; Ok(Self { - $($( $name: ui.add_graphic(<$T as GraphicCreator>::new_graphic($specifier)?), )*)* + $($( $name: { + dbg!($specifier); + ui.add_graphic(<$T as GraphicCreator>::new_graphic($specifier).unwrap()) + }, )*)* }) } }