Skip to content

Sync upstream dev (2026-07-29) - #6

Merged
pathanin merged 9 commits into
devfrom
sync-upstream-2026-07-29
Jul 28, 2026
Merged

Sync upstream dev (2026-07-29)#6
pathanin merged 9 commits into
devfrom
sync-upstream-2026-07-29

Conversation

@pathanin

Copy link
Copy Markdown
Owner

Merged upstream commits

  1. c8e0ff03f Fix trader crash (Fix trader crash PathOfBuildingCommunity/PathOfBuilding-PoE2#2398)
  2. 45c435071 Add legacy flag to Commandment support (Add legacy flag to Commandment support PathOfBuildingCommunity/PathOfBuilding-PoE2#2387)
  3. 11e177702 Fix Gemling Frost Wall Ice Crystal life (Fix Gemling Frost Wall Ice Crystal life PathOfBuildingCommunity/PathOfBuilding-PoE2#2386)
  4. 2d916fc91 Update to SimpleGraphic v2.5.4 (Update to SimpleGraphic v2.5.4 PathOfBuildingCommunity/PathOfBuilding-PoE2#2391)
    5-8. Release 0.23.1 changes

macOS port verification

  • Launch.lua — JIT-disable macOS fix preserved (clean merge, no changes needed)
  • TradeQueryRequests.lua — Conflict resolved: took upstream's processLine refactor with or {} guards (supersedes fork's string-or-object fallback), fixed nil-crash bug in pseudoModLine:match
  • TradeQuery.lua — Fork's URL-only Find Best approach maintained; upstream's SearchWithQueryWeightAdjusted design diverges at the architecture level

Resolved per P2/P3 rules. No local test runner available (luajit/busted not on PATH); CI will cover.

vaisest and others added 9 commits July 28, 2026 11:07
* Add legacy flag to Commandment support

* Add export fix

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* Fix Gemling Frost Wall Ice Crystal life

* Remove test

No need for a test with this simple change

---------

Co-authored-by: Steve <steve@openclaw.local>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* Update DLLs to SimpleGraphic-v2.5.4

* Update docker luaJIT version

---------

Co-authored-by: Wires77 <Wires77@users.noreply.github.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* Prepare release 0.23.1

* Update changelog

---------

Co-authored-by: LocalIdentity <LocalIdentity@users.noreply.github.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>
--- Fixed Crashes ---
* Fix trader crash (vaisest)

--- Fixed Calculations ---
* Fix Gemling Frost Wall Ice Crystal life (xiaoyaoyang)

--- Accuracy Improvements ---
* Add legacy flag to Commandment support (moxaj)
…7-29

# Conflicts:
#	src/Classes/TradeQueryRequests.lua
@pathanin
pathanin merged commit 0a808a0 into dev Jul 28, 2026
5 checks passed
@pathanin
pathanin deleted the sync-upstream-2026-07-29 branch July 28, 2026 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants