diff --git a/.github/scripts/.last_wow_classic_build b/.github/scripts/.last_wow_classic_build
index e2e338342b..bc9aca9f9c 100644
--- a/.github/scripts/.last_wow_classic_build
+++ b/.github/scripts/.last_wow_classic_build
@@ -1 +1 @@
-7944060322116d6dbb71e20c9ec91b6a
+3bfcb1c121ecc3fbe0c4588619f0aedf
diff --git a/.github/scripts/.last_wow_classic_era_build b/.github/scripts/.last_wow_classic_era_build
index 1eb1b706bf..18294bd188 100644
--- a/.github/scripts/.last_wow_classic_era_build
+++ b/.github/scripts/.last_wow_classic_era_build
@@ -1 +1 @@
-9b47c882f5834aef0b831786b488d33b
+65ce5e8b78da2b111bcc43b907b36049
diff --git a/WeakAurasModelPaths/ModelPathsClassic.lua b/WeakAurasModelPaths/ModelPathsClassic.lua
index 45e0e8506b..30dc6dbae0 100644
--- a/WeakAurasModelPaths/ModelPathsClassic.lua
+++ b/WeakAurasModelPaths/ModelPathsClassic.lua
@@ -422,6 +422,17 @@ WeakAuras.ModelPaths = {
     text = "arfuspetclassic",
     value = "arfuspetclassic",
    },
