Merge branch 'dev'

Author: LocalIdentity

.github/workflows/backport.yml

@@ -1,22 +1,55 @@
 name: Port changes to PoB2
+run-name: "Port PR #${{ github.event.pull_request.number || inputs.pr_number }} - ${{ github.event.pull_request.title || 'Manual dispatch' }}"
 
 on:
-    pull_request_target:
-        types: [closed]
-
-env:
-    LABEL_STRING: ${{ join(github.event.pull_request.labels.*.name, ',') }}
+  pull_request_target:
+    types: [closed]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: PoB1 PR number to port
+        required: true
+        type: number
 
 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 }}"}'
+  backport:
+    if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'pob2'))
+    runs-on: ubuntu-latest
+    steps:
+      - name: Determine PR number
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request_target" ]; then
+            echo "PR_NUMBER=${{ github.event.pull_request.number }}" >> "$GITHUB_ENV"
+          else
+            echo "PR_NUMBER=${{ github.event.inputs.pr_number }}" >> "$GITHUB_ENV"
+          fi
+
+      - name: Fetch PR details
+        id: payload
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: process.env.PR_NUMBER
+            });
+            const labels = pr.data.labels.map(l => l.name).join(',');
+            return JSON.stringify({
+              patch_url: pr.data.patch_url,
+              msg: `Apply changes from ${pr.data.html_url}`,
+              id: pr.data.number,
+              title: pr.data.title,
+              labels,
+              name: pr.data.user.name || pr.data.user.login,
+              user: pr.data.user.login,
+            });
 
+      - name: Notify PathOfBuilding-PoE2 repo
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.WIRES77_PAT }}
+          repository: ${{ github.repository_owner }}/PathOfBuilding-PoE2
+          event-type: port-changes
+          client-payload: ${{ steps.payload.outputs.result }}

.github/workflows/backport_receive.yml

@@ -1,5 +1,5 @@
 name: Update code with code from PoB2
-run-name: ${{ github.event.client_payload.title }}
+run-name: "PR #${{ github.event.client_payload.id }} - ${{ github.event.client_payload.title }}"
 
 on:
     repository_dispatch:
@@ -15,17 +15,22 @@ jobs:
               with:
                 ref: 'dev'
             - name: Apply patch
-              continue-on-error: true
               run: |
-                curl -L ${{ github.event.client_payload.patch_url }} | patch -p1 --merge --verbose -f -l --no-backup-if-mismatch
+                # Download patch first to avoid broken pipes if apply exits early
+                PATCH_FILE=$(mktemp)
+                curl -L ${{ github.event.client_payload.patch_url }} -o "$PATCH_FILE"
+                if ! git apply -v --3way --ignore-whitespace --index "$PATCH_FILE"; then
+                  echo "3-way apply failed, retrying with --reject"
+                  git apply -v --reject --ignore-whitespace --index "$PATCH_FILE" || true
+                fi
             - 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 }}
-                committer: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
                 author: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
