Skip to content

chore(merge): sync orig-mwgg/main 2026-11-07 - #198

Merged
lallaria merged 32 commits into
mainfrom
chore/merge-20261107
Nov 8, 2026
Merged

lallaria merged 32 commits into
mainfrom
chore/merge-20261107

Conversation

@lallaria

@lallaria lallaria commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Scope

Sync orig-mwgg/main (e4787b1) into beta as a true merge, so upstream authorship is preserved and the merge-base moves.

Description

  • Per-game worlds/<game>/ changes are dropped (shipped via the per-world repos). Following upstream's world removals, the installer stops shipping Celeste (Open World), SA2B and SMW ([bundle] Update 47 worlds (worlds-wheels-2026-11-08) MultiworldGG-Index#66 already dropped them from the Index); README/CODEOWNERS follow upstream.
  • Adopted: #6412 pending_locations (restores the empty-send guard in check_locations), the non-core patch download fix in api/room.py, REMOVED_WORLD_LOBBY_INFO and the aux-APWorld lobby UI, !status totals, the #6481 _speedups guard, the certifi floor, the UT ScrollEffect guard in kvui.py, .apoot/.apsnap associations.
  • Kept beta: Launcher.py, the ModuleUpdate.py version gate, Dockerfile, the release.yml python version, worlds/LauncherComponents.py, CI workflows (upstream's libcairo steps are kivymd-only), and the tracker files (upstream UT changes were already ported in 185b843; tracker_addons.get_functions stays).
  • Beta adaptations: lazy APContainer import in room.py, macros.html links in beta's room-action-link form, .apz5 association kept for the bundled OoT 9.1.0 wheel; app_version 0.9.9.
  • Webhost changes are only exercised end-to-end by the Linux-only test/hosting CI job.

TreZc0 and others added 30 commits October 19, 2026 00:50
Utils.py: ProgressTicker prints one alternating glyph per pass of a slow loop once the console has been quiet for 2 s; init_logging hands it the console stream and ends its line before each record.
Fill.py: tick in the fill_restrictive placement and swap loops, remaining_fill, and the progression balancing sphere and candidate loops.
BaseClasses.py: tick in the playthrough sphere, cull and precollected-item loops.
test/utils/test_progress_ticker.py: throttle, alternation, line ending and unusable-stream cases.
…s, papermario, pokemon_crystal, rimworld, silksong, toontown, improve launcher startup and status command
* Core: drop support for py3.11

* Doc: fix GitHub casing

* CI: build/release with py3.13

* Speedups: fix scan-build warning

* Doc: update macOS from source guide

Also drop the "universal2" suffix since that is not used anymore.

* Doc: link from contributing to running from source for supported py versions

* Doc: fix more GitHub casing
Utils.py: ProgressTicker prints one alternating glyph per pass of a slow loop once the console has been quiet for 2 s; init_logging hands it the console stream and ends its line before each record.
Fill.py: tick in the fill_restrictive placement and swap loops, remaining_fill, and the progression balancing sphere and candidate loops.
BaseClasses.py: tick in the playthrough sphere, cull and precollected-item loops.
test/utils/test_progress_ticker.py: throttle, alternation, line ending and unusable-stream cases.
…, ladx_beta, musedash, oot, rac3, silksong, sm64hacks, stardew_valley, tloz_ooa, tracker, yellowtaxi, kivy update, lobby fixes
feat(generate): tick alternating glyphs while long fill loops run
…lds, pokemon_snap, silksong, tp, wargroove2, wl, wl4, fix: options creator panel sizing
TreZc0 and others added 2 commits November 7, 2026 16:40
… peggle_deluxe, pokemon_snap, smo, tloz_ooa, toontown, wargroove2, xenobladex, yellowtaxi, fix: kivy error in UT
CommonClient.py: take pending_locations (#6412), restoring the empty-send guard in check_locations.
MultiServer.py, worlds/generic/docs/commands_en.md: take the !status totals line.
kvui.py: port the StretchOverScrollBehavior guard for legacy ScrollEffect users.
WebHostLib/api/room.py: take the non-core download fix via a lazy APContainer import.
WebHostLib/__init__.py, api/lobby.py, static/assets/lobby.js, docs/webhost configuration sample.yaml: take REMOVED_WORLD_LOBBY_INFO and aux-APWorld lobby UI.
WebHostLib/templates/macros.html: open web clients in a new tab; add DK64/TP patcher links in beta's link form.
WebHostLib/static/styles/tracker.css, templates/clients.html: take upstream layout and disclaimer tweaks.
inno_setup.iss: add .apoot and .apsnap associations, keep .apz5 for the bundled OoT wheel; stop shipping Celeste (Open World), SA2B and SMW (components, wheels, .apsmw).
requirements.txt: raise the certifi floor to 2026.10.23.
application.yaml: bump app_version to 0.9.9.
_speedups.pyx, .gitattributes, README.md, docs/CODEOWNERS, docs/running from source.md: take upstream edits.
worlds/<game>/, OptionsCreator.py, data/*.kv, data/game_details.json: removed; beta ships worlds from per-world repos and the GUI from mwgg-gui.
@lallaria
lallaria merged commit 9693943 into main Nov 8, 2026
18 checks passed
@lallaria
lallaria deleted the chore/merge-20261107 branch November 8, 2026 03:35
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.

10 participants