merge main (again) - #12
Merged
Merged
Conversation
…assword has a space in it (ArchipelagoMW#5528) * CommonClient: Fix manually connecting to a url when the username or password has a space in it * Update CommonClient.py * Update CommonClient.py
…ipelagoMW#5547) * fix hinting multi-copy items bleeding found status * reword
* Close manifest files * Name explicit encoding
* manifest file * x y z for world version
* Create archipelago.json * Sure, let's call it 7.0.0 * Update archipelago.json --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* manifest file * x y z for world version * Update archipelago.json
* add apworld manifest * add world version
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* Add Options.PlandoItem * Remove worlds.generic.PlandoItem handling * Add plando pickling test * Revert old PlandoItem cleanup * Deprecate old PlandoItem * Change to warning message * Use deprecated decorator
* SC2: fix incorrect preset option * SC2: fix incorrect evil logic preset option --------- Co-authored-by: Snarky <sparkykueken@gmail.com>
Co-authored-by: alchav <alchav@jalchavware.com>
* FF1 Client fixes. * Strip leading/trailing spaces from rom-stored player name. * FF1R encodes the name as utf-8, as it happens. * UTF-8 is four bytes per character, so we need 64 bytes for the name, not 16.
… the datapackage (ArchipelagoMW#5392) * Added DD locations to locations.json so they exist in the datapackage. * Update worlds/ff1/data/locations.json Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/ff1/data/locations.json Forgot trailing commas aren't allowed in JSON. Co-authored-by: qwint <qwint.42@gmail.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: qwint <qwint.42@gmail.com>
* implement prog trap item (thanks stardew) * oops that's wrong * okay this is right
…elagoMW#5554) * Update HK pt-br setup to add warning about BepInEx * Update HK spanish setup guide to add warning about BepInEx
old name is deprecated and new name allows both writer instance or alias/name.
…apworld (ArchipelagoMW#5509) * APWorld docs: Make a distinction between APWorld and .apworld * Update apworld specification.md * Update apworld specification.md * Be more anal about the launcher component * Update apworld specification.md * Update apworld specification.md
…s again) (ArchipelagoMW#5573) From Discord: Well, flask-compress updated and now our 3.11 CI is failing Why? They switched to a lib called backports.zstd And 3.11 pkg_resources can't handle that. pip finds it. But in our ModuleUpdate.py, we first pkg_resources.require packages, and this fails. I can't reproduce this locally yet, but in CI, it seems like even though backports.zstd is installed, it still fails on it and prompts installing it over and over in every unit test Now what do we do :KEKW: Black Sliver suggested pinning flask-compress for 3.11 But I would just like to point out that this means we can't unpin it until we drop 3.11 the real thing is we probably need to move away from pkg_resources? lol since it's been deprecated literally since the oldest version we support
…nit tests so we can test that (ArchipelagoMW#5541) * Fix webhost argparse with extra args * accidentally added line * WebHost: fix some typing B64 url conversion is used in test/hosting, so it felt appropriate to include this here. * Test: Hosting: also test autogen * Test: Hosting: simplify stop_* and leave a note about Windows compat * Test: Hosting: fix formatting error * Test: Hosting: add limitted Windows support There are actually some differences with MP on Windows that make it impossible to run this in CI. --------- Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
* Fix likely unintended concatenations * Yeah that makes sense why I thought there were more here
* Test: check game in world manifest * Update test/general/test_world_manifest.py Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com> * Test: rework finding expected manifest location * Test: fix doc comment * Test: fix wrong custom_worlds path in test_world_manifest Also simplifies the way we find ./worlds/. * Test: make test_world_manifest easier to extend * Test: check world_version in world manifest according to docs/apworld specification.md * Test: check no container version in source world manifest according what was added to docs/apworld specification.md in PR 5509 * Test: better assertion messages in test_world_manifest.py * Test: fix wording in world source manifest --------- Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com>
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
18 participants
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.
Please format your title with what portion of the project this pull request is
targeting and what it's changing.
ex. "MyGame4: implement new game" or "Docs: add new guide for customizing MyGame3"
What is this fixing or adding?
How was this tested?
If this makes graphical changes, please attach screenshots.