Update font icon aliases for release

iw4x/iw4x_00/mp/fonticons.csv

@@ -1,23 +1,21 @@
 # Fonticon Name,# Fonticon Material
-airdrop_crate_icon,airdrop_crate_icon
-airdrop_icon,airdrop_icon
-award_gametype,award_gametype
-award_joystick,award_joystick
-award_red_devil,award_red_devil
-award_weapon_knife,award_weapon_knife
+airdropcrate,airdrop_crate_icon
+airdrop,airdrop_icon
+gametype,award_gametype
+knife,award_weapon_knife
 black,black
-button_a,button_a
-button_b,button_b
-button_back,button_back
-button_lshldr,button_lshldr
-button_lstick,button_lstick
-button_ltrig,button_ltrig
-button_rshldr,button_rshldr
-button_rstick,button_rstick
-button_rtrig,button_rtrig
-button_start,button_start
-button_x,button_x
-button_y,button_y
+xboxa,button_a
+xboxb,button_b
+xboxback,button_back
+xboxleftshoulder,button_lshldr
+xboxleftstick,button_lstick
+xboxlefttrigger,button_ltrig
+xboxrightshoulder,button_rshldr
+xboxrightstick,button_rstick
+xboxrighttrigger,button_rtrig
+xboxstart,button_start
+xboxx,button_x
+xboxy,button_y
 eightball,cardicon_8ball
 price_8bit,cardicon_8bit_price
 abduction,cardicon_abduction
@@ -61,22 +59,22 @@ aa12_master,cardicon_expert_aa12
 ak47_master,cardicon_expert_ak47
 aug_master,cardicon_expert_aug
 barrett_master,cardicon_expert_barrett
-beretta_master,cardicon_expert_beretta
-beretta393_master,cardicon_expert_beretta393
-cheytac_master,cardicon_expert_cheytac
-coltanaconda_master,cardicon_expert_coltanaconda
+m9_master,cardicon_expert_beretta
+raffica_master,cardicon_expert_beretta393
+intervention_master,cardicon_expert_cheytac
+magnum_master,cardicon_expert_coltanaconda
 deserteagle_master,cardicon_expert_deserteagle
 fal_master,cardicon_expert_fal
 famas_master,cardicon_expert_famas
 fn2000_master,cardicon_expert_fn2000
-glock_master,cardicon_expert_glock
-kriss_master,cardicon_expert_kriss
+g18_master,cardicon_expert_glock
+vector_master,cardicon_expert_kriss
 m1014_master,cardicon_expert_m1014
-m16_master,cardicon_expert_m16
+m16a4_master,cardicon_expert_m16
 m21_master,cardicon_expert_m21
 m240_master,cardicon_expert_m240
-m4_master,cardicon_expert_m4
-masada_master,cardicon_expert_masada
+m4a1_master,cardicon_expert_m4
+acr_master,cardicon_expert_masada
 mg4_master,cardicon_expert_mg4
 model1887_master,cardicon_expert_model1887
 mp5k_master,cardicon_expert_mp5k
@@ -84,18 +82,17 @@ p90_master,cardicon_expert_p90
 pp2000_master,cardicon_expert_pp2000
 ranger_master,cardicon_expert_ranger
 rpd_master,cardicon_expert_rpd
-sa80_master,cardicon_expert_sa80
+l86lsw_master,cardicon_expert_sa80
 scar_master,cardicon_expert_scar
 spas12_master,cardicon_expert_spas12
 striker_master,cardicon_expert_striker
-tavor_master,cardicon_expert_tavor
+tar21_master,cardicon_expert_tavor
 tmp_master,cardicon_expert_tmp
 ump45_master,cardicon_expert_ump45
 usp_master,cardicon_expert_usp
 uzi_master,cardicon_expert_uzi
 wa2000_master,cardicon_expert_wa2000
 f15,cardicon_f15
-fmj,cardicon_fmj
 gasmask,cardicon_gasmask
 gears,cardicon_gears
 ghillie,cardicon_ghillie
@@ -110,22 +107,22 @@ aa12_expert,cardicon_gun_aa12
 ak47_expert,cardicon_gun_ak47
 aug_expert,cardicon_gun_aug
 barrett_expert,cardicon_gun_barrett
