Skip to content

Commit e703e00

Browse files
MarlaminMarlamin
committed
Merge suggestions from #574 (closes #574)
1 parent af23b74 commit e703e00

File tree

3 files changed

+94
-54
lines changed

3 files changed

+94
-54
lines changed

‎parts/interface.csv‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159918,3 +159918,12 @@
159918159918
7411001;Interface/Shop/CatalogShopWideCardMidnightBaseHeroic.BLP
159919159919
7411004;Interface/Shop/CatalogShopWideCardMidnightBaseEpic.BLP
159920159920
7411006;Interface/Shop/CatalogShopWideCardMidnightHeroicEpic.BLP
159921+
7413774;Interface/Shop/CatalogShopWideCardSubBundles.BLP
159922+
7426749;Interface/Shop/CatalogShopWideCardMOPClassicShaBundles.BLP
159923+
7427044;Interface/Shop/CatalogShopFGMidnightExpansionBaseHeroic.BLP
159924+
7427061;Interface/Shop/CatalogShopFGMidnightExpansionHeroicEpic.BLP
159925+
7427063;Interface/Shop/CatalogShopFGMidnightExpansionBaseEpic.BLP
159926+
7429659;Interface/Shop/CatalogShopFGMoPEpicBundle.BLP
159927+
7429661;Interface/Shop/CatalogShopFGMoPHeroicEpicBundle.BLP
159928+
7431493;Interface/Shop/CatalogShopWowGameTimeIcons.BLP
159929+
7431495;Interface/Shop/CatalogShopWowGameTimeIcons2x.BLP

‎parts/item.csv‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292279,3 +292279,13 @@
292279292279
7367935;Item/ObjectComponents/collections/armor_opulent_d_01_chest_Ed_f_lod01.skin
292280292280
7367936;Item/ObjectComponents/collections/armor_opulent_d_01_chest_Ed_f_lod02.skin
292281292281
7367937;Item/ObjectComponents/collections/armor_opulent_d_01_chest_Ed_f_lod03.skin
292282+
7427819;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_m.m2
292283+
7427820;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_f.m2
292284+
7428871;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_m00.skin
292285+
7428873;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_m_lod01.skin
292286+
7428875;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_m_lod02.skin
292287+
7428879;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_m_lod03.skin
292288+
7429500;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_f00.skin
292289+
7429501;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_f_lod01.skin
292290+
7429502;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_f_lod02.skin
292291+
7429503;Item/ObjectComponents/collections/mail_dracthyrquest_b_01_helm_Ed_f_lod03.skin

‎parts/placeholder.csv‎

