From 8ace5fa91d7abaadc00758e1f6eeb692f424a8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 22 Apr 2017 18:51:04 +0200 Subject: [PATCH] NOISSUE Add flame. --- api/logic/CMakeLists.txt | 10 +-- api/logic/InstanceImportTask.cpp | 57 ++++++++++-------- api/logic/InstanceImportTask.h | 6 +- .../{curse => flame}/FileResolvingTask.cpp | 14 ++--- .../{curse => flame}/FileResolvingTask.h | 8 +-- .../{curse => flame}/PackManifest.cpp | 18 +++--- .../minecraft/{curse => flame}/PackManifest.h | 10 +-- .../multimc/128x128/instances/flame.png | Bin 0 -> 3375 bytes .../multimc/32x32/instances/flame.png | Bin 0 -> 849 bytes application/resources/multimc/multimc.qrc | 3 + application/resources/sources/flame.svg | 51 ++++++++++++++++ 11 files changed, 118 insertions(+), 59 deletions(-) rename api/logic/minecraft/{curse => flame}/FileResolvingTask.cpp (76%) rename api/logic/minecraft/{curse => flame}/FileResolvingTask.h (73%) rename api/logic/minecraft/{curse => flame}/PackManifest.cpp (78%) rename api/logic/minecraft/{curse => flame}/PackManifest.h (72%) create mode 100644 application/resources/multimc/128x128/instances/flame.png create mode 100644 application/resources/multimc/32x32/instances/flame.png create mode 100644 application/resources/sources/flame.svg diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index fa1a9f57..096af6b1 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -291,11 +291,11 @@ set(MINECRAFT_SOURCES minecraft/ftb/FTBPlugin.h minecraft/ftb/FTBPlugin.cpp - # Curse - minecraft/curse/PackManifest.h - minecraft/curse/PackManifest.cpp - minecraft/curse/FileResolvingTask.h - minecraft/curse/FileResolvingTask.cpp + # Flame + minecraft/flame/PackManifest.h + minecraft/flame/PackManifest.cpp + minecraft/flame/FileResolvingTask.h + minecraft/flame/FileResolvingTask.cpp # Assets minecraft/AssetsUtils.h diff --git a/api/logic/InstanceImportTask.cpp b/api/logic/InstanceImportTask.cpp index 2005b61f..f1b3d5aa 100644 --- a/api/logic/InstanceImportTask.cpp +++ b/api/logic/InstanceImportTask.cpp @@ -11,9 +11,9 @@ #include "icons/IIconList.h" #include -// FIXME: this does not belong here, it's Minecraft/Curse specific -#include "minecraft/curse/FileResolvingTask.h" -#include "minecraft/curse/PackManifest.h" +// FIXME: this does not belong here, it's Minecraft/Flame specific +#include "minecraft/flame/FileResolvingTask.h" +#include "minecraft/flame/PackManifest.h" #include "Json.h" InstanceImportTask::InstanceImportTask(SettingsObjectPtr settings, const QUrl sourceUrl, BaseInstanceProvider * target, @@ -147,16 +147,16 @@ void InstanceImportTask::extractFinished() } const QFileInfo instanceCfgFile = findRecursive(extractDir.absolutePath(), "instance.cfg"); - const QFileInfo curseJson = findRecursive(extractDir.absolutePath(), "manifest.json"); + const QFileInfo flameJson = findRecursive(extractDir.absolutePath(), "manifest.json"); if (instanceCfgFile.isFile()) { qDebug() << "Pack appears to be exported from MultiMC."; processMultiMC(instanceCfgFile); } - else if (curseJson.isFile()) + else if (flameJson.isFile()) { - qDebug() << "Pack appears to be from Curse."; - processCurse(curseJson); + qDebug() << "Pack appears to be from 'Flame'."; + processFlame(flameJson); } else { @@ -173,7 +173,7 @@ void InstanceImportTask::extractAborted() return; } -void InstanceImportTask::processCurse(const QFileInfo & manifest) +void InstanceImportTask::processFlame(const QFileInfo & manifest) { const static QMap forgemap = { {"1.2.5", "3.4.9.171"}, @@ -181,15 +181,15 @@ void InstanceImportTask::processCurse(const QFileInfo & manifest) {"1.4.7", "6.6.2.534"}, {"1.5.2", "7.8.1.737"} }; - Curse::Manifest pack; + Flame::Manifest pack; try { - Curse::loadManifest(pack, manifest.absoluteFilePath()); + Flame::loadManifest(pack, manifest.absoluteFilePath()); } catch (JSONValidationError & e) { m_target->destroyStagingPath(m_stagingPath); - emitFailed(tr("Could not understand curse manifest:\n") + e.cause()); + emitFailed(tr("Could not understand pack manifest:\n") + e.cause()); return; } m_packRoot = manifest.absolutePath(); @@ -200,7 +200,7 @@ void InstanceImportTask::processCurse(const QFileInfo & manifest) if (!QFile::rename(overridePath, mcPath)) { m_target->destroyStagingPath(m_stagingPath); - emitFailed(tr("Could not rename the curse overrides:\n") + pack.overrides); + emitFailed(tr("Could not rename the overrides folder:\n") + pack.overrides); return; } } @@ -215,7 +215,7 @@ void InstanceImportTask::processCurse(const QFileInfo & manifest) forgeVersion = id; continue; } - qWarning() << "Unknown mod loader in curse manifest:" << id; + qWarning() << "Unknown mod loader in manifest:" << id; } QString configPath = FS::PathCombine(m_packRoot, "instance.cfg"); @@ -224,11 +224,11 @@ void InstanceImportTask::processCurse(const QFileInfo & manifest) instanceSettings->set("InstanceType", "OneSix"); OneSixInstance instance(m_globalSettings, instanceSettings, m_packRoot); auto mcVersion = pack.minecraft.version; - // Hack to correct some 'special curse sauce'... + // Hack to correct some 'special sauce'... if(mcVersion.endsWith('.')) { mcVersion.remove(QRegExp("[.]+$")); - qWarning() << "Mysterious trailing dots removed from Minecraft version while importing Curse pack."; + qWarning() << "Mysterious trailing dots removed from Minecraft version while importing pack."; } instance.setComponentVersion("net.minecraft", mcVersion); if(!forgeVersion.isEmpty()) @@ -261,6 +261,11 @@ void InstanceImportTask::processCurse(const QFileInfo & manifest) { instance.setIconKey("ftb_logo"); } + else + { + // default to something other than the MultiMC default to distinguish these + instance.setIconKey("flame"); + } } instance.init(); QString jarmodsPath = FS::PathCombine(m_packRoot, "minecraft", "jarmods"); @@ -282,18 +287,18 @@ void InstanceImportTask::processCurse(const QFileInfo & manifest) FS::deletePath(jarmodsPath); } instance.setName(m_instName); - m_curseResolver.reset(new Curse::FileResolvingTask(pack)); - connect(m_curseResolver.get(), &Curse::FileResolvingTask::succeeded, [&]() + m_modIdResolver.reset(new Flame::FileResolvingTask(pack)); + connect(m_modIdResolver.get(), &Flame::FileResolvingTask::succeeded, [&]() { - auto results = m_curseResolver->getResults(); - m_filesNetJob.reset(new NetJob(tr("Curse mod download"))); + auto results = m_modIdResolver->getResults(); + m_filesNetJob.reset(new NetJob(tr("Mod download"))); for(auto result: results.files) { auto path = FS::PathCombine(m_packRoot, "minecraft/mods", result.fileName); auto dl = Net::Download::makeFile(result.url,path); m_filesNetJob->addNetAction(dl); } - m_curseResolver.reset(); + m_modIdResolver.reset(); connect(m_filesNetJob.get(), &NetJob::succeeded, this, [&]() { m_filesNetJob.reset(); @@ -320,21 +325,21 @@ void InstanceImportTask::processCurse(const QFileInfo & manifest) m_filesNetJob->start(); } ); - connect(m_curseResolver.get(), &Curse::FileResolvingTask::failed, [&](QString reason) + connect(m_modIdResolver.get(), &Flame::FileResolvingTask::failed, [&](QString reason) { m_target->destroyStagingPath(m_stagingPath); - m_curseResolver.reset(); - emitFailed(tr("Unable to resolve Curse mod IDs:\n") + reason); + m_modIdResolver.reset(); + emitFailed(tr("Unable to resolve mod IDs:\n") + reason); }); - connect(m_curseResolver.get(), &Curse::FileResolvingTask::progress, [&](qint64 current, qint64 total) + connect(m_modIdResolver.get(), &Flame::FileResolvingTask::progress, [&](qint64 current, qint64 total) { setProgress(current, total); }); - connect(m_curseResolver.get(), &Curse::FileResolvingTask::status, [&](QString status) + connect(m_modIdResolver.get(), &Flame::FileResolvingTask::status, [&](QString status) { setStatus(status); }); - m_curseResolver->start(); + m_modIdResolver->start(); } void InstanceImportTask::processMultiMC(const QFileInfo & config) diff --git a/api/logic/InstanceImportTask.h b/api/logic/InstanceImportTask.h index a1c1857d..d5192299 100644 --- a/api/logic/InstanceImportTask.h +++ b/api/logic/InstanceImportTask.h @@ -10,7 +10,7 @@ #include "QObjectPtr.h" class BaseInstanceProvider; -namespace Curse +namespace Flame { class FileResolvingTask; } @@ -29,7 +29,7 @@ protected: private: void extractAndTweak(); void processMultiMC(const QFileInfo &config); - void processCurse(const QFileInfo &manifest); + void processFlame(const QFileInfo &manifest); private slots: void downloadSucceeded(); @@ -41,7 +41,7 @@ private slots: private: /* data */ SettingsObjectPtr m_globalSettings; NetJobPtr m_filesNetJob; - shared_qobject_ptr m_curseResolver; + shared_qobject_ptr m_modIdResolver; QUrl m_sourceUrl; BaseInstanceProvider * m_target; QString m_archivePath; diff --git a/api/logic/minecraft/curse/FileResolvingTask.cpp b/api/logic/minecraft/flame/FileResolvingTask.cpp similarity index 76% rename from api/logic/minecraft/curse/FileResolvingTask.cpp rename to api/logic/minecraft/flame/FileResolvingTask.cpp index aaac404b..582e4a07 100644 --- a/api/logic/minecraft/curse/FileResolvingTask.cpp +++ b/api/logic/minecraft/flame/FileResolvingTask.cpp @@ -3,16 +3,16 @@ const char * metabase = "https://cursemeta.dries007.net"; -Curse::FileResolvingTask::FileResolvingTask(Curse::Manifest& toProcess) +Flame::FileResolvingTask::FileResolvingTask(Flame::Manifest& toProcess) : m_toProcess(toProcess) { } -void Curse::FileResolvingTask::executeTask() +void Flame::FileResolvingTask::executeTask() { - setStatus(tr("Resolving curse mod IDs...")); + setStatus(tr("Resolving mod IDs...")); setProgress(0, m_toProcess.files.size()); - m_dljob.reset(new NetJob("Curse file resolver")); + m_dljob.reset(new NetJob("Mod id resolver")); results.resize(m_toProcess.files.size()); int index = 0; for(auto & file: m_toProcess.files) @@ -24,11 +24,11 @@ void Curse::FileResolvingTask::executeTask() m_dljob->addNetAction(dl); index ++; } - connect(m_dljob.get(), &NetJob::finished, this, &Curse::FileResolvingTask::netJobFinished); + connect(m_dljob.get(), &NetJob::finished, this, &Flame::FileResolvingTask::netJobFinished); m_dljob->start(); } -void Curse::FileResolvingTask::netJobFinished() +void Flame::FileResolvingTask::netJobFinished() { bool failed = false; int index = 0; @@ -61,6 +61,6 @@ void Curse::FileResolvingTask::netJobFinished() } else { - emitFailed(tr("Some curse ID resolving tasks failed.")); + emitFailed(tr("Some mod ID resolving tasks failed.")); } } diff --git a/api/logic/minecraft/curse/FileResolvingTask.h b/api/logic/minecraft/flame/FileResolvingTask.h similarity index 73% rename from api/logic/minecraft/curse/FileResolvingTask.h rename to api/logic/minecraft/flame/FileResolvingTask.h index a9357bfb..00658452 100644 --- a/api/logic/minecraft/curse/FileResolvingTask.h +++ b/api/logic/minecraft/flame/FileResolvingTask.h @@ -6,14 +6,14 @@ #include "multimc_logic_export.h" -namespace Curse +namespace Flame { class MULTIMC_LOGIC_EXPORT FileResolvingTask : public Task { Q_OBJECT public: - explicit FileResolvingTask(Curse::Manifest &toProcess); - const Curse::Manifest &getResults() const + explicit FileResolvingTask(Flame::Manifest &toProcess); + const Flame::Manifest &getResults() const { return m_toProcess; } @@ -25,7 +25,7 @@ protected slots: void netJobFinished(); private: /* data */ - Curse::Manifest m_toProcess; + Flame::Manifest m_toProcess; QVector results; NetJobPtr m_dljob; }; diff --git a/api/logic/minecraft/curse/PackManifest.cpp b/api/logic/minecraft/flame/PackManifest.cpp similarity index 78% rename from api/logic/minecraft/curse/PackManifest.cpp rename to api/logic/minecraft/flame/PackManifest.cpp index 7d9c2f89..62921493 100644 --- a/api/logic/minecraft/curse/PackManifest.cpp +++ b/api/logic/minecraft/flame/PackManifest.cpp @@ -1,7 +1,7 @@ #include "PackManifest.h" #include "Json.h" -static void loadFileV1(Curse::File & f, QJsonObject & file) +static void loadFileV1(Flame::File & f, QJsonObject & file) { f.projectId = Json::requireInteger(file, "projectID"); f.fileId = Json::requireInteger(file, "fileID"); @@ -9,29 +9,29 @@ static void loadFileV1(Curse::File & f, QJsonObject & file) f.required = Json::ensureBoolean(file, QString("required"), true); } -static void loadModloaderV1(Curse::Modloader & m, QJsonObject & modLoader) +static void loadModloaderV1(Flame::Modloader & m, QJsonObject & modLoader) { m.id = Json::requireString(modLoader, "id"); m.primary = Json::ensureBoolean(modLoader, QString("primary"), false); } -static void loadMinecraftV1(Curse::Minecraft & m, QJsonObject & minecraft) +static void loadMinecraftV1(Flame::Minecraft & m, QJsonObject & minecraft) { m.version = Json::requireString(minecraft, "version"); // extra libraries... apparently only used for a custom Minecraft launcher in the 1.2.5 FTB retro pack - // intended use is likely hardcoded in the Curse client, the manifest says nothing + // intended use is likely hardcoded in the 'Flame' client, the manifest says nothing m.libraries = Json::ensureString(minecraft, QString("libraries"), QString()); auto arr = Json::ensureArray(minecraft, "modLoaders", QJsonArray()); for (const auto & item : arr) { auto obj = Json::requireObject(item); - Curse::Modloader loader; + Flame::Modloader loader; loadModloaderV1(loader, obj); m.modLoaders.append(loader); } } -static void loadManifestV1(Curse::Manifest & m, QJsonObject & manifest) +static void loadManifestV1(Flame::Manifest & m, QJsonObject & manifest) { auto mc = Json::requireObject(manifest, "minecraft"); loadMinecraftV1(m.minecraft, mc); @@ -42,21 +42,21 @@ static void loadManifestV1(Curse::Manifest & m, QJsonObject & manifest) for (const auto & item : arr) { auto obj = Json::requireObject(item); - Curse::File file; + Flame::File file; loadFileV1(file, obj); m.files.append(file); } m.overrides = Json::ensureString(manifest, "overrides", "overrides"); } -void Curse::loadManifest(Curse::Manifest & m, const QString &filepath) +void Flame::loadManifest(Flame::Manifest & m, const QString &filepath) { auto doc = Json::requireDocument(filepath); auto obj = Json::requireObject(doc); m.manifestType = Json::requireString(obj, "manifestType"); if(m.manifestType != "minecraftModpack") { - throw JSONValidationError("Not a Curse modpack manifest!"); + throw JSONValidationError("Not a modpack manifest!"); } m.manifestVersion = Json::requireInteger(obj, "manifestVersion"); if(m.manifestVersion != 1) diff --git a/api/logic/minecraft/curse/PackManifest.h b/api/logic/minecraft/flame/PackManifest.h similarity index 72% rename from api/logic/minecraft/curse/PackManifest.h rename to api/logic/minecraft/flame/PackManifest.h index 36e05cc2..ae91bffb 100644 --- a/api/logic/minecraft/curse/PackManifest.h +++ b/api/logic/minecraft/flame/PackManifest.h @@ -3,7 +3,7 @@ #include #include -namespace Curse +namespace Flame { struct File { @@ -27,20 +27,20 @@ struct Minecraft { QString version; QString libraries; - QVector modLoaders; + QVector modLoaders; }; struct Manifest { QString manifestType; int manifestVersion = 0; - Curse::Minecraft minecraft; + Flame::Minecraft minecraft; QString name; QString version; QString author; - QVector files; + QVector files; QString overrides; }; -void loadManifest(Curse::Manifest & m, const QString &filepath); +void loadManifest(Flame::Manifest & m, const QString &filepath); } diff --git a/application/resources/multimc/128x128/instances/flame.png b/application/resources/multimc/128x128/instances/flame.png new file mode 100644 index 0000000000000000000000000000000000000000..8a50a0b418e8dc27ebb91ab3886d8bea40987104 GIT binary patch literal 3375 zcmV+~4bbw5P)xjk|4;AkyYG4O2I0iRjPm#s|XYX zse&97r5;L=Byc<~uW%?N1f_!1;t`?Ng(B!F*eWV&T|un~Sf$#-qOu7hTOj1Ucl*Z# z2_)gYS?=7K>3q)NkGwbY`~Jv$bLY-oeghE^5fKp)5fKp)5fKp)5fKsp7YN-6s6q}U zi}rLx(vB3(F%YCUfWa2BSuf(0>dw&*gvtOijzK8{kcI4`SwoYMaZUL2% z1-uUYOi}oq9OZm5mjjC8drGKUfFDRvtT1{D>Ts{Z_?{9@1JvhbP&lz8m>>%{S6O@y z38eulCUaIPl&B5dqcFZ_gwg;22;NhyFhUk`mSPR%gx3I)O^Ow2lj1juHIx%(18h^S zA-GMBrIvCXg@o4tF;A9xHKsm&JkU`_cnwgOa!+(bu&0c}Yk*Q^a{?zLxIqpj%M&dH zgx3I)HXbQ8q%EC2(sG^f8bHwBL#-a3X}L@&4ItwfNQQVPNKenSTqcwTpp*f?*&ZsM zNwmRWJ??H4$w-S#Rg@-60(?fYKx(hU>P8vVgv=c^KeK4$&=J# zvY5fQx|0cv0b~LBz%1Q)xX5k{Mv5X{)|o^g3?K^_3Oq|dJFPWPj$k7x#)%Tv=t{!( z29WvmM6j9@ovWbp8iM&`v&s*hLSGv|PN6MH-UpiN&cy}3t|&kEs_sN86VshQO~~<_ zL6Q}O;o?g^LDEOeW{>VvPQ{n^R5_Mf)MYvT80c}z0b&gF29xjnY@R;r-PKU2LfpQ8RNb(VSR`sZ0otQ;e-ASAd-?RWS zPK*@K5}u0>!oN-bas2ZXaG1M+i*={rDiWzXg>?9$1(1_y1Kh7W4+ZSgoj^K#VE_!~ zLvZHMGe&x}L)ih^4In3RC2+0oJd_~l?)R(psu24 zdSZ3KP}~oe3QO0zfZi5BXsoi8(-dx81gV5t9l=03*}nxOv>8C=(+u<7e%{l(BTV?v zt6?yM6mzA|2HlRMuLUr;1vHdcYts|%d=nbBhJ9PSQtd?nqr4Kcf<6OC4Q1Cm4}m*Y zLrxR(=kg<7s?U;>XyT<{CTKB$9M2ix@fdlJJK^RfX2(QER=xNDP0#ZzjUN!qlN0?j zLa3_`;LT%Ey@oJyIT$rGHm!R=9nbfbo=J@PUW?X*9s@{^*7@D^mlGYn>WI~W^ZI#` z$|($xg&vl%I}LgaAZV&wqwP=Of?uRRu7{?9I>}r)g){YtpFr0wK&=5p7L0r@vtv8- zhL&BFrc(ngNHR@_aAkBEAX{nlt|K5f!@G|~D~EI$Kuuu;VL*#c_Rnv6K6L)2d--He9&NZ( zhp;XKsM#mis2$YKbr$3D@$Tee6+vGevbshB)wBSo8}-YSwwFWW4$k9P=PDhddJJGF z+A(9ew7%q`f$qeysH#I$*Dc_`N}^`DWPtX)+=*k2Ch{KdYa!^G3s7T#qb|KGvehN- z#IZ`b_b;B%V}JzzQ4)8LOXc@+o9mb+21z5YCAAo!qFTll*8`UwghRXBiRDIz(kccH zA7SiB>Oxh8?agnw6UVLogcSs3UQ6m+7Vg{twW^s^-1xlXumBv{?@k;mq&Vueq|O%L zZO1Xr=~Z>P*Jm$6!r|{RaTH4TW_E0>wll5D2zI*{EHm^OAcr-8vp=)5FM&P}oc!6* z{qX*u9ED})rhM|VimmxkSxQ=;*jG#bt7hO{22ATIUxkFdIo&)iuIV=-iNQ#^iPEW z!xlmP7Us`CzR9{ym6)t`9>h9Y4IoO`4Xm~u;M7O8P6MIv3mCluF1rgpe%ku}zn3z2 z`&^&<;lk@q{M@_~GO?8bI8*iSAm*ge@PzA%88 z$rdEm$8fiQ;!Jqgr!cPvd{fO6n2`mSj)6&^!UY*rv9mjSC|Ink`3HY=0!<|MAsC32 zoOY}SDXp*PPbJ~)KftQ{;n?Amzl+s{E;qteQ=plJO*`ebu3g4>Z9&WuS3YadsfRT}nxWA;TdBSDH=#6x&mqpl`= zX8-_E%q9f4LWVC~_}~fWi$I+4uP03-W`ZOxX7hpCgfhpM1^^JVScYU~Mh73-1#2{w z;FBp>vmn!>mr%m*Rigbt=xw>S(KjFXLw!t(`4N<<~%}r-Xpu5xzEn zSW1!{Mj}aH@aMn|cxSE$Sydug4y&q}8LY}$4Ep=!zF!$%8vrVnjvZhGg1@Fc_|>Vf z&%-CHH;U3v0ZZPcoPMIn;rd5K_}%~jVgcn8GaSJb5H&ZU#}32ukT zQ^wU|4leCkb01&Uus(Fte zVHwC!v}Ms5;op;QtSt!fhyDFk6sQ5c3+7R*2x8L8vk(_)6^(cF9I zp>8@b+_~rc&;R>z?>+Z^@V|$Ow?R&m%L0u+F))dZUUd=AvH*yS3KVyMypZ${6iupw zTZsTz;!<0g2Sy^Y*$92&;%FiO@!x`atZZNi*bz~h#Yd^?WGo)P_^tq;2JxZji&9F% z%H??d;syXf{?O)IgSIN$-uF2$pEAtD=WAOtTK?fmkfYH zdVqZf3Lj7)&9sP%3W;ILVje?jrWI&679prG&u%6-p$73K1t2aOPz=PX55SyMSLrm9 znHtI|idbM2MP|&4!yFmdRU4X_(EJ(j(POx{#S(21jjvcuz0ClmnKGbCSFrssXj(Ln zbR0A$4FK%dt&}xDO^1G`a79`T$2A53p*U(jV!t#`w1RC=Tpj81C1C*7#T4)& zsJ21n8Q9Yf65yH~hIbDkrx2X?VDsK^6X9vX0DcOB!#@29G@pO`l!DQ_aN7yx$DrvY zIM#)arLuT|0V8{xDS(~(sQg#VxXbYVhVdt`vC>~FJ>dU^#`ljQ?kSz>!mQ!`!1M~J zHZ-Q)b!6oI0$}Kxal=Tz|CqJ<4L@hknfb@GAyHjSk(yaTPLYSV4`A$3bm4H1|AAb& zX&B$Pa@EaTEdDWvv|*7O)n}!*_JhoL+!72;CZ3PW_1&Y=y;J}DvDhIZ*&?!5MADaS b(Z!BG!B5Qc$A}(=00000NkvXXu0mjfi>7~8 literal 0 HcmV?d00001 diff --git a/application/resources/multimc/multimc.qrc b/application/resources/multimc/multimc.qrc index ef3e9ab6..b4bc5c16 100644 --- a/application/resources/multimc/multimc.qrc +++ b/application/resources/multimc/multimc.qrc @@ -249,6 +249,9 @@ 32x32/instances/ftb_logo.png 128x128/instances/ftb_logo.png + 32x32/instances/flame.png + 128x128/instances/flame.png + 32x32/instances/gear.png 128x128/instances/gear.png diff --git a/application/resources/sources/flame.svg b/application/resources/sources/flame.svg new file mode 100644 index 00000000..8a6da2f7 --- /dev/null +++ b/application/resources/sources/flame.svg @@ -0,0 +1,51 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + +