4 files changed, 25 insertions, 25 deletions

diff --git a/api/logic/minecraft/curse/FileResolvingTask.cpp b/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
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<QByteArray> results;
 	NetJobPtr m_dljob;
 };
diff --git a/api/logic/minecraft/curse/PackManifest.cpp b/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
index 36e05cc2..ae91bffb 100644
--- a/api/logic/minecraft/curse/PackManifest.h
+++ b/api/logic/minecraft/flame/PackManifest.h
@@ -3,7 +3,7 @@
 #include <QString>
 #include <QVector>
 
-namespace Curse
+namespace Flame
 {
 struct File
 {
@@ -27,20 +27,20 @@ struct Minecraft
 {
 	QString version;
 	QString libraries;
-	QVector<Curse::Modloader> modLoaders;
+	QVector<Flame::Modloader> modLoaders;
 };
 
 struct Manifest
 {
 	QString manifestType;
 	int manifestVersion = 0;
-	Curse::Minecraft minecraft;
+	Flame::Minecraft minecraft;
 	QString name;
 	QString version;
 	QString author;
-	QVector<Curse::File> files;
+	QVector<Flame::File> files;
 	QString overrides;
 };
 
-void loadManifest(Curse::Manifest & m, const QString &filepath);
+void loadManifest(Flame::Manifest & m, const QString &filepath);
 }