Merge branch 'dev'

Author: LocalIdentity

.github/workflows/backport.yml

@@ -0,0 +1,22 @@
+name: Port changes to PoB2
+
+on:
+    pull_request_target:
+        types: [closed]
+
+env:
+    LABEL_STRING: ${{ join(github.event.pull_request.labels.*.name, ',') }}
+
+jobs:
+    backport:
+        if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'pob2')
+        runs-on: ubuntu-latest
+        steps:
+            - name: Notify PathOfBuilding repo
+              uses: peter-evans/repository-dispatch@v3
+              with:
+                token: ${{ secrets.WIRES77_PAT }}
+                repository: ${{ github.repository_owner }}/PathOfBuilding-PoE2
+                event-type: port-changes
+                client-payload: '{"patch_url": "${{ github.event.pull_request.patch_url }}", "msg": "Apply changes from ${{ github.event.pull_request.html_url }}", "id": ${{ github.event.pull_request.number }}, "title": "${{ github.event.pull_request.title }}", "labels": "${{ env.LABEL_STRING }}", "name": "${{ github.event.pull_request.user.name }}", "user": "${{ github.event.pull_request.user.login }}"}'
+

.github/workflows/backport_receive.yml

@@ -0,0 +1,28 @@
+name: Update code with code from PoB2
+
+on:
+    repository_dispatch:
+        types:
+            - port-changes
+
+jobs:
+    apply-patch:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+              with:
+                ref: 'dev'
+            - name: Apply patch
+              run: |
+                curl -L ${{ github.event.client_payload.patch_url }} | git apply -v --index
+            - name: Create Pull Request
+              uses: peter-evans/create-pull-request@v5
+              with:
+                title: "[pob2-port] ${{ github.event.client_payload.title }}"
+                branch: pob2-pr-${{ github.event.client_payload.id }}
+                body: |
+                  ${{ github.event.client_payload.msg }}
+                author: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
+                commit-message: ${{ github.event.client_payload.msg }}
+                labels: ${{ github.event.client_payload.labels }}

.github/workflows/release.yml

@@ -40,6 +40,7 @@ jobs:
                 sed -i 's/\[Voronoff/\[Tom Clancy Is Dead/' temp_change.md;
                 sed -i 's/\[PJacek/\[TPlant/' temp_change.md;
                 sed -i 's/\[justjuangui/\[trompetin17/' temp_change.md;
+                sed -i 's/\r//g' temp_change.md;
                 cp temp_change.md changelog_temp.txt;
                 cat CHANGELOG.md | tr \\r \\n | sed '1d' >> temp_change.md;
                 printf "# Changelog\n\n## [v${{ github.event.inputs.releaseVersion }}](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v${{ github.event.inputs.releaseVersion }}) ($(date +'%Y/%m/%d'))\n\n" | cat - temp_change.md > CHANGELOG.md;

CHANGELOG.md

@@ -208,7 +208,7 @@ Z:\home\dev\.vscode\extensions\tangzx.emmylua-0.8.20-linux-x64\debugger\emmy\win
 
 ## Testing
 
