Skip to content

Commit 1fe3ad2

Browse files
committed
Merge suggestions from #728 (closes #728)
1 parent f44d0b9 commit 1fe3ad2

3 files changed

Lines changed: 17 additions & 0 deletions

File tree

parts/creature.csv

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79894,6 +79894,7 @@
7989479894
7651224;Creature/SpringMonkeyMount/SpringMonkeyMount_Saddle_Brown.blp
7989579895
7651311;Creature/ShaWolfMount_Classic/ShaWolfMount_Classic.m2
7989679896
7651313;Creature/ShaOwlMount_Classic/ShaOwlMount_Classic.m2
79897+
7651315;Creature/ShaBeakyPet_Classic/ShaBeakyPet_Classic.m2
7989779898
7651317;Creature/BatPetRevendreth2_Classic/BatPetRevendreth2_Classic.m2
7989879899
7651391;Creature/FelLesserGronn/FelLesserGronn_lod01.skin
7989979900
7651392;Creature/FelLesserGronn/FelLesserGronn_lod02.skin
@@ -79983,7 +79984,11 @@
7998379984
7657988;Creature/Falcosauros/FalcosaurosPet0101-00.anim
7998479985
7657989;creature/babyraptor/babyraptor0100-00.anim
7998579986
7657990;creature/babyraptor/babyraptor0101-00.anim
79987+
7657993;Creature/ShaBeakyPet_Classic/fb_shadoweataway_void1_ba_blurred_witch.blp
79988+
7657997;Creature/ShaBeakyPet_Classic/Clouds01_Desat.blp
79989+
7658003;Creature/ShaBeakyPet_Classic/ShaBeakyPet_Classic00.skin
7998679990
7658397;Creature/BatPetRevendreth2_Classic/BatPetRevendreth2_Classic.blp
79991+
7658424;Creature/ShaBeakyPet_Classic/ShaBeakyPet_Classic.blp
7998779992
7660516;Creature/FrostwolfPup/FrostWolfPup_NoCollar0061-00.anim
7998879993
7660517;Creature/FrostwolfPup/FrostWolfPup_NoCollar_lod01.skin
7998979994
7660518;Creature/FrostwolfPup/FrostWolfPup_NoCollar_lod02.skin
@@ -80148,6 +80153,14 @@
8014880153
7758989;Creature/SpringMonkeyMount/10FX_Wind_Streams.blp
8014980154
7758993;Creature/SpringMonkeyMount/Glass_Beveled_Distortion.blp
8015080155
7758994;Creature/SpringMonkeyMount/7FX_AlphaMask_Glow_Blur.blp
80156+
7792809;Creature/PalanquinMount_Classic/PalanquinMount_Classic.m2
80157+
7807248;Creature/PalanquinMount_Classic/smoke_loose_02_256_blend_contrast.blp
80158+
7807249;Creature/PalanquinMount_Classic/wispymagic_vert_azeritemist_blue_128_greyrotate_blend.blp
80159+
7807252;Creature/PalanquinMount_Classic/GenericGlow_Alpha_128.blp
80160+
7807253;Creature/PalanquinMount_Classic/PalanquinMount_Classic_Red.blp
80161+
7807255;Creature/PalanquinMount_Classic/ArmorReflect4.blp
80162+
7807257;Creature/PalanquinMount_Classic/PalanquinMount_Classic_Glow.blp
80163+
7807258;Creature/PalanquinMount_Classic/PalanquinMount_Classic00.skin
8015180164
7808610;Creature/BabySnapLizard/BabySnapLizard0128-00.anim
8015280165
7808614;Creature/BabySnapLizard/BabySnapLizard0123-00.anim
8015380166
7808617;Creature/BabySnapLizard/BabySnapLizard0129-00.anim

parts/interface.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169240,6 +169240,7 @@
169240169240
7655256;Interface/ICONS/INV_Shield_1H_OutdoorAmaniLoa_C_01.blp
169241169241
7657069;Interface/AddOns/Blizzard_APIDocumentationGenerated/LuaCurveObjectBaseAPIDocumentation.lua
169242169242
7657804;Interface/ICONS/INV_BatPetRevendreth2.blp
169243+
7657991;Interface/ICONS/INV_ShaBeakyPet.blp
169243169244
7658123;Interface/ICONS/INV12_ApexTalent_Warrior_RampagingBerserker2.blp
169244169245
7658124;Interface/ICONS/INV_1205_Voidforge_CosmicVoid.blp
169245169246
7658125;Interface/ICONS/INV_1205_Voidforge_FluctuatingVoidcoreFragments_CosmicVoid.blp
@@ -169582,6 +169583,7 @@
169582169583
7754023;Interface/AddOns/Blizzard_APIDocumentationGenerated/SecondsFormatterSharedDocumentation.lua
169583169584
7754024;Interface/AddOns/Blizzard_APIDocumentationGenerated/NumericRuleFormatterAPIDocumentation.lua
169584169585
7754025;Interface/AddOns/Blizzard_APIDocumentationGenerated/AbbreviatedNumberFormatterAPIDocumentation.lua
169586+
7754063;Interface/ICONS/INV_PalanquinMount.blp
169585169587
7758097;Interface/AddOns/Blizzard_RaidFrame/Wrath/RaidFrame.xml
169586169588
7765534;Interface/Glues/LOADINGSCREENS/Expansion11/Main/Loadscreen_RitualSite_BrokenThrone.blp
169587169589
7765536;Interface/Glues/LOADINGSCREENS/Expansion11/Main/Loadscreen_RitualSite_DaggerspinePoint.blp

parts/placeholder.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217396,6 +217396,7 @@
217396217396
7657869;Creature/BatPetRevendreth2_Classic/BatPetRevendreth2_Classic_7657869.blp
217397217397
7657870;Creature/BatPetRevendreth2_Classic/BatPetRevendreth2_Classic_7657870.blp
217398217398
7657871;Creature/BatPetRevendreth2_Classic/BatPetRevendreth2_Classic_7657871.blp
217399+
7657995;Creature/ShaBeakyPet_Classic/ShaBeakyPet_Classic_7657995.blp
217399217400
7658246;models/unknown/unk_exp11_8hu_kultiras_ropelights02/8HU_KULTIRAS_ROPELIGHTS02.m2
217400217401
7658247;models/unknown/unk_exp11_8hu_kultiras_ropelights03/8HU_KULTIRAS_ROPELIGHTS03.m2
217401217402
7658248;models/unknown/unk_exp11_8hu_kultiras_ropelights04/8HU_KULTIRAS_ROPELIGHTS04.m2
@@ -220089,6 +220090,7 @@
220089220090
7807109;World/Expansion11/Doodads/PlayerHousing/12PH_Shop_LunarNewYear_Gourd01_7807109.blp
220090220091
7807110;World/Expansion11/Doodads/PlayerHousing/12PH_Shop_LunarNewYear_Gourd01_7807110.blp
220091220092
7807111;World/Expansion11/Doodads/PlayerHousing/12PH_Shop_LunarNewYear_Gourd01_7807111.blp
220093+
7807250;Creature/PalanquinMount_Classic/PalanquinMount_Classic_7807250.blp
220092220094
7807587;models/unktextures/ember_chunky_blankmorerotation_A_7807587.blp
220093220095
7807588;models/unktextures/White8x8_7807588.blp
220094220096
7807770;models/creature/unk_exp11_7734979/7734979_7807770.blp

0 commit comments

Comments
 (0)