Skip to content

Commit e8f499c

Browse files
MarlaminMarlamin
committed
Merge suggestions from #725 (closes #725)
1 parent 2b13718 commit e8f499c

File tree

2 files changed

+32
-31
lines changed

2 files changed

+32
-31
lines changed

‎parts/creature.csv‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66416,9 +66416,15 @@
6641666416
5098369;Creature/LunarDragonMount/LunarDragonMount_lod02.skin
6641766417
5098370;Creature/LunarDragonMount/LunarDragonMount_lod03.skin
6641866418
5098429;creature/Morchie/Morchie.m2
66419-
5098993;creature/scaleddrakemount/scaleddrakemount_lod01.skin
66420-
5099005;creature/scaleddrakemount/scaleddrakemount_lod02.skin
66421-
5099006;creature/scaleddrakemount/scaleddrakemount_lod03.skin
66419+
5098922;Creature/ScaledDrakeMount/DrakeSkinScaled_03.blp
66420+
5098930;Creature/ScaledDrakeMount/Frost3.blp
66421+
5098942;Creature/ScaledDrakeMount/DrakeSkinScaled_02.blp
66422+
5098954;Creature/ScaledDrakeMount/DrakeSkinScaled_01.blp
66423+
5098967;Creature/ScaledDrakeMount/PlasmaPartiBaseGlow2.blp
66424+
5098980;Creature/ScaledDrakeMount/DrakeMount_Saddle.blp
66425+
5098993;Creature/ScaledDrakeMount/ScaledDrakeMount_lod01.skin
66426+
5099005;Creature/ScaledDrakeMount/ScaledDrakeMount_lod02.skin
66427+
5099006;Creature/ScaledDrakeMount/ScaledDrakeMount_lod03.skin
6642266428
5099283;creature/FlameCat/FlameCat.m2
6642366429
5099599;creature/thunderhydra/thunderhydra_lod01.skin
6642466430
5099600;creature/thunderhydra/thunderhydra_lod02.skin
@@ -71732,6 +71738,7 @@
7173271738
5858574;Creature/NerubianBeetleLargeMount/NerubianBeetleLargeMount_Tan.blp
7173371739
5858885;Creature/HarronirBat/HarronirBat_Body_Blue.blp
7173471740
5858887;Creature/HarronirBat/HarronirBat_Body_Pink.blp
71741+
5858924;Creature/HarronirBat/ArmorReflect_Organic01.blp
7173571742
5858925;Creature/HarronirBat/HarronirBat0098-00.anim
7173671743
5858926;Creature/HarronirBat/HarronirBat0097-00.anim
7173771744
5858927;Creature/HarronirBat/HarronirBat0096-00.anim
@@ -72028,17 +72035,17 @@
7202872035
5902180;Creature/MechaDevilsaur/MechaDevilsaur_lod01.skin
7202972036
5902181;Creature/MechaDevilsaur/MechaDevilsaur_lod02.skin
7203072037
5902182;Creature/MechaDevilsaur/MechaDevilsaur_lod03.skin
72031-
5902794;Creature/BearMountUtility_Anvil/BearMountUtility_Anvil.m2
72032-
5902795;Creature/BearMountUtility_Satchel/BearMountUtility_Satchel.m2
72033-
5902806;Creature/BearMountUtility_Satchel/ArmorReflect4.blp
72034-
5902807;Creature/BearMountUtility_Anvil/BearMountUtility_Anvil00.skin
72035-
5902808;Creature/BearMountUtility_Anvil/BearMountUtility_Anvil_lod01.skin
72036-
5902809;Creature/BearMountUtility_Anvil/BearMountUtility_Anvil_lod02.skin
72037-
5902810;Creature/BearMountUtility_Anvil/BearMountUtility_Anvil_lod03.skin
72038-
5902811;Creature/BearMountUtility_Satchel/BearMountUtility_Satchel00.skin
72039-
5902812;Creature/BearMountUtility_Satchel/BearMountUtility_Satchel_lod01.skin
72040-
5902813;Creature/BearMountUtility_Satchel/BearMountUtility_Satchel_lod02.skin
72041-
5902814;Creature/BearMountUtility_Satchel/BearMountUtility_Satchel_lod03.skin
72038+
5902794;Creature/BearMountUtility/BearMountUtility_Anvil.m2
72039+
5902795;Creature/BearMountUtility/BearMountUtility_Satchel.m2
72040+
5902806;Creature/BearMountUtility/ArmorReflect4.blp
72041+
5902807;Creature/BearMountUtility/BearMountUtility_Anvil00.skin
72042+
5902808;Creature/BearMountUtility/BearMountUtility_Anvil_lod01.skin
72043+
5902809;Creature/BearMountUtility/BearMountUtility_Anvil_lod02.skin
72044+
5902810;Creature/BearMountUtility/BearMountUtility_Anvil_lod03.skin
72045+
5902811;Creature/BearMountUtility/BearMountUtility_Satchel00.skin
72046+
5902812;Creature/BearMountUtility/BearMountUtility_Satchel_lod01.skin
72047+
5902813;Creature/BearMountUtility/BearMountUtility_Satchel_lod02.skin
72048+
5902814;Creature/BearMountUtility/BearMountUtility_Satchel_lod03.skin
7204272049
5902815;Creature/Gazlowe/ArmorReflect4.blp
7204372050
5902817;Creature/Gazlowe/Gazlowe0120-00.anim
7204472051
5902818;Creature/Gazlowe/Gazlowe0119-00.anim
@@ -72471,6 +72478,7 @@
7247172478
5931571;Creature/Yeti_Greench2/Yeti_Greench2_lod01.skin
7247272479
5931572;Creature/Yeti_Greench2/Yeti_Greench2_lod02.skin
7247372480
5931573;Creature/Yeti_Greench2/Yeti_Greench2_lod03.skin
72481+
5931632;Creature/BearMountUtility/Glow128.blp
7247472482
5931638;Creature/MechaDevilsaurMount/Ember_Offset_Streak.blp
7247572483
5931639;Creature/MechaDevilsaurMount/White8x8.blp
7247672484
5931643;Creature/MechaDevilsaurMount/8FX_ExplosionSmoke_A.blp
@@ -73419,6 +73427,7 @@
7341973427
6156390;Creature/ShipMount/Ember_Offset.blp
7342073428
6156398;Creature/ShipMount/ShipMount.blp
7342173429
6156399;Creature/ShipMount/ArmorReflect4.blp
73430+
6156403;Creature/ShipMount/ArmorReflect_Organic01.blp
7342273431
6156404;Creature/ShipMount/ShipMount00.skin
7342373432
6156405;Creature/ShipMount/ShipMount_lod01.skin
7342473433
6156406;Creature/ShipMount/ShipMount_lod02.skin
@@ -74957,6 +74966,7 @@
7495774966
6405843;Creature/RutaaniBird/RutaaniBird_FX_Red.blp
7495874967
6405844;Creature/RutaaniBird/RutaaniBird_FX_Tan.blp
7495974968
6405845;Creature/RutaaniBird/RutaaniBird_FX_Lightbloom.blp
74969+
6405851;Creature/RutaaniBird/ArmorReflect_Organic01.blp
7496074970
6405858;Creature/RutaaniBird/RutaaniBird0097-00.anim
7496174971
6405863;Creature/RutaaniBird/RutaaniBird0097-01.anim
7496274972
6405868;Creature/RutaaniBird/RutaaniBird0096-00.anim
@@ -76505,6 +76515,7 @@
7650576515
6916909;Creature/RutaaniBirdMount/RutaaniBirdMount_FX_Pink.blp
7650676516
6916910;Creature/RutaaniBirdMount/RutaaniBirdMount_FX_Purple.blp
7650776517
6916911;Creature/RutaaniBirdMount/RutaaniBirdMount_FX_Red.blp
76518+
6916985;Creature/RutaaniBirdMount/ArmorReflect_Organic01.blp
7650876519
6916986;Creature/RutaaniBirdMount/ArmorReflect4.blp
7650976520
6916987;Creature/RutaaniBirdMount/RutaaniBirdMount0097-00.anim
7651076521
6916988;Creature/RutaaniBirdMount/RutaaniBirdMount0097-01.anim
@@ -78287,9 +78298,8 @@
7828778298
7263332;Creature/GrovemanFemale/GrovemanFemale_Skin_Green.blp
7828878299
7263333;Creature/GrovemanFemale/GrovemanFemale_Skin_Brown.blp
7828978300
7263334;Creature/GrovemanFemale/GrovemanFemale_Skin_Yellow.blp
78290-
7263530;Creature/AmaniBearMount2/armorreflect4.blp
78291-
7263532;Creature/AmaniBearMount2/AmaniBearMount2_7263534.blp
78292-
7263534;Creature/AmaniBearMount2/AmaniBearMount2_7263532.blp
78301+
7263530;Creature/AmaniBearMount2/ArmorReflect4.blp
78302+
7263532;Creature/AmaniBearMount2/ArmorReflect_Organic01.blp
7829378303
7263536;Creature/AmaniBearMount2/AmaniBearMount20097-00.anim
7829478304
7263538;Creature/AmaniBearMount2/AmaniBearMount20096-00.anim
7829578305
7263540;Creature/AmaniBearMount2/AmaniBearMount20098-00.anim
@@ -78306,7 +78316,8 @@
7830678316
7263563;Creature/AmaniBearMount2/AmaniBearMount2_lod01.skin
7830778317
7263565;Creature/AmaniBearMount2/AmaniBearMount2_lod02.skin
7830878318
7263567;Creature/AmaniBearMount2/AmaniBearMount2_lod03.skin
78309-
7263577;Creature/AmaniBearMount/armorreflect4.blp
78319+
7263577;Creature/AmaniBearMount/ArmorReflect4.blp
78320+
7263579;Creature/AmaniBearMount/ArmorReflect_Organic01.blp
7831078321
7263584;Creature/AmaniBearMount/AmaniBearMount0097-00.anim
7831178322
7263586;Creature/AmaniBearMount/AmaniBearMount0096-00.anim
7831278323
7263589;Creature/AmaniBearMount/AmaniBearMount0098-00.anim
@@ -79057,7 +79068,7 @@
7905779068
7448046;Creature/LavaSnailMount/LavaSnailMount_FX_Green.blp
7905879069
7448152;creature/riverotterlarge/riverotterlarge0100-00.anim
7905979070
7448153;creature/riverotterlarge/riverotterlarge0101-00.anim
79060-
7448870;Creature/HorseDragonMount/HorseDragonMount_Alpha.blp
79071+
7448870;Creature/HorseDragonMount/HorseDragonMount_Glow_BW.blp
7906179072
7449864;Creature/Warhorse2/9fx_flare_b.blp
7906279073
7449865;Creature/Warhorse2/grey50percentsquare16x16_a.blp
7906379074
7449872;Creature/NagaMale/NagaMale0075-00.anim
@@ -80020,6 +80031,7 @@
8002080031
7678042;Creature/HorseDragonMount_Classic/10FX_Lightning_Circle_BW_512.blp
8002180032
7678043;Creature/HorseDragonMount_Classic/White8x8.blp
8002280033
7678047;Creature/HorseDragonMount_Classic/ArmorReflect4.blp
80034+
7678048;Creature/HorseDragonMount_Classic/HorseDragonMount_Glow_BW_Classic.blp
8002380035
7678050;Creature/HorseDragonMount_Classic/lightningundertile_bw_2.blp
8002480036
7678054;Creature/HorseDragonMount_Classic/soft_flare_.blp
8002580037
7678057;Creature/HorseDragonMount_Classic/HorseDragonMount_Classic00.skin

