NOISSUE Update links to repo, fix up library README

This commit is contained in:
Petr Mrázek 2021-10-21 23:25:52 +02:00
parent a8458e36ff
commit 7c86732a47
11 changed files with 59 additions and 38 deletions

View File

@ -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. 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: 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 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. **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 - type: dropdown

View File

@ -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: 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 init
git submodule update git submodule update
``` ```
@ -51,7 +51,7 @@ mkdir ~/MultiMC && cd ~/MultiMC
mkdir build mkdir build
mkdir install mkdir install
# clone the complete source # 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 # configure the project
cd build cd build
cmake -DCMAKE_INSTALL_PREFIX=../install ../src cmake -DCMAKE_INSTALL_PREFIX=../install ../src

View File

@ -1453,7 +1453,7 @@ Long time coming, this release brought a lot of incremental improvements and fix
- Update to the German translation. - Update to the German translation.
## MultiMC 0.1.1 ## 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 ## MultiMC 0.1
- Reworked the version numbering system to support our [new Git workflow](http://nvie.com/posts/a-successful-git-branching-model/). - Reworked the version numbering system to support our [new Git workflow](http://nvie.com/posts/a-successful-git-branching-model/).

View File

@ -47,11 +47,11 @@ EXIT STATUS
BUGS BUGS
---- ----
<https://github.com/MultiMC/MultiMC5/issues> <https://github.com/MultiMC/Launcher/issues>
RESOURCES RESOURCES
--------- ---------
GitHub: <https://github.com/MultiMC/MultiMC5> GitHub: <https://github.com/MultiMC/Launcher>
Main website: <https://multimc.org> Main website: <https://multimc.org>

View File

@ -38,12 +38,12 @@ void UpdateDialog::loadChangelog()
QString url; QString url;
if(channel == "stable") 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; m_changelogType = CHANGELOG_MARKDOWN;
} }
else 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; m_changelogType = CHANGELOG_COMMITS;
} }
dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData)); dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData));
@ -58,7 +58,7 @@ QString reprocessMarkdown(QByteArray markdown)
QString output = hoedown.process(markdown); QString output = hoedown.process(markdown);
// HACK: easier than customizing hoedown // HACK: easier than customizing hoedown
output.replace(QRegExp("GH-([0-9]+)"), "<a href=\"https://github.com/MultiMC/MultiMC5/issues/\\1\">GH-\\1</a>"); output.replace(QRegExp("GH-([0-9]+)"), "<a href=\"https://github.com/MultiMC/Launcher/issues/\\1\">GH-\\1</a>");
qDebug() << output; qDebug() << output;
return output; return output;
} }
@ -100,7 +100,7 @@ QString reprocessCommits(QByteArray json)
result += "<tr><td>"; result += "<tr><td>";
if(issuenr.length()) if(issuenr.length())
{ {
result += QString("<a href=\"https://github.com/MultiMC/MultiMC5/issues/%1\">GH-%2</a>").arg(issuenr, issuenr); result += QString("<a href=\"https://github.com/MultiMC/Launcher/issues/%1\">GH-%2</a>").arg(issuenr, issuenr);
} }
else if(prefix.length()) else if(prefix.length())
{ {

View File

@ -43,8 +43,8 @@
</releases> </releases>
<url type="homepage">https://multimc.org/</url> <url type="homepage">https://multimc.org/</url>
<url type="help">https://discord.com/invite/0k2zsXGNHs0fE4Wm</url> <url type="help">https://discord.com/invite/0k2zsXGNHs0fE4Wm</url>
<url type="faq">https://github.com/MultiMC/MultiMC5/wiki/FAQ</url> <url type="faq">https://github.com/MultiMC/Launcher/wiki/FAQ</url>
<url type="bugtracker">https://github.com/MultiMC/MultiMC5/issues</url> <url type="bugtracker">https://github.com/MultiMC/Launcher/issues</url>
<url type="translate">https://translate.multimc.org/</url> <url type="translate">https://translate.multimc.org/</url>
<url type="donation">https://www.patreon.com/multimc</url> <url type="donation">https://www.patreon.com/multimc</url>
<developer_name>The MultiMC Team</developer_name> <developer_name>The MultiMC Team</developer_name>

View File

@ -26,7 +26,7 @@
<item> <item>
<widget class="QTextBrowser" name="textBrowser"> <widget class="QTextBrowser" name="textBrowser">
<property name="html"> <property name="html">
<string>&lt;html&gt;&lt;body&gt;&lt;h1&gt;Upgrade is required&lt;/h1&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Please report any issues on our &lt;a href=&quot;https://github.com/MultiMC/MultiMC5/issues&quot;&gt;github issues page&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;There is also a &lt;a href=&quot;https://discord.gg/GtPmv93&quot;&gt;discord channel for testing here&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;body&gt;&lt;h1&gt;Upgrade is required&lt;/h1&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Please report any issues on our &lt;a href=&quot;https://github.com/MultiMC/Launcher/issues&quot;&gt;github issues page&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;There is also a &lt;a href=&quot;https://discord.gg/GtPmv93&quot;&gt;discord channel for testing here&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>

View File

@ -131,7 +131,7 @@ void DownloadTask::processDownloadedVersionInfo()
QObject::connect(netJob.get(), &NetJob::progress, this, &DownloadTask::fileDownloadProgressChanged); QObject::connect(netJob.get(), &NetJob::progress, this, &DownloadTask::fileDownloadProgressChanged);
QObject::connect(netJob.get(), &NetJob::failed, this, &DownloadTask::fileDownloadFailed); 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.")); setStatus(tr("Downloading one update file."));
} }

View File

@ -48,7 +48,7 @@ QString LanguageSelectionWidget::getSelectedLanguageKey() const
void LanguageSelectionWidget::retranslate() void LanguageSelectionWidget::retranslate()
{ {
QString text = tr("Don't see your language or the quality is poor?<br/><a href=\"%1\">Help us with translations!</a>") QString text = tr("Don't see your language or the quality is poor?<br/><a href=\"%1\">Help us with translations!</a>")
.arg("https://github.com/MultiMC/MultiMC5/wiki/Translating-MultiMC"); .arg("https://github.com/MultiMC/Launcher/wiki/Translating-MultiMC");
helpUsLabel->setText(text); helpUsLabel->setText(text);
} }

View File

@ -206,7 +206,7 @@ void PageContainer::help()
QString pageId = m_currentPage->helpPage(); QString pageId = m_currentPage->helpPage();
if (pageId.isEmpty()) if (pageId.isEmpty())
return; return;
DesktopServices::openUrl(QUrl("https://github.com/MultiMC/MultiMC5/wiki/" + pageId)); DesktopServices::openUrl(QUrl("https://github.com/MultiMC/Launcher/wiki/" + pageId));
} }
} }

View File

@ -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. 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
Hoedown is a revived fork of Sundown, the Markdown parser based on the original code of the Upskirt library by Natacha Porté. 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. 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 ## launcher
Java launcher part for Minecraft. 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. 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 ## LocalPeer
Library for making only one instance of the application run at all times. 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. Changes are made to make the code more generic and useful in less usual conditions.
## optional-bare
## ganalytics A simple single-file header-only version of a C++17-like optional for default-constructible, copyable types, for C++98 and later.
A Google Analytics library for Qt.
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 ## tomlc99
A TOML language parser. Used by Forge 1.14+ to store mod metadata. A TOML language parser. Used by Forge 1.14+ to store mod metadata.
See [github repo](https://github.com/cktan/tomlc99). See [github repo](https://github.com/cktan/tomlc99).
Licenced under the MIT licence. 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.