0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Update repository links

Browse Source
This commit is contained in:
kb1000 2021-10-21 01:46:13 +02:00
parent 264d3017aa
commit 8bc5b5a01f
No known key found for this signature in database
GPG Key ID: C174DD765CC3E131
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BUILD.md
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
@ -75,7 +75,7 @@ You can use IDEs like KDevelop or QtCreator to open the CMake project if you wan
### Loading the project in Qt Creator (optional) ### Loading the project in Qt Creator (optional)
1. Open Qt Creator. 1. Open Qt Creator.
2. Choose `File->Open File or Project`. 2. Choose `File->Open File or Project`.
3. Navigate to the MultiMC5 source folder you cloned and choose CMakeLists.txt. 3. Navigate to the Launcher source folder you cloned and choose CMakeLists.txt.
4. Read the instructions that just popped up about a build location and choose one. 4. Read the instructions that just popped up about a build location and choose one.
5. You should see "Run CMake" in the window. 5. You should see "Run CMake" in the window.
- Make sure that Generator is set to "Unix Generator (Desktop Qt 5.6.x GCC 64bit)". - Make sure that Generator is set to "Unix Generator (Desktop Qt 5.6.x GCC 64bit)".
@ -83,7 +83,7 @@ You can use IDEs like KDevelop or QtCreator to open the CMake project if you wan
- You'll see warnings and it might not be clear that it succeeded until you scroll to the bottom of the window. - You'll see warnings and it might not be clear that it succeeded until you scroll to the bottom of the window.
- Hit "Finish" if CMake ran successfully. - Hit "Finish" if CMake ran successfully.
6. Cross your fingers and press the Run button (bottom left of Qt Creator). 6. Cross your fingers and press the Run button (bottom left of Qt Creator).
- If the project builds successfully it will run and the MultiMC5 window will pop up. - If the project builds successfully it will run and the Launcher window will pop up.
**If this doesn't work for you, let us know on IRC ([Esper/#MultiMC](http://webchat.esper.net/?nick=&channels=MultiMC))!** **If this doesn't work for you, let us know on IRC ([Esper/#MultiMC](http://webchat.esper.net/?nick=&channels=MultiMC))!**
@ -132,7 +132,7 @@ Ensure that OpenSSL, zlib, Java and CMake are on `PATH`.
### Loading the project ### Loading the project
1. Open Qt Creator, 1. Open Qt Creator,
2. Choose File->Open File or Project, 2. Choose File->Open File or Project,
3. Navigate to the MultiMC5 source folder you cloned and choose CMakeLists.txt, 3. Navigate to the Launcher source folder you cloned and choose CMakeLists.txt,
4. Read the instructions that just popped up about a build location and choose one, 4. Read the instructions that just popped up about a build location and choose one,
5. If you chose not to add CMake to the system PATH, tell Qt Creator where you installed it, 5. If you chose not to add CMake to the system PATH, tell Qt Creator where you installed it,
- Otherwise you can skip this step. - Otherwise you can skip this step.
@ -142,7 +142,7 @@ Ensure that OpenSSL, zlib, Java and CMake are on `PATH`.
- You'll see warnings and it might not be clear that it succeeded until you scroll to the bottom of the window. - You'll see warnings and it might not be clear that it succeeded until you scroll to the bottom of the window.
- Hit "Finish" if CMake ran successfully. - Hit "Finish" if CMake ran successfully.
7. Cross your fingers and press the Run button (bottom left of Qt Creator)! 7. Cross your fingers and press the Run button (bottom left of Qt Creator)!
- If the project builds successfully it will run and the MultiMC5 window will pop up, - If the project builds successfully it will run and the Launcher window will pop up,
- Test OpenSSL by making an instance and trying to log in. If Qt Creator couldn't find OpenSSL during the CMake stage, login will fail and you'll get an error. - Test OpenSSL by making an instance and trying to log in. If Qt Creator couldn't find OpenSSL during the CMake stage, login will fail and you'll get an error.
The following .dlls are needed for the app to run (copy them to build directory if you want to be able to move the build to another pc): The following .dlls are needed for the app to run (copy them to build directory if you want to be able to move the build to another pc):
@ -166,7 +166,7 @@ zlib1.dll
**These build instructions worked for me (Drayshak) on a fresh Windows 8 x64 Professional install. If they don't work for you, let us know on IRC ([Esper/#MultiMC](http://webchat.esper.net/?nick=&channels=MultiMC))!** **These build instructions worked for me (Drayshak) on a fresh Windows 8 x64 Professional install. If they don't work for you, let us know on IRC ([Esper/#MultiMC](http://webchat.esper.net/?nick=&channels=MultiMC))!**
### Compile from command line on Windows ### Compile from command line on Windows
1. If you installed Qt with the web installer, there should be a shortcut called `Qt 5.4 for Desktop (MinGW 4.9 32-bit)` in the Start menu on Windows 7 and 10. Best way to find it is to search for it. Do note you cannot just use cmd.exe, you have to use the shortcut, otherwise the proper MinGW software will not be on the PATH. 1. If you installed Qt with the web installer, there should be a shortcut called `Qt 5.4 for Desktop (MinGW 4.9 32-bit)` in the Start menu on Windows 7 and 10. Best way to find it is to search for it. Do note you cannot just use cmd.exe, you have to use the shortcut, otherwise the proper MinGW software will not be on the PATH.
2. Once that is open, change into your user directory, and clone MultiMC by doing `git clone --recursive https://github.com/MultiMC/MultiMC5.git`, and change directory to the folder you cloned to. 2. Once that is open, change into your user directory, and clone MultiMC by doing `git clone --recursive https://github.com/MultiMC/Launcher.git`, and change directory to the folder you cloned to.
3. Make a build directory, and change directory to the directory and do `cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=C:\Path\that\makes\sense\for\you`. By default, it will install to C:\Program Files (x86), which you might not want, if you want a local installation. If you want to install it to that directory, make sure to run the command window as administrator. 3. Make a build directory, and change directory to the directory and do `cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=C:\Path\that\makes\sense\for\you`. By default, it will install to C:\Program Files (x86), which you might not want, if you want a local installation. If you want to install it to that directory, make sure to run the command window as administrator.
3. Do `mingw32-make -jX`, where X is the number of cores your CPU has plus one. 3. Do `mingw32-make -jX`, where X is the number of cores your CPU has plus one.
4. Now to wait for it to compile. This could take some time. Hopefully it compiles properly. 4. Now to wait for it to compile. This could take some time. Hopefully it compiles properly.
@ -186,8 +186,8 @@ zlib1.dll
Pick an installation path - this is where the final `.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. Pick an installation path - this is where the final `.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration.
``` ```
git clone --recursive https://github.com/MultiMC/MultiMC5.git git clone --recursive https://github.com/MultiMC/Launcher.git
cd MultiMC5 cd Launcher
mkdir build mkdir build
cd build cd build
cmake \ cmake \

2
changelog.md
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/).

4
doc/multimc.1.txt
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>

8
launcher/dialogs/UpdateDialog.cpp
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())
{ {

4
launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml
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>

2
launcher/pages/instance/LegacyUpgradePage.ui
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>

2
launcher/updater/DownloadTask.cpp
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."));
} }

2
launcher/widgets/LanguageSelectionWidget.cpp
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);
} }

2
launcher/widgets/PageContainer.cpp
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));
} }
} }

2
notsecrets/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
set(Launcher_DisplayName "${Launcher_CommonName} 5" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_CommonName} 5" PARENT_SCOPE)
set(Launcher_UserAgent "${Launcher_CommonName}/5.0" PARENT_SCOPE) set(Launcher_UserAgent "${Launcher_CommonName}/5.0" PARENT_SCOPE)
set(Launcher_ConfigFile "devlauncher.cfg" PARENT_SCOPE) set(Launcher_ConfigFile "devlauncher.cfg" PARENT_SCOPE)
set(Launcher_Git "https://github.com/MultiMC/MultiMC5" PARENT_SCOPE) set(Launcher_Git "https://github.com/MultiMC/Launcher" PARENT_SCOPE)
set(Launcher_Branding_ICNS "notsecrets/Launcher.icns" PARENT_SCOPE) set(Launcher_Branding_ICNS "notsecrets/Launcher.icns" PARENT_SCOPE)
set(Launcher_Branding_WindowsRC "notsecrets/launcher.rc" PARENT_SCOPE) set(Launcher_Branding_WindowsRC "notsecrets/launcher.rc" PARENT_SCOPE)