merge upstream main into dock-dev #1

Open

ubufugu wants to merge 0 commits from main into dock-dev

pull from: main

merge into: ubufugu:dock-dev

ubufugu:dock-dev

Conversation 0 Commits - Files Changed -

ubufugu commented 2026-04-09 10:53:04 -07:00

Owner

Copy Link

No description provided.

ubufugu added 38 commits 2026-04-09 10:53:05 -07:00

Muse Dash: Add support for Wuthering Waves Pioneer Podcast and Ay-Aye Horse (#6071) 116ab2286a

sc2: Fixing random fill errors in unit tests (#6045) 4276c6d6b0

Core: Make Generate.main only init logging on __main__ (#6069) 74f41e3733

setup.py: add rule_builder.cached_world to included list (#6070) 645f25a94e

Clients: remove datapackage from persistent_storage ... (#6074) ... cf47cc67c0

... next time it gets written to.
This makes loading peristent_storage faster in the future.

Core, Webhost: update and pin dependency versions (#6075) ffe4c6dd15

Launcher: Add konsole to terminal list and rework launch dialog (#5684) ... 1705620c4f

* Make component launching indicate if no terminal window, add konsole

* Attempt to spell better and remove whitespace

* Update terminal priority

* Make helper for clearing LD_LIBRARY_PATH

* Add handling to linux launch

* Hopefully fix setter

* Apply suggestions from code review

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

Docs: update macOS setup instructions for more specificity on Python version (#6078) 36cf86f2e8

Pokemon Emerald: Fix Latios KeyError (#6056) 5ca50cd8d3

Muse Dash: Fix nondeterministic generation with include_songs (#6040) ... 03c9d0717b

The include_songs option is an OptionSet, whose value is a set, but was being iterated to produce self.included_songs. Sets are unordered and may have a different iteration order each time a python process is run. This meant that the order of the elements in self.included_songs could differ even when generating with a fixed seed.

This caused nondeterministic generation with the same seed because create_song_pool() deterministically randomly picks songs from self.included_songs, which could be in a different order each time, so different songs could be picked.

Messenger: Require Wingsuit to traverse Dark Cave (#6059) 393ed51203

Stardew valley: Four small fixes (#6055) ... 2d58e7953c

* - Fixed the Dr Seuss Bundle asking for tigerseye (mineral) instead of tiger trout (fish)

* - Made blue grass starter more consistent

* - Fragments of the past does not rely on ginger island

* - Removed legacy hard coded strange bun recipe that messed with chefsanity logic

Stardew Valley: trimmed lucky purple shorts need gold to make (#6034) ... a1ed804267

The current logic only requires the shorts and a sewing machine, but a
gold bar is also necessary

Stardew Valley: Fixed an issue where some specific option combinations could create more items than locations (#6012) ... 139856a573

* - Improved the dynamic locations count algorithm to take into account the nature of various heavy settings in both directions

* - Fixes from Code Review

* - We're only testing for sunday locations, might as well only take sunday locations in the list to test

* - One more slight optimization

* - Added consideration for bundles per room in filler locations counting

* - Registered some more IDs to handle items up to 10

Super Mario Land 2: Fix Space Zone 2 Logic (#6025) 773f3c4f08

Satisfactory: bug fix in __init__.py (#5930) ... a7a7879df4

Solved indentation error to return to intended functionality

lufia2ac: update CollectionRule import (#5936) 96277fe9be

WebHost: Remove space before comma separators in tutorial authors (#5999) ... 95f696c04f

* Remove space before comma

* Factorio authors update

* Simplify template

APQuest: Various fixes (#6079) ... 88dc135960

* Import Buffer from typing_extensions instead of collections.abc for 3.11 compat

* always re-set sound volumes before playing

* fix game window scaling if parent is vertical

* make default volume lower

Satisfactory: Fixed buildings missing from goal check (#5772) 2b46df90b4

Aquaria: Fixing bug where Urchin Costume is not a progression damaging item (#5998) bdbf72f148

Options Creator: bind free text set_value to text instead of on_text_validate (#5915) ba7ca0bd23

SMW: Prevent receiving your own traps while aliased (#5763) 58a6407040

Rule Builder: Add field resolvers (#5919) c640d2fa24

CI: set permissions, update and pin actions, CodeQL for actions (#6073) ... 2ee20a3ac4

* CI: reduce default permissions to minimum

* CI: update pin actions

Most of them. CodeQL and action-gh-release is untouched for now.
Immutable actions and actions/* are pinned to version,
other actions are pinned to hash.

* CI: make use of archive: false in upload-artifact

also set compression level and error behavior for scan-build upload.

* CI: update codeql and enable scanning actions

The Witness: (Unbeatable seed) Ensure Desert Laser Redirection is required when the box is rotated (#5889) ... 5360b6bb37

* Unbeatable seed: 11 lasers + redirect when the box is rotated

* naming

APQuest: Tap to move (#6082) ... 3c4af8f432

* Tap to move

* inputs

* cleanup

* oops

MM3: Bump world version (#6088) 68f25f4642

Pokemon Emerald: Bump version (#6083) debe4cf035

APQuest: Fix focus issues (#6090) ... 3f3c343fb3

* My best attempt at fixing focus issues on Android

* didn't mean to remove that

APQuest: Add Link to Poptracker Pack to Setup Guide (#6089) ... 427b147818

* Update setup_en.md

* Update setup_de.md

WebHost: Fix hosting with invalid worlds installed (#5648) bb2a775c05

APWorld Builder: Add option to skip opening output folder (#5847) e0cfef3407

Stardew Valley: 0.6.7 Day 1 fixes (#6098) ... 36bab6f52a

- The Shane and Sebastian Portrait filler items werent tagged properly.
- The Beach Farm adds one secretsanity check, so it needs to be in the allsanity preset
- The Allsanity preset is renamed to "Maxsanity" to encourage better defined terminology and Allsanity means something else
- The "All Random" preset has been removed entirely. It has been the cause of too many beginner footguns over the years. People can still achieve the effect manually, but at least they'll have to try a little bit to ruin their own experience.

Various Worlds: purge world: MultiWorld (#5973) 030cb4b578

Bomb Rush Cyberfunk: Fix logic requirement increasing after collecting item (#6105) 6262235161

WebHost: 2025 to 2026 (#6094) bcd3f9a74c

DKC3: Delete DKC3 (#6097) b7c4fcb4c6

Some checks failed

Hide all checks

Analyze modified files / flake8 (push) Successful in 1m51s

Details

Analyze modified files / mypy (push) Successful in 1m33s

Details

Build / build-ubuntu2204 (push) Failing after 1m8s

Details

ctest / Test C++ ubuntu-latest (push) Failing after 19s

Details

Build and Publish Docker Images / prepare (push) Successful in 38s

Details

Native Code Static Analysis / scan-build (push) Successful in 4m46s

Details

type check / pyright (push) Successful in 45s

Details

unittests / Test Python 3.11.2 ubuntu-latest (push) Failing after 3m48s

Details

unittests / Test Python 3.12 ubuntu-latest (push) Failing after 6m2s

Details

unittests / Test Python 3.13 ubuntu-latest (push) Failing after 5m42s

Details

unittests / Test hosting with 3.13 on ubuntu-latest (push) Successful in 4m13s

Details

unittests / Test Python 3.13 macos-latest (push) Has been cancelled

Details

unittests / Test Python 3.11 windows-latest (push) Has been cancelled

Details

unittests / Test Python 3.13 windows-latest (push) Has been cancelled

Details

Analyze modified files / mypy (pull_request) Has been cancelled

Details

Analyze modified files / flake8 (pull_request) Has been cancelled

Details

ctest / Test C++ ubuntu-latest (pull_request) Has been cancelled

Details

ctest / Test C++ windows-latest (pull_request) Has been cancelled

Details

unittests / Test Python 3.13 macos-latest (pull_request) Has been cancelled

Details

unittests / Test Python 3.11.2 ubuntu-latest (pull_request) Has been cancelled

Details

unittests / Test Python 3.12 ubuntu-latest (pull_request) Has been cancelled

Details

unittests / Test Python 3.13 ubuntu-latest (pull_request) Has been cancelled

Details

unittests / Test Python 3.11 windows-latest (pull_request) Has been cancelled

Details

unittests / Test Python 3.13 windows-latest (pull_request) Has been cancelled

Details

unittests / Test hosting with 3.13 on ubuntu-latest (pull_request) Has been cancelled

Details

type check / pyright (pull_request) Has been cancelled

Details

Native Code Static Analysis / scan-build (pull_request) Has been cancelled

Details

Build / build-win (pull_request) Has been cancelled

Details

Build / build-ubuntu2204 (pull_request) Has been cancelled

Details

Build and Publish Docker Images / build (amd64, amd64, ubuntu-latest, amd64) (push) Failing after 2m21s

Details

Build / build-win (push) Has been cancelled

Details

ctest / Test C++ windows-latest (push) Has been cancelled

Details

Build and Publish Docker Images / build (arm64, arm64, ubuntu-24.04-arm, arm64) (push) Has been cancelled

Details

Build and Publish Docker Images / manifest (push) Has been cancelled

Details

CodeQL / Analyze (actions) (push) Failing after 1m46s

Details

CodeQL / Analyze (javascript) (push) Failing after 1m21s

Details

CodeQL / Analyze (python) (push) Failing after 1m20s

Details

This pull request has changes conflicting with the target branch.

• .github/workflows/docker.yml

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin main:main

git checkout main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Assignees

Clear assignees

ubufugu

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: ubufugu/dockipelago#1