‎parts/placeholder.csv‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99470,12 +99470,6 @@
9947099470
5098897;World/Expansion09/Doodads/Djaradin/10DJ_Djaradin_Shield01_5098897.blp
9947199471
5098898;World/Expansion09/Doodads/Djaradin/10DJ_Djaradin_Shield01_5098898.blp
9947299472
5098899;World/Expansion09/Doodads/Djaradin/10DJ_Djaradin_Shield01_5098899.blp
99473-
5098922;creature/scaleddrakemount/scaleddrakemount_5098922.blp
99474-
5098930;creature/scaleddrakemount/scaleddrakemount_5098930.blp
99475-
5098942;creature/scaleddrakemount/scaleddrakemount_5098942.blp
99476-
5098954;creature/scaleddrakemount/scaleddrakemount_5098954.blp
99477-
5098967;creature/scaleddrakemount/scaleddrakemount_5098967.blp
99478-
5098980;creature/scaleddrakemount/scaleddrakemount_5098980.blp
9947999473
5099024;character/nightelf/female/nightelffemale_hd_tattoo_5099024.blp
9948099474
5099025;Character/NightElf/Female/NightElfFemale_HD_tattoo_color_5099025.blp
9948199475
5099026;Character/NightElf/Female/NightElfFemale_HD_tattoo_color_5099026.blp
@@ -130719,7 +130713,6 @@
130719130713
5858758;item/objectcomponents/waist/buckle_raiddeathknightnerubian_d_01_5858758.blp
130720130714
5858867;World/Expansion10/Doodads/Earthen/11EA_Earthen_BannerStanding03_5858867.blp
130721130715
5858868;World/Expansion10/Doodads/Earthen/11EA_Earthen_BannerStanding03_5858868.blp
130722-
5858924;Creature/HarronirBat/HarronirBat_5858924.blp
130723130716
5860439;models/unknown/unk_exp10_5010353/5010353_5860439.blp
130724130717
5860451;World/WMO/autogen-names/nerubiancrypt/15908_lightcookie_5860451.blp
130725130718
5860452;World/WMO/autogen-names/nerubiancrypt/15908_lightcookie_5860452.blp
@@ -135975,7 +135968,6 @@
135975135968
5931567;Creature/Yeti_Greench2/Yeti_Greench2_5931567.blp
135976135969
5931569;Creature/Yeti_Greench2/Yeti_Greench2_5931569.blp
135977135970
5931578;ITEM/ObjectComponents/Weapon/Misc_1H_Bag_A_01_5931578.blp
135978-
5931632;Creature/BearMountUtility/BearMountUtility_5931632.blp
135979135971
5931641;Creature/MechaDevilsaurMount/MechaDevilsaurMount_5931641.blp
135980135972
5931649;Creature/MechaDevilsaurMount/MechaDevilsaurMount_5931649.blp
135981135973
5931655;Creature/MechaDevilsaurMount/MechaDevilsaurMount_5931655.blp
@@ -146802,7 +146794,6 @@
146802146794
6156400;Creature/ShipMount/ShipMount_6156400.blp
146803146795
6156401;Creature/ShipMount/ShipMount_6156401.blp
146804146796
6156402;Creature/ShipMount/ShipMount_6156402.blp
146805-
6156403;Creature/ShipMount/ShipMount_6156403.blp
146806146797
6156479;World/WMO/autogen-names/12eversongwathanancrypts/16845_6156479.blp
146807146798
6156480;World/WMO/autogen-names/12eversongwathanancrypts/16845_6156480.blp
146808146799
6156543;World/WMO/autogen-names/unknown/18195_lightcookie_6156543.blp
@@ -159776,7 +159767,6 @@
159776159767
6405751;models/spells/unk_exp10_6403991/640399100.skin
159777159768
6405774;models/world/unk_exp11_6036349/6036349_6405774.blp
159778159769
6405846;Creature/RutaaniBird/RutaaniBird_6405846.blp
159779-
6405851;Creature/RutaaniBird/RutaaniBird_6405851.blp
159780159770
6405855;Creature/RutaaniBird/RutaaniBird_6405855.blp
159781159771
6405953;models/world/unk_exp10_6405953/6405953.m2
159782159772
6405954;models/world/unk_exp10_6405954/6405954.m2
@@ -179187,7 +179177,6 @@
179187179177
6916982;Creature/RutaaniBirdMount/RutaaniBirdMount_6916982.blp
179188179178
6916983;Creature/RutaaniBirdMount/RutaaniBirdMount_6916983.blp
179189179179
6916984;Creature/RutaaniBirdMount/RutaaniBirdMount_6916984.blp
179190-
6916985;Creature/RutaaniBirdMount/RutaaniBirdMount_6916985.blp
179191179180
6917003;World/WMO/autogen-names/12delvesdevouringhost01/17123_6917003.blp
179192179181
6917006;World/WMO/autogen-names/12delvesdevouringhost01/17123_6917006.blp
179193179182
6917007;World/WMO/autogen-names/12delvesdevouringhost01/17123_6917007.blp
@@ -196656,6 +196645,7 @@
196656196645
7263396;models/spells/unk_exp11_7263289/7263289_lod02.skin
196657196646
7263399;models/spells/unk_exp11_7263289/7263289_lod03.skin
196658196647
7263515;World/Expansion11/Doodads/PlayerHousing/12PH_Leg_7AF_Shaman_WindChime02_7263515.blp
196648+
7263534;Creature/AmaniBearMount2/AmaniBearMount2_7263534.blp
196659196649
7263569;World/Expansion11/Doodads/PlayerHousing/12PH_Leg_7AF_Shaman_MissionBoard_7263569.blp
196660196650
7263655;models/creature/unk_exp11_6986068/6986068_7263655.blp
196661196651
7263656;models/creature/unk_exp11_6986068/6986068_7263656.blp
@@ -217485,7 +217475,6 @@
217485217475
7678044;Creature/HorseDragonMount_Classic/HorseDragonMount_Classic_7678044.blp
217486217476
7678045;Creature/HorseDragonMount_Classic/HorseDragonMount_Classic_7678045.blp
217487217477
7678046;Creature/HorseDragonMount_Classic/HorseDragonMount_Classic_7678046.blp
217488-
7678048;Creature/HorseDragonMount_Classic/HorseDragonMount_Classic_7678048.blp
217489217478
7678049;Creature/HorseDragonMount_Classic/HorseDragonMount_Classic_7678049.blp
217490217479
7678052;Creature/HorseDragonMount_Classic/HorseDragonMount_Classic_7678052.blp
217491217480
7678318;models/spells/unk_exp11_7678318/7678318.m2

0 commit comments

Comments
 (0)