Skip to content

Commit

Permalink
Merge pull request #5106 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.97.41
  • Loading branch information
ThyWoof authored Dec 9, 2024
2 parents 33c3729 + 99de99e commit 9688ab2
Show file tree
Hide file tree
Showing 252 changed files with 141,554 additions and 6,734 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ artifacts/
StyleCopReport.xml

# Files built by Visual Studio
obj/
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,13 @@ CraftingManualRecipeEnchantJavelin_Frostburn Title='Enchant Frostburn Javelin'.
CraftingManualRecipeEnchantJavelin_Sharpness Title='Enchant Javelin of Sharpness'.
CraftingManualRecipeEnchantJavelin_Souldrinker Title='Enchant Souldrinker Javelin'.
CraftingManualRecipeEnchantJavelin_Whiteburn Title='Enchant Whiteburn Javelin'.
CraftingManualRecipeEnchantKatana_Bearclaw Title='Enchant Bearclaw Katana'.
CraftingManualRecipeEnchantKatana_Lightbringer Title='Enchant Lightbringer Katana'.
CraftingManualRecipeEnchantKatana_Souldrinker Title='Enchant Souldrinker Katana'.
CraftingManualRecipeEnchantKatana_Whiteburn Title='Enchant Whiteburn Katana'.
CraftingManualRecipeEnchantKatana+1 Title='Enchant Katana +1'.
CraftingManualRecipeEnchantKatana+2 Title='Enchant Katana +2'.
CraftingManualRecipeEnchantKatana+3 Title='Enchant Katana +3'.
CraftingManualRecipeEnchantLeather_Deflection Title='Enchant Leather of Deflection'.
CraftingManualRecipeEnchantLeather_FlameDancing Title='Enchant Leather of Flame Dancing'.
CraftingManualRecipeEnchantLeather_FrostWalking Title='Enchant Leather of Frost Walking'.
Expand Down Expand Up @@ -627,6 +634,7 @@ CraftingManualRecipePrimeCEHalberd Title='Prime Halberd'.
CraftingManualRecipePrimeCEHandXbow Title='Prime Hand Crossbow'.
CraftingManualRecipePrimeCELongMace Title='Prime Long Mace'.
CraftingManualRecipePrimeCEPike Title='Prime Pike'.
CraftingManualRecipePrimeKatana Title='Prime Katana'.
CreateDeadRisenGhost Title='Raise Spectral Avenger'.
CreateDeadRisenGhost Description='Summons <b>Spectral Avenger</b>:
A powerful, ethereal undead creature.'.
Expand Down
53 changes: 43 additions & 10 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9688ab2

Please sign in to comment.