-beretta_expert,cardicon_gun_beretta
-beretta393_expert,cardicon_gun_beretta393
-cheytac_expert,cardicon_gun_cheytac
-coltanaconda_expert,cardicon_gun_coltanaconda
+m9_expert,cardicon_gun_beretta
+raffica_expert,cardicon_gun_beretta393
+intervention_expert,cardicon_gun_cheytac
+magnum_expert,cardicon_gun_coltanaconda
 deserteagle_expert,cardicon_gun_deserteagle
 fal_expert,cardicon_gun_fal
 famas_expert,cardicon_gun_famas
 fn2000_expert,cardicon_gun_fn2000
-glock_expert,cardicon_gun_glock
-kriss_expert,cardicon_gun_kriss
+g18_expert,cardicon_gun_glock
+vector_expert,cardicon_gun_kriss
 m1014_expert,cardicon_gun_m1014
-m16_expert,cardicon_gun_m16
+m16a4_expert,cardicon_gun_m16
 m21_expert,cardicon_gun_m21
 m240_expert,cardicon_gun_m240
-m4_expert,cardicon_gun_m4
-masada_expert,cardicon_gun_masada
+m4a1_expert,cardicon_gun_m4
+acr_expert,cardicon_gun_masada
 mg4_expert,cardicon_gun_mg4
 model1887_expert,cardicon_gun_model1887
 mp5k_expert,cardicon_gun_mp5k
@@ -133,11 +130,12 @@ p90_expert,cardicon_gun_p90
 pp2000_expert,cardicon_gun_pp2000
 ranger_expert,cardicon_gun_ranger
 rpd_expert,cardicon_gun_rpd
-sa80_expert,cardicon_gun_sa80
+l86lsw_expert,cardicon_gun_sa80
 scar_expert,cardicon_gun_scar
 spas12_expert,cardicon_gun_spas12
 striker_expert,cardicon_gun_striker
-tavor_expert,cardicon_gun_tavor
+tar21_expert,cardicon_gun_tavor
+tmp_expert,cardicon_gun_tmp
 ump45_expert,cardicon_gun_ump45
 usp_expert,cardicon_gun_usp
 uzi_expert,cardicon_gun_uzi
@@ -191,7 +189,7 @@ pirate,cardicon_pirate1
 pirateflag,cardicon_pirateflag
 porterjustice,cardicon_porterjustice
 goldcross,cardicon_prestige10
-prestige10_rot,cardicon_prestige10_02
+prestige10medal,cardicon_prestige10_02
 prestige_classic_1,cardicon_prestige_classic1
 prestige_classic_2,cardicon_prestige_classic2
 prestige_classic_3,cardicon_prestige_classic3
@@ -429,8 +427,8 @@ airstrike_enemy,compass_objpoint_airstrike_busy
 airstrike_friendly,compass_objpoint_airstrike_friendly
 ammo_enemy,compass_objpoint_ammo_enemy
 ammo_friendly,compass_objpoint_ammo_friendly
-b2_friendly,compass_objpoint_b2_airstrike_friendly
-b2_enemy,compass_objpoint_b2_airstrike_enemy
+stealthbomber_friendly,compass_objpoint_b2_airstrike_friendly
+stealthbomber_enemy,compass_objpoint_b2_airstrike_enemy
 c130_enemy,compass_objpoint_c130_enemy
 c130_friendly,compass_objpoint_c130_friendly
 helicopter_enemy,compass_objpoint_helicopter_busy
@@ -463,7 +461,7 @@ dpad_40mm_grenade,dpad_40mm_grenade
 dpad_down,dpad_down
 ac130,dpad_killstreak_ac130
 carepackage,dpad_killstreak_carepackage
-choppergunner,dpad_killstreak_cobra_gunner
+chopper,dpad_killstreak_cobra_gunner
 counteruav,dpad_killstreak_counter_uav
 emergencyairdrop,dpad_killstreak_emergency_airdrop
 emp,dpad_killstreak_emp
@@ -510,42 +508,42 @@ ak47,hud_icon_ak47
 ak47classic,hud_icon_ak47_classic
 artillery,hud_icon_artillery
 at4,hud_icon_at4
-barrett50cal,hud_icon_barrett50cal
-benellim4,hud_icon_benelli_m4
-beretta393,hud_icon_beretta393
+barrett,hud_icon_barrett50cal
+m1014,hud_icon_benelli_m4
+raffica,hud_icon_beretta393
 c4,hud_icon_c4
-cheytac,hud_icon_cheytac
+intervention,hud_icon_cheytac
 claymore,hud_icon_claymore
-coltanaconda,hud_icon_colt_anaconda
+magnum,hud_icon_colt_anaconda
 deserteagle,hud_icon_desert_eagle
 deserteaglegold,hud_icon_desert_eagle_gold
 dragunov,hud_icon_dragunov
 famas,hud_icon_famas
 fn2000,hud_icon_fn2000
