Sync dev with upstream (2026-09-09) - #10
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Sync
devwithPathOfBuildingCommunity/PathOfBuilding-PoE2.Merged from upstream
fd4c1acb7Update spec — touchessrc/Export/spec.luaonly (31 ins / 31 del).Clean merge, no conflicts.
macOS port
Nothing needed forward-porting. Upstream's single file has no overlap with any fork-only patch.
Fork deltas verified present after the merge:
src/Launch.lua—jit.os == "OSX"→jit.off()block (7 lines) intact.src/Classes/TradeQueryRequests.lua—pseudoModLinenil guard + its marker comment intact.src/Classes/TradeQuery.lua— fork delta intact (14 ins / 56 del vs upstream).Verification
git diff --stat <pre> HEADlists onlysrc/Export/spec.lua. No fork-only file appears.git diff upstream/dev HEAD -- <file>confirms every live fork delta.a3e01e572'sprocessLinemarker comment about the dropped{fractured}/{crafted}prefix is absent because upstream has since adopted byte-identicalprocessLinecode. The fix is in the file; it is simply no longer a fork delta. Nothing restored.bustedis not installed locally, so the suite was not run here — relying on CIrun_tests/check_modcache.