mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-10-06 06:50:16 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE use https more widely

Browse Source
This commit is contained in:
Chris Lane 2018-11-02 12:04:08 +00:00
parent 9b74e73ad3
commit 0572a1e4e6
No known key found for this signature in database
GPG Key ID: D13377F969CCE9C4
12 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -41,7 +41,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
##################################### Set Application options ##################################### ##################################### Set Application options #####################################
######## Set URLs ######## ######## Set URLs ########
set(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch MultiMC's news RSS feed from.") set(MultiMC_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetch MultiMC's news RSS feed from.")
######## Set version numbers ######## ######## Set version numbers ########
set(MultiMC_VERSION_MAJOR 0) set(MultiMC_VERSION_MAJOR 0)

2
api/logic/minecraft/auth/YggdrasilTask.cpp
View File

@ -122,7 +122,7 @@ void YggdrasilTask::processReply()
tr("<b>SSL Handshake failed.</b><br/>There might be a few causes for it:<br/>" tr("<b>SSL Handshake failed.</b><br/>There might be a few causes for it:<br/>"
"<ul>" "<ul>"
"<li>You use Windows XP and need to <a " "<li>You use Windows XP and need to <a "
"href=\"http://www.microsoft.com/en-us/download/details.aspx?id=38918\">update " "href=\"https://www.microsoft.com/en-us/download/details.aspx?id=38918\">update "
"your root certificates</a></li>" "your root certificates</a></li>"
"<li>Some device on your network is interfering with SSL traffic. In that case, " "<li>Some device on your network is interfering with SSL traffic. In that case, "
"you have bigger worries than Minecraft not starting.</li>" "you have bigger worries than Minecraft not starting.</li>"

2
api/logic/minecraft/forge/ForgeXzDownload.cpp
View File

@ -30,7 +30,7 @@ ForgeXzDownload::ForgeXzDownload(QString relative_path, MetaEntryPtr entry) : Ne
m_pack200_xz_file.setFileTemplate("./dl_temp.XXXXXX"); m_pack200_xz_file.setFileTemplate("./dl_temp.XXXXXX");
m_status = Job_NotStarted; m_status = Job_NotStarted;
m_url_path = relative_path; m_url_path = relative_path;
m_url = "http://files.minecraftforge.net/maven/" + m_url_path + ".pack.xz"; m_url = "https://files.minecraftforge.net/maven/" + m_url_path + ".pack.xz";
} }
void ForgeXzDownload::start() void ForgeXzDownload::start()

4
api/logic/modplatform/ftb/FtbPackInstallTask.cpp
View File

@ -32,11 +32,11 @@ void FtbPackInstallTask::downloadPack()
QString url; QString url;
if(m_pack.type == FtbPackType::Private) if(m_pack.type == FtbPackType::Private)
{ {
url = QString("http://ftb.cursecdn.com/FTB2/privatepacks/%1").arg(packoffset); url = QString("https://ftb.cursecdn.com/FTB2/privatepacks/%1").arg(packoffset);
} }
else else
{ {
url = QString("http://ftb.cursecdn.com/FTB2/modpacks/%1").arg(packoffset); url = QString("https://ftb.cursecdn.com/FTB2/modpacks/%1").arg(packoffset);
} }
job->addNetAction(Net::Download::makeCached(url, entry)); job->addNetAction(Net::Download::makeCached(url, entry));
archivePath = entry->getFullPath(); archivePath = entry->getFullPath();

2
api/logic/net/URLConstants.cpp
View File

@ -4,7 +4,7 @@ namespace URLConstants {
QString getLegacyJarUrl(QString version) QString getLegacyJarUrl(QString version)
{ {
return "http://" + AWS_DOWNLOAD_VERSIONS + getJarPath(version); return "https://" + AWS_DOWNLOAD_VERSIONS + getJarPath(version);
} }
QString getJarPath(QString version) QString getJarPath(QString version)

16
api/logic/net/URLConstants.h
View File

@ -25,15 +25,15 @@ const QString LIBRARY_BASE("libraries.minecraft.net/");
//const QString SKINS_BASE("skins.minecraft.net/MinecraftSkins/"); //const QString SKINS_BASE("skins.minecraft.net/MinecraftSkins/");
const QString SKINS_BASE("crafatar.com/skins/"); const QString SKINS_BASE("crafatar.com/skins/");
const QString AUTH_BASE("authserver.mojang.com/"); const QString AUTH_BASE("authserver.mojang.com/");
const QString FORGE_LEGACY_URL("http://files.minecraftforge.net/minecraftforge/json"); const QString FORGE_LEGACY_URL("https://files.minecraftforge.net/minecraftforge/json");
const QString FORGE_GRADLE_URL("http://files.minecraftforge.net/maven/net/minecraftforge/forge/json"); const QString FORGE_GRADLE_URL("https://files.minecraftforge.net/maven/net/minecraftforge/forge/json");
const QString MOJANG_STATUS_URL("http://status.mojang.com/check"); const QString MOJANG_STATUS_URL("https://status.mojang.com/check");
const QString MOJANG_STATUS_NEWS_URL("http://status.mojang.com/news"); const QString MOJANG_STATUS_NEWS_URL("https://status.mojang.com/news");
const QString LITELOADER_URL("http://dl.liteloader.com/versions/versions.json"); const QString LITELOADER_URL("https://dl.liteloader.com/versions/versions.json");
const QString IMGUR_BASE_URL("https://api.imgur.com/3/"); const QString IMGUR_BASE_URL("https://api.imgur.com/3/");
const QString FMLLIBS_OUR_BASE_URL("http://files.multimc.org/fmllibs/"); const QString FMLLIBS_OUR_BASE_URL("https://files.multimc.org/fmllibs/");
const QString FMLLIBS_FORGE_BASE_URL("http://files.minecraftforge.net/fmllibs/"); const QString FMLLIBS_FORGE_BASE_URL("https://files.minecraftforge.net/fmllibs/");
const QString TRANSLATIONS_BASE_URL("http://files.multimc.org/translations/"); const QString TRANSLATIONS_BASE_URL("https://files.multimc.org/translations/");
QString getJarPath(QString version); QString getJarPath(QString version);
QString getLegacyJarUrl(QString version); QString getLegacyJarUrl(QString version);

2
api/logic/translations/TranslationsModel.cpp
View File

@ -200,7 +200,7 @@ void TranslationsModel::downloadIndex()
qDebug() << "Downloading Translations Index..."; qDebug() << "Downloading Translations Index...";
d->m_index_job.reset(new NetJob("Translations Index")); d->m_index_job.reset(new NetJob("Translations Index"));
MetaEntryPtr entry = ENV.metacache()->resolveEntry("translations", "index"); MetaEntryPtr entry = ENV.metacache()->resolveEntry("translations", "index");
d->m_index_task = Net::Download::makeCached(QUrl("http://files.multimc.org/translations/index"), entry); d->m_index_task = Net::Download::makeCached(QUrl("https://files.multimc.org/translations/index"), entry);
d->m_index_job->addNetAction(d->m_index_task); d->m_index_job->addNetAction(d->m_index_task);
connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed); connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed);
connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexRecieved); connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexRecieved);