-fnfal,hud_icon_fnfal
-glock,hud_icon_glock
+fal,hud_icon_fnfal
+g18,hud_icon_glock
 javelin,hud_icon_javelin
-kriss,hud_icon_kriss
-m14_scoped,hud_icon_m14_scoped
-m14ebr,hud_icon_m14ebr
+vector,hud_icon_kriss
+m21_scoped,hud_icon_m14_scoped
+m21,hud_icon_m14ebr
 m16a4,hud_icon_m16a4
 m16a4_grenade,hud_icon_m16a4_grenade
 m240,hud_icon_m240
 m249saw,hud_icon_m249saw
 m249saw_mounted,hud_icon_m249saw_mounted
 m40a3,hud_icon_m40a3
-m4carbine,hud_icon_m4carbine
+m4a1,hud_icon_m4carbine
 m79,hud_icon_m79
-m9beretta,hud_icon_m9beretta
-masada,hud_icon_masada
+m9,hud_icon_m9beretta
+acr,hud_icon_masada
 mg4,hud_icon_mg4
-miniuzi,hud_icon_mini_uzi
+uzi,hud_icon_mini_uzi
 model1887,hud_icon_model1887
 mp44,hud_icon_mp44
 mp5,hud_icon_mp5
 mp5_silencer,hud_icon_mp5_silencer
 mp5k,hud_icon_mp5k
-mp9,hud_icon_mp9
+tmp,hud_icon_mp9
 nvg,hud_icon_nvg
 p90,hud_icon_p90
 pistol,hud_icon_pistol
@@ -555,21 +553,21 @@ riotshield,hud_icon_riot_shield
 rpd,hud_icon_rpd
 rpg,hud_icon_rpg
 rpg_dpad,hud_icon_rpg_dpad
-sa80,hud_icon_sa80
-sa80_lmg,hud_icon_sa80_lmg
-sawedoff,hud_icon_sawed_off
-scarh,hud_icon_scar_h
+l86lsw,hud_icon_sa80
+l86lsw_lmg,hud_icon_sa80_lmg
+ranger,hud_icon_sawed_off
+scar,hud_icon_scar_h
 sentry_hud,hud_icon_sentrygun
 shotgun,hud_icon_shotgun
 sniperrifle,hud_icon_sniperrifle
 spas12,hud_icon_spas12
-steyr,hud_icon_steyr
+aug,hud_icon_steyr
 stinger,hud_icon_stinger
 striker,hud_icon_striker
 tavor,hud_icon_tavor
 ump45,hud_icon_ump45
-undermounted_shotgun,hud_icon_undermounted_shotgun
-usp45,hud_icon_usp_45
+undermountedshotgun,hud_icon_undermounted_shotgun
+usp,hud_icon_usp_45
 wa2000,hud_icon_wa2000
 javelin_clu_on,hud_javelin_clu_on
 javelin_dir_on,hud_javelin_dir_on
@@ -577,8 +575,8 @@ javelin_lock_on,hud_javelin_lock_on
 javelin_norocket_on,hud_javelin_norocket_on
 javelin_rocket_on,hud_javelin_rocket_on
 javelin_top_on,hud_javelin_top_on
-cobra_friendly,hud_minimap_cobra_green
-cobra_enemy,hud_minimap_cobra_red
+chopper_friendly,hud_minimap_cobra_green
+chopper_enemy,hud_minimap_cobra_red
 harrier_friendly,hud_minimap_harrier_green
 harrier_enemy,hud_minimap_harrier_red
 pavelow_friendly,hud_minimap_pavelow_green
@@ -797,30 +795,30 @@ ak47_cac,weapon_ak47
 ak47classic_cac,weapon_ak47_classic
 ak74u_cac,weapon_aks74u
 at4_cac,weapon_at4
-acog_cac,weapon_attachment_acog
-akimbo_cac,weapon_attachment_akimbo
-eotech_cac,weapon_attachment_eotech
-fmj_cac,weapon_attachment_fmj
-grip_cac,weapon_attachment_grip
-heartbeat_cac,weapon_attachment_heartbeat
-m203_cac,weapon_attachment_m203
-reflex_cac,weapon_attachment_reflex
-rof_cac,weapon_attachment_rof
-shotgun_cac,weapon_attachment_shotgun
-suppressor_cac,weapon_attachment_suppressor
-tactical_cac,weapon_attachment_tactical
-thermal_cac,weapon_attachment_thermal
-xmags_cac,weapon_attachment_xmags
+acog,weapon_attachment_acog
+akimbo,weapon_attachment_akimbo
+holo,weapon_attachment_eotech
+fmj,weapon_attachment_fmj
+grip,weapon_attachment_grip
+heartbeat,weapon_attachment_heartbeat
+m203,weapon_attachment_m203
+reddot,weapon_attachment_reflex
+rapidfire,weapon_attachment_rof
+underbarrelshotgun,weapon_attachment_shotgun
+silencer,weapon_attachment_suppressor
+tacticalknife,weapon_attachment_tactical
+thermal,weapon_attachment_thermal
+xmags,weapon_attachment_xmags
 aug_cac,weapon_aug
