Closed evan-goode closed 7 months ago
FYI, I didn't know this until I Googled "how to review a merge PR" and found https://haacked.com/archive/2014/02/21/reviewing-merge-commits/, but you can run git diff-tree --cc
on this commit and it will show only hunks that changed as part of the conflict resolution, which results in only about an 800 line diff.
Just tried the debug build of this from the github actions and things seem to be working ok after I found the extra info for the api url and stuff as it did not migrate my Ely.by accounts after doing so I could log into my 2fa enabled ely.by accounts (needed to do the usual password:token method as no 2fa input box anymore that was available with 7.2) afterwards I could log into my ely.by enabled servers ok and skins worked.
Sorry for the force pushes, I screwed up by merging 8.0 on top of commits from another feature branch, and then re-writing history on the other branch.
Just tried the debug build of this from the github actions and things seem to be working ok after I found the extra info for the api url and stuff as it did not migrate my Ely.by accounts
Thanks for testing. I just filed https://github.com/fn2006/PollyMC/pull/117 to auto-migrate Ely.by accounts to the new format, would you mind seeing whether that works for you (once the CI finishes the build you need)? That branch is based on 7.2 not 8.0 FYI.
Maybe we should add a message to that dialog box about 2FA on Ely.by. Adding the dedicated field back is also doable, but it doesn't make much sense since it's an Ely.by-specific feature. If there's some other auth server that expects 2FA formatted like hunter2-12356
instead of hunter2:123456
then it's not gonna work.
The updater seems to work on the AppImage, at least to report that there are no updates, but of course I couldn't test the actual updating.
Test Nix build on macOS, works great. Going to mark this no longer a draft since it's closer to mergeable.
Merge tag '8.0' into unmojang-8.0
Resolves: https://github.com/fn2006/PollyMC/issues/115
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0
(Imcomplete) list of changes in 8.0 relevant to PollyMC: