Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix conflicts

Browse Source 
Signed-off-by: sneedium <sneed@sneedmc.org>
This commit is contained in:
sneedium 2022-06-14 21:37:11 -04:00
parent 984e5b3b19
commit 2a1dcd6a38
Signed by: sneedium
GPG Key ID: 906F66490FBE722F
42 changed files with 8114 additions and 985 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View File

@ -8,11 +8,7 @@ body:
If you need help with running Minecraft, please visit us on our Discord before making a bug report.
Before submitting a bug report, please make sure you have read this *entire* form, and that:
<<<<<<< HEAD
* You have read the [FAQ](https://github.com/Sneederix/SneedMC/wiki/FAQ) and it has not answered your question
=======
* You have read the [PolyMC wiki](https://polymc.org/wiki/) and it has not answered your question.
>>>>>>> upstream/develop
* 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/Sneederix/SneedMC/issues)

6
CMakeLists.txt
View File

@ -97,10 +97,10 @@ set(Launcher_BUG_TRACKER_URL "https://github.com/Sneederix/SneedMC/issues" CACHE
set(Launcher_TRANSLATIONS_URL "" CACHE STRING "URL for the translations platform.")
# Matrix Space
set(Launcher_MATRIX_URL "https://matrix.to/#/#polymc:matrix.org" CACHE STRING "URL to the Matrix Space")
set(Launcher_MATRIX_URL "" CACHE STRING "URL to the Matrix Space")
# Discord URL
set(Launcher_DISCORD_URL "https://discord.gg/Z52pwxWCHP" CACHE STRING "URL for the Discord guild.")
set(Launcher_DISCORD_URL "" CACHE STRING "URL for the Discord guild.")
@ -220,7 +220,7 @@ if(UNIX AND APPLE)
elseif(UNIX)
set(BINARY_DEST_DIR "bin")
set(LIBRARY_DEST_DIR "lib${LIB_SUFFIX}")
set(JARS_DEST_DIR "share/jars")
set(JARS_DEST_DIR "jars")
set(LAUNCHER_DESKTOP_DEST_DIR "share/applications" CACHE STRING "Path to the desktop file directory")
set(LAUNCHER_METAINFO_DEST_DIR "share/metainfo" CACHE STRING "Path to the metainfo directory")
set(LAUNCHER_ICON_DEST_DIR "share/icons/hicolor/scalable/apps" CACHE STRING "Path to the scalable icon directory")

44
README.md
View File

@ -7,11 +7,6 @@
SneedMC is a sneedful launcher for Minecraft that focuses on sneedictability, long term sneedility, and sneedicity.
<<<<<<< HEAD
=======
This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC.
If you want to read about why this fork was created, check out [our FAQ page](https://polymc.org/wiki/overview/faq/).
>>>>>>> upstream/develop
<br>
# Installation
@ -19,7 +14,6 @@ If you want to read about why this fork was created, check out [our FAQ page](ht
- All downloads and instructions for PolyMC can be found [here](https://polymc.org/download/)
- Last build status: https://github.com/PolyMC/PolyMC/actions
<<<<<<< HEAD
### <img src="https://www.vectorlogo.zone/logos/linuxfoundation/linuxfoundation-icon.svg" height="20" alt=""/> Cross-distro packages
<a href='https://flathub.org/apps/details/org.polymc.PolyMC'><img width='240' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a>
@ -124,8 +118,6 @@ In both cases you need X11, Qt5 and Java installed. Both files are 64bit only.
For OpenBSD available are [gzipped 32-bit binaries](http://glowiak.github.io/file/polymc-latest-obsd32-raw), download, unpack and run.
You need X11, Qt5 and Java installed.
=======
>>>>>>> upstream/develop
## Development Builds
@ -172,11 +164,7 @@ If you want to contribute to SneedMC you might find it useful to join our Discor
## Building
<<<<<<< HEAD
If you want to build SneedMC yourself, check [BUILD.md](BUILD.md) for build instructions.
=======
If you want to build PolyMC yourself, check [Build Instructions](https://polymc.org/wiki/development/build-instructions/) for build instructions.
>>>>>>> upstream/develop
## Code formatting
@ -199,36 +187,4 @@ To modify download information or change packaging information send a pull reque
## Forking/Redistributing/Custom builds policy
<<<<<<< HEAD
SNEED
=======
We don't care what you do with your fork/custom build as long as you do the following as a basic courtesy:
- Follow the terms of the [license](LICENSE) (not just a courtesy, but also a legal responsibility)
- Make it clear that your fork is not PolyMC and is not endorsed by or affiliated with the PolyMC project (https://polymc.org).
- Go through [CMakeLists.txt](CMakeLists.txt) and change PolyMC's API keys to your own or set them to empty strings (`""`) to disable them (this way the program will still compile but the functionality requiring those keys will be disabled).
If you have any questions or want any clarification on the above conditions please make an issue and ask us.
Be aware that if you build this software without removing the provided API keys in [CMakeLists.txt](CMakeLists.txt) you are accepting the following terms and conditions:
- [Microsoft Identity Platform Terms of Use](https://docs.microsoft.com/en-us/legal/microsoft-identity-platform/terms-of-use)
- [CurseForge 3rd Party API Terms and Conditions](https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions)
If you do not agree with these terms and conditions, then remove the associated API keys from the [CMakeLists.txt](CMakeLists.txt) file by setting them to an empty string (`""`).
All launcher code is available under the GPL-3.0-only license.
The logo and related assets are under the CC BY-SA 4.0 license.
## Sponsors
Thank you to all our generous backers over at Open Collective! Support PolyMC by [becoming a backer](https://opencollective.com/polymc).
[![OpenCollective Backers](https://opencollective.com/polymc/backers.svg?width=890&limit=1000)](https://opencollective.com/polymc#backers)
Also, thanks to JetBrains for providing us a few licenses for all their products, as part of their [Open Source program](https://www.jetbrains.com/opensource/).
[![JetBrains](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/opensource/)
Additionally, thanks to the awesome people over at [MacStadium](https://www.macstadium.com/), for providing M1-Macs for development purposes!
<a href="https://www.macstadium.com"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="Powered by MacStadium" width="300"></a>
>>>>>>> upstream/develop

4
buildconfig/BuildConfig.cpp.in
View File

@ -59,10 +59,6 @@ Config::Config()
VERSION_BUILD = @Launcher_VERSION_BUILD@;
BUILD_PLATFORM = "@Launcher_BUILD_PLATFORM@";
<<<<<<< HEAD
=======
UPDATER_BASE = "@Launcher_UPDATER_BASE@";
>>>>>>> upstream/develop
GIT_COMMIT = "@Launcher_GIT_COMMIT@";
GIT_REFSPEC = "@Launcher_GIT_REFSPEC@";

14
buildconfig/BuildConfig.h
View File

@ -63,23 +63,14 @@ class Config {
/// A short string identifying this build's platform. For example, "lin64" or "win32".
QString BUILD_PLATFORM;
<<<<<<< HEAD
=======
/// URL for the updater's channel
QString UPDATER_BASE;
>>>>>>> upstream/develop
/// User-Agent to use.
QString USER_AGENT;
/// User-Agent to use for uncached requests.
QString USER_AGENT_UNCACHED;
<<<<<<< HEAD
QString VERSION_CHANNEL;
=======
>>>>>>> upstream/develop
/// The git commit hash of this build
QString GIT_COMMIT;
@ -135,13 +126,8 @@ class Config {
QString LIBRARY_BASE = "https://libraries.minecraft.net/";
QString AUTH_BASE = "https://authserver.mojang.com/";
QString IMGUR_BASE_URL = "https://api.imgur.com/3/";
<<<<<<< HEAD
QString FMLLIBS_BASE_URL = "https://files.multimc.org/fmllibs/";
QString TRANSLATIONS_BASE_URL = "https://files.multimc.org/translations/";
=======
QString FMLLIBS_BASE_URL = "https://files.polymc.org/fmllibs/";
QString TRANSLATIONS_BASE_URL = "https://i18n.polymc.org/";
>>>>>>> upstream/develop
QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/";

42
launcher/Application.cpp
View File

@ -152,47 +152,6 @@ void appDebugOutput(QtMsgType type, const QMessageLogContext &context, const QSt
fflush(stderr);
}
#ifdef LAUNCHER_WITH_UPDATER
QString getIdealPlatform(QString currentPlatform) {
auto info = Sys::getKernelInfo();
switch(info.kernelType) {
case Sys::KernelType::Darwin: {
if(info.kernelMajor >= 17) {
// macOS 10.13 or newer
return "osx64-5.15.2";
}
else {
// macOS 10.12 or older
return "osx64";
}
}
case Sys::KernelType::Windows: {
// FIXME: 5.15.2 is not stable on Windows, due to a large number of completely unpredictable and hard to reproduce issues
break;
/*
if(info.kernelMajor == 6 && info.kernelMinor >= 1) {
// Windows 7
return "win32-5.15.2";
}
else if (info.kernelMajor > 6) {
// Above Windows 7
return "win32-5.15.2";
}
else {
// Below Windows 7
return "win32";
}
*/
}
case Sys::KernelType::Undetermined:
case Sys::KernelType::Linux: {
break;
}
}
return currentPlatform;
}
#endif
}
Application::Application(int &argc, char **argv) : QApplication(argc, argv)
@ -361,6 +320,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
QDir foo(FS::PathCombine(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), ".."));
dataPath = foo.absolutePath();
adjustedBy = "Persistent data path";
#endif
#ifdef Q_OS_LINUX
// TODO: this should be removed in a future version

2
launcher/CMakeLists.txt
View File

@ -822,6 +822,8 @@ SET(LAUNCHER_SOURCES
ui/pagedialog/PageDialog.h
ui/dialogs/ProgressDialog.cpp
ui/dialogs/ProgressDialog.h
ui/dialogs/ReviewMessageBox.cpp
ui/dialogs/ReviewMessageBox.h
ui/dialogs/VersionSelectDialog.cpp
ui/dialogs/VersionSelectDialog.h
ui/dialogs/SkinUploadDialog.cpp

10
launcher/minecraft/MinecraftInstance.cpp
View File

@ -56,11 +56,7 @@
#include "launch/steps/PreLaunchCommand.h"
#include "launch/steps/TextPrint.h"
#include "launch/steps/CheckJava.h"
<<<<<<< HEAD
#include "launch/steps/Update.h"
=======
#include "launch/steps/QuitAfterGameStop.h"
>>>>>>> upstream/develop
#include "minecraft/launch/LauncherPartLaunch.h"
#include "minecraft/launch/DirectJavaLaunch.h"
@ -89,6 +85,7 @@
#include "MinecraftLoadAndCheck.h"
#include "minecraft/gameoptions/GameOptions.h"
#include "minecraft/update/FoldersTask.h"
#include "launch/steps/Update.h"
#define IBUS "@im=ibus"
@ -493,14 +490,9 @@ QStringList MinecraftInstance::processMinecraftArgs(
}
}
<<<<<<< HEAD
// blatant self-promotion.
token_mapping["profile_name"] = token_mapping["version_name"] = "SneedMC";
=======
token_mapping["profile_name"] = name();
token_mapping["version_name"] = profile->getMinecraftVersion();
>>>>>>> upstream/develop
token_mapping["version_type"] = profile->getMinecraftVersionType();
QString absRootDir = QDir(gameRoot()).absolutePath();

4
launcher/net/PasteUpload.cpp
View File

@ -44,9 +44,6 @@
#include <QJsonArray>
#include <QJsonDocument>
#include <QFile>
<<<<<<< HEAD
#include <QHttpMultiPart>
=======
#include <QHttpPart>
#include <QUrlQuery>
@ -55,7 +52,6 @@ std::array<PasteUpload::PasteTypeInfo, 4> PasteUpload::PasteTypes = {
{"hastebin", "https://hst.sh", "/documents"},
{"paste.gg", "https://paste.gg", "/api/v1/pastes"},
{"mclo.gs", "https://api.mclo.gs", "/1/log"}}};
>>>>>>> upstream/develop
PasteUpload::PasteUpload(QWidget *window, QString text, QString baseUrl, PasteType pasteType) : m_window(window), m_baseUrl(baseUrl), m_pasteType(pasteType), m_text(text.toUtf8())
{

1
launcher/resources/flat/flat.qrc
View File

@ -11,7 +11,6 @@
<file>scalable/copy.svg</file>
<file>scalable/coremods.svg</file>
<file>scalable/custom-commands.svg</file>
<file>scalable/discord.svg</file>
<file>scalable/externaltools.svg</file>
<file>scalable/help.svg</file>
<file>scalable/instance-settings.svg</file>

7
launcher/resources/multimc/multimc.qrc
View File

@ -248,13 +248,6 @@
<!-- placeholder when loading screenshot images -->
<file>scalable/screenshot-placeholder.svg</file>
<!-- matrix logo -->
<file>scalable/matrix.svg</file>
<!-- discord logo icon thing. from discord. traced from bitmap -->
<file>scalable/discord.svg</file>
<!-- instance icons -->
<file>32x32/instances/chicken.png</file>
<file>128x128/instances/chicken.png</file>

21
launcher/resources/pe_light/scalable/launcher.svg
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<<<<<<< HEAD
<svg
version="1.1"
@ -8093,24 +8092,4 @@ uO2RPZtQG4ZhPAv4fz9noaNY2jAvAAAAAElFTkSuQmCC
"
id="image63" />
</g>
=======
<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
<stop stop-color="#dedede" offset="0"/>
<stop stop-color="#d2d2d2" offset=".5"/>
<stop stop-color="#c0c0c0" offset="1"/>
</linearGradient>
</defs>
<g>
<path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#8f8f8f"/>
<path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#c2c2c2"/>
<path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#7c7c7c"/>
<path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#d3d3d3"/>
<path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#bcbcbc"/>
<path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#dedede"/>
<path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
</g>
<path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
>>>>>>> upstream/develop
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 KiB

After

Width:  |  Height:  |  Size: 606 KiB

15
launcher/ui/MainWindow.cpp
View File

@ -362,7 +362,7 @@ public:
if(!BuildConfig.MATRIX_URL.isEmpty()) {
actionMATRIX = TranslatedAction(MainWindow);
actionMATRIX->setObjectName(QStringLiteral("actionMATRIX"));
actionMATRIX->setIcon(APPLICATION->getThemedIcon("matrix"));
//actionMATRIX->setIcon(APPLICATION->getThemedIcon("matrix"));
actionMATRIX.setTextId(QT_TRANSLATE_NOOP("MainWindow", "&Matrix Space"));
actionMATRIX.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 Matrix space"));
all_actions.append(&actionMATRIX);
@ -371,7 +371,7 @@ public:
if (!BuildConfig.DISCORD_URL.isEmpty()) {
actionDISCORD = TranslatedAction(MainWindow);
actionDISCORD->setObjectName(QStringLiteral("actionDISCORD"));
actionDISCORD->setIcon(APPLICATION->getThemedIcon("discord"));
//actionDISCORD->setIcon(APPLICATION->getThemedIcon("discord"));
actionDISCORD.setTextId(QT_TRANSLATE_NOOP("MainWindow", "&Discord Guild"));
actionDISCORD.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 Discord guild."));
all_actions.append(&actionDISCORD);
@ -394,8 +394,6 @@ public:
actionAbout.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "View information about %1."));
all_actions.append(&actionAbout);
mainToolBar->addSeparator();
actionCAT = TranslatedAction(MainWindow);
actionCAT->setObjectName(QStringLiteral("actionCAT"));
actionCAT->setCheckable(true);
@ -442,7 +440,7 @@ public:
if (!BuildConfig.BUG_TRACKER_URL.isEmpty()) {
helpMenu->addAction(actionReportBug);
}
if(!BuildConfig.MATRIX_URL.isEmpty()) {
helpMenu->addAction(actionMATRIX);
}
@ -470,11 +468,6 @@ public:
helpButtonAction->setDefaultWidget(helpMenuButton);
mainToolBar->addAction(helpButtonAction);
if(BuildConfig.UPDATER_ENABLED)
{
mainToolBar->addAction(actionCheckUpdate);
}
mainToolBar->addSeparator();
mainToolBar->addAction(actionCAT);
@ -534,8 +527,6 @@ public:
if (!BuildConfig.SUBREDDIT_URL.isEmpty())
helpMenu->addAction(actionREDDIT);
helpMenu->addSeparator();
if(BuildConfig.UPDATER_ENABLED)
helpMenu->addAction(actionCheckUpdate);
MainWindow->setMenuBar(menuBar);
}

11
launcher/ui/dialogs/AboutDialog.cpp
View File

@ -46,17 +46,6 @@
#include "HoeDown.h"
namespace {
QString getLink(QString link, QString name) {
return QString("&lt;<a href='%1'>%2</a>&gt;").arg(link).arg(name);
}
QString getWebsite(QString link) {
return getLink(link, QObject::tr("Website"));
}
QString getGitHub(QString username) {
return getLink("https://github.com/" + username, "GitHub");
}
// Credits
// This is a hack, but I can't think of a better way to do this easily without screwing with QTextDocument...

6
launcher/ui/pages/global/AccountListPage.cpp
View File

@ -163,15 +163,9 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
tr("Microsoft Accounts not available"),
//: %1 refers to the launcher itself
tr(
<<<<<<< HEAD
"Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated SneedMC.\n\n"
"Please update both your operating system and SneedMC."
),
=======
"Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated %1.\n\n"
"Please update both your operating system and %1."
).arg(BuildConfig.LAUNCHER_NAME),
>>>>>>> upstream/develop
QMessageBox::Warning
)->exec();
return;

102
launcher/ui/pages/global/LauncherPage.cpp
View File

@ -76,25 +76,6 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
m_languageModel = APPLICATION->translations();
loadSettings();
<<<<<<< HEAD
=======
#ifdef LAUNCHER_WITH_UPDATER
if(BuildConfig.UPDATER_ENABLED)
{
QObject::connect(APPLICATION->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &LauncherPage::refreshUpdateChannelList);
if (APPLICATION->updateChecker()->hasChannels())
{
refreshUpdateChannelList();
}
else
{
APPLICATION->updateChecker()->updateChanList(false);
}
ui->updateSettingsBox->setHidden(false);
}
#endif
>>>>>>> upstream/develop
connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
}
@ -189,93 +170,10 @@ void LauncherPage::on_metadataDisableBtn_clicked()
ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
}
<<<<<<< HEAD
=======
#ifdef LAUNCHER_WITH_UPDATER
void LauncherPage::refreshUpdateChannelList()
{
// Stop listening for selection changes. It's going to change a lot while we update it and
// we don't need to update the
// description label constantly.
QObject::disconnect(ui->updateChannelComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(updateChannelSelectionChanged(int)));
QList<UpdateChecker::ChannelListEntry> channelList = APPLICATION->updateChecker()->getChannelList();
ui->updateChannelComboBox->clear();
int selection = -1;
for (int i = 0; i < channelList.count(); i++)
{
UpdateChecker::ChannelListEntry entry = channelList.at(i);
// When it comes to selection, we'll rely on the indexes of a channel entry being the
// same in the
// combo box as it is in the update checker's channel list.
// This probably isn't very safe, but the channel list doesn't change often enough (or
// at all) for
// this to be a big deal. Hope it doesn't break...
ui->updateChannelComboBox->addItem(entry.name);
// If the update channel we just added was the selected one, set the current index in
// the combo box to it.
if (entry.id == m_currentUpdateChannel)
{
qDebug() << "Selected index" << i << "channel id" << m_currentUpdateChannel;
selection = i;
}
}
ui->updateChannelComboBox->setCurrentIndex(selection);
// Start listening for selection changes again and update the description label.
QObject::connect(ui->updateChannelComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(updateChannelSelectionChanged(int)));
refreshUpdateChannelDesc();
// Now that we've updated the channel list, we can enable the combo box.
// It starts off disabled so that if the channel list hasn't been loaded, it will be
// disabled.
ui->updateChannelComboBox->setEnabled(true);
}
void LauncherPage::updateChannelSelectionChanged(int index)
{
refreshUpdateChannelDesc();
}
void LauncherPage::refreshUpdateChannelDesc()
{
// Get the channel list.
QList<UpdateChecker::ChannelListEntry> channelList = APPLICATION->updateChecker()->getChannelList();
int selectedIndex = ui->updateChannelComboBox->currentIndex();
if (selectedIndex < 0)
{
return;
}
if (selectedIndex < channelList.count())
{
// Find the channel list entry with the given index.
UpdateChecker::ChannelListEntry selected = channelList.at(selectedIndex);
// Set the description text.
ui->updateChannelDescLabel->setText(selected.description);
// Set the currently selected channel ID.
m_currentUpdateChannel = selected.id;
}
}
#endif
>>>>>>> upstream/develop
void LauncherPage::applySettings()
{
auto s = APPLICATION->settings();
<<<<<<< HEAD
=======
// Updates
s->set("AutoUpdate", ui->autoUpdateCheckBox->isChecked());
s->set("UpdateChannel", m_currentUpdateChannel);
>>>>>>> upstream/develop
auto original = s->get("IconTheme").toString();
//FIXME: make generic
switch (ui->themeComboBox->currentIndex())

15
launcher/ui/pages/global/LauncherPage.h
View File

@ -90,21 +90,6 @@ slots:
void on_iconsDirBrowseBtn_clicked();
void on_metadataDisableBtn_clicked();
#ifdef LAUNCHER_WITH_UPDATER
/*!
<<<<<<< HEAD
=======
* Updates the list of update channels in the combo box.
*/
void refreshUpdateChannelList();
/*!
* Updates the channel description label.
*/
void refreshUpdateChannelDesc();
void updateChannelSelectionChanged(int index);
#endif
/*!
>>>>>>> upstream/develop
* Updates the font preview

49
launcher/ui/pages/global/LauncherPage.ui
View File

@ -46,55 +46,6 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<<<<<<< HEAD
=======
<widget class="QGroupBox" name="updateSettingsBox">
<property name="title">
<string>Update Settings</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QCheckBox" name="autoUpdateCheckBox">
<property name="text">
<string>Check for updates on start?</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="updateChannelLabel">
<property name="text">
<string>Up&amp;date Channel:</string>
</property>
<property name="buddy">
<cstring>updateChannelComboBox</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="updateChannelComboBox">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="updateChannelDescLabel">
<property name="text">
<string>No channel selected.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
>>>>>>> upstream/develop
<widget class="QGroupBox" name="foldersBox">
<property name="title">
<string>Folders</string>

7
launcher/ui/pages/global/MinecraftPage.ui
View File

@ -173,17 +173,10 @@
<item>
<widget class="QCheckBox" name="closeAfterLaunchCheck">
<property name="toolTip">
<<<<<<< HEAD
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SneedMC will automatically reopen when the game crashes or exits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Close SneedMC after game window opens</string>
=======
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The launcher will automatically reopen when the game crashes or exits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>&amp;Close the launcher after game window opens</string>
>>>>>>> upstream/develop
</property>
</widget>
</item>

4
launcher/ui/pages/instance/VersionPage.cpp
View File

@ -426,11 +426,7 @@ void VersionPage::on_actionDownload_All_triggered()
{
CustomMessageBox::selectable(
this, tr("Error"),
<<<<<<< HEAD
tr("SneedMC cannot download Minecraft or update instances unless you have at least "
=======
tr("Cannot download Minecraft or update instances unless you have at least "
>>>>>>> upstream/develop
"one account added.\nPlease add your Mojang or Minecraft account."),
QMessageBox::Warning)->show();
return;

3
launcher/ui/pages/instance/WorldListPage.cpp
View File

@ -46,10 +46,7 @@
#include <QTreeView>
#include <QInputDialog>
#include <QProcess>
<<<<<<< HEAD
=======
#include <Qt>
>>>>>>> upstream/develop
#include <QSortFilterProxyModel>
#include "tools/MCEditTool.h"

12
launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
View File

@ -285,13 +285,6 @@ void ModpackListModel::searchRequestFinished(QJsonDocument& doc_all)
void ModpackListModel::searchRequestFailed(QString reason)
{
<<<<<<< HEAD
if(jobPtr->first()->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 409){
//409 Gone, notify user to update
QMessageBox::critical(nullptr, tr("Error"), tr("Modrinth API version too old!\nPlease update SneedMC!"));
//self-destruct
((ModDownloadDialog *)((ModrinthPage *)parent())->parentWidget())->reject();
=======
if (!jobPtr->first()->m_reply) {
// Network error
QMessageBox::critical(nullptr, tr("Error"), tr("A network error occurred. Could not load modpacks."));
@ -302,7 +295,6 @@ void ModpackListModel::searchRequestFailed(QString reason)
QString("%1 %2")
.arg(m_parent->displayName())
.arg(tr("API version too old!\nPlease update %1!").arg(BuildConfig.LAUNCHER_NAME)));
>>>>>>> upstream/develop
}
jobPtr.reset();
@ -318,10 +310,6 @@ void ModpackListModel::searchRequestFailed(QString reason)
}
}
<<<<<<< HEAD
}
=======
} // namespace Modrinth
/******** Helpers ********/
>>>>>>> upstream/develop

4
launcher/ui/widgets/PageContainer.cpp
View File

@ -238,11 +238,7 @@ void PageContainer::help()
QString pageId = m_currentPage->helpPage();
if (pageId.isEmpty())
return;
<<<<<<< HEAD
DesktopServices::openUrl(QUrl("https://github.com/Sneederix/SneedMC/wiki/" + pageId));
=======
DesktopServices::openUrl(QUrl(BuildConfig.HELP_URL.arg(pageId)));
>>>>>>> upstream/develop
}
}

15
libraries/rainbow/CMakeLists.txt
View File

@ -8,22 +8,7 @@ set(RAINBOW_SOURCES
src/rainbow.cpp
)
<<<<<<< HEAD
add_definitions(-DRAINBOW_LIBRARY)
add_library(SneedMC_rainbow SHARED ${RAINBOW_SOURCES})
target_include_directories(SneedMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(SneedMC_rainbow Qt5::Core Qt5::Gui)
# Install it
install(
TARGETS SneedMC_rainbow
RUNTIME DESTINATION ${LIBRARY_DEST_DIR}
LIBRARY DESTINATION ${LIBRARY_DEST_DIR}
)
=======
add_library(Launcher_rainbow STATIC ${RAINBOW_SOURCES})
target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui)
>>>>>>> upstream/develop

6
nix/default.nix
View File

@ -41,15 +41,9 @@ let
javaPaths = lib.makeSearchPath "bin/java" ([ jdk jdk8 ] ++ extraJDKs);
in
<<<<<<< HEAD:nix/sneedmc/default.nix
mkDerivation rec {
pname = "sneedmc";
version = "nightly";
=======
stdenv.mkDerivation rec {
pname = "polymc";
inherit version;
>>>>>>> upstream/develop:nix/default.nix
src = lib.cleanSource self;

6
nix/sneedmc/default.nix
View File

@ -41,15 +41,9 @@ let
javaPaths = lib.makeSearchPath "bin/java" ([ jdk jdk8 ] ++ extraJDKs);
in
<<<<<<< HEAD:nix/sneedmc/default.nix
mkDerivation rec {
pname = "sneedmc";
version = "nightly";
=======
stdenv.mkDerivation rec {
pname = "polymc";
inherit version;
>>>>>>> upstream/develop:nix/default.nix
src = lib.cleanSource self;

29
program_info/CMakeLists.txt
View File

@ -9,33 +9,22 @@ set(Launcher_ConfigFile "sneedmc.cfg" PARENT_SCOPE)
set(Launcher_Git "https://github.com/Sneederix/SneedMC" PARENT_SCOPE)
set(Launcher_DesktopFileName "org.sneederix.SneedMC.desktop" PARENT_SCOPE)
<<<<<<< HEAD
set(Launcher_Desktop "program_info/org.sneederix.SneedMC.desktop" PARENT_SCOPE)
set(Launcher_MetaInfo "program_info/org.sneederix.SneedMC.metainfo.xml" PARENT_SCOPE)
set(Launcher_ManPage "program_info/sneedmc.1.txt" PARENT_SCOPE)
set(Launcher_SVG "program_info/org.sneederix.SneedMC.svg" PARENT_SCOPE)
set(Launcher_Branding_ICNS "program_info/sneedmc.icns" PARENT_SCOPE)
set(Launcher_Branding_ICO "program_info/sneedmc.ico")
set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE)
set(Launcher_Branding_WindowsRC "program_info/sneedmc.rc" PARENT_SCOPE)
set(Launcher_Branding_LogoQRC "program_info/sneedmc.qrc" PARENT_SCOPE)
configure_file(org.sneederix.SneedMC.desktop.in org.sneederix.SneedMC.desktop)
configure_file(org.sneederix.SneedMC.metainfo.xml.in org.sneederix.SneedMC.metainfo.xml)
=======
set(Launcher_Desktop "program_info/org.polymc.PolyMC.desktop" PARENT_SCOPE)
set(Launcher_MetaInfo "program_info/org.polymc.PolyMC.metainfo.xml" PARENT_SCOPE)
set(Launcher_ManPage "program_info/polymc.6.txt" PARENT_SCOPE)
set(Launcher_SVG "program_info/org.polymc.PolyMC.svg" PARENT_SCOPE)
set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE)
set(Launcher_Branding_ICO "program_info/polymc.ico")
set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE)
set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE)
set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE)
set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE)
configure_file(org.polymc.PolyMC.desktop.in org.polymc.PolyMC.desktop)
configure_file(org.polymc.PolyMC.metainfo.xml.in org.polymc.PolyMC.metainfo.xml)
configure_file(polymc.rc.in polymc.rc @ONLY)
configure_file(polymc.manifest.in polymc.manifest @ONLY)
configure_file(polymc.ico polymc.ico COPYONLY)
configure_file(org.sneederix.SneedMC.desktop.in org.sneederix.SneedMC.desktop)
configure_file(org.sneederix.SneedMC.metainfo.xml.in org.sneederix.SneedMC.metainfo.xml)
configure_file(sneedmc.ico sneedmc.ico COPYONLY)
configure_file(win_install.nsi.in win_install.nsi @ONLY)
>>>>>>> upstream/develop
configure_file(org.sneederix.SneedMC.desktop.in org.sneederix.SneedMC.desktop)
configure_file(org.sneederix.SneedMC.metainfo.xml.in org.sneederix.SneedMC.metainfo.xml)

32
program_info/genicons.sh
View File

@ -1,51 +1,19 @@
#/bin/bash
<<<<<<< HEAD
inkscape -w 16 -h 16 -o sneedmc_16.png org.sneederix.SneedMC.svg
inkscape -w 24 -h 24 -o sneedmc_24.png org.sneederix.SneedMC.svg
inkscape -w 32 -h 32 -o sneedmc_32.png org.sneederix.SneedMC.svg
inkscape -w 48 -h 48 -o sneedmc_48.png org.sneederix.SneedMC.svg
inkscape -w 64 -h 64 -o sneedmc_64.png org.sneederix.SneedMC.svg
inkscape -w 128 -h 128 -o sneedmc_128.png org.sneederix.SneedMC.svg
=======
# ICO
inkscape -w 16 -h 16 -o polymc_16.png org.polymc.PolyMC.svg
inkscape -w 24 -h 24 -o polymc_24.png org.polymc.PolyMC.svg
inkscape -w 32 -h 32 -o polymc_32.png org.polymc.PolyMC.svg
inkscape -w 48 -h 48 -o polymc_48.png org.polymc.PolyMC.svg
inkscape -w 64 -h 64 -o polymc_64.png org.polymc.PolyMC.svg
inkscape -w 128 -h 128 -o polymc_128.png org.polymc.PolyMC.svg
>>>>>>> upstream/develop
convert sneedmc_128.png sneedmc_64.png sneedmc_48.png sneedmc_32.png sneedmc_24.png sneedmc_16.png sneedmc.ico
<<<<<<< HEAD
inkscape -w 256 -h 256 -o sneedmc_256.png org.sneederix.SneedMC.svg
inkscape -w 512 -h 512 -o sneedmc_512.png org.sneederix.SneedMC.svg
inkscape -w 1024 -h 1024 -o sneedmc_1024.png org.sneederix.SneedMC.svg
png2icns sneedmc.icns sneedmc_1024.png sneedmc_512.png sneedmc_256.png sneedmc_128.png sneedmc_32.png sneedmc_16.png
=======
rm -f polymc_*.png
inkscape -w 1024 -h 1024 -o polymc_1024.png org.polymc.PolyMC.bigsur.svg
mkdir polymc.iconset
sips -z 16 16 polymc_1024.png --out polymc.iconset/icon_16x16.png
sips -z 32 32 polymc_1024.png --out polymc.iconset/icon_16x16@2x.png
sips -z 32 32 polymc_1024.png --out polymc.iconset/icon_32x32.png
sips -z 64 64 polymc_1024.png --out polymc.iconset/icon_32x32@2x.png
sips -z 128 128 polymc_1024.png --out polymc.iconset/icon_128x128.png
sips -z 256 256 polymc_1024.png --out polymc.iconset/icon_128x128@2x.png
sips -z 256 256 polymc_1024.png --out polymc.iconset/icon_256x256.png
sips -z 512 512 polymc_1024.png --out polymc.iconset/icon_256x256@2x.png
sips -z 512 512 polymc_1024.png --out polymc.iconset/icon_512x512.png
cp polymc_1024.png polymc.iconset/icon_512x512@2x.png
iconutil -c icns polymc.iconset
>>>>>>> upstream/develop
rm -f sneedmc_*.png
rm -rf sneedmc.iconset

174
program_info/org.polymc.PolyMC.bigsur.svg
View File

@ -1,174 +0,0 @@
<svg
width="1024"
height="1024"
viewBox="0 0 1024 1024"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<g filter="url(#filter0_d_102_69)">
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M924 354.627C924 344.845 924.004 335.062 923.944 325.279C923.895 317.038 923.8 308.799 923.576 300.562C923.092 282.609 922.033 264.502 918.84 246.749C915.602 228.741 910.314 211.98 901.981 195.617C893.789 179.534 883.088 164.817 870.32 152.058C857.555 139.299 842.834 128.605 826.746 120.418C810.366 112.083 793.587 106.797 775.558 103.56C757.803 100.372 739.691 99.315 721.738 98.83C713.495 98.607 705.253 98.513 697.008 98.462C687.22 98.402 677.432 98.407 667.644 98.407L553.997 98H468.997L357.361 98.407C347.554 98.407 337.747 98.402 327.94 98.462C319.678 98.513 311.42 98.607 303.161 98.83C285.167 99.315 267.014 100.373 249.217 103.565C231.164 106.801 214.36 112.085 197.958 120.414C181.835 128.602 167.083 139.297 154.291 152.058C141.501 164.816 130.78 179.53 122.573 195.61C114.217 211.981 108.919 228.752 105.673 246.77C102.477 264.516 101.418 282.617 100.931 300.562C100.709 308.8 100.613 317.039 100.563 325.279C100.503 335.063 100 347.216 100 356.999L100.003 467.089L100 552.998L100.508 665.427C100.508 675.223 100.504 685.019 100.563 694.815C100.613 703.067 100.709 711.317 100.932 719.566C101.418 737.542 102.479 755.675 105.678 773.452C108.923 791.484 114.22 808.269 122.569 824.653C130.777 840.759 141.5 855.495 154.291 868.272C167.082 881.049 181.83 891.757 197.95 899.956C214.362 908.302 231.174 913.595 249.238 916.836C267.027 920.029 285.174 921.088 303.161 921.573C311.42 921.796 319.679 921.891 327.941 921.941C337.748 922.001 347.554 921.997 357.361 921.997L470.006 922H555.217L667.644 921.996C677.432 921.996 687.22 922.001 697.008 921.941C705.253 921.891 713.495 921.796 721.738 921.573C739.698 921.087 757.816 920.027 775.579 916.832C793.597 913.591 810.368 908.3 826.739 899.959C842.831 891.761 857.554 881.051 870.32 868.272C883.086 855.497 893.786 840.763 901.978 824.66C910.316 808.268 915.604 791.475 918.844 773.431C922.034 755.661 923.092 737.535 923.577 719.566C923.8 711.316 923.895 703.066 923.944 694.815C924.005 685.019 924 675.223 924 665.427C924 665.427 923.994 554.983 923.994 552.998V466.999C923.994 465.533 924 354.627 924 354.627Z"
fill="url(#paint0_linear_102_69)"
/>
</g>
<mask
id="mask0_102_69"
style="mask-type: alpha"
maskUnits="userSpaceOnUse"
x="100"
y="98"
width="824"
height="824"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M924 354.627C924 344.845 924.004 335.062 923.944 325.279C923.895 317.038 923.8 308.799 923.576 300.562C923.092 282.609 922.033 264.502 918.84 246.749C915.602 228.741 910.314 211.98 901.981 195.617C893.789 179.534 883.088 164.817 870.32 152.058C857.555 139.299 842.834 128.605 826.746 120.418C810.366 112.083 793.587 106.797 775.558 103.56C757.803 100.372 739.691 99.315 721.738 98.83C713.495 98.607 705.253 98.513 697.008 98.462C687.22 98.402 677.432 98.407 667.644 98.407L553.997 98H468.997L357.361 98.407C347.554 98.407 337.747 98.402 327.94 98.462C319.678 98.513 311.42 98.607 303.161 98.83C285.167 99.315 267.014 100.373 249.217 103.565C231.164 106.801 214.36 112.085 197.958 120.414C181.835 128.602 167.083 139.297 154.291 152.058C141.501 164.816 130.78 179.53 122.573 195.61C114.217 211.981 108.919 228.752 105.673 246.77C102.477 264.516 101.418 282.617 100.931 300.562C100.709 308.8 100.613 317.039 100.563 325.279C100.503 335.063 100 347.216 100 356.999L100.003 467.089L100 552.998L100.508 665.427C100.508 675.223 100.504 685.019 100.563 694.815C100.613 703.067 100.709 711.317 100.932 719.566C101.418 737.542 102.479 755.675 105.678 773.452C108.923 791.484 114.22 808.269 122.569 824.653C130.777 840.759 141.5 855.495 154.291 868.272C167.082 881.049 181.83 891.757 197.95 899.956C214.362 908.302 231.174 913.595 249.238 916.836C267.027 920.029 285.174 921.088 303.161 921.573C311.42 921.796 319.679 921.891 327.941 921.941C337.748 922.001 347.554 921.997 357.361 921.997L470.006 922H555.217L667.644 921.996C677.432 921.996 687.22 922.001 697.008 921.941C705.253 921.891 713.495 921.796 721.738 921.573C739.698 921.087 757.816 920.027 775.579 916.832C793.597 913.591 810.368 908.3 826.739 899.959C842.831 891.761 857.554 881.051 870.32 868.272C883.086 855.497 893.786 840.763 901.978 824.66C910.316 808.268 915.604 791.475 918.844 773.431C922.034 755.661 923.092 737.535 923.577 719.566C923.8 711.316 923.895 703.066 923.944 694.815C924.005 685.019 924 675.223 924 665.427C924 665.427 923.994 554.983 923.994 552.998V466.999C923.994 465.533 924 354.627 924 354.627Z"
fill="white"
/>
</mask>
<g mask="url(#mask0_102_69)">
<rect
x="42"
y="36"
width="914"
height="914"
fill="url(#paint1_linear_102_69)"
/>
<g filter="url(#filter1_b_102_69)">
<rect
x="100"
y="98"
width="824"
height="824"
rx="126"
fill="black"
fill-opacity="0.01"
/>
</g>
</g>
<path
d="M367.15 732.923C367.15 732.923 367.15 627.678 512.003 627.678C656.895 627.678 656.856 732.923 656.856 732.923H367.15Z"
fill="#765338"
/>
<path
d="M512.006 627.684L367.153 732.929L277.626 457.399L512.006 627.684Z"
fill="#B7835A"
/>
<path
d="M512.006 627.684L746.385 457.399L656.859 732.929L512.006 627.684Z"
fill="#5B422D"
/>
<path
d="M522.757 635.48L512.004 643.292L501.25 635.48C501.25 627.667 512.004 627.667 512.004 627.667C512.004 627.667 522.757 627.667 522.757 635.48Z"
fill="#72B147"
/>
<path
d="M512.006 627.684C512.006 627.684 512.006 457.399 746.385 457.399L739.74 477.852L712.617 513.183L685.495 517.263L658.372 552.594L631.25 556.674L604.127 592.005L577.005 596.085L549.882 631.416L522.76 635.496L512.006 627.684Z"
fill="#5A9A30"
/>
<path
d="M501.252 635.48L474.129 631.399L447.007 596.069L419.884 591.988L392.762 556.658L365.639 552.578L338.517 517.247L311.394 513.167L284.272 477.836L277.626 457.382C512.006 457.382 512.006 627.668 512.006 627.668L501.252 635.48Z"
fill="#88B858"
/>
<path
d="M277.625 457.384L512.005 627.67L746.385 457.384L512.005 287.098L277.625 457.384Z"
fill="url(#paint2_linear_102_69)"
/>
<defs>
<filter
id="filter0_d_102_69"
x="90"
y="98"
width="844"
height="844"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"
>
<feFlood flood-opacity="0" result="BackgroundImageFix" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
/>
<feOffset dy="10" />
<feGaussianBlur stdDeviation="5" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.3 0"
/>
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_102_69"
/>
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_102_69"
result="shape"
/>
</filter>
<filter
id="filter1_b_102_69"
x="89.1269"
y="87.1269"
width="845.746"
height="845.746"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"
>
<feFlood flood-opacity="0" result="BackgroundImageFix" />
<feGaussianBlur in="BackgroundImage" stdDeviation="5.43656" />
<feComposite
in2="SourceAlpha"
operator="in"
result="effect1_backgroundBlur_102_69"
/>
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_backgroundBlur_102_69"
result="shape"
/>
</filter>
<linearGradient
id="paint0_linear_102_69"
x1="-181.14"
y1="98"
x2="-181.14"
y2="1484.28"
gradientUnits="userSpaceOnUse"
>
<stop stop-color="white" />
<stop offset="0.489516" stop-color="#EFEFEF" />
<stop offset="1" stop-color="#C0C0C0" />
</linearGradient>
<linearGradient
id="paint1_linear_102_69"
x1="928.377"
y1="992.826"
x2="928.377"
y2="134.072"
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#F6F3F3" />
<stop offset="1" stop-color="white" />
</linearGradient>
<linearGradient
id="paint2_linear_102_69"
x1="394.815"
y1="372.239"
x2="629.182"
y2="542.528"
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#88B858" />
<stop offset="0.5" stop-color="#72B147" />
<stop offset="1" stop-color="#5A9A30" />
</linearGradient>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 8.5 KiB

8095
program_info/org.sneederix.SneedMC.bigsur.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 606 KiB

5
program_info/org.sneederix.SneedMC.desktop.in
View File

@ -8,10 +8,5 @@ Exec=@Launcher_APP_BINARY_NAME@
StartupNotify=true
Icon=org.sneederix.SneedMC
Categories=Game;
<<<<<<< HEAD:program_info/org.sneederix.SneedMC.desktop.in
Keywords=game;minecraft;launcher;
StartupWMClass=SneedMC
=======
Keywords=game;minecraft;launcher;mc;
StartupWMClass=PolyMC
>>>>>>> upstream/develop:program_info/org.polymc.PolyMC.desktop.in

11
program_info/org.sneederix.SneedMC.metainfo.xml.in
View File

@ -9,15 +9,9 @@
<developer_name>SneedMC Team</developer_name>
<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>
<<<<<<< HEAD:program_info/org.sneederix.SneedMC.metainfo.xml.in
<project_license>GPL-3.0-or-later</project_license>
<url type="homepage">https://SneedMC.org/</url>
<url type="help">https://github.com/Sneederix/SneedMC#help--support</url>
=======
<project_license>GPL-3.0-only</project_license>
<url type="homepage">https://polymc.org/</url>
<url type="help">https://polymc.org/wiki/</url>
>>>>>>> upstream/develop:program_info/org.polymc.PolyMC.metainfo.xml.in
<description>
<p>SneedMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
<p>Features:</p>
@ -33,13 +27,8 @@
</description>
<screenshots>
<screenshot type="default">
<<<<<<< HEAD:program_info/org.sneederix.SneedMC.metainfo.xml.in
<caption>The main SneedMC window</caption>
<image type="source" width="1011" height="994">https://polymc.github.io/assets/img/screenshots/LauncherDark.png</image>
=======
<caption>The main PolyMC window</caption>
<image type="source" width="931" height="759">https://polymc.org/img/screenshots/LauncherDark.png</image>
>>>>>>> upstream/develop:program_info/org.polymc.PolyMC.metainfo.xml.in
</screenshot>
<screenshot>
<caption>Modpack installation</caption>

23
program_info/polymc-header-black.svg
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 376.77 135.47" xmlns="http://www.w3.org/2000/svg" class="home">
<defs>
<linearGradient id="a" x1="4.498" x2="12.435" y1="3.801" y2="9.568" gradientUnits="userSpaceOnUse">
<stop stop-color="#88b858" offset="0"/>
<stop stop-color="#72b147" offset=".5"/>
<stop stop-color="#5a9a30" offset="1"/>
</linearGradient>
</defs>
<path d="M42.375 118.668s0-24.797 34.094-24.797c34.103 0 34.094 24.797 34.094 24.797z" fill="#765338"/>
<path d="M76.47 93.872 42.376 118.67 21.304 53.751z" fill="#b7835a"/>
<path d="m76.47 93.872 55.165-40.121-21.072 64.918z" fill="#5b422d"/>
<path d="m79 95.709-2.53 1.84-2.532-1.84c0-1.84 2.531-1.84 2.531-1.84s2.531 0 2.531 1.84z" fill="#72b147"/>
<path d="M76.47 93.872s0-40.121 55.165-40.121l-1.564 4.819-6.384 8.324-6.384.962-6.383 8.324-6.384.961-6.384 8.325-6.384.961-6.384 8.324-6.383.962z" fill="#5a9a30"/>
<path d="m73.938 95.709-6.383-.961-6.384-8.325-6.384-.961-6.384-8.324-6.384-.962-6.383-8.324-6.384-.962-6.384-8.324-1.564-4.819c55.165 0 55.165 40.121 55.165 40.121z" fill="#88b858"/>
<path d="m.53 6.685 7.937 5.766 7.937-5.766L8.467.918z" fill="url(#a)" transform="matrix(6.95 0 0 6.9572 17.626 7.241)"/>
<path d="m22.868 58.567-1.564-4.82L76.469 93.87l55.166-40.122-1.564 4.82L76.47 97.55z" fill="none"/>
<g fill="#000" stroke-width=".265" aria-label="PolyMC">
<g stroke-width=".01" aria-label="PolyMC">
<path d="M168.153 47.323q5.434 0 9.287 1.858 3.852 1.788 5.916 5.228 2.133 3.44 2.133 8.324 0 2.958-.895 5.847-.894 2.82-2.889 5.16-1.926 2.27-5.09 3.646t-7.705 1.375h-7.361v18.3h-6.673V47.322zm.688 25.041q2.958 0 4.884-.963 1.927-.963 3.027-2.408 1.1-1.513 1.582-3.164.482-1.651.482-2.958 0-1.514-.482-3.096-.481-1.651-1.65-2.958-1.101-1.376-2.959-2.202-1.788-.894-4.471-.894h-7.705v18.643zM187.49 82.6q0-4.265 1.994-7.705 2.064-3.44 5.641-5.434 3.577-1.995 8.118-1.995 4.678 0 8.186 1.995 3.509 1.995 5.435 5.434 1.926 3.44 1.926 7.705t-1.926 7.773q-1.926 3.44-5.503 5.435-3.509 1.995-8.187 1.995-4.54 0-8.118-1.857-3.508-1.927-5.572-5.298-1.995-3.44-1.995-8.048zm6.397.07q0 2.751 1.238 5.021 1.238 2.202 3.302 3.509 2.133 1.307 4.678 1.307 2.683 0 4.747-1.307 2.133-1.307 3.302-3.509 1.17-2.27 1.17-5.022 0-2.752-1.17-4.953-1.17-2.27-3.302-3.577-2.064-1.376-4.747-1.376-2.614 0-4.747 1.376-2.063 1.376-3.302 3.646-1.17 2.201-1.17 4.884zM223.251 43.858h6.398v53.246h-6.398zM238.914 110.808l18.78-42.17h5.917l-18.368 42.17zm7.017-13.484-13.69-28.687h7.223l11.489 25.453zM266.775 97.085V51.2h.063l23.855 33.774-3.043-.67L311.384 51.2h.122v45.885h-7.06v-29.88l.487 3.59-16.065 22.7h-.122l-16.31-22.7 1.218-3.286v29.576zM352.299 93.62q-.974.67-2.921 1.643-1.887.973-4.564 1.704-2.617.67-5.843.608-5.172-.062-9.31-1.825-4.138-1.826-6.999-4.869-2.86-3.104-4.442-7.06-1.522-4.016-1.522-8.52 0-5.05 1.583-9.25t4.503-7.241q2.921-3.104 6.938-4.808 4.016-1.704 8.763-1.704 4.199 0 7.485 1.156 3.347 1.096 5.598 2.496l-2.799 6.633q-1.704-1.156-4.26-2.313-2.556-1.156-5.781-1.156-2.921 0-5.599 1.217-2.678 1.156-4.686 3.347-2.008 2.13-3.225 4.99-1.156 2.86-1.156 6.208 0 3.468 1.034 6.39 1.096 2.92 3.043 5.05 2.008 2.07 4.747 3.287 2.799 1.156 6.268 1.156 3.408 0 5.964-1.035 2.616-1.095 4.199-2.434z"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

139
program_info/polymc-header.Source.svg
View File

@ -1,139 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="1424"
height="512"
version="1.1"
viewBox="0 0 376.77 135.47"
id="svg866"
sodipodi:docname="PolyMC-Header.Source.svg"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview868"
pagecolor="#343434"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="0.61938202"
inkscape:cx="534.40363"
inkscape:cy="299.49206"
inkscape:window-width="2560"
inkscape:window-height="1382"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg866" />
<defs
id="defs831">
<linearGradient
id="linearGradient84726"
x1="4.4979"
x2="12.435"
y1="3.8011"
y2="9.5681"
gradientUnits="userSpaceOnUse">
<stop
stop-color="#88b858"
offset="0"
id="stop824" />
<stop
stop-color="#72b147"
offset=".5"
id="stop826" />
<stop
stop-color="#5a9a30"
offset="1"
id="stop828" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient84726"
id="linearGradient1147"
gradientUnits="userSpaceOnUse"
x1="4.4979"
y1="3.8011"
x2="12.435"
y2="9.5681" />
</defs>
<g
id="g1157">
<g
transform="matrix(6.95,0,0,6.9572,17.626477,7.241195)"
id="g1322">
<g
id="g1318">
<path
d="m 3.561,16.016 c 0,0 0,-3.5642 4.9056,-3.5642 4.9069,0 4.9056,3.5642 4.9056,3.5642 z"
fill="#765338"
id="path1304" />
<path
d="M 8.4667,12.452 3.5611,16.0162 0.5292,6.6851 Z"
fill="#b7835a"
id="path1306" />
<path
d="m 8.4667,12.452 7.9375,-5.7669 -3.0319,9.3311 z"
fill="#5b422d"
id="path1308" />
<path
d="M 8.8308,12.716 8.46663,12.98058 8.10246,12.716 c 0,-0.26458 0.36417,-0.26458 0.36417,-0.26458 0,0 0.36417,0 0.36417,0.26458 z"
fill="#72b147"
id="path1310" />
<path
d="m 8.4667,12.452 c 0,0 -2e-7,-5.7669 7.9375,-5.7669 l -0.22507,0.69269 -0.91853,1.1965 -0.91853,0.13819 -0.91853,1.1965 -0.91853,0.13819 -0.91853,1.1965 -0.91853,0.13819 -0.91853,1.1965 -0.91853,0.13819 z"
fill="#5a9a30"
id="path1312" />
<path
d="M 8.1025,12.716 7.18397,12.57781 6.26544,11.38131 5.34691,11.24312 4.42838,10.04662 3.50985,9.90843 2.59132,8.71193 1.67279,8.57374 0.75426,7.37724 0.52919,6.68455 c 7.9375,1e-7 7.9375,5.7669 7.9375,5.7669 z"
fill="#88b858"
id="path1314" />
<path
d="m 0.52917,6.6846 7.9375,5.7669 7.9375,-5.7669 -7.9375,-5.7669 z"
fill="url(#linearGradient84726)"
id="path1316"
style="fill:url(#linearGradient1147)" />
</g>
<path
d="m 0.75424,7.3773 -0.22507,-0.69269 7.9375,5.7669 7.9375,-5.7669 -0.22507,0.69269 -7.7124,5.6034 z"
fill-opacity="0"
id="path1320" />
</g>
<g
id="polymc-header-text-3"
fill="white"
transform="matrix(6.9306,0,0,6.9306,-695.39957,-649.40511)"
stroke-width="0.26458"
aria-label="PolyMC"
style="fill:#ffffff;fill-opacity:1">
<text
xml:space="preserve"
style="font-size:9.92603px;line-height:1.25;font-family:sans-serif;letter-spacing:-0.610833px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke-width:0.0101009"
x="121.65298"
y="107.71044"
id="text4534"><tspan
sodipodi:role="line"
id="tspan4532"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.92603px;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';fill:#ffffff;fill-opacity:1;stroke-width:0.0101009"
x="121.65298"
y="107.71044">Poly<tspan
style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:8.78072px;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Semi-Bold'"
id="tspan137828"
rotate="0 0">MC</tspan></tspan></text>
</g>
</g>
<g
id="polymc-header-text-4"
fill="white"
transform="matrix(6.9306,0,0,6.9306,-697.30938,-585.54339)"
stroke-width="0.26458"
aria-label="PolyMC"
style="fill:#ffffff;fill-opacity:1" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.9 KiB

23
program_info/polymc-header.svg
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 376.77 135.47" xmlns="http://www.w3.org/2000/svg" class="home">
<defs>
<linearGradient id="a" x1="4.498" x2="12.435" y1="3.801" y2="9.568" gradientUnits="userSpaceOnUse">
<stop stop-color="#88b858" offset="0"/>
<stop stop-color="#72b147" offset=".5"/>
<stop stop-color="#5a9a30" offset="1"/>
</linearGradient>
</defs>
<path d="M42.375 118.668s0-24.797 34.094-24.797c34.103 0 34.094 24.797 34.094 24.797z" fill="#765338"/>
<path d="M76.47 93.872 42.376 118.67 21.304 53.751z" fill="#b7835a"/>
<path d="m76.47 93.872 55.165-40.121-21.072 64.918z" fill="#5b422d"/>
<path d="m79 95.709-2.53 1.84-2.532-1.84c0-1.84 2.531-1.84 2.531-1.84s2.531 0 2.531 1.84z" fill="#72b147"/>
<path d="M76.47 93.872s0-40.121 55.165-40.121l-1.564 4.819-6.384 8.324-6.384.962-6.383 8.324-6.384.961-6.384 8.325-6.384.961-6.384 8.324-6.383.962z" fill="#5a9a30"/>
<path d="m73.938 95.709-6.383-.961-6.384-8.325-6.384-.961-6.384-8.324-6.384-.962-6.383-8.324-6.384-.962-6.384-8.324-1.564-4.819c55.165 0 55.165 40.121 55.165 40.121z" fill="#88b858"/>
<path d="m.53 6.685 7.937 5.766 7.937-5.766L8.467.918z" fill="url(#a)" transform="matrix(6.95 0 0 6.9572 17.626 7.241)"/>
<path d="m22.868 58.567-1.564-4.82L76.469 93.87l55.166-40.122-1.564 4.82L76.47 97.55z" fill="none"/>
<g fill="#fff" stroke-width=".265" aria-label="PolyMC">
<g stroke-width=".01" aria-label="PolyMC">
<path d="M168.153 47.323q5.434 0 9.287 1.858 3.852 1.788 5.916 5.228 2.133 3.44 2.133 8.324 0 2.958-.895 5.847-.894 2.82-2.889 5.16-1.926 2.27-5.09 3.646t-7.705 1.375h-7.361v18.3h-6.673V47.322zm.688 25.041q2.958 0 4.884-.963 1.927-.963 3.027-2.408 1.1-1.513 1.582-3.164.482-1.651.482-2.958 0-1.514-.482-3.096-.481-1.651-1.65-2.958-1.101-1.376-2.959-2.202-1.788-.894-4.471-.894h-7.705v18.643zM187.49 82.6q0-4.265 1.994-7.705 2.064-3.44 5.641-5.434 3.577-1.995 8.118-1.995 4.678 0 8.186 1.995 3.509 1.995 5.435 5.434 1.926 3.44 1.926 7.705t-1.926 7.773q-1.926 3.44-5.503 5.435-3.509 1.995-8.187 1.995-4.54 0-8.118-1.857-3.508-1.927-5.572-5.298-1.995-3.44-1.995-8.048zm6.397.07q0 2.751 1.238 5.021 1.238 2.202 3.302 3.509 2.133 1.307 4.678 1.307 2.683 0 4.747-1.307 2.133-1.307 3.302-3.509 1.17-2.27 1.17-5.022 0-2.752-1.17-4.953-1.17-2.27-3.302-3.577-2.064-1.376-4.747-1.376-2.614 0-4.747 1.376-2.063 1.376-3.302 3.646-1.17 2.201-1.17 4.884zM223.251 43.858h6.398v53.246h-6.398zM238.914 110.808l18.78-42.17h5.917l-18.368 42.17zm7.017-13.484-13.69-28.687h7.223l11.489 25.453zM266.775 97.085V51.2h.063l23.855 33.774-3.043-.67L311.384 51.2h.122v45.885h-7.06v-29.88l.487 3.59-16.065 22.7h-.122l-16.31-22.7 1.218-3.286v29.576zM352.299 93.62q-.974.67-2.921 1.643-1.887.973-4.564 1.704-2.617.67-5.843.608-5.172-.062-9.31-1.825-4.138-1.826-6.999-4.869-2.86-3.104-4.442-7.06-1.522-4.016-1.522-8.52 0-5.05 1.583-9.25t4.503-7.241q2.921-3.104 6.938-4.808 4.016-1.704 8.763-1.704 4.199 0 7.485 1.156 3.347 1.096 5.598 2.496l-2.799 6.633q-1.704-1.156-4.26-2.313-2.556-1.156-5.781-1.156-2.921 0-5.599 1.217-2.678 1.156-4.686 3.347-2.008 2.13-3.225 4.99-1.156 2.86-1.156 6.208 0 3.468 1.034 6.39 1.096 2.92 3.043 5.05 2.008 2.07 4.747 3.287 2.799 1.156 6.268 1.156 3.408 0 5.964-1.035 2.616-1.095 4.199-2.434z"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

68
program_info/polymc.6.txt
View File

@ -1,68 +0,0 @@
SNEEDMC(1)
==========
:doctype: manpage
NAME
----
sneedmc - a launcher and instance manager for Minecraft.
SYNOPSIS
--------
*sneedmc* ['OPTIONS']
DESCRIPTION
-----------
SneedMC is a custom launcher for Minecraft that allows you to easily manage
multiple installations of Minecraft at once. It also allows you to easily
install and remove mods by simply dragging and dropping.
Here are the current features of SneedMC.
OPTIONS
-------
*-d, --dir*='DIRECTORY'::
Use 'DIRECTORY' as the SneedMC root.
*-l, --launch*='INSTANCE_ID'::
Launch the instance specified by 'INSTANCE_ID'.
*--alive*::
Write a small 'live.check' file after SneedMC starts.
*-h, --help*::
Display help text and exit.
*-v, --version*::
Display program version and exit.
*-a, --profile*='PROFILE'::
Use the account specified by 'PROFILE' (only valid in combination with --launch).
EXIT STATUS
-----------
*0*::
Success
*1*::
Failure (syntax or usage error; configuration error; unexpected error).
BUGS
----
<https://github.com/Sneederix/SneedMC/issues>
RESOURCES
---------
GitHub: <https://github.com/Sneederix/SneedMC>
Main website: <https://sneedmc.org>
AUTHORS
-------
<<<<<<< HEAD:program_info/sneedmc.1.txt
SNEED <sneed@sneedmc.org>
=======
PolyMC Contributors
>>>>>>> upstream/develop:program_info/polymc.6.txt
// vim: syntax=asciidoc

BIN
program_info/polymc.icns
View File

Binary file not shown.

33
program_info/polymc.manifest.in
View File

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<<<<<<< HEAD:program_info/sneedmc.manifest
<assemblyIdentity name="SneedMC.Application.1" type="win32" version="1.0.0.0" />
=======
<assemblyIdentity name="PolyMC.Application.1" type="win32" version="@Launcher_RELEASE_VERSION_NAME4@" />
>>>>>>> upstream/develop:program_info/polymc.manifest.in
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
</dependentAssembly>
</dependency>
<description>Custom Minecraft launcher for managing multiple installs.</description>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!--The ID below indicates app support for Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!--The ID below indicates app support for Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!--The ID below indicates app support for Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!--The ID below indicates app support for Windows 10/11 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
</assembly>

37
program_info/polymc.rc.in
View File

@ -1,37 +0,0 @@
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
IDI_ICON1 ICON DISCARDABLE "sneedmc.ico"
1 RT_MANIFEST "sneedmc.manifest"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @Launcher_RELEASE_VERSION_NAME4_COMMA@
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
BEGIN
<<<<<<< HEAD:program_info/sneedmc.rc
VALUE "CompanyName", "Sneederix"
VALUE "FileDescription", "SneedMC"
VALUE "FileVersion", "1.0.0.0"
VALUE "ProductName", "SneedMC"
VALUE "ProductVersion", "1"
=======
VALUE "CompanyName", "MultiMC & PolyMC Contributors"
VALUE "FileDescription", "PolyMC"
VALUE "FileVersion", "@Launcher_RELEASE_VERSION_NAME4@"
VALUE "ProductName", "PolyMC"
VALUE "ProductVersion", "@Launcher_RELEASE_VERSION_NAME4@"
>>>>>>> upstream/develop:program_info/polymc.rc.in
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0000, 0x04b0 // Unicode
END
END

4
program_info/sneedmc.1.txt
View File

@ -59,10 +59,6 @@ Main website: <https://sneedmc.org>
AUTHORS
-------
<<<<<<< HEAD:program_info/sneedmc.1.txt
SNEED <sneed@sneedmc.org>
=======
PolyMC Contributors
>>>>>>> upstream/develop:program_info/polymc.6.txt
// vim: syntax=asciidoc

4
program_info/sneedmc.manifest
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<<<<<<< HEAD:program_info/sneedmc.manifest
<assemblyIdentity name="SneedMC.Application.1" type="win32" version="1.0.0.0" />
=======
<assemblyIdentity name="PolyMC.Application.1" type="win32" version="@Launcher_RELEASE_VERSION_NAME4@" />
>>>>>>> upstream/develop:program_info/polymc.manifest.in
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>

8
program_info/sneedmc.rc
View File

@ -15,19 +15,11 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
<<<<<<< HEAD:program_info/sneedmc.rc
VALUE "CompanyName", "Sneederix"
VALUE "FileDescription", "SneedMC"
VALUE "FileVersion", "1.0.0.0"
VALUE "ProductName", "SneedMC"
VALUE "ProductVersion", "1"
=======
VALUE "CompanyName", "MultiMC & PolyMC Contributors"
VALUE "FileDescription", "PolyMC"
VALUE "FileVersion", "@Launcher_RELEASE_VERSION_NAME4@"
VALUE "ProductName", "PolyMC"
VALUE "ProductVersion", "@Launcher_RELEASE_VERSION_NAME4@"
>>>>>>> upstream/develop:program_info/polymc.rc.in
END
END
BLOCK "VarFileInfo"