From 39deef45ea87d69bd3719e55b091b51757d3e952 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Mon, 15 Dec 2025 13:56:59 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9216 --- .github/tweak_changelogs.sh | 2 + changelog.txt.rej | 112 ++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 changelog.txt.rej diff --git a/.github/tweak_changelogs.sh b/.github/tweak_changelogs.sh index 1d32a48078..d2db1fb0ce 100755 --- a/.github/tweak_changelogs.sh +++ b/.github/tweak_changelogs.sh @@ -50,6 +50,8 @@ sed -i -re 's/( \()?\[\\#[0-9]+\]\([^)]*\),? ?\)?//g' changelog_temp.txt sed -i -re 's/\[([^]]*)\]\(https:\/\/github\.com\/[^)]*\)/\1/g' changelog_temp.txt # Create new changelog format: add version header, remove lines 2-3, format section headers, remove ## headers with following line, prepend to existing changelog echo "VERSION[${RELEASE_VERSION#v}][$(date +'%Y/%m/%d')]" | cat - changelog_temp.txt | sed '2,3d' | sed -re 's/^### (.*)/\n--- \1 ---/' | sed -e '/^##.*/,+1 d' | cat - changelog.txt > changelog_new.txt +# Convert dashes to asterisks for bullet points +sed -i -e 's/^- /* /' changelog_new.txt mv changelog_new.txt changelog.txt # Normalize line endings to CRLF for all output files to ensure consistent checksums with Windows diff --git a/changelog.txt.rej b/changelog.txt.rej new file mode 100644 index 0000000000..5d693c9817 --- /dev/null +++ b/changelog.txt.rej @@ -0,0 +1,112 @@ +diff a/changelog.txt b/changelog.txt (rejected hunks) +@@ -1,54 +1,54 @@ + VERSION[2.58.1][2025/11/05] + + --- User Interface --- +-- Fix incorrect tooltip when crafting some flask mods (LocalIdentity) +-- Fix Damage Gain breakdown including skill conversion (LocalIdentity) +-- Fix insufficient skill cost warning applying to other skills (LocalIdentity) ++* Fix incorrect tooltip when crafting some flask mods (LocalIdentity) ++* Fix Damage Gain breakdown including skill conversion (LocalIdentity) ++* Fix insufficient skill cost warning applying to other skills (LocalIdentity) + + --- Fixed Calculations --- +-- Fix Spectre conversion multiplier applying to "gain as x" mods and Chaos damage (LocalIdentity) +-- Fix Pyroclast Mine Exposure being inverted and unscalable (LocalIdentity) ++* Fix Spectre conversion multiplier applying to "gain as x" mods and Chaos damage (LocalIdentity) ++* Fix Pyroclast Mine Exposure being inverted and unscalable (LocalIdentity) + + --- Fixed Behaviours --- +-- Fix Intuitive Leap, Thread of Hope and Impossible Escape not parsing correctly (Wires77) +-- Fix mod order when crafting Grafts (LocalIdentity) +-- Fix "Farewell to Flesh" not applying to Agony Crawler ailment damage (LocalIdentity) +-- Fix Dying Breath Curse effect mod not working (LocalIdentity) ++* Fix Intuitive Leap, Thread of Hope and Impossible Escape not parsing correctly (Wires77) ++* Fix mod order when crafting Grafts (LocalIdentity) ++* Fix "Farewell to Flesh" not applying to Agony Crawler ailment damage (LocalIdentity) ++* Fix Dying Breath Curse effect mod not working (LocalIdentity) + + + VERSION[2.58.0][2025/11/03] + + --- Keepers of the Flame --- +-- Update and add new 3.27 skills (LocalIdentity) +-- Add new Wand and Ring item bases (LocalIdentity) +-- Add initial support for Grafts (LocalIdentity) +-- Add initial support for Foulborn unique mods (Wires77) +-- Add Support for new Monster Phys damage conversion logic (LocalIdentity) +-- Add support for "Farewell to Flesh" (Lycia Bloodline Herald Ascendancy Node) (majochem) +-- Add instant buyout to search URLs (Goufix) ++* Update and add new 3.27 skills (LocalIdentity) ++* Add new Wand and Ring item bases (LocalIdentity) ++* Add initial support for Grafts (LocalIdentity) ++* Add initial support for Foulborn unique mods (Wires77) ++* Add Support for new Monster Phys damage conversion logic (LocalIdentity) ++* Add support for "Farewell to Flesh" (Lycia Bloodline Herald Ascendancy Node) (majochem) ++* Add instant buyout to search URLs (Goufix) + + --- User Interface --- +-- Show Foulborn Icon on new Foulborn uniques and flavour text on new base items (Blitz54) +-- Sort Replica Dragonfang's Flight mods (Wires77) +-- Fix "The Tactician" missing flavour text (Nightblade) ++* Show Foulborn Icon on new Foulborn uniques and flavour text on new base items (Blitz54) ++* Sort Replica Dragonfang's Flight mods (Wires77) ++* Fix "The Tactician" missing flavour text (Nightblade) + + --- Fixed Calculations --- +-- Fix Warcry uptime when using Dual Strike of Ambidexterity (LocalIdentity) ++* Fix Warcry uptime when using Dual Strike of Ambidexterity (LocalIdentity) + + --- Fixed Behaviours --- +-- Fix Gem dropdown tooltip not updating when hovering over gems (LocalIdentity) +-- Fix Aul Bloodline Aura nodes always applying (LocalIdentity) +-- Fix Everlasting Sacrifice not showing the config from the Chaos Ascendancy (Wires77) +-- Fix Intuitive Leap, Thread of Hope and Impossible Escape not working (n1tr0xs) +-- Fix legacy Curse cluster not appearing on tree sometimes (LocalIdentity) +-- Fix Overexertion and Echoes of Creation counting duplicate Warcries (LocalIdentity) +-- Fix Chaos Inoculation not disabling Righteous Fire Buff and Degen (LocalIdentity) ++* Fix Gem dropdown tooltip not updating when hovering over gems (LocalIdentity) ++* Fix Aul Bloodline Aura nodes always applying (LocalIdentity) ++* Fix Everlasting Sacrifice not showing the config from the Chaos Ascendancy (Wires77) ++* Fix Intuitive Leap, Thread of Hope and Impossible Escape not working (n1tr0xs) ++* Fix legacy Curse cluster not appearing on tree sometimes (LocalIdentity) ++* Fix Overexertion and Echoes of Creation counting duplicate Warcries (LocalIdentity) ++* Fix Chaos Inoculation not disabling Righteous Fire Buff and Degen (LocalIdentity) + + --- Accuracy Improvements --- +-- Fix Burning Ground from Replica Siegebreaker not working (pabgarbar) ++* Fix Burning Ground from Replica Siegebreaker not working (pabgarbar) + + --- Other changes --- +-- Fix broken header images on Linux (ZereoX) ++* Fix broken header images on Linux (ZereoX) + + VERSION[2.57.0][2025/10/30] + +@@ -2587,7 +2587,7 @@ VERSION[2.19.0][2022/07/12] + VERSION[2.18.1][2022/06/05] + + --- Fixed Bugs --- +-- Fix crash related to Life gain on Block (Regisle) ++* Fix crash related to Life gain on Block (Regisle) + + VERSION[2.18.0][2022/06/05] + +@@ -2833,7 +2833,7 @@ VERSION[2.14.0][2022/02/05] + * Add Armour and Evasion sorting to the tree and uniques tab (Lexy) + * Add Mastery tooltip for an unallocated node when comparing trees (pHiney) + * Add improvements to multiple passive tree jewel socket management (Lothrik) +-- Update tree images to use the latest colours (LocalIdentity) ++* Update tree images to use the latest colours (LocalIdentity) + * Fix Passive Tree Management Titles (pHiney) + + --- New Calculations --- +@@ -2862,7 +2862,7 @@ VERSION[2.14.0][2022/02/05] + * Update Crimson Storm changes (lpolaright) + * Update Whispering Ice and its trigger conditions (Nostrademous) + * Update Kraityn's bandit rewards based on 3.16 values (Prismateria) +-- Update Kingmaker with 3.16 changes (Wires77) ++* Update Kingmaker with 3.16 changes (Wires77) + * Update Blightwell and Solstice Vigil to 3.16.0 (Lothrik) + * Update Saqawals Flock to 3.16 values (Lexy) + * Update Survival Jewels to 3.16.0 (Lothrik) From ac47c3ce463c6694f39e66239f32b25dbebbe1bf Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Tue, 16 Dec 2025 02:35:18 +1100 Subject: [PATCH 2/2] Fix conflict --- changelog.txt.rej | 112 ---------------------------------------------- 1 file changed, 112 deletions(-) delete mode 100644 changelog.txt.rej diff --git a/changelog.txt.rej b/changelog.txt.rej deleted file mode 100644 index 5d693c9817..0000000000 --- a/changelog.txt.rej +++ /dev/null @@ -1,112 +0,0 @@ -diff a/changelog.txt b/changelog.txt (rejected hunks) -@@ -1,54 +1,54 @@ - VERSION[2.58.1][2025/11/05] - - --- User Interface --- --- Fix incorrect tooltip when crafting some flask mods (LocalIdentity) --- Fix Damage Gain breakdown including skill conversion (LocalIdentity) --- Fix insufficient skill cost warning applying to other skills (LocalIdentity) -+* Fix incorrect tooltip when crafting some flask mods (LocalIdentity) -+* Fix Damage Gain breakdown including skill conversion (LocalIdentity) -+* Fix insufficient skill cost warning applying to other skills (LocalIdentity) - - --- Fixed Calculations --- --- Fix Spectre conversion multiplier applying to "gain as x" mods and Chaos damage (LocalIdentity) --- Fix Pyroclast Mine Exposure being inverted and unscalable (LocalIdentity) -+* Fix Spectre conversion multiplier applying to "gain as x" mods and Chaos damage (LocalIdentity) -+* Fix Pyroclast Mine Exposure being inverted and unscalable (LocalIdentity) - - --- Fixed Behaviours --- --- Fix Intuitive Leap, Thread of Hope and Impossible Escape not parsing correctly (Wires77) --- Fix mod order when crafting Grafts (LocalIdentity) --- Fix "Farewell to Flesh" not applying to Agony Crawler ailment damage (LocalIdentity) --- Fix Dying Breath Curse effect mod not working (LocalIdentity) -+* Fix Intuitive Leap, Thread of Hope and Impossible Escape not parsing correctly (Wires77) -+* Fix mod order when crafting Grafts (LocalIdentity) -+* Fix "Farewell to Flesh" not applying to Agony Crawler ailment damage (LocalIdentity) -+* Fix Dying Breath Curse effect mod not working (LocalIdentity) - - - VERSION[2.58.0][2025/11/03] - - --- Keepers of the Flame --- --- Update and add new 3.27 skills (LocalIdentity) --- Add new Wand and Ring item bases (LocalIdentity) --- Add initial support for Grafts (LocalIdentity) --- Add initial support for Foulborn unique mods (Wires77) --- Add Support for new Monster Phys damage conversion logic (LocalIdentity) --- Add support for "Farewell to Flesh" (Lycia Bloodline Herald Ascendancy Node) (majochem) --- Add instant buyout to search URLs (Goufix) -+* Update and add new 3.27 skills (LocalIdentity) -+* Add new Wand and Ring item bases (LocalIdentity) -+* Add initial support for Grafts (LocalIdentity) -+* Add initial support for Foulborn unique mods (Wires77) -+* Add Support for new Monster Phys damage conversion logic (LocalIdentity) -+* Add support for "Farewell to Flesh" (Lycia Bloodline Herald Ascendancy Node) (majochem) -+* Add instant buyout to search URLs (Goufix) - - --- User Interface --- --- Show Foulborn Icon on new Foulborn uniques and flavour text on new base items (Blitz54) --- Sort Replica Dragonfang's Flight mods (Wires77) --- Fix "The Tactician" missing flavour text (Nightblade) -+* Show Foulborn Icon on new Foulborn uniques and flavour text on new base items (Blitz54) -+* Sort Replica Dragonfang's Flight mods (Wires77) -+* Fix "The Tactician" missing flavour text (Nightblade) - - --- Fixed Calculations --- --- Fix Warcry uptime when using Dual Strike of Ambidexterity (LocalIdentity) -+* Fix Warcry uptime when using Dual Strike of Ambidexterity (LocalIdentity) - - --- Fixed Behaviours --- --- Fix Gem dropdown tooltip not updating when hovering over gems (LocalIdentity) --- Fix Aul Bloodline Aura nodes always applying (LocalIdentity) --- Fix Everlasting Sacrifice not showing the config from the Chaos Ascendancy (Wires77) --- Fix Intuitive Leap, Thread of Hope and Impossible Escape not working (n1tr0xs) --- Fix legacy Curse cluster not appearing on tree sometimes (LocalIdentity) --- Fix Overexertion and Echoes of Creation counting duplicate Warcries (LocalIdentity) --- Fix Chaos Inoculation not disabling Righteous Fire Buff and Degen (LocalIdentity) -+* Fix Gem dropdown tooltip not updating when hovering over gems (LocalIdentity) -+* Fix Aul Bloodline Aura nodes always applying (LocalIdentity) -+* Fix Everlasting Sacrifice not showing the config from the Chaos Ascendancy (Wires77) -+* Fix Intuitive Leap, Thread of Hope and Impossible Escape not working (n1tr0xs) -+* Fix legacy Curse cluster not appearing on tree sometimes (LocalIdentity) -+* Fix Overexertion and Echoes of Creation counting duplicate Warcries (LocalIdentity) -+* Fix Chaos Inoculation not disabling Righteous Fire Buff and Degen (LocalIdentity) - - --- Accuracy Improvements --- --- Fix Burning Ground from Replica Siegebreaker not working (pabgarbar) -+* Fix Burning Ground from Replica Siegebreaker not working (pabgarbar) - - --- Other changes --- --- Fix broken header images on Linux (ZereoX) -+* Fix broken header images on Linux (ZereoX) - - VERSION[2.57.0][2025/10/30] - -@@ -2587,7 +2587,7 @@ VERSION[2.19.0][2022/07/12] - VERSION[2.18.1][2022/06/05] - - --- Fixed Bugs --- --- Fix crash related to Life gain on Block (Regisle) -+* Fix crash related to Life gain on Block (Regisle) - - VERSION[2.18.0][2022/06/05] - -@@ -2833,7 +2833,7 @@ VERSION[2.14.0][2022/02/05] - * Add Armour and Evasion sorting to the tree and uniques tab (Lexy) - * Add Mastery tooltip for an unallocated node when comparing trees (pHiney) - * Add improvements to multiple passive tree jewel socket management (Lothrik) --- Update tree images to use the latest colours (LocalIdentity) -+* Update tree images to use the latest colours (LocalIdentity) - * Fix Passive Tree Management Titles (pHiney) - - --- New Calculations --- -@@ -2862,7 +2862,7 @@ VERSION[2.14.0][2022/02/05] - * Update Crimson Storm changes (lpolaright) - * Update Whispering Ice and its trigger conditions (Nostrademous) - * Update Kraityn's bandit rewards based on 3.16 values (Prismateria) --- Update Kingmaker with 3.16 changes (Wires77) -+* Update Kingmaker with 3.16 changes (Wires77) - * Update Blightwell and Solstice Vigil to 3.16.0 (Lothrik) - * Update Saqawals Flock to 3.16 values (Lexy) - * Update Survival Jewels to 3.16.0 (Lothrik)