Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Prism Launcher 8.2 #161

Draft
wants to merge 172 commits into
base: develop
Choose a base branch
from
Draft

Conversation

evan-goode
Copy link
Contributor

Resolves #152

Prism Launcher 8.2 was just a version bump since they forgot to increment the version in the 8.1 release. 8.1 upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.1.

This was a straightforward merge, not too many conflicts. You can see changes from the conflict resolution using git diff-tree --cc unmojang/8.2.

I don't see many things in the changelog relevant to us. The macOS builds are now released as zip files, not tar.gz.

I think we should merge or close the other outstanding PRs before releasing 8.2, so I'm marking this as a draft.

HyperSoop and others added 30 commits July 11, 2023 21:25
Signed-off-by: Trial97 <[email protected]>
I, Hazel Hofmann <[email protected]>, hereby add my Signed-off-by to this commit: 9ada8d9

Signed-off-by: Hazel Hofmann <[email protected]>
Co-authored-by: Tayou <[email protected]>
Signed-off-by: Alexandru Ionut Tripon <[email protected]>
Co-authored-by: seth <[email protected]>
Signed-off-by: Alexandru Ionut Tripon <[email protected]>
Co-authored-by: seth <[email protected]>
Signed-off-by: Alexandru Ionut Tripon <[email protected]>
…t-action-2.x

chore(deps): update korthout/backport-action action to v2.1.1
Signed-off-by: Desoroxxx <[email protected]>
Improve name and tooltip of mod dependency management option
Only open/close groups on left button
Trial97 and others added 16 commits March 3, 2024 14:07
Signed-off-by: Trial97 <[email protected]>
(cherry picked from commit aac6fea724e029b9ef4e4ed3e98b04c40149add0)
Signed-off-by: TheKodeToad <[email protected]>
(cherry picked from commit 6a9f5540d385cd2edf7e43f3ad308041571a9f83)
Previously instances would get "stuck" in the folder

Signed-off-by: TheKodeToad <[email protected]>
(cherry picked from commit 9574ebe480a6a837533fc4339c1f3605300555ca)
Signed-off-by: TheKodeToad <[email protected]>
(cherry picked from commit df60f5cc9650a111a65ada2ea589bf7ecf9ac506)
Signed-off-by: TheKodeToad <[email protected]>
(cherry picked from commit bd0cd828269ee259dd10439c84baeaec2f1220df)
Signed-off-by: TheKodeToad <[email protected]>
(cherry picked from commit fccf857d8e5040fd64d7bc302463c1c9184f110f)
Signed-off-by: TheKodeToad <[email protected]>
(cherry picked from commit c0eb80947db57c4b0de376213d53aac4f694e1b0)
Signed-off-by: TheKodeToad <[email protected]>
(cherry picked from commit 138df66355b54151302f0b143ec1c2a5a4eb11c8)
Signed-off-by: TheKodeToad <[email protected]>
(cherry picked from commit 4101fbb63433d1ee90476f55d76a7a7f0ced6ccb)
[Backport release-8.x] (More) mrpack export fixes
Signed-off-by: Tayou <[email protected]>
(cherry picked from commit 877eb4172a737c44505b3c784e84ab710b291e5e)
Signed-off-by: Sefa Eyeoglu <[email protected]>
Signed-off-by: Evan Goode <[email protected]>
@evan-goode evan-goode mentioned this pull request Mar 21, 2024
@evan-goode
Copy link
Contributor Author

cc @lemonzest79 @fn2006

Exception(const QString& message) : std::exception(), m_message(message) { qCritical() << "Exception:" << message; }
Exception(const Exception& other) : std::exception(), m_message(other.cause()) {}
Exception(const QString& message) : std::exception(), m_message(message.toUtf8()) { qCritical() << "Exception:" << message; }
Exception(const Exception& other) : std::exception(), m_message(other.m_message) {}

Check warning

Code scanning / CodeQL

Inconsistent definition of copy constructor and assignment ('Rule of Two') Warning

No matching copy assignment operator in class Exception. It is good practice to match a copy constructor with a copy assignment operator.
@marlester-dev
Copy link

marlester-dev commented Apr 4, 2024

Any news bout this?

@marlester-dev
Copy link

Prism Launcher 8.3 was released: https://prismlauncher.org/news/release-8.3/

@marlester-dev
Copy link

@evan-goode could you maybe fork off this repo and merge all the pulls with 8.2? Fn2006 isn't active since december last year

@lemonzest79
Copy link

Is this project abandoned now??

@marlester-dev
Copy link

marlester-dev commented May 14, 2024

Is this project abandoned now??

Try FjordLauncher, it's a successor of PollyMC made by evangoode- https://github.com/unmojang/FjordLauncher. Artifact for Windows: https://github.com/unmojang/FjordLauncher/actions/runs/8996507098/artifacts/1482901159.

@lemonzest79
Copy link

Is this project abandoned now??

Try FjordLauncher, it's a successor of PollyMC made by evangoode- https://github.com/unmojang/FjordLauncher. Artifact for Windows: https://github.com/unmojang/FjordLauncher/actions/runs/8996507098/artifacts/1482901159.

Thanks, I use Linux so grabbed the .AppImage :) will try this out thanks again

@ErrorGranted
Copy link

any update on this?

@hero-persson
Copy link

Hello, I will be maintaining a DRM-free version of Fjord Launcher at https://github.com/hero-persson/FjordLauncherUnlocked. If you are looking for an maintained, up-to-date alternative to PollyMC that doesn't require a Microsoft account, this is it.

@zocker-160
Copy link

zocker-160 commented Jun 27, 2024

@hero-persson will you enable issues on your repo and are you interested in my changes to the flatpak (see unmojang/FjordLauncher#5) ?

@hero-persson
Copy link

@hero-persson will you enable issues on your repo and are you interested in my changes to the flatpak (see unmojang/FjordLauncher#5) ?

Hey, I would rather not enable issues, because the only difference with Fjord Launcher is the DRM removing patch. But, you can contact me at @hero-persson:matrix.org if there are any issues with Fjord Launcher Unlocked.

For the same reason, I would rather not make changes to the Flatpak, sorry. But I did fork Fjord Launcher's Flatpak which has at least the Java 21 change. Here are installing instructions: https://github.com/hero-persson/FjordLauncherUnlocked#flatpak

@zocker-160
Copy link

@hero-persson understood, no problem. I will contact you on matrix.

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.

Prism Launcher 8.1 Released