diff options
| -rw-r--r-- | .github/FUNDING.yml | 2 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/bug_report.yml | 12 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/config.yml | 4 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/rfc.yml | 4 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/suggestion.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/trigger_release.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.md | 63 | ||||
| -rw-r--r-- | launcher/ui/dialogs/AboutDialog.cpp | 2 | ||||
| -rw-r--r-- | program_info/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | program_info/README.md | 4 | ||||
| -rw-r--r-- | program_info/org.prismlauncher.PrismLauncher.desktop.in | 4 | ||||
| -rw-r--r-- | program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in | 22 |
13 files changed, 94 insertions, 37 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 247675fc..6d05e3da 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -open_collective: polymc +open_collective: prismlauncher diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index ab3c8a29..ea1fbfdd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -8,9 +8,9 @@ body: If you need help with running Minecraft, please visit us on our Discord before making a bug report. Before submitting a bug report, please make sure you have read this *entire* form, and that: - * You have read the [PolyMC wiki](https://polymc.org/wiki/) and it has not answered your question. + * You have read the [Prism Launcher wiki](https://prismlauncher.org/wiki/) and it has not answered your question. * Your bug is not caused by Minecraft or any mods you have installed. - * Your issue has not been reported before, [make sure to use the search function!](https://github.com/PolyMC/PolyMC/issues) + * Your issue has not been reported before, [make sure to use the search function!](https://github.com/PrismLauncher/PrismLauncher/issues) **Do not forget to give your issue a descriptive title.** "Bug in the instance screen" makes it hard to distinguish issues at a glance. - type: dropdown @@ -25,15 +25,15 @@ body: - Other - type: textarea attributes: - label: Version of PolyMC - description: The version of PolyMC used in the bug report. - placeholder: PolyMC 1.4.1 + label: Version of Prism Launcher + description: The version of Prism Launcher used in the bug report. + placeholder: Prism Launcher 5.0 validations: required: true - type: textarea attributes: label: Version of Qt - description: The version of Qt used in the bug report. You can find it in Help -> About PolyMC -> About Qt. + description: The version of Qt used in the bug report. You can find it in Help -> About Prism Launcher -> About Qt. placeholder: Qt 6.3.0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 932d0c8f..97a55db3 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - - name: PolyMC Matrix Support Room - url: https://matrix.to/#/#support:polymc.org + - name: Prism Launcher Matrix Support Room + url: https://matrix.to/#/#prism-support:matrix.org about: Please ask for support here before opening an issue. diff --git a/.github/ISSUE_TEMPLATE/rfc.yml b/.github/ISSUE_TEMPLATE/rfc.yml index 0a40d01d..fa7cdbe6 100644 --- a/.github/ISSUE_TEMPLATE/rfc.yml +++ b/.github/ISSUE_TEMPLATE/rfc.yml @@ -6,7 +6,7 @@ body: - type: markdown attributes: value: | - ### Use this form to suggest a larger change for PolyMC. + ### Use this form to suggest a larger change for Prism Launcher. - type: textarea attributes: label: Goal @@ -18,7 +18,7 @@ body: attributes: label: Motivation description: | - Introduce the topic. If this is a not-well-known section of PolyMC, a detailed explanation of the background is recommended. + Introduce the topic. If this is a not-well-known section of Prism Launcher, a detailed explanation of the background is recommended. Some example points of discussion: - What specific problems are you facing right now that you're trying to address? - Are there any previous discussions? Link to them and summarize them (don't force your readers to read them though!). diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml index 48f157b3..ddee86b6 100644 --- a/.github/ISSUE_TEMPLATE/suggestion.yml +++ b/.github/ISSUE_TEMPLATE/suggestion.yml @@ -5,25 +5,25 @@ body: - type: markdown attributes: value: | - ### Use this form to suggest a feature for PolyMC. + ### Use this form to suggest a feature for Prism Launcher. - type: input attributes: label: Role - description: In what way do you use PolyMC that needs this feature? + description: In what way do you use Prism Launcher that needs this feature? placeholder: I play modded Minecraft. validations: required: true - type: input attributes: label: Suggestion - description: What do you want PolyMC to do? + description: What do you want Prism Launcher to do? placeholder: I want the cat button to meow. validations: required: true - type: input attributes: label: Benefit - description: Why do you need PolyMC to do this? + description: Why do you need Prism Launcher to do this? placeholder: so that I can always hear a cat when I need to. validations: required: true diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml index 476280df..e74e870a 100644 --- a/.github/workflows/trigger_release.yml +++ b/.github/workflows/trigger_release.yml @@ -65,7 +65,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref }} - name: PrismLauncher ${{ env.VERSION }} + name: Prism Launcher ${{ env.VERSION }} draft: true prerelease: false files: | diff --git a/CMakeLists.txt b/CMakeLists.txt index a3b74a73..131d3e53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ endif() ##################################### Set Application options ##################################### ######## Set URLs ######## -set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING "URL to fetch PrismLauncher's news RSS feed from.") +set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING "URL to fetch Prism Launcher's news RSS feed from.") set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'") set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help") @@ -5,25 +5,80 @@ Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. -We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher). +This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC. ## Installation -- All downloads and instructions for Prism Launcher will soon be available. +- All downloads and instructions for Prism Launcher can be found [on our website](https://prismlauncher.org/download/). - Last build status can be found [here](https://github.com/PrismLauncher/PrismLauncher/actions). ### Development Builds There are development builds available [here](https://github.com/PrismLauncher/PrismLauncher/actions). These have debug information in the binaries, so their file sizes are relatively larger. -Portable builds are provided for AppImage on Linux, Windows, and macOS. +Portable builds are provided for on Linux, Windows, and macOS. +For Debian and Arch, you can use these packages for the latest development versions: +[](https://aur.archlinux.org/packages/prismlauncher-git/) +[](https://mpr.makedeb.org/packages/prismlauncher-git) ## Help & Support +Feel free to create an issue if you need help. However, you might find it easier to ask in the Discord server. -[](https://discord.gg/hX4g537UNE) +[](https://discord.gg/prismlauncher) +We will also soon be opening up our Matrix channels. +You can already join our Matrix space: + +[](https://matrix.to/#/#prismlauncher:matrix.org) + +We also have a subreddit you can post your issues and suggestions on: + +[r/PrismLauncher](https://www.reddit.com/r/PrismLauncher/) + +## Building + +If you want to build Prism Launcher yourself, check [Build Instructions](https://prismlauncher.org/wiki/development/build-instructions/) for build instructions. + +## Translations + +The translation effort for PrismLauncher is hosted on [Weblate](https://hosted.weblate.org/projects/prismlauncher/launcher/) and information about translating Prism Launcher is available at <https://github.com/PrismLauncher/Translations> + +## Forking/Redistributing/Custom builds policy + +We don't care what you do with your fork/custom build as long as you follow the terms of the [license](LICENSE) (this is a legal responsibility), and if you made code changes rather than just packaging a custom build, please do the following as a basic courtesy: + +- Make it clear that your fork is not PrismLauncher and is not endorsed by or affiliated with the PrismLauncher project (<https://prismlauncher.org>). +- Go through [CMakeLists.txt](CMakeLists.txt) and change PrismLauncher's API keys to your own or set them to empty strings (`""`) to disable them (this way the program will still compile but the functionality requiring those keys will be disabled). + +If you have any questions or want any clarification on the above conditions please make an issue and ask us. + +Be aware that if you build this software without removing the provided API keys in [CMakeLists.txt](CMakeLists.txt) you are accepting the following terms and conditions: + +- [Microsoft Identity Platform Terms of Use](https://docs.microsoft.com/en-us/legal/microsoft-identity-platform/terms-of-use) +- [CurseForge 3rd Party API Terms and Conditions](https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions) + +If you do not agree with these terms and conditions, then remove the associated API keys from the [CMakeLists.txt](CMakeLists.txt) file by setting them to an empty string (`""`). ## License All launcher code is available under the GPL-3.0-only license. + +The logo and related assets are under the CC BY-SA 4.0 license. + +## Sponsors + +Thanks to JetBrains for providing us a few licenses for all their products, as part of their [Open Source program](https://www.jetbrains.com/opensource/). + +[](https://www.jetbrains.com/opensource/) + +Also thanks to Weblate for hosting our translation efforts. + +<a href="https://hosted.weblate.org/engage/prismlauncher/"> +<img src="https://hosted.weblate.org/widgets/prismlauncher/-/open-graph.png" alt="Translation status" width="300" /> +</a> + +Additionally, thanks to the awesome people over at [MacStadium](https://www.macstadium.com/), for providing M1-Macs for development purposes! + +<a href="https://www.macstadium.com"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="Powered by MacStadium" width="300"></a> + diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp index 2970d47d..cecda1df 100644 --- a/launcher/ui/dialogs/AboutDialog.cpp +++ b/launcher/ui/dialogs/AboutDialog.cpp @@ -172,7 +172,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia QString urlText("<html><head/><body><p><a href=\"%1\">%1</a></p></body></html>"); ui->urlLabel->setText(urlText.arg(BuildConfig.LAUNCHER_GIT)); - QString copyText("© 2021-2022 %1"); + QString copyText("© 2022 %1"); ui->copyLabel->setText(copyText.arg(BuildConfig.LAUNCHER_COPYRIGHT)); connect(ui->closeButton, SIGNAL(clicked()), SLOT(close())); diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index 62a01231..f6e2ea84 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -14,7 +14,7 @@ set(Launcher_DisplayName "Prism Launcher") set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE) -set(Launcher_Copyright "Prism Launcher Contributors\\n© 2012-2021 MultiMC Contributors") +set(Launcher_Copyright "Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors \\n© 2012-2021 MultiMC Contributors") set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE) set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE) set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE) diff --git a/program_info/README.md b/program_info/README.md index 8fc81a19..5ba2fa32 100644 --- a/program_info/README.md +++ b/program_info/README.md @@ -1,6 +1,6 @@ -# PrismLauncher Program Info +# Prism Launcher Program Info -This is PrismLauncher's program info which contains information about: +This is Prism Launcher's program info which contains information about: - Application name and logo (and branding in general) - Various URLs and API endpoints diff --git a/program_info/org.prismlauncher.PrismLauncher.desktop.in b/program_info/org.prismlauncher.PrismLauncher.desktop.in index 63a6b586..e608f588 100644 --- a/program_info/org.prismlauncher.PrismLauncher.desktop.in +++ b/program_info/org.prismlauncher.PrismLauncher.desktop.in @@ -7,6 +7,6 @@ Terminal=false Exec=@Launcher_APP_BINARY_NAME@ StartupNotify=true Icon=org.prismlauncher.PrismLauncher -Categories=Game; -Keywords=game;minecraft;launcher;mc; +Categories=Game;ActionGame;AdventureGame;Simulation; +Keywords=game;minecraft;launcher;mc;multimc;polymc; StartupWMClass=PrismLauncher diff --git a/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in index 2e10f7be..13a860d9 100644 --- a/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in +++ b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in @@ -1,33 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> <id>org.prismlauncher.PrismLauncher</id> - <provides> - <id>org.prismlauncher.PrismLauncher</id> - </provides> <launchable type="desktop-id">org.prismlauncher.PrismLauncher.desktop</launchable> - <name>PrismLauncher</name> - <developer_name>PrismLauncher</developer_name> + <name>Prism Launcher</name> + <developer_name>Prism Launcher Contributors</developer_name> <summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-3.0-only</project_license> <url type="homepage">https://prismlauncher.org/</url> <url type="help">https://prismlauncher.org/wiki/</url> + <url type="bugtracker">https://github.com/PrismLauncher/PrismLauncher/issues</url> + <url type="contact">https://discord.gg/prismlauncher</url> + <url type="vcs-browser">https://github.com/PrismLauncher/PrismLauncher</url> + <url type="contribute">https://github.com/PrismLauncher/PrismLauncher/blob/develop/CONTRIBUTING.md</url> + <url type="translate">https://hosted.weblate.org/projects/prismlauncher/launcher</url> <description> - <p>PrismLauncher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p> + <p>Prism Launcher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p> <p>Features:</p> <ul> <li>Easily install game modifications, such as Fabric, Forge and Quilt</li> - <li>Control your java settings</li> + <li>Control your Java settings</li> <li>Manage worlds and resource packs from the launcher</li> <li>See logs and other details easily</li> <li>Kill Minecraft in case of a crash/freeze</li> - <li>Isolate minecraft instances to keep everything clean</li> + <li>Isolate Minecraft instances to keep everything clean</li> <li>Install and update mods directly from the launcher</li> </ul> </description> <screenshots> <screenshot type="default"> - <caption>The main PrismLauncher window</caption> + <caption>The main Prism Launcher window</caption> <image type="source" width="976" height="764">https://prismlauncher.org/img/screenshots/LauncherDark.png</image> </screenshot> <screenshot> @@ -36,7 +38,7 @@ </screenshot> <screenshot> <caption>Mod installation</caption> - <image type="source" width="1000" height="692">https://prismlauncher.org/img/screenshots/ModInstallDark.png</image> + <image type="source" width="1036" height="700">https://prismlauncher.org/img/screenshots/ModInstallDark.png</image> </screenshot> <screenshot> <caption>Mod updating</caption> |