Crude s/PollyMC/Fjord Launcher
@ -189,7 +189,7 @@ set(Launcher_VERSION_NAME4_COMMA "${Launcher_VERSION_MAJOR},${Launcher_VERSION_M
|
|||||||
set(Launcher_BUILD_PLATFORM "unknown" CACHE STRING "A short string identifying the platform that this build was built for. Only used to display in the about dialog.")
|
set(Launcher_BUILD_PLATFORM "unknown" CACHE STRING "A short string identifying the platform that this build was built for. Only used to display in the about dialog.")
|
||||||
|
|
||||||
# Github repo URL with releases for updater
|
# Github repo URL with releases for updater
|
||||||
set(Launcher_UPDATER_GITHUB_REPO "https://github.com/fn2006/PollyMC" CACHE STRING "Base github URL for the updater.")
|
set(Launcher_UPDATER_GITHUB_REPO "https://github.com/unmojang/FjordLauncher" CACHE STRING "Base github URL for the updater.")
|
||||||
|
|
||||||
# Name to help updater identify valid artifacts
|
# Name to help updater identify valid artifacts
|
||||||
set(Launcher_BUILD_ARTIFACT "" CACHE STRING "Artifact name to help the updater identify valid artifacts.")
|
set(Launcher_BUILD_ARTIFACT "" CACHE STRING "Artifact name to help the updater identify valid artifacts.")
|
||||||
@ -201,7 +201,7 @@ set(Launcher_META_URL "https://meta.unmojang.org/v1/" CACHE STRING "URL to fetch
|
|||||||
set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
|
set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
|
||||||
|
|
||||||
# Bug tracker URL
|
# Bug tracker URL
|
||||||
set(Launcher_BUG_TRACKER_URL "https://github.com/fn2006/PollyMC/issues" CACHE STRING "URL for the bug tracker.")
|
set(Launcher_BUG_TRACKER_URL "https://github.com/unmojang/FjordLauncher/issues" CACHE STRING "URL for the bug tracker.")
|
||||||
|
|
||||||
# Translations Platform URL
|
# Translations Platform URL
|
||||||
set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/launcher/" CACHE STRING "URL for the translations platform.")
|
set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/launcher/" CACHE STRING "URL for the translations platform.")
|
||||||
@ -341,7 +341,7 @@ include(ECMQtDeclareLoggingCategory)
|
|||||||
|
|
||||||
####################################### Program Info #######################################
|
####################################### Program Info #######################################
|
||||||
|
|
||||||
set(Launcher_APP_BINARY_NAME "pollymc" CACHE STRING "Name of the Launcher binary")
|
set(Launcher_APP_BINARY_NAME "fjordlauncher" CACHE STRING "Name of the Launcher binary")
|
||||||
add_subdirectory(program_info)
|
add_subdirectory(program_info)
|
||||||
|
|
||||||
####################################### Install layout #######################################
|
####################################### Install layout #######################################
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
## PollyMC
|
## Fjord Launcher
|
||||||
|
|
||||||
PollyMC - Minecraft Launcher
|
Fjord Launcher - Minecraft Launcher
|
||||||
Copyright (C) 2022-2023 PollyMC Contributors
|
Copyright (C) 2022-2023 Fjord Launcher Contributors
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
30
README.md
@ -1,15 +1,15 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<img src="./program_info/pollymc-header-black.svg#gh-light-mode-only" alt="PollyMC logo" width="60%"/>
|
<img src="./program_info/fjordlauncher-header-black.svg#gh-light-mode-only" alt="Fjord Launcher logo" width="60%"/>
|
||||||
<img src="./program_info/pollymc-header.svg#gh-dark-mode-only" alt="PollyMC logo" width="60%"/>
|
<img src="./program_info/fjordlauncher-header.svg#gh-dark-mode-only" alt="Fjord Launcher logo" width="60%"/>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
PollyMC is a **fork** of Prism Launcher. It is **not** endorsed by or affiliated with PolyMC or Prism launcher.
|
Fjord Launcher is a **fork** of Prism Launcher. It is **not** endorsed by or affiliated with PolyMC or Prism launcher.
|
||||||
|
|
||||||
<h1>Advantages of this fork over regular Prism:</h1>
|
<h1>Advantages of this fork over regular Prism:</h1>
|
||||||
|
|
||||||
Offline mode doesn't require an account.
|
Offline mode doesn't require an account.
|
||||||
|
|
||||||
[Alternative auth server support](https://github.com/fn2006/PollyMC/wiki/Alternative-Auth-Servers).
|
[Alternative auth server support](https://github.com/unmojang/FjordLauncher/wiki/Alternative-Auth-Servers).
|
||||||
|
|
||||||
Ability to download FTB modpacks from within the launcher.
|
Ability to download FTB modpacks from within the launcher.
|
||||||
|
|
||||||
@ -21,39 +21,39 @@ You **will not** open an issue in the Prism Launcher repo.
|
|||||||
|
|
||||||
You **will not** open an issue in the PolyMC repo.
|
You **will not** open an issue in the PolyMC repo.
|
||||||
|
|
||||||
You **will not** ask about PollyMC in the Prism Launcher discord.
|
You **will not** ask about Fjord Launcher in the Prism Launcher discord.
|
||||||
|
|
||||||
You **will not** ask about PollyMC in the PolyMC discord.
|
You **will not** ask about Fjord Launcher in the PolyMC discord.
|
||||||
|
|
||||||
You **will** open an issue [here](https://github.com/fn2006/PollyMC/issues).
|
You **will** open an issue [here](https://github.com/unmojang/FjordLauncher/issues).
|
||||||
|
|
||||||
You **will** start a discussion [here](https://github.com/fn2006/PollyMC/discussions).
|
You **will** start a discussion [here](https://github.com/unmojang/FjordLauncher/discussions).
|
||||||
|
|
||||||
<h1>Installation</h1>
|
<h1>Installation</h1>
|
||||||
|
|
||||||
<h2>Windows</h2>
|
<h2>Windows</h2>
|
||||||
|
|
||||||
You can get installers or portable builds from the [releases section](https://github.com/fn2006/PollyMC/releases/latest), MSVC builds are recommended over MinGW builds but there's no real difference.
|
You can get installers or portable builds from the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest), MSVC builds are recommended over MinGW builds but there's no real difference.
|
||||||
|
|
||||||
<h3>Scoop Installer</h3>
|
<h3>Scoop Installer</h3>
|
||||||
|
|
||||||
If you prefer Scoop over traditional methods of installing Windows programs, [TechPro424](https://github.com/TechPro424) maintains a Scoop bucket that provides PollyMC.
|
If you prefer Scoop over traditional methods of installing Windows programs, [TechPro424](https://github.com/TechPro424) maintains a Scoop bucket that provides Fjord Launcher.
|
||||||
|
|
||||||
To install PollyMC from Scoop:
|
To install Fjord Launcher from Scoop:
|
||||||
|
|
||||||
First run `scoop bucket add TechPro424 https://github.com/TechPro424/scoop-bucket` to add the bucket to your system.
|
First run `scoop bucket add TechPro424 https://github.com/TechPro424/scoop-bucket` to add the bucket to your system.
|
||||||
|
|
||||||
Then run `scoop install TechPro424/pollymc`.
|
Then run `scoop install TechPro424/fjordlauncher`.
|
||||||
|
|
||||||
<h2>Linux</h2>
|
<h2>Linux</h2>
|
||||||
|
|
||||||
You can get the launcher as an AppImage, a Flatpak or a portable binary from the [releases section](https://github.com/fn2006/PollyMC/releases/latest).
|
You can get the launcher as an AppImage, a Flatpak or a portable binary from the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest).
|
||||||
|
|
||||||
Alternatively, PollyMC is also available on the [AUR](https://aur.archlinux.org/packages?O=0&K=pollymc).
|
Alternatively, Fjord Launcher is also available on the [AUR](https://aur.archlinux.org/packages?O=0&K=fjordlauncher).
|
||||||
|
|
||||||
<h2>MacOS</h2>
|
<h2>MacOS</h2>
|
||||||
|
|
||||||
There are builds for MacOS in the [releases section](https://github.com/fn2006/PollyMC/releases/latest).
|
There are builds for MacOS in the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest).
|
||||||
<h2></h2>
|
<h2></h2>
|
||||||
|
|
||||||
To build the launcher yourself, follow [the instructions on the Prism Launcher website](https://prismlauncher.org/wiki/development/build-instructions) but clone this repo instead.
|
To build the launcher yourself, follow [the instructions on the Prism Launcher website](https://prismlauncher.org/wiki/development/build-instructions) but clone this repo instead.
|
||||||
|
@ -8,4 +8,4 @@ done
|
|||||||
export PATH="${PATH}${PATH:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
|
export PATH="${PATH}${PATH:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
|
||||||
export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/"
|
export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/"
|
||||||
|
|
||||||
exec /app/bin/pollyrun "$@"
|
exec /app/bin/fjordrun "$@"
|
@ -1,4 +1,4 @@
|
|||||||
id: org.fn2006.PollyMC
|
id: org.unmojang.FjordLauncher
|
||||||
runtime: org.kde.Platform
|
runtime: org.kde.Platform
|
||||||
runtime-version: 5.15-23.08
|
runtime-version: 5.15-23.08
|
||||||
sdk: org.kde.Sdk
|
sdk: org.kde.Sdk
|
||||||
@ -13,7 +13,7 @@ add-extensions:
|
|||||||
autodelete: false
|
autodelete: false
|
||||||
directory: utils/gamescope
|
directory: utils/gamescope
|
||||||
|
|
||||||
command: pollymc
|
command: fjordlauncher
|
||||||
finish-args:
|
finish-args:
|
||||||
- --share=ipc
|
- --share=ipc
|
||||||
- --socket=x11
|
- --socket=x11
|
||||||
@ -36,7 +36,7 @@ modules:
|
|||||||
# Needed for proper Wayland support
|
# Needed for proper Wayland support
|
||||||
- libdecor.json
|
- libdecor.json
|
||||||
|
|
||||||
- name: pollymc
|
- name: fjordlauncher
|
||||||
buildsystem: cmake-ninja
|
buildsystem: cmake-ninja
|
||||||
builddir: true
|
builddir: true
|
||||||
config-opts:
|
config-opts:
|
||||||
@ -154,10 +154,10 @@ modules:
|
|||||||
buildsystem: simple
|
buildsystem: simple
|
||||||
build-commands:
|
build-commands:
|
||||||
- install -Dm755 prime-run /app/bin/prime-run
|
- install -Dm755 prime-run /app/bin/prime-run
|
||||||
- mv /app/bin/pollymc /app/bin/pollyrun
|
- mv /app/bin/fjordlauncher /app/bin/fjordrun
|
||||||
- install -Dm755 pollymc /app/bin/pollymc
|
- install -Dm755 fjordlauncher /app/bin/fjordlauncher
|
||||||
sources:
|
sources:
|
||||||
- type: file
|
- type: file
|
||||||
path: prime-run
|
path: prime-run
|
||||||
- type: file
|
- type: file
|
||||||
path: pollymc
|
path: fjordlauncher
|
@ -908,7 +908,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
|
|||||||
|
|
||||||
// check update locks
|
// check update locks
|
||||||
{
|
{
|
||||||
auto update_log_path = FS::PathCombine(m_dataPath, "logs", "pollymc_update.log");
|
auto update_log_path = FS::PathCombine(m_dataPath, "logs", "fjordlauncher_update.log");
|
||||||
|
|
||||||
auto update_lock = QFileInfo(FS::PathCombine(m_dataPath, ".prism_launcher_update.lock"));
|
auto update_lock = QFileInfo(FS::PathCombine(m_dataPath, ".prism_launcher_update.lock"));
|
||||||
if (update_lock.exists()) {
|
if (update_lock.exists()) {
|
||||||
@ -922,7 +922,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
|
|||||||
"\n"
|
"\n"
|
||||||
"This likely means that a update attempt failed. Please ensure your installation is in working order before "
|
"This likely means that a update attempt failed. Please ensure your installation is in working order before "
|
||||||
"proceeding.\n"
|
"proceeding.\n"
|
||||||
"Check the PollyMC updater log at: \n"
|
"Check the Fjord Launcher updater log at: \n"
|
||||||
"%7\n"
|
"%7\n"
|
||||||
"for details on the last update attempt.\n"
|
"for details on the last update attempt.\n"
|
||||||
"\n"
|
"\n"
|
||||||
@ -959,7 +959,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
|
|||||||
"\n"
|
"\n"
|
||||||
"Please ensure your installation is in working order before "
|
"Please ensure your installation is in working order before "
|
||||||
"proceeding.\n"
|
"proceeding.\n"
|
||||||
"Check the PollyMC updater log at: \n"
|
"Check the Fjord Launcher updater log at: \n"
|
||||||
"%1\n"
|
"%1\n"
|
||||||
"for details on the last update attempt.")
|
"for details on the last update attempt.")
|
||||||
.arg(update_log_path);
|
.arg(update_log_path);
|
||||||
@ -991,7 +991,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
|
|||||||
auto infoMsg = tr("Update succeeded\n"
|
auto infoMsg = tr("Update succeeded\n"
|
||||||
"\n"
|
"\n"
|
||||||
"You are now running %1 .\n"
|
"You are now running %1 .\n"
|
||||||
"Check the PollyMC updater log at: \n"
|
"Check the Fjord Launcher updater log at: \n"
|
||||||
"%1\n"
|
"%1\n"
|
||||||
"for details.")
|
"for details.")
|
||||||
.arg(BuildConfig.printableVersionString())
|
.arg(BuildConfig.printableVersionString())
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
version="1.1"
|
version="1.1"
|
||||||
id="svg99"
|
id="svg99"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
sodipodi:docname="org.fn2006.PollyMC.svg"
|
sodipodi:docname="org.unmojang.FjordLauncher.svg"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
@ -8,7 +8,7 @@
|
|||||||
version="1.1"
|
version="1.1"
|
||||||
id="svg99"
|
id="svg99"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
sodipodi:docname="org.fn2006.PollyMC.svg"
|
sodipodi:docname="org.unmojang.FjordLauncher.svg"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
@ -294,7 +294,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p>Note: you probably don't need to set this if CurseForge already works.</p><p><span style=" font-weight:700;">Using the Official Curseforge Launcher's key may break Curseforge's Terms of service, but should allow PollyMC to download all mods in a modpack without you needing to download any of them manually.</span></p></body></html></string>
|
<string><html><head/><body><p>Note: you probably don't need to set this if CurseForge already works.</p><p><span style=" font-weight:700;">Using the Official Curseforge Launcher's key may break Curseforge's Terms of service, but should allow Fjord Launcher to download all mods in a modpack without you needing to download any of them manually.</span></p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -155,7 +155,8 @@ void AccountListPage::on_actionAddAuthlibInjector_triggered()
|
|||||||
MinecraftAccountPtr account = AuthlibInjectorLoginDialog::newAccount(
|
MinecraftAccountPtr account = AuthlibInjectorLoginDialog::newAccount(
|
||||||
this, tr("Please enter your username (sometimes an email address), password, and the URL of your API server."
|
this, tr("Please enter your username (sometimes an email address), password, and the URL of your API server."
|
||||||
"<br>"
|
"<br>"
|
||||||
"See <a href=\"https://github.com/fn2006/PollyMC/wiki/Alternative-Auth-Servers\">this page</a> on the PollyMC wiki for a "
|
"See <a href=\"https://github.com/unmojang/FjordLauncher/wiki/Alternative-Auth-Servers\">this page</a> on the Fjord "
|
||||||
|
"Launcher wiki for a "
|
||||||
"list of common API servers.</p>"
|
"list of common API servers.</p>"
|
||||||
"<br><br>"
|
"<br><br>"
|
||||||
"<b>Caution!</b> Your username and password will be sent to the authentication server you specify!"));
|
"<b>Caution!</b> Your username and password will be sent to the authentication server you specify!"));
|
||||||
|
@ -57,7 +57,7 @@ PrismExternalUpdater::PrismExternalUpdater(QWidget* parent, const QString& appDi
|
|||||||
priv = new PrismExternalUpdater::Private();
|
priv = new PrismExternalUpdater::Private();
|
||||||
priv->appDir = QDir(appDir);
|
priv->appDir = QDir(appDir);
|
||||||
priv->dataDir = QDir(dataDir);
|
priv->dataDir = QDir(dataDir);
|
||||||
auto settings_file = priv->dataDir.absoluteFilePath("pollymc_update.cfg");
|
auto settings_file = priv->dataDir.absoluteFilePath("fjordlauncher_update.cfg");
|
||||||
priv->settings = std::make_unique<QSettings>(settings_file, QSettings::Format::IniFormat);
|
priv->settings = std::make_unique<QSettings>(settings_file, QSettings::Format::IniFormat);
|
||||||
priv->allowBeta = priv->settings->value("allow_beta", false).toBool();
|
priv->allowBeta = priv->settings->value("allow_beta", false).toBool();
|
||||||
priv->autoCheck = priv->settings->value("auto_check", false).toBool();
|
priv->autoCheck = priv->settings->value("auto_check", false).toBool();
|
||||||
|
@ -218,11 +218,11 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
|
|||||||
|
|
||||||
// Command line parsing
|
// Command line parsing
|
||||||
QCommandLineParser parser;
|
QCommandLineParser parser;
|
||||||
parser.setApplicationDescription(QObject::tr("An auto-updater for PollyMC"));
|
parser.setApplicationDescription(QObject::tr("An auto-updater for Fjord Launcher"));
|
||||||
|
|
||||||
parser.addOptions(
|
parser.addOptions(
|
||||||
{ { { "d", "dir" }, tr("Use a custom path as application root (use '.' for current directory)."), tr("directory") },
|
{ { { "d", "dir" }, tr("Use a custom path as application root (use '.' for current directory)."), tr("directory") },
|
||||||
{ { "V", "pollymc-version" },
|
{ { "V", "fjordlauncher-version" },
|
||||||
tr("Use this version as the installed launcher version. (provided because stdout can not be reliably captured on windows)"),
|
tr("Use this version as the installed launcher version. (provided because stdout can not be reliably captured on windows)"),
|
||||||
tr("installed launcher version") },
|
tr("installed launcher version") },
|
||||||
{ { "I", "install-version" }, "Install a specific version.", tr("version name") },
|
{ { "I", "install-version" }, "Install a specific version.", tr("version name") },
|
||||||
@ -285,7 +285,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
|
|||||||
m_selectUI = parser.isSet("select-ui");
|
m_selectUI = parser.isSet("select-ui");
|
||||||
m_allowDowngrade = parser.isSet("allow-downgrade");
|
m_allowDowngrade = parser.isSet("allow-downgrade");
|
||||||
|
|
||||||
auto version = parser.value("pollymc-version");
|
auto version = parser.value("fjordlauncher-version");
|
||||||
if (!version.isEmpty()) {
|
if (!version.isEmpty()) {
|
||||||
if (version.contains('-')) {
|
if (version.contains('-')) {
|
||||||
auto index = version.indexOf('-');
|
auto index = version.indexOf('-');
|
||||||
@ -346,7 +346,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
m_updateLogPath = FS::PathCombine(m_dataPath, "logs", "pollymc_update.log");
|
m_updateLogPath = FS::PathCombine(m_dataPath, "logs", "fjordlauncher_update.log");
|
||||||
|
|
||||||
{ // setup logging
|
{ // setup logging
|
||||||
FS::ensureFolderPathExists(FS::PathCombine(m_dataPath, "logs"));
|
FS::ensureFolderPathExists(FS::PathCombine(m_dataPath, "logs"));
|
||||||
@ -576,7 +576,7 @@ void PrismUpdaterApp::run()
|
|||||||
|
|
||||||
if (m_isFlatpak) {
|
if (m_isFlatpak) {
|
||||||
showFatalErrorMessage(tr("Updating flatpack not supported"), tr("Actions outside of checking if an update is available are not "
|
showFatalErrorMessage(tr("Updating flatpack not supported"), tr("Actions outside of checking if an update is available are not "
|
||||||
"supported when running the flatpak version of PollyMC."));
|
"supported when running the flatpak version of Fjord Launcher."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (m_isAppimage) {
|
if (m_isAppimage) {
|
||||||
@ -1101,13 +1101,13 @@ void PrismUpdaterApp::backupAppDir()
|
|||||||
if (file_list.isEmpty()) {
|
if (file_list.isEmpty()) {
|
||||||
// best guess
|
// best guess
|
||||||
if (BuildConfig.BUILD_ARTIFACT.toLower() == "linux") {
|
if (BuildConfig.BUILD_ARTIFACT.toLower() == "linux") {
|
||||||
file_list.append({ "PollyMC", "bin", "share", "lib" });
|
file_list.append({ "FjordLauncher", "bin", "share", "lib" });
|
||||||
} else { // windows by process of elimination
|
} else { // windows by process of elimination
|
||||||
file_list.append({
|
file_list.append({
|
||||||
"jars",
|
"jars",
|
||||||
"pollymc.exe",
|
"fjordlauncher.exe",
|
||||||
"pollymc_filelink.exe",
|
"fjordlauncher_filelink.exe",
|
||||||
"pollymc_updater.exe",
|
"fjordlauncher_updater.exe",
|
||||||
"qtlogging.ini",
|
"qtlogging.ini",
|
||||||
"imageformats",
|
"imageformats",
|
||||||
"iconengines",
|
"iconengines",
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
${config.pre-commit.installationScript}
|
${config.pre-commit.installationScript}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
inputsFrom = [config.packages.pollymc-unwrapped];
|
inputsFrom = [config.packages.fjordlauncher-unwrapped];
|
||||||
buildInputs = with pkgs; [ccache ninja];
|
buildInputs = with pkgs; [ccache ninja];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -13,12 +13,12 @@
|
|||||||
in {
|
in {
|
||||||
inherit
|
inherit
|
||||||
(ourPackages)
|
(ourPackages)
|
||||||
pollymc-qt5-unwrapped
|
fjordlauncher-qt5-unwrapped
|
||||||
pollymc-qt5
|
fjordlauncher-qt5
|
||||||
pollymc-unwrapped
|
fjordlauncher-unwrapped
|
||||||
pollymc
|
fjordlauncher
|
||||||
;
|
;
|
||||||
default = ourPackages.pollymc;
|
default = ourPackages.fjordlauncher;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -49,16 +49,16 @@
|
|||||||
inherit version;
|
inherit version;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
pollymc-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs;
|
fjordlauncher-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs;
|
||||||
|
|
||||||
pollymc-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix {
|
fjordlauncher-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix {
|
||||||
pollymc-unwrapped = final.pollymc-qt5-unwrapped;
|
fjordlauncher-unwrapped = final.fjordlauncher-qt5-unwrapped;
|
||||||
};
|
};
|
||||||
|
|
||||||
pollymc-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs;
|
fjordlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs;
|
||||||
|
|
||||||
pollymc = prev.qt6Packages.callPackage ./pkg/wrapper.nix {
|
fjordlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix {
|
||||||
inherit (final) pollymc-unwrapped;
|
inherit (final) fjordlauncher-unwrapped;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
}:
|
}:
|
||||||
assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux";
|
assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux";
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pollymc-unwrapped";
|
pname = "fjordlauncher-unwrapped";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = lib.cleanSource self;
|
src = lib.cleanSource self;
|
||||||
@ -58,8 +58,8 @@ assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is on
|
|||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
mainProgram = "pollymc";
|
mainProgram = "fjordlauncher";
|
||||||
homepage = "https://github.com/fn2006/PollyMC/";
|
homepage = "https://github.com/unmojang/FjordLauncher/";
|
||||||
description = "A free, open source launcher for Minecraft";
|
description = "A free, open source launcher for Minecraft";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Allows you to have multiple, separate instances of Minecraft (each with
|
Allows you to have multiple, separate instances of Minecraft (each with
|
||||||
@ -67,7 +67,7 @@ assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is on
|
|||||||
their associated options with a simple interface.
|
their associated options with a simple interface.
|
||||||
'';
|
'';
|
||||||
platforms = with platforms; linux ++ darwin;
|
platforms = with platforms; linux ++ darwin;
|
||||||
changelog = "https://github.com/fn2006/PollyMC/releases/tag/${version}";
|
changelog = "https://github.com/unmojang/FjordLauncher/releases/tag/${version}";
|
||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3Only;
|
||||||
maintainers = with maintainers; [fn2006];
|
maintainers = with maintainers; [fn2006];
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
symlinkJoin,
|
symlinkJoin,
|
||||||
pollymc-unwrapped,
|
fjordlauncher-unwrapped,
|
||||||
wrapQtAppsHook,
|
wrapQtAppsHook,
|
||||||
addOpenGLRunpath,
|
addOpenGLRunpath,
|
||||||
qtbase, # needed for wrapQtAppsHook
|
qtbase, # needed for wrapQtAppsHook
|
||||||
@ -29,14 +29,14 @@
|
|||||||
additionalLibs ? [],
|
additionalLibs ? [],
|
||||||
additionalPrograms ? [],
|
additionalPrograms ? [],
|
||||||
}: let
|
}: let
|
||||||
pollymcFinal = pollymc-unwrapped.override {
|
fjordlauncherFinal = fjordlauncher-unwrapped.override {
|
||||||
inherit msaClientID gamemodeSupport;
|
inherit msaClientID gamemodeSupport;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
symlinkJoin {
|
symlinkJoin {
|
||||||
name = "pollymc-${pollymcFinal.version}";
|
name = "fjordlauncher-${fjordlauncherFinal.version}";
|
||||||
|
|
||||||
paths = [pollymcFinal];
|
paths = [fjordlauncherFinal];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
wrapQtAppsHook
|
wrapQtAppsHook
|
||||||
@ -92,5 +92,5 @@ in
|
|||||||
"--prefix PATH : ${lib.makeBinPath runtimePrograms}"
|
"--prefix PATH : ${lib.makeBinPath runtimePrograms}"
|
||||||
];
|
];
|
||||||
|
|
||||||
inherit (pollymcFinal) meta;
|
inherit (fjordlauncherFinal) meta;
|
||||||
}
|
}
|
||||||
|
@ -8,49 +8,49 @@ if(UNIX)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(Launcher_CommonName "PollyMC")
|
set(Launcher_CommonName "FjordLauncher")
|
||||||
set(Launcher_DisplayName "PollyMC")
|
set(Launcher_DisplayName "Fjord Launcher")
|
||||||
|
|
||||||
set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
|
set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
|
||||||
set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
|
set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
|
||||||
|
|
||||||
set(Launcher_Copyright "© 2022-2024 PollyMC Contributors\\n© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors")
|
set(Launcher_Copyright "© 2022-2024 Fjord Launcher Contributors\\n© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors")
|
||||||
set(Launcher_Copyright_Mac "© 2022-2024 PollyMC Contributors\\n© 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
|
set(Launcher_Copyright_Mac "© 2022-2024 Fjord Launcher Contributors\\n© 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
|
||||||
set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
|
set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
|
||||||
set(Launcher_Domain "" PARENT_SCOPE)
|
set(Launcher_Domain "" PARENT_SCOPE)
|
||||||
set(Launcher_UserAgent "PrismLauncher/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE)
|
set(Launcher_UserAgent "PrismLauncher/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE)
|
||||||
set(Launcher_ConfigFile "pollymc.cfg" PARENT_SCOPE)
|
set(Launcher_ConfigFile "fjordlauncher.cfg" PARENT_SCOPE)
|
||||||
set(Launcher_Git "https://github.com/fn2006/PollyMC" PARENT_SCOPE)
|
set(Launcher_Git "https://github.com/unmojang/FjordLauncher" PARENT_SCOPE)
|
||||||
set(Launcher_DesktopFileName "org.fn2006.PollyMC.desktop" PARENT_SCOPE)
|
set(Launcher_DesktopFileName "org.unmojang.FjordLauncher.desktop" PARENT_SCOPE)
|
||||||
set(Launcher_SVGFileName "org.fn2006.PollyMC.svg" PARENT_SCOPE)
|
set(Launcher_SVGFileName "org.unmojang.FjordLauncher.svg" PARENT_SCOPE)
|
||||||
|
|
||||||
set(Launcher_Desktop "program_info/org.fn2006.PollyMC.desktop" PARENT_SCOPE)
|
set(Launcher_Desktop "program_info/org.unmojang.FjordLauncher.desktop" PARENT_SCOPE)
|
||||||
set(Launcher_mrpack_MIMEInfo "program_info/modrinth-mrpack-mime.xml" PARENT_SCOPE)
|
set(Launcher_mrpack_MIMEInfo "program_info/modrinth-mrpack-mime.xml" PARENT_SCOPE)
|
||||||
set(Launcher_MetaInfo "program_info/org.fn2006.PollyMC.metainfo.xml" PARENT_SCOPE)
|
set(Launcher_MetaInfo "program_info/org.unmojang.FjordLauncher.metainfo.xml" PARENT_SCOPE)
|
||||||
set(Launcher_SVG "program_info/org.fn2006.PollyMC.svg" PARENT_SCOPE)
|
set(Launcher_SVG "program_info/org.unmojang.FjordLauncher.svg" PARENT_SCOPE)
|
||||||
set(Launcher_Branding_ICNS "program_info/prismlauncher.icns" PARENT_SCOPE)
|
set(Launcher_Branding_ICNS "program_info/prismlauncher.icns" PARENT_SCOPE)
|
||||||
set(Launcher_Branding_ICO "program_info/pollymc.ico")
|
set(Launcher_Branding_ICO "program_info/fjordlauncher.ico")
|
||||||
set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE)
|
set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE)
|
||||||
set(Launcher_Branding_WindowsRC "program_info/pollymc.rc" PARENT_SCOPE)
|
set(Launcher_Branding_WindowsRC "program_info/fjordlauncher.rc" PARENT_SCOPE)
|
||||||
set(Launcher_Branding_LogoQRC "program_info/prismlauncher.qrc" PARENT_SCOPE)
|
set(Launcher_Branding_LogoQRC "program_info/prismlauncher.qrc" PARENT_SCOPE)
|
||||||
|
|
||||||
set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE)
|
set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE)
|
||||||
|
|
||||||
configure_file(org.fn2006.PollyMC.desktop.in org.fn2006.PollyMC.desktop)
|
configure_file(org.unmojang.FjordLauncher.desktop.in org.unmojang.FjordLauncher.desktop)
|
||||||
configure_file(org.fn2006.PollyMC.metainfo.xml.in org.fn2006.PollyMC.metainfo.xml)
|
configure_file(org.unmojang.FjordLauncher.metainfo.xml.in org.unmojang.FjordLauncher.metainfo.xml)
|
||||||
configure_file(pollymc.rc.in pollymc.rc @ONLY)
|
configure_file(fjordlauncher.rc.in fjordlauncher.rc @ONLY)
|
||||||
configure_file(pollymc.manifest.in pollymc.manifest @ONLY)
|
configure_file(fjordlauncher.manifest.in fjordlauncher.manifest @ONLY)
|
||||||
configure_file(pollymc.ico pollymc.ico COPYONLY)
|
configure_file(fjordlauncher.ico fjordlauncher.ico COPYONLY)
|
||||||
configure_file(win_install.nsi.in win_install.nsi @ONLY)
|
configure_file(win_install.nsi.in win_install.nsi @ONLY)
|
||||||
|
|
||||||
if(SCDOC_FOUND)
|
if(SCDOC_FOUND)
|
||||||
set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/pollymc.6.scd")
|
set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/fjordlauncher.6.scd")
|
||||||
set(out_man "${CMAKE_CURRENT_BINARY_DIR}/pollymc.6")
|
set(out_man "${CMAKE_CURRENT_BINARY_DIR}/fjordlauncher.6")
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
DEPENDS "${in_scd}"
|
DEPENDS "${in_scd}"
|
||||||
OUTPUT "${out_man}"
|
OUTPUT "${out_man}"
|
||||||
COMMAND ${SCDOC_SCDOC} < "${in_scd}" > "${out_man}"
|
COMMAND ${SCDOC_SCDOC} < "${in_scd}" > "${out_man}"
|
||||||
)
|
)
|
||||||
add_custom_target(man ALL DEPENDS ${out_man})
|
add_custom_target(man ALL DEPENDS ${out_man})
|
||||||
set(Launcher_ManPage "program_info/pollymc.6" PARENT_SCOPE)
|
set(Launcher_ManPage "program_info/fjordlauncher.6" PARENT_SCOPE)
|
||||||
endif()
|
endif()
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
version="1.1"
|
version="1.1"
|
||||||
viewBox="0 0 376.77 135.47"
|
viewBox="0 0 376.77 135.47"
|
||||||
id="svg866"
|
id="svg866"
|
||||||
sodipodi:docname="pollymc-header-black.svg"
|
sodipodi:docname="fjordlauncher-header-black.svg"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB |
@ -7,7 +7,7 @@
|
|||||||
version="1.1"
|
version="1.1"
|
||||||
viewBox="0 0 376.77 135.47"
|
viewBox="0 0 376.77 135.47"
|
||||||
id="svg866"
|
id="svg866"
|
||||||
sodipodi:docname="pollymc-header.Source.svg"
|
sodipodi:docname="fjordlauncher-header.Source.svg"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
@ -101,13 +101,13 @@
|
|||||||
d="M 3,11 H 61 V 57 H 3 Z m 41,35 v 6 h 12 v -6 z m -12,3 v 3 H 44 V 49 Z M 54,28 v 18 h 2 V 28 Z" /></clipPath></defs><g
|
d="M 3,11 H 61 V 57 H 3 Z m 41,35 v 6 h 12 v -6 z m -12,3 v 3 H 44 V 49 Z M 54,28 v 18 h 2 V 28 Z" /></clipPath></defs><g
|
||||||
id="g1157"
|
id="g1157"
|
||||||
transform="translate(0,-15.491025)"><g
|
transform="translate(0,-15.491025)"><g
|
||||||
id="pollymc-header-text-3"
|
id="fjordlauncher-header-text-3"
|
||||||
fill="white"
|
fill="white"
|
||||||
transform="matrix(6.9306,0,0,6.9306,-695.39957,-649.40511)"
|
transform="matrix(6.9306,0,0,6.9306,-695.39957,-649.40511)"
|
||||||
stroke-width="0.26458"
|
stroke-width="0.26458"
|
||||||
aria-label="PolyMC"
|
aria-label="PolyMC"
|
||||||
style="fill:#ffffff;fill-opacity:1"
|
style="fill:#ffffff;fill-opacity:1"
|
||||||
inkscape:label="pollymc-header-text-3"><text
|
inkscape:label="fjordlauncher-header-text-3"><text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.63541px;line-height:1.25;font-family:'Trade Winds';-inkscape-font-specification:'Trade Winds, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:-0.610833px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke-width:0.0101009"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.63541px;line-height:1.25;font-family:'Trade Winds';-inkscape-font-specification:'Trade Winds, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:-0.610833px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke-width:0.0101009"
|
||||||
x="121.65298"
|
x="121.65298"
|
||||||
@ -116,14 +116,14 @@
|
|||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan807"
|
id="tspan807"
|
||||||
x="121.65298"
|
x="121.65298"
|
||||||
y="107.71044">PollyMC</tspan></text></g></g><g
|
y="107.71044">Fjord Launcher</tspan></text></g></g><g
|
||||||
id="pollymc-header-text-4"
|
id="fjordlauncher-header-text-4"
|
||||||
fill="white"
|
fill="white"
|
||||||
transform="matrix(6.9306,0,0,6.9306,-697.30938,-585.54339)"
|
transform="matrix(6.9306,0,0,6.9306,-697.30938,-585.54339)"
|
||||||
stroke-width="0.26458"
|
stroke-width="0.26458"
|
||||||
aria-label="PolyMC"
|
aria-label="PolyMC"
|
||||||
style="fill:#ffffff;fill-opacity:1"
|
style="fill:#ffffff;fill-opacity:1"
|
||||||
inkscape:label="pollymc-header-text-4" /><g
|
inkscape:label="fjordlauncher-header-text-4" /><g
|
||||||
id="g5269"
|
id="g5269"
|
||||||
clip-path="url(#clipPath5628)"
|
clip-path="url(#clipPath5628)"
|
||||||
transform="matrix(2.2049154,0,0,2.2049154,5.9126449,-7.2321236)"
|
transform="matrix(2.2049154,0,0,2.2049154,5.9126449,-7.2321236)"
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
@ -7,7 +7,7 @@
|
|||||||
version="1.1"
|
version="1.1"
|
||||||
viewBox="0 0 376.77 135.47"
|
viewBox="0 0 376.77 135.47"
|
||||||
id="svg866"
|
id="svg866"
|
||||||
sodipodi:docname="pollymc-header.svg"
|
sodipodi:docname="fjordlauncher-header.svg"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.2 KiB |
@ -1,27 +1,27 @@
|
|||||||
pollymc(6)
|
fjordlauncher(6)
|
||||||
|
|
||||||
|
|
||||||
# NAME
|
# NAME
|
||||||
|
|
||||||
pollymc - a launcher and instance manager for Minecraft.
|
fjordlauncher - a launcher and instance manager for Minecraft.
|
||||||
|
|
||||||
|
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
|
|
||||||
*pollymc* [OPTIONS...]
|
*fjordlauncher* [OPTIONS...]
|
||||||
|
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
|
|
||||||
PollyMC is a custom launcher for Minecraft that allows you to easily manage
|
Fjord Launcher is a custom launcher for Minecraft that allows you to easily manage
|
||||||
multiple installations of Minecraft at once. It also allows you to easily
|
multiple installations of Minecraft at once. It also allows you to easily
|
||||||
install and remove mods by simply dragging and dropping.
|
install and remove mods by simply dragging and dropping.
|
||||||
Here are the current features of PollyMC.
|
Here are the current features of Fjord Launcher.
|
||||||
|
|
||||||
# OPTIONS
|
# OPTIONS
|
||||||
|
|
||||||
*-d, --dir*=DIRECTORY
|
*-d, --dir*=DIRECTORY
|
||||||
Use DIRECTORY as the PollyMC root.
|
Use DIRECTORY as the Fjord Launcher root.
|
||||||
|
|
||||||
*-l, --launch*=INSTANCE_ID
|
*-l, --launch*=INSTANCE_ID
|
||||||
Launch the instance specified by INSTANCE_ID.
|
Launch the instance specified by INSTANCE_ID.
|
||||||
@ -30,7 +30,7 @@ Here are the current features of PollyMC.
|
|||||||
Show the configuration window of the instance specified by INSTANCE_ID.
|
Show the configuration window of the instance specified by INSTANCE_ID.
|
||||||
|
|
||||||
*--alive*
|
*--alive*
|
||||||
Write a small 'live.check' file after PollyMC starts.
|
Write a small 'live.check' file after Fjord Launcher starts.
|
||||||
|
|
||||||
*-h, --help*
|
*-h, --help*
|
||||||
Display help text and exit.
|
Display help text and exit.
|
||||||
@ -69,15 +69,15 @@ variables, besides other common Qt variables:
|
|||||||
|
|
||||||
# BUGS
|
# BUGS
|
||||||
|
|
||||||
https://github.com/fn2006/PollyMC/issues
|
https://github.com/unmojang/FjordLauncher/issues
|
||||||
|
|
||||||
# RESOURCES
|
# RESOURCES
|
||||||
|
|
||||||
GitHub: https://github.com/fn2006/PollyMC
|
GitHub: https://github.com/unmojang/FjordLauncher
|
||||||
|
|
||||||
# AUTHORS
|
# AUTHORS
|
||||||
|
|
||||||
Prism Launcher Contributors
|
Prism Launcher Contributors
|
||||||
|
|
||||||
PollyMC Contributors
|
Fjord Launcher Contributors
|
||||||
|
|
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
@ -5,7 +5,7 @@
|
|||||||
<ws2:longPathAware>true</ws2:longPathAware>
|
<ws2:longPathAware>true</ws2:longPathAware>
|
||||||
</windowsSettings>
|
</windowsSettings>
|
||||||
</application>
|
</application>
|
||||||
<assemblyIdentity name="PollyMC.Application.1" type="win32" version="@Launcher_VERSION_NAME4@" />
|
<assemblyIdentity name="Fjord Launcher" type="win32" version="@Launcher_VERSION_NAME4@" />
|
||||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||||
<security>
|
<security>
|
||||||
<requestedPrivileges>
|
<requestedPrivileges>
|
@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE RCC>
|
<!DOCTYPE RCC>
|
||||||
<RCC version="1.0">
|
<RCC version="1.0">
|
||||||
<qresource prefix="/">
|
<qresource prefix="/">
|
||||||
<file>org.fn2006.PollyMC.svg</file>
|
<file>org.unmojang.FjordLauncher.svg</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
@ -3,8 +3,8 @@
|
|||||||
#endif
|
#endif
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
IDI_ICON1 ICON DISCARDABLE "pollymc.ico"
|
IDI_ICON1 ICON DISCARDABLE "fjordlauncher.ico"
|
||||||
1 RT_MANIFEST "pollymc.manifest"
|
1 RT_MANIFEST "fjordlauncher.manifest"
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION @Launcher_VERSION_NAME4_COMMA@
|
FILEVERSION @Launcher_VERSION_NAME4_COMMA@
|
||||||
@ -15,10 +15,10 @@ BEGIN
|
|||||||
BEGIN
|
BEGIN
|
||||||
BLOCK "000004b0"
|
BLOCK "000004b0"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "MultiMC & Prism Launcher & PollyMC Contributors"
|
VALUE "CompanyName", "MultiMC & Prism Launcher & Fjord Launcher Contributors"
|
||||||
VALUE "FileDescription", "PollyMC"
|
VALUE "FileDescription", "Fjord Launcher"
|
||||||
VALUE "FileVersion", "@Launcher_VERSION_NAME4@"
|
VALUE "FileVersion", "@Launcher_VERSION_NAME4@"
|
||||||
VALUE "ProductName", "PollyMC"
|
VALUE "ProductName", "Fjord Launcher"
|
||||||
VALUE "ProductVersion", "@Launcher_VERSION_NAME4@"
|
VALUE "ProductVersion", "@Launcher_VERSION_NAME4@"
|
||||||
END
|
END
|
||||||
END
|
END
|
@ -8,7 +8,7 @@
|
|||||||
version="1.1"
|
version="1.1"
|
||||||
id="svg99"
|
id="svg99"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
sodipodi:docname="org.fn2006.PollyMC Source.svg"
|
sodipodi:docname="org.unmojang.FjordLauncher Source.svg"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
@ -6,7 +6,7 @@
|
|||||||
fill="none"
|
fill="none"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
id="svg1070"
|
id="svg1070"
|
||||||
sodipodi:docname="org.fn2006.PollyMC.bigsur.svg"
|
sodipodi:docname="org.unmojang.FjordLauncher.bigsur.svg"
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
@ -1,12 +1,12 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Version=1.0
|
Version=1.0
|
||||||
Name=PollyMC
|
Name=Fjord Launcher
|
||||||
Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
|
Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
|
||||||
Type=Application
|
Type=Application
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Exec=@Launcher_APP_BINARY_NAME@ %U
|
Exec=@Launcher_APP_BINARY_NAME@ %U
|
||||||
StartupNotify=true
|
StartupNotify=true
|
||||||
Icon=org.fn2006.PollyMC
|
Icon=org.unmojang.FjordLauncher
|
||||||
Categories=Game;ActionGame;AdventureGame;Simulation;
|
Categories=Game;ActionGame;AdventureGame;Simulation;
|
||||||
Keywords=game;minecraft;mc;
|
Keywords=game;minecraft;mc;
|
||||||
StartupWMClass=PrismLauncher
|
StartupWMClass=PrismLauncher
|
@ -1,16 +1,16 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<component type="desktop">
|
<component type="desktop">
|
||||||
<id>org.fn2006.PollyMC</id>
|
<id>org.unmojang.FjordLauncher</id>
|
||||||
<launchable type="desktop-id">org.fn2006.PollyMC.desktop</launchable>
|
<launchable type="desktop-id">org.unmojang.FjordLauncher.desktop</launchable>
|
||||||
<name>PollyMC</name>
|
<name>Fjord Launcher</name>
|
||||||
<developer_name>fn2006</developer_name>
|
<developer_name>fn2006</developer_name>
|
||||||
<summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary>
|
<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>
|
<metadata_license>CC0-1.0</metadata_license>
|
||||||
<project_license>GPL-3.0-only</project_license>
|
<project_license>GPL-3.0-only</project_license>
|
||||||
<url type="homepage">https://github.com/fn2006/PollyMC</url>
|
<url type="homepage">https://github.com/unmojang/FjordLauncher</url>
|
||||||
<url type="bugtracker">https://github.com/fn2006/PollyMC/issues</url>
|
<url type="bugtracker">https://github.com/unmojang/FjordLauncher/issues</url>
|
||||||
<description>
|
<description>
|
||||||
<p>PollyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
|
<p>Fjord Launcher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
|
||||||
<p>Features:</p>
|
<p>Features:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Easily install game modifications, such as Fabric, Forge and Quilt</li>
|
<li>Easily install game modifications, such as Fabric, Forge and Quilt</li>
|
@ -8,7 +8,7 @@
|
|||||||
version="1.1"
|
version="1.1"
|
||||||
id="svg99"
|
id="svg99"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
sodipodi:docname="org.fn2006.PollyMC.svg"
|
sodipodi:docname="org.unmojang.FjordLauncher.svg"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE RCC>
|
<!DOCTYPE RCC>
|
||||||
<RCC version="1.0">
|
<RCC version="1.0">
|
||||||
<qresource prefix="/">
|
<qresource prefix="/">
|
||||||
<file>org.fn2006.PollyMC.svg</file>
|
<file>org.unmojang.FjordLauncher.svg</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|