2
application/BuildConfig.h
View File

@ -51,7 +51,7 @@ public:
/** /**
* This is used to fetch the news RSS feed. * This is used to fetch the news RSS feed.
* It defaults in CMakeLists.txt to "http://multimc.org/rss.xml" * It defaults in CMakeLists.txt to "https://multimc.org/rss.xml"
*/ */
QString NEWS_RSS_URL; QString NEWS_RSS_URL;

6
application/MainWindow.cpp
View File

@ -1568,12 +1568,12 @@ void MainWindow::on_actionReportBug_triggered()
void MainWindow::on_actionPatreon_triggered() void MainWindow::on_actionPatreon_triggered()
{ {
DesktopServices::openUrl(QUrl("http://www.patreon.com/multimc")); DesktopServices::openUrl(QUrl("https://www.patreon.com/multimc"));
} }
void MainWindow::on_actionMoreNews_triggered() void MainWindow::on_actionMoreNews_triggered()
{ {
DesktopServices::openUrl(QUrl("http://multimc.org/posts.html")); DesktopServices::openUrl(QUrl("https://multimc.org/posts.html"));
} }
void MainWindow::newsButtonClicked() void MainWindow::newsButtonClicked()
@ -1585,7 +1585,7 @@ void MainWindow::newsButtonClicked()
} }
else else
{ {
DesktopServices::openUrl(QUrl("http://multimc.org/posts.html")); DesktopServices::openUrl(QUrl("https://multimc.org/posts.html"));
} }
} }

2
application/dialogs/AboutDialog.cpp
View File

@ -124,7 +124,7 @@ AboutDialog::~AboutDialog()
void AboutDialog::loadPatronList() void AboutDialog::loadPatronList()
{ {
netJob.reset(new NetJob("Patreon Patron List")); netJob.reset(new NetJob("Patreon Patron List"));
netJob->addNetAction(Net::Download::makeByteArray(QUrl("http://files.multimc.org/patrons.txt"), &dataSink)); netJob->addNetAction(Net::Download::makeByteArray(QUrl("https://files.multimc.org/patrons.txt"), &dataSink));
connect(netJob.get(), &NetJob::succeeded, this, &AboutDialog::patronListLoaded); connect(netJob.get(), &NetJob::succeeded, this, &AboutDialog::patronListLoaded);
netJob->start(); netJob->start();
} }

2
application/dialogs/AboutDialog.ui
View File

@ -180,7 +180,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://github.com/MultiMC/MultiMC5&quot;&gt;http://github.com/MultiMC/MultiMC5&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/MultiMC/MultiMC5&quot;&gt;https://github.com/MultiMC/MultiMC5&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>

4
application/pages/global/ExternalToolsPage.ui
View File

@ -63,7 +63,7 @@
<item> <item>
<widget class="QLabel" name="jprofilerLink"> <widget class="QLabel" name="jprofilerLink">
<property name="text"> <property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.ej-technologies.com/products/jprofiler/overview.html&quot;&gt;http://www.ej-technologies.com/products/jprofiler/overview.html&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://www.ej-technologies.com/products/jprofiler/overview.html&quot;&gt;https://www.ej-technologies.com/products/jprofiler/overview.html&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -137,7 +137,7 @@
<item> <item>
<widget class="QLabel" name="mceditLink"> <widget class="QLabel" name="mceditLink">
<property name="text"> <property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.mcedit.net/&quot;&gt;http://www.mcedit.net/&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://www.mcedit.net/&quot;&gt;https://www.mcedit.net/&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>