-PoB uses the [Busted](https://olivinelabs.com/busted/) framework to run its tests. Tests are stored under `spec/System` and run automatically when a PR is modified.
+PoB uses the [Busted](https://lunarmodules.github.io/busted/) framework to run its tests. Tests are stored under `spec/System` and run automatically when a PR is modified.
 More tests can be added to this folder to test specific functionality, or new test builds can be added to ensure nothing changed that wasn't intended. 
 
 ### Running tests

CONTRIBUTING.md

@@ -37,10 +37,12 @@ The JSON data and required skill tree assets should come in a `.zip` archive.
 Steps:
 1. Download the `.zip` archive.
 2. Create a new directory in `./src/TreeData` with the following schema:
-    `<major_league_version>_<minor_league_version>`.
+    `<major_league_version>_<minor_league_version>`. For alternate or ruthless trees, add the suffixing as appropriate.
     For 3.14, the correct directory name would be `3_14`.
+    For 3.25 Ruthless 'alternate' tree, the correct directory name would be `3_25_ruthless_alternate`.
 3. Copy the following file from the `.zip` archive root to the new directory:
    * `data.json`.
+   Note for Ruthless for example, the exported data from GGG will be `ruthless.json`, and this file should be copied into the new directory and renamed to `data.json` for the following steps to pick it up.
 4. Copy the following files from the `assets` subdirectory in the `.zip` archive to the
     new directory:
     * `mastery-active-effect-3.png`
@@ -54,7 +56,7 @@ Steps:
    according to the file's format. This is important, otherwise the JSON data converter
    won't trigger.
 7. Restart Path of Building Community. This should result in a new file `tree.lua`.
-8. Remove `data.json` and `sprites.json` from the new directory. Do not commit these files.
+8. Remove `data.json` and `sprites.json` from the new directories. Do not commit these files.
 
 ## Timeless Jewel updates
 

RELEASE.md

@@ -1,3 +1,77 @@
+VERSION[2.53.0][2025/06/13]
+
+--- 3.26 Mercenaries of Trarthus ---
+* Add new skill trees (Ariacell)
+* Add showcased Mercenaries of Trarthus uniques (Paliak)
+* Update uniques from patch notes (Tandrial)
+* Add support for Vile Bastion Energy Shield per Spell Block mod (Ariacell)
+* Add support for Fortification stacks above 20 (Zpooks)
+* Add support for Minion Elemental conversion mods (Paliak)
+* Add support for "with spell skills" mods (NL908)
+* Add support for Shaper of Winter/Call of the Void damage taken mod (dcepil)
+* Update Arcane Surge cast speed from 10% to 20% (Ariacell, Paliak)
+* Update Death Aura damage (samimisami)
+
+--- New to Path of Building ---
+* Add support for Wintertide Brand average DOT calculation (czarandy)
+* Add support for self-cast Hydrosphere DPS (CedrN)
+* Add Karui Backburner Spectre (LollashTTV)
+* Add support for Rejuvenation Totem Mana helm enchant (Blitz54)
+* Add support for Tornado Shot legacy Helm Enchant (Blitz54)
+* Add support for +1 Rallying/Battlemage Cry exerted attacks Helm Enchant (Blitz54)
+* Add support for Felbog Fang Hindered mod (Blitz54)
+* Add support for "minions recover #% life on block" (Blitz54)
+* Add support for Assured Strike tree node (Blitz54)
+* Add support for Settling Ash tree passive (Blitz54)
+* Add a warning when more than one Aspect skill is active (Paliak)
+* Add support for Ewar's Mirage +1 projectile when in off-hand (Blitz54)
+* Add resource lost information to enemy damage breakdown (Edvinas-Smita)
+* Add support for Aquamarine Flask "reduced effect of freeze on you" (Blitz54)
+* Resume failed update feature (Wires77)
+
+--- User Interface ---
+* Add shortcut to copy node text from Passive Tree to the clipboard (rexfox147)
+* Keep Max Price and Max Level between Trade Queries (mcagnion)
+* Change wording for Base Damage Reduction in Hit taken breakdown (DarkJaslo)
+* Show stored uses in Warcry uptime tooltip (CedrN)
+
+--- Fixed Crashes ---
+* Fix crash when importing skill tree (Wires77)
+
+--- Fixed Calculations ---
+* Fix Explosive Arrow multiplying fuse rate by action speed twice (NL908)
+* Fix Gain Ward instead of Armour/Evasion mod when total is above 100 (LocalIdentity)
+* Fix Herald of Ash damage showing negative values (LocalIdentity)
+* Fix Puppeteer Caustic Ground on death calculation (LocalIdentity)
+* Fix Tincture CDR mod and Mana Burn rate display bug (LocalIdentity)
+* Fix Relic Flask's combining effect with Unique flask of the same name (LocalIdentity)
+* Fix negative Impale DPS for dual wielding combined attacks (andyli00)
+* Improve MoM + EB (+ES bypass) calculations (Edvinas-Smita)
+
+--- Fixed Behaviours ---
+* Fix issues around importing to the wrong tree (Wires77)
+* Fix Sacrificial Zeal appearing on new builds (Paliak)
+* Fix Foxshade Life modifiers preventing Life mastery (Blitz54)
+* Fix Gruthkul's Pelt disabling on hit curses (Paliak)
+* Fix Minion supports not scaling Siegebreaker ground DoT (LocalIdentity)
+* Fix The Baron and Rotting Might not stacking correctly (LocalIdentity)
+* Fix Wiki hotkey (F1) not working correctly on Relic Items (LocalIdentity)
+* Fix Moonbender's Wing applying to Shield skills (LocalIdentity)
+* Fix Queen's Hunger mod not working (Wires77)
+
+--- Accuracy Improvements ---
+* Remove Royale mods from craft menu and exporter (Blitz54)
+* Update Shepherd of Souls Keystone mods (rexfox147)
+* Fix many unique staves with Attack block instead of Spell block implicit (Blitz54, LocalIdentity)
+* Update Malachai's Mark mods (Blitz54)
+* Fix Tides of Time unique belt not having Shaper influence (RealWhimsy)
+* Fix Dominating Blow Hit counting multiple times when used in FullDPS (Paliak)
+* Fix Gem-lined Cap Ascendancy Notable not applying (Paliak)
+* Fix first explicit mod missing when importing some uniques (Paliak)
+* Update Scold's Bridle self-damage wording (HeffU)
+* Remove channelling part from Divine Ire of Disintegration (Tntmister)
+
+
 VERSION[2.52.3][2025/02/20]
 
 --- New to Path of Building ---

changelog.txt

@@ -36,6 +36,8 @@ Often a mod will only apply under certain conditions, apply multiple times based
     * var: mod to multiply by
     * limit: The maximum number the mod can go up to
     * limitTotal: boolean that changes the behavior of limit to apply after multiplication.  Defaults to false.
+	* globalLimit: The maximum global number the mod can go up to, even with multiple sources. Useful for mods that say "up to a maximum of ..."
+    * globalLimitKey: string identifier for the global limit. Mods with identical keys cannot go over the globalLimit.
 * MultiplierThreshold: Similar to a condition that only applies when the variable is above a specified threshold
     * var: name of the mod
     * threshold: number to reach before the mod applies

docs/modSyntax.md

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <PoBVersion>
-	<Version number="2.52.3" />
+	<Version number="2.53.0" />
 	<Source part="default" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/" />
 	<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/runtime/" />
 	<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/src/" />