+                committer: ${{ 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 }}
+                labels: ${{ github.event.client_payload.labels }}

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [v2.60.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v2.60.0) (2026/01/28)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.59.1...v2.60.0)
+
+
+## What's Changed
+### New to Path of Building
+- Add 3.27 Phrecia Tree [\#9437](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9437) ([ShadowTrolll](https://github.com/ShadowTrolll))
+- Add support for newer unveils on Bitterbind Point [\#9357](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9357) ([Peechey](https://github.com/Peechey))
+- Add "aoe" filtering for gem search [\#9433](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9433) ([Blitz54](https://github.com/Blitz54))
+### Fixed Crashes
+- Fix crash on adding support gems and importing items to many builds [\#9340](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9340) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Radius Jewels in Shared Items Crashing on Load [\#9349](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9349) ([Peechey](https://github.com/Peechey))
+- Fix Crash when sorting gems while using Foulborn Gruthkel's Pelt [\#9376](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9376) ([LocalIdentity](https://github.com/LocalIdentity))
+### User Interface
+- Fix Foulborn Icons showing on tree nodes, and foil items not importing type [\#9363](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9363) ([Blitz54](https://github.com/Blitz54))
+### Fixed Calculations
+- Fix Spellslinger gaining generic damage instead of Spell damage [\#9352](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9352) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Foulborn Choir of the Storm's Overcapped Mod not applying to Total Mana [\#9351](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9351) ([Peechey](https://github.com/Peechey))
+### Fixed Behaviours
+- Fix Party Tab max Fortify override not working [\#9342](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9342) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Utula's working with The Tides of Time [\#9436](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9436) ([Blitz54](https://github.com/Blitz54))
+### Accuracy Improvements
+- Updated Lori's Lantern text to match in-game description [\#9418](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9418) ([EminGul](https://github.com/EminGul))
+- Fix flavour text for some Uniques [\#9434](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9434) ([Blitz54](https://github.com/Blitz54))
+- Fix Sirus Meteor and Maven Memory game damage values [\#9372](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9372) ([LocalIdentity](https://github.com/LocalIdentity))
+
+
 ## [v2.59.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v2.59.2) (2025/11/23)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.59.1...v2.59.2)

Dockerfile

@@ -14,7 +14,7 @@ RUN wget https://luarocks.org/releases/luarocks-3.7.0.tar.gz && tar xf luarocks-
 RUN cd luarocks-3.7.0 && ./configure && make
 
 FROM buildbase AS luajit
-RUN git clone https://github.com/LuaJIT/LuaJIT && cd LuaJIT && git checkout c7db8255e1eb59f933fac7bc9322f0e4f8ddc6e6
+RUN git clone https://github.com/LuaJIT/LuaJIT && cd LuaJIT && git checkout 871db2c84ecefd70a850e03a6c340214a81739f0
 RUN cd LuaJIT && make
 
 FROM buildbase AS emmyluadebugger

changelog.txt

@@ -1,3 +1,31 @@
+VERSION[2.60.0][2026/01/28]
+
+--- New to Path of Building ---
+* Add 3.27 Phrecia Tree (ShadowTrolll)
+* Add support for newer unveils on Bitterbind Point (Peechey)
+* Add "aoe" filtering for gem search (Blitz54)
+
+--- Fixed Crashes ---
+* Fix crash on adding support gems and importing items to many builds (LocalIdentity)
+* Fix Radius Jewels in Shared Items Crashing on Load (Peechey)
+* Fix Crash when sorting gems while using Foulborn Gruthkel's Pelt (LocalIdentity)
+
+--- User Interface ---
+* Fix Foulborn Icons showing on tree nodes, and foil items not importing type (Blitz54)
+
+--- Fixed Calculations ---
+* Fix Spellslinger gaining generic damage instead of Spell damage (LocalIdentity)
+* Fix Foulborn Choir of the Storm's Overcapped Mod not applying to Total Mana (Peechey)
+
+--- Fixed Behaviours ---
+* Fix Party Tab max Fortify override not working (LocalIdentity)
+* Fix Utula's working with The Tides of Time (Blitz54)
+
+--- Accuracy Improvements ---
+* Updated Lori's Lantern text to match in-game description (EminGul)
+* Fix flavour text for some Uniques (Blitz54)
+* Fix Sirus Meteor and Maven Memory game damage values (LocalIdentity)
+
 VERSION[2.59.2][2025/11/23]
 
 --- Fixed Crashes ---

manifest.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <PoBVersion>
-	<Version number="2.59.2" />
+	<Version number="2.60.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/" />

runtime/lua/dkjson.lua

@@ -130,6 +130,26 @@ local function escapeutf8 (uchar)
   end
 end
 
+local function sortedkeys(tbl)
+  local keys = {}
+  for k in pairs(tbl) do
+    keys[#keys + 1] = k
+  end
+  table.sort(keys, function(a, b)
+    local ta, tb = type(a), type(b)
+    if ta == tb then
+      return a < b
+    end
+    if ta == "number" then
+      return true
+    elseif tb == "number" then
+      return false
+    end
+    return ta < tb
+  end)
+  return keys
+end
+
 local function fsub (str, pattern, repl)
   -- gsub always builds a new string in a buffer, even when no match
   -- exists. First using find should be more efficient when most strings
@@ -333,7 +353,10 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, s
           end
         end
       else -- unordered
-        for k,v in pairs (value) do
+        local keys = sortedkeys(value)
+        for i = 1, #keys do
+          local k = keys[i]
+          local v = value[k]
           buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
           if not buflen then return nil, msg end
           prev = true -- add a seperator before the next element

src/Classes/GemSelectControl.lua

@@ -186,6 +186,8 @@ function GemSelectClass:BuildList(buf)
 								tagName = "strength"
 							elseif tagName == "dex" then
 								tagName = "dexterity"
+							elseif tagName == "aoe" then
+								tagName = "area"
 							end
 							-- for :melee we want to exclude gems that DON'T have this tag
 							-- for :-melee we want to exclude gems that DO have this tag
@@ -590,7 +592,7 @@ function GemSelectClass:AddGemTooltip(gemInstance)
 		local grantedEffectSecondary = gemInstance.gemData.VaalGem and primary or secondary
 		self.tooltip:AddLine(fontSizeTitle, colorCodes.GEM .. altQualMap[gemInstance.qualityId]..grantedEffect.name, "FONTIN SC")
 		self.tooltip:AddSeparator(10)
-		self.tooltip:AddLine(fontSizeBig, "^x7F7F7F" .. gemInstance.gemData.tagString)
+		self.tooltip:AddLine(fontSizeBig, "^x7F7F7F" .. gemInstance.gemData.tagString, "FONTIN SC")
 		self:AddCommonGemInfo(gemInstance, grantedEffect, true)
 		self.tooltip:AddSeparator(10)
 		self.tooltip:AddLine(fontSizeTitle, colorCodes.GEM .. (gemInstance.gemData.secondaryEffectName or grantedEffectSecondary.name), "FONTIN SC")

src/Classes/ImportTab.lua

@@ -1065,6 +1065,23 @@ function ImportTabClass:ImportItem(itemData, slotName)
 			end
 		end
 	end
+	if itemData.foilVariation or itemData.isRelic then
+		local foilVariants = {
+			"Amethyst",
+			"Verdant",
+			"Ruby",
+			"Cobalt",
+			"Sunset",
+			"Aureate",
+			"Celestial Quartz",
+			"Celestial Ruby",
+			"Celestial Emerald",
+			"Celestial Aureate",
+			"Celestial Pearl",
+			"Celestial Amethyst",
+		}
+		item.foilType = foilVariants[itemData.foilVariation] or "Rainbow"
+	end
 
 	-- Add and equip the new item
 	item:BuildAndParseRaw()

src/Classes/PassiveTreeView.lua

@@ -1111,7 +1111,7 @@ function PassiveTreeViewClass:AddNodeName(tooltip, node, build)
 	else
 		tooltip.tooltipHeader = tooltipMap[node.type] or "UNKNOWN"
 	end
-	nodeName = node.dn
+	local nodeName = node.dn
 	if main.showFlavourText then
 		nodeName = "^xF8E6CA" .. node.dn
 	end