Lines changed: 75 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -158934,7 +158934,7 @@
158934158934
6035578;sound/creature/CrystalMech/CrystalMech_jumpstart_6035578.ogg
158935158935
6035580;sound/creature/CrystalMech/CrystalMech_jumpstart_6035580.ogg
158936158936
6035582;sound/creature/CrystalMech/CrystalMech_jumpstart_6035582.ogg
158937-
6035694;models/spells/unk_exp10_7235096/7235096_6035694.blp
158937+
6035694;models/unknown/unk_exp10_7235096/7235096_6035694.blp
158938158938
6035779;sound/creature/CrystalMech/CrystalMech_jumpstart_6035779.ogg
158939158939
6035781;sound/creature/CrystalMech/CrystalMech_jumpstart_6035781.ogg
158940158940
6035783;sound/creature/CrystalMech/CrystalMech_jumpstart_6035783.ogg
@@ -175539,9 +175539,9 @@
175539175539
6740275;Spells/11FX_FelRush_Channel_6740275.blp
175540175540
6740276;Spells/11FX_FelRush_Channel_6740276.blp
175541175541
6747118;World/WMO/Dungeon/EtherealRaid/11DU_EtherealRaid_DarkHeart01_6747118.blp
175542-
6749237;sound/doodad/go_6405964_loop_6749237.ogg
175543-
6749239;sound/doodad/go_6405964_loop_6749239.ogg
175544-
6749241;sound/doodad/go_6405964_loop_6749241.ogg
175542+
6749237;sound/doodad/go_11du_etherealraid_main_console_loop_6749237.ogg
175543+
6749239;sound/doodad/go_11du_etherealraid_main_console_loop_6749239.ogg
175544+
6749241;sound/doodad/go_11du_etherealraid_main_console_loop_6749241.ogg
175545175545
6749304;models/unknown/unk_exp10_6749304/6749304.m2
175546175546
6751386;sound/doodad/go_11ET_Ethereal_Structure_Pipe01_loop_6751386.ogg
175547175547
6751388;sound/doodad/go_11ET_Ethereal_Structure_Pipe01_loop_6751388.ogg
@@ -179101,7 +179101,15 @@
179101179101
6889230;Spells/11FX_VoidBarrierBreak01_6889230.blp
179102179102
6889236;models/6887189_6889236.blp
179103179103
6889347;models/item/unk_exp10_6889761_be_m/6889761_Be_m_6889347.blp
179104+
6889350;item/texturecomponents/leguppertexture/6888907_Be_m_lu_u_6889350.blp
179105+
6889352;item/texturecomponents/torsolowertexture/6888907_Be_m_tl_u_6889352.blp
179106+
6889357;item/texturecomponents/leglowertexture/6888907_Be_m_ll_u_6889357.blp
179107+
6889358;item/texturecomponents/torsouppertexture/6888907_Be_m_tu_u_6889358.blp
179108+
6889359;item/texturecomponents/armlowertexture/6888907_Be_m_al_u_6889359.blp
179109+
6889361;item/texturecomponents/handtexture/6888907_Be_m_ha_u_6889361.blp
179104179110
6889362;models/item/unk_exp10_6888948_be_m/6888948_Be_m_6889362.blp
179111+
6889363;item/texturecomponents/armuppertexture/6888907_Be_m_au_u_6889363.blp
179112+
6889372;models/item/unk_exp10_6888907_be_m/6888907_Be_m_6889372.blp
179105179113
6889742;sound/creature/Ethereal2_M/Ethereal2_M_farewell_6889742.ogg
179106179114
6889744;sound/creature/Ethereal2_F/Ethereal2_F_farewell_6889744.ogg
179107179115
6889749;sound/creature/Ethereal2_M/Ethereal2_M_farewell_6889749.ogg
@@ -183928,11 +183936,11 @@
183928183936
7208946;models/world/unk_exp10_7208847/7208847_lod01.skin
183929183937
7208949;models/world/unk_exp10_7208847/7208847_lod02.skin
183930183938
7208951;models/world/unk_exp10_7208847/7208847_lod03.skin
183931-
7209257;models/spells/unk_exp10_7209257/7209257.m2
183932-
7209259;models/spells/unk_exp10_7209257/720925700.skin
183933-
7209260;models/spells/unk_exp10_7209257/7209257_lod01.skin
183934-
7209261;models/spells/unk_exp10_7209257/7209257_lod02.skin
183935-
7209262;models/spells/unk_exp10_7209257/7209257_lod03.skin
183939+
7209257;models/unknown/unk_exp10_7209257/7209257.m2
183940+
7209259;models/unknown/unk_exp10_7209257/720925700.skin
183941+
7209260;models/unknown/unk_exp10_7209257/7209257_lod01.skin
183942+
7209261;models/unknown/unk_exp10_7209257/7209257_lod02.skin
183943+
7209262;models/unknown/unk_exp10_7209257/7209257_lod03.skin
183936183944
7210331;item/texturecomponents/leguppertexture/7209757_lu_u_7210331.blp
183937183945
7210332;item/texturecomponents/leguppertexture/7209677_Be_m_lu_u_7210332.blp
183938183946
7210334;item/texturecomponents/leguppertexture/7209757_lu_u_7210334.blp
@@ -184395,8 +184403,8 @@
184395184403
7233219;models/unknown/unk_exp10_7233219/7233219.m2
184396184404
7233220;models/unknown/unk_exp10_7233220/7233220.m2
184397184405
7235001;models/world/unk_exp10_7235001/7235001.m2
184398-
7235002;models/spells/unk_exp10_7235002/7235002.m2
184399-
7235096;models/spells/unk_exp10_7235096/7235096.m2
184406+
7235002;models/unknown/unk_exp10_7235002/7235002.m2
184407+
7235096;models/unknown/unk_exp10_7235096/7235096.m2
184400184408
7235138;models/unknown/unk_exp10_7233214/723321400.skin
184401184409
7235141;models/unknown/unk_exp10_7233214/7233214_lod01.skin
184402184410
7235144;models/unknown/unk_exp10_7233214/7233214_lod02.skin
@@ -184410,17 +184418,17 @@
184410184418
7235198;models/world/unk_exp10_7235001/7235001_lod01.skin
184411184419
7235200;models/world/unk_exp10_7235001/7235001_lod02.skin
184412184420
7235202;models/world/unk_exp10_7235001/7235001_lod03.skin
184413-
7235487;models/spells/unk_exp10_7235096/7235096_7235487.blp
184414-
7235488;models/spells/unk_exp10_7235096/7235096_7235488.blp
184415-
7235489;models/spells/unk_exp10_7235096/7235096_7235489.blp
184416-
7235490;models/spells/unk_exp10_7235096/723509600.skin
184417-
7235491;models/spells/unk_exp10_7235096/7235096_lod01.skin
184418-
7235492;models/spells/unk_exp10_7235096/7235096_lod02.skin
184419-
7235493;models/spells/unk_exp10_7235096/7235096_lod03.skin
184420-
7235494;models/spells/unk_exp10_7235002/723500200.skin
184421-
7235496;models/spells/unk_exp10_7235002/7235002_lod01.skin
184422-
7235497;models/spells/unk_exp10_7235002/7235002_lod02.skin
184423-
7235499;models/spells/unk_exp10_7235002/7235002_lod03.skin
184421+
7235487;models/unknown/unk_exp10_7235096/7235096_7235487.blp
184422+
7235488;models/unknown/unk_exp10_7235096/7235096_7235488.blp
184423+
7235489;models/unknown/unk_exp10_7235096/7235096_7235489.blp
184424+
7235490;models/unknown/unk_exp10_7235096/723509600.skin
184425+
7235491;models/unknown/unk_exp10_7235096/7235096_lod01.skin
184426+
7235492;models/unknown/unk_exp10_7235096/7235096_lod02.skin
184427+
7235493;models/unknown/unk_exp10_7235096/7235096_lod03.skin
184428+
7235494;models/unknown/unk_exp10_7235002/723500200.skin
184429+
7235496;models/unknown/unk_exp10_7235002/7235002_lod01.skin
184430+
7235497;models/unknown/unk_exp10_7235002/7235002_lod02.skin
184431+
7235499;models/unknown/unk_exp10_7235002/7235002_lod03.skin
184424184432
7235609;models/unknown/unk_exp10_7233216/723321600.skin
184425184433
7235610;models/unknown/unk_exp10_7233216/7233216_lod01.skin
184426184434
7235611;models/unknown/unk_exp10_7233216/7233216_lod02.skin
@@ -184890,11 +184898,11 @@
184890184898
7257656;sound/doodad/go_SilkWormBossAbdomen_loop_7257656.ogg
184891184899
7257724;spells/textures/textureblendset_4786_7257724.blp
184892184900
7257725;spells/textures/textureblendset_4786_7257725.blp
184893-
7257799;models/spells/unk_exp10_7257799/7257799.m2
184894-
7257802;models/spells/unk_exp10_7257802/7257802.m2
184895-
7257803;models/spells/unk_exp10_7257803/7257803.m2
184896-
7257804;models/spells/unk_exp10_7257804/7257804.m2
184897-
7257805;models/spells/unk_exp10_7257805/7257805.m2
184901+
7257799;models/unknown/unk_exp10_7257799/7257799.m2
184902+
7257802;models/unknown/unk_exp10_7257802/7257802.m2
184903+
7257803;models/unknown/unk_exp10_7257803/7257803.m2
184904+
7257804;models/unknown/unk_exp10_7257804/7257804.m2
184905+
7257805;models/unknown/unk_exp10_7257805/7257805.m2
184898184906
7258806;Sound/Creature/VoidFlyerMount/VoidFlyerMount_fidget_7258806.ogg
184899184907
7258808;Sound/Creature/VoidFlyerMount/VoidFlyerMount_fidget_7258808.ogg
184900184908
7258810;Sound/Creature/VoidFlyerMount/VoidFlyerMount_fidget_7258810.ogg
@@ -184991,21 +184999,21 @@
184991184999
7262407;Sound/Creature/KareshFlyer/KareshFlyer_fidget10_7262407.ogg
184992185000
7263691;models/world/unk_exp10_7216249/7216249_7263691.blp
184993185001
7263694;models/world/unk_exp10_7216249/7216249_7263694.blp
184994-
7265311;models/spells/unk_exp10_7257803/725780300.skin
184995-
7265315;models/spells/unk_exp10_7257803/7257803_lod01.skin
184996-
7265318;models/spells/unk_exp10_7257803/7257803_lod02.skin
184997-
7265320;models/spells/unk_exp10_7257803/7257803_lod03.skin
184998-
7265323;models/spells/unk_exp10_7257805/725780500.skin
184999-
7265324;models/spells/unk_exp10_7257805/7257805_lod01.skin
185000-
7265325;models/spells/unk_exp10_7257805/7257805_lod02.skin
185001-
7265326;models/spells/unk_exp10_7257805/7257805_lod03.skin
185002-
7265327;models/spells/unk_exp10_7257804/725780400.skin
185003-
7265328;models/spells/unk_exp10_7257804/7257804_lod01.skin
185004-
7265329;models/spells/unk_exp10_7257804/7257804_lod02.skin
185005-
7265330;models/spells/unk_exp10_7257804/7257804_lod03.skin
185002+
7265311;models/unknown/unk_exp10_7257803/725780300.skin
185003+
7265315;models/unknown/unk_exp10_7257803/7257803_lod01.skin
185004+
7265318;models/unknown/unk_exp10_7257803/7257803_lod02.skin
185005+
7265320;models/unknown/unk_exp10_7257803/7257803_lod03.skin
185006+
7265323;models/unknown/unk_exp10_7257805/725780500.skin
185007+
7265324;models/unknown/unk_exp10_7257805/7257805_lod01.skin
185008+
7265325;models/unknown/unk_exp10_7257805/7257805_lod02.skin
185009+
7265326;models/unknown/unk_exp10_7257805/7257805_lod03.skin
185010+
7265327;models/unknown/unk_exp10_7257804/725780400.skin
185011+
7265328;models/unknown/unk_exp10_7257804/7257804_lod01.skin
185012+
7265329;models/unknown/unk_exp10_7257804/7257804_lod02.skin
185013+
7265330;models/unknown/unk_exp10_7257804/7257804_lod03.skin
185006185014
7265331;Sound/Creature/KareshFlyer/KareshFlyer_fidget5_7265331.ogg
185007-
7265499;models/spells/unk_exp10_7257799/725779900.skin
185008-
7265716;models/spells/unk_exp10_7257802/725780200.skin
185015+
7265499;models/unknown/unk_exp10_7257799/725779900.skin
185016+
7265716;models/unknown/unk_exp10_7257802/725780200.skin
185009185017
7265854;Sound/Creature/KareshFlyer/KareshFlyer_fidget12_7265854.ogg
185010185018
7265856;Sound/Creature/KareshFlyer/KareshFlyer_fidget12_7265856.ogg
185011185019
7265858;Sound/Creature/KareshFlyer/KareshFlyer_fidget12_7265858.ogg
@@ -185073,7 +185081,7 @@
185073185081
7266680;Sound/Creature/KareshFlyer/KareshFlyer_wound_7266680.ogg
185074185082
7266682;Sound/Creature/KareshFlyer/KareshFlyer_wound_7266682.ogg
185075185083
7266684;Sound/Creature/KareshFlyer/KareshFlyer_wound_7266684.ogg
185076-
7267551;models/spells/unk_exp10_7267551/7267551.m2
185084+
7267551;models/unknown/unk_exp10_7267551/7267551.m2
185077185085
7273505;sound/creature/KareshFlyerMount/KareshFlyerMount_cast_oneshot_7273505.ogg
185078185086
7273507;sound/creature/KareshFlyerMount/KareshFlyerMount_cast_oneshot_7273507.ogg
185079185087
7273509;sound/creature/KareshFlyerMount/KareshFlyerMount_cast_oneshot_7273509.ogg
@@ -185187,15 +185195,15 @@
185187185195
7277972;Creature/FelBatGladiatorMount_Void/FelBatGladiatorMount_Void_7277972.blp
185188185196
7277974;Creature/FelBatGladiatorMount_Void/FelBatGladiatorMount_Void_7277974.blp
185189185197
7284552;Creature/FelBatGladiatorMount_Void/FelBatGladiatorMount_Void_7284552.blp
185190-
7286675;models/spells/unk_exp10_7286675/7286675.m2
185191-
7287335;models/spells/unk_exp10_7286675/728667500.skin
185192-
7287336;models/spells/unk_exp10_7286675/7286675_lod01.skin
185193-
7287338;models/spells/unk_exp10_7286675/7286675_lod02.skin
185198+
7286675;models/unknown/unk_exp10_7286675/7286675.m2
185199+
7287335;models/unknown/unk_exp10_7286675/728667500.skin
185200+
7287336;models/unknown/unk_exp10_7286675/7286675_lod01.skin
185201+
7287338;models/unknown/unk_exp10_7286675/7286675_lod02.skin
185194185202
7287353;Creature/HeadlessHorsemanMount2/HeadlessHorsemanMount2_7287353.blp
185195-
7291723;models/spells/unk_exp10_7267551/726755100.skin
185196-
7291724;models/spells/unk_exp10_7267551/7267551_lod01.skin
185197-
7291725;models/spells/unk_exp10_7267551/7267551_lod02.skin
185198-
7291726;models/spells/unk_exp10_7267551/7267551_lod03.skin
185203+
7291723;models/unknown/unk_exp10_7267551/726755100.skin
185204+
7291724;models/unknown/unk_exp10_7267551/7267551_lod01.skin
185205+
7291725;models/unknown/unk_exp10_7267551/7267551_lod02.skin
185206+
7291726;models/unknown/unk_exp10_7267551/7267551_lod03.skin
185199185207
7296012;Item/ObjectComponents/collections/quiver_1h_tribal_b_01_7296012.blp
185200185208
7296013;Item/ObjectComponents/collections/quiver_1h_tribal_b_01_7296013.blp
185201185209
7296014;Item/ObjectComponents/collections/quiver_1h_tribal_b_01_7296014.blp
@@ -185208,7 +185216,7 @@
185208185216
7301966;models/unknown/unk_exp10_7301966/7301966.m2
185209185217
7301967;models/unknown/unk_exp10_7301967/7301967.m2
185210185218
7301968;models/unknown/unk_exp10_7301968/7301968.m2
185211-
7303281;models/spells/unk_exp10_7303281/7303281.m2
185219+
7303281;models/unknown/unk_exp10_7303281/7303281.m2
185212185220
7303341;models/unktextures/Caustic_Blue3_7303341.blp
185213185221
7303348;models/unktextures/Ember_Offset_frost_7303348.blp
185214185222
7304552;models/unktextures/Gray8x8_7304552.blp
@@ -185532,7 +185540,7 @@
185532185540
7372722;Creature/Murloc/MurlocDeepSea_7372722.blp
185533185541
7372726;Creature/Murloc/MurlocDeepSea_7372726.blp
185534185542
7374536;models/unktextures/7fx_heroaura_fire_noedge_7374536.blp
185535-
7374892;models/spells/unk_exp10_7374892/7374892.m2
185543+
7374892;models/unknown/unk_exp10_7374892/7374892.m2
185536185544
7378554;Sound/Creature/WardenOwlPet/WardenOwlPet_aggro_7378554.ogg
185537185545
7378556;Sound/Creature/WardenOwlPet/WardenOwlPet_aggro_7378556.ogg
185538185546
7378558;Sound/Creature/WardenOwlPet/WardenOwlPet_aggro_7378558.ogg
@@ -185610,5 +185618,18 @@
185610185618
7383351;Sound/Spell/ChallengeModeStart_cast_oneshot_7383351.ogg
185611185619
7384756;Sound/Spell/ChallengeModeStart_cast_oneshot_7384756.ogg
185612185620
7388760;Sound/Spell/Seal_cast_oneshot_7388760.ogg
185613-
7389506;models/spells/unk_exp10_7374892/7374892_7389506.blp
185614-
7389507;models/spells/unk_exp10_7374892/737489200.skin
185621+
7389506;models/unknown/unk_exp10_7374892/7374892_7389506.blp
185622+
7389507;models/unknown/unk_exp10_7374892/737489200.skin
185623+
7412380;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-ClosingWeekend-SkyRift-Emitter-01_0_7412380.ogg
185624+
7412382;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-ClosingWeekend-SkyRift-Emitter-01_1_7412382.ogg
185625+
7412384;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-ClosingWeekend-SkyRift-Emitter-01_2_7412384.ogg
185626+
7412386;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-ClosingWeekend-SkyRift-Emitter-01_3_7412386.ogg
185627+
7412388;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-ClosingWeekend-SkyRift-Emitter-01_4_7412388.ogg
185628+
7412390;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-ClosingWeekend-SkyRift-Emitter-01_5_7412390.ogg
185629+
7412392;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-FinalSurge-SkyRift-Emitter-01_0_7412392.ogg
185630+
7412394;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-FinalSurge-SkyRift-Emitter-01_1_7412394.ogg
185631+
7412396;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-FinalSurge-SkyRift-Emitter-01_2_7412396.ogg
185632+
7412398;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-FinalSurge-SkyRift-Emitter-01_3_7412398.ogg
185633+
7412400;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-FinalSurge-SkyRift-Emitter-01_4_7412400.ogg
185634+
7412402;Sound/Emitters/11.2.5Amb-BrokenIsles-Dalaran-FinalSurge-SkyRift-Emitter-01_5_7412402.ogg
185635+
7419586;models/item/unk_exp10_6888907_be_m/6888907_Be_m_7419586.blp

0 commit comments

Comments
 (0)