-barrett50cal_cac,weapon_barrett50cal
-benellim4_cac,weapon_benelli_m4
-beretta393_cac,weapon_beretta393
+barrett_cac,weapon_barrett50cal
+m1014_cac,weapon_benelli_m4
+raffica_cac,weapon_beretta393
 c4_cac,weapon_c4
-cheytac_cac,weapon_cheytac
+intervention_cac,weapon_cheytac
 claymore_cac,weapon_claymore
 colt45_cac,weapon_colt_45
-colt45silencer_cac,weapon_colt_45_silencer
-coltanaconda_cac,weapon_colt_anaconda
+colt45_silencer,weapon_colt_45_silencer
+magnum_cac,weapon_colt_anaconda
 concgrenade_cac,weapon_concgrenade
 deserteagle_cac,weapon_desert_eagle
 deserteaglegold_cac,weapon_desert_eagle_gold
@@ -829,32 +827,29 @@ dragunovsvd_cac,weapon_dragunovsvd
 famas_cac,weapon_famas
 flashbang_cac,weapon_flashbang
 fn2000_cac,weapon_fn2000
-fnfal_cac,weapon_fnfal
+fal_cac,weapon_fnfal
 fraggrenade_cac,weapon_fraggrenade
 g3_cac,weapon_g3
 g36c_cac,weapon_g36c
-glock_cac,weapon_glock
+g18_cac,weapon_glock
 gp25_cac,weapon_gp25
 javelin_cac,weapon_javelin
-kriss_cac,weapon_kriss
+vector_cac,weapon_kriss
 m1014_cac,weapon_m1014
 m14scoped_cac,weapon_m14_scoped
-m14ebr_cac,weapon_m14ebr
+m21_cac,weapon_m14ebr
 m16a4_cac,weapon_m16a4
-m203_cac,weapon_m203
 m240_cac,weapon_m240
 m249saw_cac,weapon_m249saw
 m40a3_cac,weapon_m40a3
-m4short_cac,weapon_m4_short
-m4carbine_cac,weapon_m4carbine
+m4a1_cac,weapon_m4carbine
 m60e4_cac,weapon_m60e4
 m79_cac,weapon_m79
-m9beretta_cac,weapon_m9beretta
-m9berettasilencer_cac,weapon_m9beretta_silencer
-masada_cac,weapon_masada
-matjavelin_cac,weapon_mat_javelin
+m9_cac,weapon_m9beretta
+m9_silencer_cac,weapon_m9beretta_silencer
+acr_cac,weapon_masada
 mg4_cac,weapon_mg4
-miniuzi_cac,weapon_mini_uzi
+uzi_cac,weapon_mini_uzi
 model1887_cac,weapon_model1887
 mp44_cac,weapon_mp44
 mp5_cac,weapon_mp5
@@ -867,18 +862,18 @@ ranger_cac,weapon_ranger
 remington700_cac,weapon_remington700
 riotshield_cac,weapon_riotshield
 rpd_cac,weapon_rpd
-rpg7_cac,weapon_rpg7
-sa80_cac,weapon_sa80
-scarh_cac,weapon_scar_h
+rpg_cac,weapon_rpg7
+l86lsw_cac,weapon_sa80
+scar_cac,weapon_scar_h
 skorpion_cac,weapon_skorpion
 smokegrenade_cac,weapon_smokegrenade
 spas12_cac,weapon_spas12
 stinger_cac,weapon_stinger
 striker_cac,weapon_striker
-tavor_cac,weapon_tavor
+tar21_cac,weapon_tavor
 tmp_cac,weapon_tmp
 ump45_cac,weapon_ump45
-usp45_cac,weapon_usp_45
+usp_cac,weapon_usp_45
 usp45akimbo_cac,weapon_usp_45_akimbo
 usp45silencer_cac,weapon_usp_45_silencer
 wa2000_cac,weapon_wa2000