+   {
+    children = {
+     {
+      fileId = "122971",
+      text = "arthasundead.m2",
+      value = "arthasundead.m2",
+     },
+    },
+    text = "arthasundead",
+    value = "arthasundead",
+   },
    {
     children = {
      {
@@ -2992,6 +3003,28 @@ WeakAuras.ModelPaths = {
     text = "pig",
     value = "pig",
    },
+   {
+    children = {
+     {
+      fileId = "125427",
+      text = "pitlord.m2",
+      value = "pitlord.m2",
+     },
+    },
+    text = "pitlord",
+    value = "pitlord",
+   },
+   {
+    children = {
+     {
+      fileId = "1418496",
+      text = "pitlord2.m2",
+      value = "pitlord2.m2",
+     },
+    },
+    text = "pitlord2",
+    value = "pitlord2",
+   },
    {
     children = {
      {
@@ -4109,6 +4142,17 @@ WeakAuras.ModelPaths = {
     text = "unicorn",
     value = "unicorn",
    },
+   {
+    children = {
+     {
+      fileId = "4059402",
+      text = "uther.m2",
+      value = "uther.m2",
+     },
+    },
+    text = "uther",
+    value = "uther",
+   },
    {
     children = {
      {
@@ -14478,6 +14522,11 @@ WeakAuras.ModelPaths = {
         text = "shield_round_b_01.m2",
         value = "shield_round_b_01.m2",
        },
+       {
+        fileId = "5937349",
+        text = "shield_shaman_a_01.m2",
+        value = "shield_shaman_a_01.m2",
+       },
        {
         fileId = "143029",
         text = "shield_stratholme_d_01.m2",
@@ -14488,6 +14537,11 @@ WeakAuras.ModelPaths = {
         text = "shield_stratholme_d_02.m2",
         value = "shield_stratholme_d_02.m2",
        },
+       {
+        fileId = "5937343",
+        text = "shield_warrior_a_01.m2",
+        value = "shield_warrior_a_01.m2",
+       },
        {
         fileId = "143063",
         text = "shield_wheel_b_01.m2",
@@ -17055,6 +17109,11 @@ WeakAuras.ModelPaths = {
         text = "knife_1h_pvphorde_a_01.m2",
         value = "knife_1h_pvphorde_a_01.m2",
        },
+       {
+        fileId = "5904689",
+        text = "knife_1h_rogue_a_01.m2",
+        value = "knife_1h_rogue_a_01.m2",
+       },
        {
         fileId = "146306",
         text = "knife_1h_standard_a_01.m2",
@@ -17225,6 +17284,11 @@ WeakAuras.ModelPaths = {
         text = "mace_1h_tauren_b_02.m2",
         value = "mace_1h_tauren_b_02.m2",
        },
+       {
+        fileId = "3096508",
+        text = "mace_1h_uther_d_01.m2",
+        value = "mace_1h_uther_d_01.m2",
+       },
        {
         fileId = "146725",
         text = "mace_1h_zulgurub_d_01.m2",
@@ -17375,6 +17439,11 @@ WeakAuras.ModelPaths = {
         text = "misc_1h_book_c_02.m2",
         value = "misc_1h_book_c_02.m2",
        },
+       {
+        fileId = "5904694",
+        text = "misc_1h_book_priest_a_01.m2",
+        value = "misc_1h_book_priest_a_01.m2",
+       },
        {
         fileId = "146950",
         text = "misc_1h_bottle_a_01.m2",
@@ -17745,6 +17814,16 @@ WeakAuras.ModelPaths = {
         text = "stave_2h_ahnqiraj_d_04.m2",
         value = "stave_2h_ahnqiraj_d_04.m2",
        },
+       {
+        fileId = "5937379",
+        text = "stave_2h_ancient_a_01.m2",
+        value = "stave_2h_ancient_a_01.m2",
+       },
+       {
+        fileId = "5937380",
+        text = "stave_2h_ancient_a_02.m2",
+        value = "stave_2h_ancient_a_02.m2",
+       },
        {
         fileId = "147399",
         text = "stave_2h_blackwing_a_01.m2",
@@ -17870,6 +17949,11 @@ WeakAuras.ModelPaths = {
         text = "stave_2h_long_epicpriest02.m2",
         value = "stave_2h_long_epicpriest02.m2",
        },
+       {
+        fileId = "5904691",
+        text = "stave_2h_mage_a_01.m2",
+        value = "stave_2h_mage_a_01.m2",
+       },
        {
         fileId = "147581",
         text = "stave_2h_medivh_d_01.m2",
@@ -17930,6 +18014,11 @@ WeakAuras.ModelPaths = {
         text = "stave_2h_stratholme_d_03.m2",
         value = "stave_2h_stratholme_d_03.m2",
        },
+       {
+        fileId = "5904690",
+        text = "stave_2h_warlock_a_01.m2",
+        value = "stave_2h_warlock_a_01.m2",
+       },
        {
         fileId = "147757",
         text = "stave_2h_zulgurub_d_01.m2",
@@ -18030,6 +18119,11 @@ WeakAuras.ModelPaths = {
         text = "sword_1h_horde_c_02.m2",
         value = "sword_1h_horde_c_02.m2",
        },
+       {
+        fileId = "5904688",
+        text = "sword_1h_hunter_a_01.m2",
+        value = "sword_1h_hunter_a_01.m2",
+       },
        {
         fileId = "147937",
         text = "sword_1h_katana_a_01.m2",
@@ -18360,6 +18454,11 @@ WeakAuras.ModelPaths = {
         text = "sword_2h_epic_a_03.m2",
         value = "sword_2h_epic_a_03.m2",
        },
+       {
+        fileId = "340549",
+        text = "sword_2h_frostmourne_d_02.m2",
+        value = "sword_2h_frostmourne_d_02.m2",
+       },
        {
         fileId = "148364",
         text = "sword_2h_horde_a_01.m2",
@@ -18425,6 +18524,11 @@ WeakAuras.ModelPaths = {
         text = "sword_2h_korean_c_01.m2",
         value = "sword_2h_korean_c_01.m2",
        },
+       {
+        fileId = "5904695",
+        text = "sword_2h_paladin_a_01.m2",
+        value = "sword_2h_paladin_a_01.m2",
+       },
        {
         fileId = "148485",
         text = "sword_2h_pvpalliance_a_01.m2",
@@ -18776,11 +18880,31 @@ WeakAuras.ModelPaths = {
     text = "6_0_flamesofragnaros_enchant.m2",
     value = "6_0_flamesofragnaros_enchant.m2",
    },
+   {
+    fileId = "970419",
+    text = "6_0_weaponenchant_healing_low.m2",
+    value = "6_0_weaponenchant_healing_low.m2",
+   },
+   {
+    fileId = "969719",
+    text = "6_0_weaponenchant_multistrike_low.m2",
+    value = "6_0_weaponenchant_multistrike_low.m2",
+   },
+   {
+    fileId = "970422",
+    text = "6_0_weaponenchant_pvp.m2",
+    value = "6_0_weaponenchant_pvp.m2",
+   },
    {
     fileId = "1611750",
     text = "7fx_kiljaeden_armageddon_meteor_missile.m2",
     value = "7fx_kiljaeden_armageddon_meteor_missile.m2",
    },
+   {
+    fileId = "1392611",
+    text = "7fx_weaponenchant_arcane.m2",
+    value = "7fx_weaponenchant_arcane.m2",
+   },
    {
     fileId = "1315162",
     text = "7fx_weaponenchant_energyfire.m2",
@@ -20672,6 +20796,11 @@ WeakAuras.ModelPaths = {
     text = "greaterheal_low_base.m2",
     value = "greaterheal_low_base.m2",
    },
+   {
+    fileId = "512480",
+    text = "green_gas_plague_cloud.m2",
+    value = "green_gas_plague_cloud.m2",
+   },
    {
     fileId = "166278",
     text = "greenghost_state.m2",
@@ -21405,6 +21534,11 @@ WeakAuras.ModelPaths = {
     text = "loyaltyup_impact_head.m2",
     value = "loyaltyup_impact_head.m2",
    },
+   {
+    fileId = "628731",
+    text = "mage_altertime_impact.m2",
+    value = "mage_altertime_impact.m2",
+   },
    {
     fileId = "166512",
     text = "mage_arcanebarrage_impact.m2",
@@ -21660,6 +21794,11 @@ WeakAuras.ModelPaths = {
     text = "missile_thorns.m2",
     value = "missile_thorns.m2",
    },
+   {
+    fileId = "166575",
+    text = "missile_wave_nature.m2",
+    value = "missile_wave_nature.m2",
+   },
    {
     fileId = "166579",
     text = "missile_wrench.m2",
@@ -21730,6 +21869,11 @@ WeakAuras.ModelPaths = {
     text = "nature_cast_hand.m2",
     value = "nature_cast_hand.m2",
    },
+   {
+    fileId = "166603",
+    text = "nature_form_precast.m2",
+    value = "nature_form_precast.m2",
+   },
    {
     fileId = "166604",
     text = "nature_precast_chest.m2",
@@ -21740,11 +21884,46 @@ WeakAuras.ModelPaths = {
     text = "nature_precast_low_hand.m2",
     value = "nature_precast_low_hand.m2",
    },
+   {
+    fileId = "304176",
+    text = "nature_rune_impact_base.m2",
+    value = "nature_rune_impact_base.m2",
+   },
+   {
+    fileId = "304323",
+    text = "nature_rune_shield_impact_base.m2",
+    value = "nature_rune_shield_impact_base.m2",
+   },
+   {
+    fileId = "303845",
+    text = "naturebeam_neutral_state_base.m2",
+    value = "naturebeam_neutral_state_base.m2",
+   },
+   {
+    fileId = "253570",
+    text = "naturebeam_state_base.m2",
+    value = "naturebeam_state_base.m2",
+   },
+   {
+    fileId = "166607",
+    text = "naturereflect_state_chest.m2",
+    value = "naturereflect_state_chest.m2",
+   },
    {
     fileId = "166608",
     text = "natureresistance_impact_base.m2",
     value = "natureresistance_impact_base.m2",
    },
+   {
+    fileId = "166609",
+    text = "natureward_impact_chest.m2",
+    value = "natureward_impact_chest.m2",
+   },
+   {
+    fileId = "329062",
+    text = "naturezone.m2",
+    value = "naturezone.m2",
+   },
    {
     fileId = "166610",
     text = "naxxramasstrike_impactdd_med_base.m2",
@@ -21860,6 +22039,11 @@ WeakAuras.ModelPaths = {
     text = "poison_impactdot_med_chest.m2",
     value = "poison_impactdot_med_chest.m2",
    },
+   {
+    fileId = "166646",
+    text = "poisonelemental_impact_base.m2",
+    value = "poisonelemental_impact_base.m2",
+   },
    {
     fileId = "166647",
     text = "poisonshield_state_base.m2",
@@ -22965,6 +23149,11 @@ WeakAuras.ModelPaths = {
     text = "wrath_precast_hand.m2",
     value = "wrath_precast_hand.m2",
    },
+   {
+    fileId = "253573",
+    text = "xplosion_nature_impact.m2",
+    value = "xplosion_nature_impact.m2",
+   },
    {
     fileId = "167229",
     text = "zig_missile.m2",
@@ -30397,6 +30586,23 @@ WeakAuras.ModelPaths = {
     text = "environment",
     value = "environment",
    },
+   {
+    children = {
+     {
+      children = {
+       {
+        fileId = "1328746",
+        text = "7xp_moustache.m2",
+        value = "7xp_moustache.m2",
+       },
+      },
+      text = "doodads",
+      value = "doodads",
+     },
+    },
+    text = "expansion06",
+    value = "expansion06",
+   },
    {
     children = {
      {