From 7c86732a47ab40db4061e6c333945e4922f4626e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 21 Oct 2021 23:25:52 +0200 Subject: [PATCH] NOISSUE Update links to repo, fix up library README --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 +- BUILD.md | 4 +- changelog.md | 2 +- doc/multimc.1.txt | 4 +- launcher/dialogs/UpdateDialog.cpp | 8 +-- .../usr/share/metainfo/multimc.metainfo.xml | 4 +- launcher/pages/instance/LegacyUpgradePage.ui | 2 +- launcher/updater/DownloadTask.cpp | 2 +- launcher/widgets/LanguageSelectionWidget.cpp | 2 +- launcher/widgets/PageContainer.cpp | 2 +- libraries/README.md | 63 ++++++++++++------- 11 files changed, 59 insertions(+), 38 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5b8d858e..72986e94 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](https://discord.gg/multimc) 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 [FAQ](https://github.com/MultiMC/MultiMC5/wiki/FAQ) and it has not answered your question + * You have read the [FAQ](https://github.com/MultiMC/Launcher/wiki/FAQ) 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/MultiMC/MultiMC5/issues) + * Your issue has not been reported before, [make sure to use the search function!](https://github.com/MultiMC/Launcher/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 diff --git a/BUILD.md b/BUILD.md index faa9fa85..51de99b2 100644 --- a/BUILD.md +++ b/BUILD.md @@ -23,7 +23,7 @@ Also note that this guide is for development purposes only. No support is given Clone the source code using git and grab all the submodules: ``` -git clone https://github.com/MultiMC/MultiMC5.git +git clone https://github.com/MultiMC/Launcher.git git submodule init git submodule update ``` @@ -51,7 +51,7 @@ mkdir ~/MultiMC && cd ~/MultiMC mkdir build mkdir install # clone the complete source -git clone --recursive https://github.com/MultiMC/MultiMC5.git src +git clone --recursive https://github.com/MultiMC/Launcher.git src # configure the project cd build cmake -DCMAKE_INSTALL_PREFIX=../install ../src diff --git a/changelog.md b/changelog.md index e864a4c7..b2cbdd81 100644 --- a/changelog.md +++ b/changelog.md @@ -1453,7 +1453,7 @@ Long time coming, this release brought a lot of incremental improvements and fix - Update to the German translation. ## MultiMC 0.1.1 -- Hotfix - Changed the issue tracker URL to [GitHub issues](https://github.com/MultiMC/MultiMC5/issues). +- Hotfix - Changed the issue tracker URL to [GitHub issues](https://github.com/MultiMC/Launcher/issues). ## MultiMC 0.1 - Reworked the version numbering system to support our [new Git workflow](http://nvie.com/posts/a-successful-git-branching-model/). diff --git a/doc/multimc.1.txt b/doc/multimc.1.txt index c2d93880..eaf77f8f 100644 --- a/doc/multimc.1.txt +++ b/doc/multimc.1.txt @@ -47,11 +47,11 @@ EXIT STATUS BUGS ---- - + RESOURCES --------- -GitHub: +GitHub: Main website: diff --git a/launcher/dialogs/UpdateDialog.cpp b/launcher/dialogs/UpdateDialog.cpp index 04732d1b..ca3bd915 100644 --- a/launcher/dialogs/UpdateDialog.cpp +++ b/launcher/dialogs/UpdateDialog.cpp @@ -38,12 +38,12 @@ void UpdateDialog::loadChangelog() QString url; if(channel == "stable") { - url = QString("https://raw.githubusercontent.com/MultiMC/MultiMC5/%1/changelog.md").arg(channel); + url = QString("https://raw.githubusercontent.com/MultiMC/Launcher/%1/changelog.md").arg(channel); m_changelogType = CHANGELOG_MARKDOWN; } else { - url = QString("https://api.github.com/repos/MultiMC/MultiMC5/compare/%1...%2").arg(BuildConfig.GIT_COMMIT, channel); + url = QString("https://api.github.com/repos/MultiMC/Launcher/compare/%1...%2").arg(BuildConfig.GIT_COMMIT, channel); m_changelogType = CHANGELOG_COMMITS; } dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData)); @@ -58,7 +58,7 @@ QString reprocessMarkdown(QByteArray markdown) QString output = hoedown.process(markdown); // HACK: easier than customizing hoedown - output.replace(QRegExp("GH-([0-9]+)"), "GH-\\1"); + output.replace(QRegExp("GH-([0-9]+)"), "GH-\\1"); qDebug() << output; return output; } @@ -100,7 +100,7 @@ QString reprocessCommits(QByteArray json) result += ""; if(issuenr.length()) { - result += QString("GH-%2").arg(issuenr, issuenr); + result += QString("GH-%2").arg(issuenr, issuenr); } else if(prefix.length()) { diff --git a/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml b/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml index 4c6b7450..3bccba47 100644 --- a/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml +++ b/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml @@ -43,8 +43,8 @@ https://multimc.org/ https://discord.com/invite/0k2zsXGNHs0fE4Wm - https://github.com/MultiMC/MultiMC5/wiki/FAQ - https://github.com/MultiMC/MultiMC5/issues + https://github.com/MultiMC/Launcher/wiki/FAQ + https://github.com/MultiMC/Launcher/issues https://translate.multimc.org/ https://www.patreon.com/multimc The MultiMC Team diff --git a/launcher/pages/instance/LegacyUpgradePage.ui b/launcher/pages/instance/LegacyUpgradePage.ui index a94ee039..085919e3 100644 --- a/launcher/pages/instance/LegacyUpgradePage.ui +++ b/launcher/pages/instance/LegacyUpgradePage.ui @@ -26,7 +26,7 @@ - <html><body><h1>Upgrade is required</h1><p>MultiMC now supports old Minecraft versions and all the required features in the new (OneSix) instance format. As a consequence, the old (Legacy) format has been entirely disabled and old instances need to be upgraded.</p><p>The upgrade will create a new instance with the same contents as the current one, in the new format. The original instance will remain untouched, in case anything goes wrong in the process.</p><p>Please report any issues on our <a href="https://github.com/MultiMC/MultiMC5/issues">github issues page</a>.</p><p>There is also a <a href="https://discord.gg/GtPmv93">discord channel for testing here</a>.</p></body></html> + <html><body><h1>Upgrade is required</h1><p>MultiMC now supports old Minecraft versions and all the required features in the new (OneSix) instance format. As a consequence, the old (Legacy) format has been entirely disabled and old instances need to be upgraded.</p><p>The upgrade will create a new instance with the same contents as the current one, in the new format. The original instance will remain untouched, in case anything goes wrong in the process.</p><p>Please report any issues on our <a href="https://github.com/MultiMC/Launcher/issues">github issues page</a>.</p><p>There is also a <a href="https://discord.gg/GtPmv93">discord channel for testing here</a>.</p></body></html> true diff --git a/launcher/updater/DownloadTask.cpp b/launcher/updater/DownloadTask.cpp index 2c62ad24..875d9d84 100644 --- a/launcher/updater/DownloadTask.cpp +++ b/launcher/updater/DownloadTask.cpp @@ -131,7 +131,7 @@ void DownloadTask::processDownloadedVersionInfo() QObject::connect(netJob.get(), &NetJob::progress, this, &DownloadTask::fileDownloadProgressChanged); QObject::connect(netJob.get(), &NetJob::failed, this, &DownloadTask::fileDownloadFailed); - if(netJob->size() == 1) // Translation issues... see https://github.com/MultiMC/MultiMC5/issues/1701 + if(netJob->size() == 1) // Translation issues... see https://github.com/MultiMC/Launcher/issues/1701 { setStatus(tr("Downloading one update file.")); } diff --git a/launcher/widgets/LanguageSelectionWidget.cpp b/launcher/widgets/LanguageSelectionWidget.cpp index 3a8fbd2f..2b972ba7 100644 --- a/launcher/widgets/LanguageSelectionWidget.cpp +++ b/launcher/widgets/LanguageSelectionWidget.cpp @@ -48,7 +48,7 @@ QString LanguageSelectionWidget::getSelectedLanguageKey() const void LanguageSelectionWidget::retranslate() { QString text = tr("Don't see your language or the quality is poor?
Help us with translations!") - .arg("https://github.com/MultiMC/MultiMC5/wiki/Translating-MultiMC"); + .arg("https://github.com/MultiMC/Launcher/wiki/Translating-MultiMC"); helpUsLabel->setText(text); } diff --git a/launcher/widgets/PageContainer.cpp b/launcher/widgets/PageContainer.cpp index 978d3e82..25e3b676 100644 --- a/launcher/widgets/PageContainer.cpp +++ b/launcher/widgets/PageContainer.cpp @@ -206,7 +206,7 @@ void PageContainer::help() QString pageId = m_currentPage->helpPage(); if (pageId.isEmpty()) return; - DesktopServices::openUrl(QUrl("https://github.com/MultiMC/MultiMC5/wiki/" + pageId)); + DesktopServices::openUrl(QUrl("https://github.com/MultiMC/Launcher/wiki/" + pageId)); } } diff --git a/libraries/README.md b/libraries/README.md index ac861148..39505881 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -9,6 +9,13 @@ This library has served as a base for some (much more full-featured and advanced Copyright belongs to Petr Mrázek, unless explicitly stated otherwise in the source files. Available under the Apache 2.0 license. +## ganalytics +A Google Analytics library for Qt. + +BSD licensed, derived from [qt-google-analytics](https://github.com/HSAnet/qt-google-analytics). + +Modifications include better handling of IP anonymization (can be enabled) and general improvements of the API (application handles persistence and ID generation instead of the library). + ## hoedown Hoedown is a revived fork of Sundown, the Markdown parser based on the original code of the Upskirt library by Natacha Porté. @@ -24,6 +31,13 @@ Simple Java tool that prints the JVM details - version and platform bitness. Do what you want with it. It is so trivial that noone cares. +## Katabasis +Oauth2 library customized for Microsoft authentication. + +This is a fork of the [O2 library](https://github.com/pipacs/o2). + +MIT licensed. + ## launcher Java launcher part for Minecraft. @@ -127,23 +141,6 @@ See [github repo](https://github.com/ljfa-ag/libnbtplusplus). Available either under LGPL version 3 or later. -## pack200 -Unpacks pack200 archives (squished, compression-optimized Java jars). This format is only used by Forge to save bandwidth. - -A horrible little thing extracted from the depths of the OpenJDK codebase. Please don't look at it, or you will praise Cthulhu for his clean code for the rest of your days. - -Available under GPL 2 with classpath exception. - -## rainbow -Color functions extracted from [KGuiAddons](https://inqlude.org/libraries/kguiaddons.html). Used for adaptive text coloring. - -Available either under LGPL version 2.1 or later. - -## xz-embedded -Tiny implementation of LZMA2 de/compression. This format is only used by Forge to save bandwidth. - -Public domain. - ## LocalPeer Library for making only one instance of the application run at all times. @@ -151,17 +148,41 @@ BSD licensed, derived from [QtSingleApplication](https://github.com/qtproject/qt Changes are made to make the code more generic and useful in less usual conditions. +## optional-bare -## ganalytics -A Google Analytics library for Qt. +A simple single-file header-only version of a C++17-like optional for default-constructible, copyable types, for C++98 and later. -BSD licensed, derived from [qt-google-analytics](https://github.com/HSAnet/qt-google-analytics). +Imported from: https://github.com/martinmoene/optional-bare/commit/0bb1d183bcee1e854c4ea196b533252c51f98b81 -Modifications include better handling of IP anonymization (can be enabled) and general improvements of the API (application handles persistence and ID generation instead of the library). +Boost Software License - Version 1.0 + +## quazip + +A zip manipulation library, forked for MultiMC's use. + +LGPL 2.1 + +## rainbow +Color functions extracted from [KGuiAddons](https://inqlude.org/libraries/kguiaddons.html). Used for adaptive text coloring. + +Available either under LGPL version 2.1 or later. + +## systeminfo + +A MultiMC-specific library for probing system information. + +Apache 2.0 ## tomlc99 + A TOML language parser. Used by Forge 1.14+ to store mod metadata. See [github repo](https://github.com/cktan/tomlc99). Licenced under the MIT licence. + +## xz-embedded + +Tiny implementation of LZMA2 de/compression. This format is only used by Forge to save bandwidth. + +Public domain.