13 files changed, 453 insertions, 453 deletions

diff --git a/api/logic/minecraft/launch/ClaimAccount.cpp b/api/logic/minecraft/launch/ClaimAccount.cpp
index 71670b4f..a1180f0a 100644
--- a/api/logic/minecraft/launch/ClaimAccount.cpp
+++ b/api/logic/minecraft/launch/ClaimAccount.cpp
@@ -3,22 +3,22 @@
 
 ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session): LaunchStep(parent)
 {
-	if(session->status == AuthSession::Status::PlayableOnline)
-	{
-		m_account = session->m_accountPtr;
-	}
+    if(session->status == AuthSession::Status::PlayableOnline)
+    {
+        m_account = session->m_accountPtr;
+    }
 }
 
 void ClaimAccount::executeTask()
 {
-	if(m_account)
-	{
-		lock.reset(new UseLock(m_account));
-		emitSucceeded();
-	}
+    if(m_account)
+    {
+        lock.reset(new UseLock(m_account));
+        emitSucceeded();
+    }
 }
 
 void ClaimAccount::finalize()
 {
-	lock.reset();
+    lock.reset();
 }
diff --git a/api/logic/minecraft/launch/ClaimAccount.h b/api/logic/minecraft/launch/ClaimAccount.h
index c11c2128..64891406 100644
--- a/api/logic/minecraft/launch/ClaimAccount.h
+++ b/api/logic/minecraft/launch/ClaimAccount.h
@@ -20,18 +20,18 @@
 
 class ClaimAccount: public LaunchStep
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit ClaimAccount(LaunchTask *parent, AuthSessionPtr session);
-	virtual ~ClaimAccount() {};
+    explicit ClaimAccount(LaunchTask *parent, AuthSessionPtr session);
+    virtual ~ClaimAccount() {};
 
-	void executeTask() override;
-	void finalize() override;
-	bool canAbort() const override
-	{
-		return false;
-	}
+    void executeTask() override;
+    void finalize() override;
+    bool canAbort() const override
+    {
+        return false;
+    }
 private:
-	std::unique_ptr<UseLock> lock;
-	MojangAccountPtr m_account;
+    std::unique_ptr<UseLock> lock;
+    MojangAccountPtr m_account;
 };
diff --git a/api/logic/minecraft/launch/CreateServerResourcePacksFolder.cpp b/api/logic/minecraft/launch/CreateServerResourcePacksFolder.cpp
index 5398f7d0..bbca46d5 100644
--- a/api/logic/minecraft/launch/CreateServerResourcePacksFolder.cpp
+++ b/api/logic/minecraft/launch/CreateServerResourcePacksFolder.cpp
@@ -9,11 +9,11 @@ CreateServerResourcePacksFolder::CreateServerResourcePacksFolder(LaunchTask* par
 
 void CreateServerResourcePacksFolder::executeTask()
 {
-	auto instance = m_parent->instance();
-	std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-	if(!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->minecraftRoot(), "server-resource-packs")))
-	{
-		emit logLine(tr("Couldn't create the 'server-resource-packs' folder"), MessageLevel::Error);
-	}
-	emitSucceeded();
+    auto instance = m_parent->instance();
+    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
+    if(!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->minecraftRoot(), "server-resource-packs")))
+    {
+        emit logLine(tr("Couldn't create the 'server-resource-packs' folder"), MessageLevel::Error);
+    }
+    emitSucceeded();
 }
diff --git a/api/logic/minecraft/launch/CreateServerResourcePacksFolder.h b/api/logic/minecraft/launch/CreateServerResourcePacksFolder.h
index 1e7b6621..b29496c9 100644
--- a/api/logic/minecraft/launch/CreateServerResourcePacksFolder.h
+++ b/api/logic/minecraft/launch/CreateServerResourcePacksFolder.h
@@ -22,16 +22,16 @@
 // HACK: this is a workaround for MCL-3732 - 'server-resource-packs' folder is created.
 class CreateServerResourcePacksFolder: public LaunchStep
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit CreateServerResourcePacksFolder(LaunchTask *parent);
-	virtual ~CreateServerResourcePacksFolder() {};
+    explicit CreateServerResourcePacksFolder(LaunchTask *parent);
+    virtual ~CreateServerResourcePacksFolder() {};
 
-	virtual void executeTask();
-	virtual bool canAbort() const
-	{
-		return false;
-	}
+    virtual void executeTask();
+    virtual bool canAbort() const
+    {
+        return false;
+    }
 };
 
 
diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.cpp b/api/logic/minecraft/launch/DirectJavaLaunch.cpp
index 4ccc5c3c..7ead8324 100644
--- a/api/logic/minecraft/launch/DirectJavaLaunch.cpp
+++ b/api/logic/minecraft/launch/DirectJavaLaunch.cpp
@@ -22,128 +22,128 @@
 
 DirectJavaLaunch::DirectJavaLaunch(LaunchTask *parent) : LaunchStep(parent)
 {
-	connect(&m_process, &LoggedProcess::log, this, &DirectJavaLaunch::logLines);
-	connect(&m_process, &LoggedProcess::stateChanged, this, &DirectJavaLaunch::on_state);
+    connect(&m_process, &LoggedProcess::log, this, &DirectJavaLaunch::logLines);
+    connect(&m_process, &LoggedProcess::stateChanged, this, &DirectJavaLaunch::on_state);
 }
 
 void DirectJavaLaunch::executeTask()
 {
-	auto instance = m_parent->instance();
-	std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-	QStringList args = minecraftInstance->javaArguments();
+    auto instance = m_parent->instance();
+    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
+    QStringList args = minecraftInstance->javaArguments();
 
-	args.append("-Djava.library.path=" + minecraftInstance->getNativePath());
+    args.append("-Djava.library.path=" + minecraftInstance->getNativePath());
 
-	auto classPathEntries = minecraftInstance->getClassPath();
-	args.append("-cp");
-	QString classpath;
+    auto classPathEntries = minecraftInstance->getClassPath();
+    args.append("-cp");
+    QString classpath;
 #ifdef Q_OS_WIN32
-	classpath = classPathEntries.join(';');
+    classpath = classPathEntries.join(';');
 #else
-	classpath = classPathEntries.join(':');
+    classpath = classPathEntries.join(':');
 #endif
-	args.append(classpath);
-	args.append(minecraftInstance->getMainClass());
-
-	QString allArgs = args.join(", ");
-	emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MultiMC);
-
-	auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
-
-	m_process.setProcessEnvironment(instance->createEnvironment());
-
-	// make detachable - this will keep the process running even if the object is destroyed
-	m_process.setDetachable(true);
-
-	auto mcArgs = minecraftInstance->processMinecraftArgs(m_session);
-	args.append(mcArgs);
-
-	QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
-	if(!wrapperCommandStr.isEmpty())
-	{
-		auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
-		auto wrapperCommand = wrapperArgs.takeFirst();
-		auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
-		if (realWrapperCommand.isEmpty())
-		{
-			QString reason = tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand);
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-			return;
-		}
-		emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::MultiMC);
-		args.prepend(javaPath);
-		m_process.start(wrapperCommand, wrapperArgs + args);
-	}
-	else
-	{
-		m_process.start(javaPath, args);
-	}
+    args.append(classpath);
+    args.append(minecraftInstance->getMainClass());
+
+    QString allArgs = args.join(", ");
+    emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MultiMC);
+
+    auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
+
+    m_process.setProcessEnvironment(instance->createEnvironment());
+
+    // make detachable - this will keep the process running even if the object is destroyed
+    m_process.setDetachable(true);
+
+    auto mcArgs = minecraftInstance->processMinecraftArgs(m_session);
+    args.append(mcArgs);
+
+    QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
+    if(!wrapperCommandStr.isEmpty())
+    {
+        auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
+        auto wrapperCommand = wrapperArgs.takeFirst();
+        auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
+        if (realWrapperCommand.isEmpty())
+        {
+            QString reason = tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand);
+            emit logLine(reason, MessageLevel::Fatal);
+            emitFailed(reason);
+            return;
+        }
+        emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::MultiMC);
+        args.prepend(javaPath);
+        m_process.start(wrapperCommand, wrapperArgs + args);
+    }
+    else
+    {
+        m_process.start(javaPath, args);
+    }
 }
 
 void DirectJavaLaunch::on_state(LoggedProcess::State state)
 {
-	switch(state)
-	{
-		case LoggedProcess::FailedToStart:
-		{
-			//: Error message displayed if instace can't start
-			QString reason = tr("Could not launch minecraft!");
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-			return;
-		}
-		case LoggedProcess::Aborted:
-		case LoggedProcess::Crashed:
-
-		{
-			m_parent->setPid(-1);
-			emitFailed("Game crashed.");
-			return;
-		}
-		case LoggedProcess::Finished:
-		{
-			m_parent->setPid(-1);
-			// if the exit code wasn't 0, report this as a crash
-			auto exitCode = m_process.exitCode();
-			if(exitCode != 0)
-			{
-				emitFailed("Game crashed.");
-				return;
-			}
-			//FIXME: make this work again
-			// m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
-			// run post-exit
-			emitSucceeded();
-			break;
-		}
-		case LoggedProcess::Running:
-			emit logLine(tr("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
-			m_parent->setPid(m_process.processId());
-			m_parent->instance()->setLastLaunch();
-			break;
-		default:
-			break;
-	}
+    switch(state)
+    {
+        case LoggedProcess::FailedToStart:
+        {
+            //: Error message displayed if instace can't start
+            QString reason = tr("Could not launch minecraft!");
+            emit logLine(reason, MessageLevel::Fatal);
+            emitFailed(reason);
+            return;
+        }
+        case LoggedProcess::Aborted:
+        case LoggedProcess::Crashed:
+
+        {
+            m_parent->setPid(-1);
+            emitFailed("Game crashed.");
+            return;
+        }
+        case LoggedProcess::Finished:
+        {
+            m_parent->setPid(-1);
+            // if the exit code wasn't 0, report this as a crash
+            auto exitCode = m_process.exitCode();
+            if(exitCode != 0)
+            {
+                emitFailed("Game crashed.");
+                return;
+            }
+            //FIXME: make this work again
+            // m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
+            // run post-exit
+            emitSucceeded();
+            break;
+        }
+        case LoggedProcess::Running:
+            emit logLine(tr("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
+            m_parent->setPid(m_process.processId());
+            m_parent->instance()->setLastLaunch();
+            break;
+        default:
+            break;
+    }
 }
 
 void DirectJavaLaunch::setWorkingDirectory(const QString &wd)
 {
-	m_process.setWorkingDirectory(wd);
+    m_process.setWorkingDirectory(wd);
 }
 
 void DirectJavaLaunch::proceed()
 {
-	// nil
+    // nil
 }
 
 bool DirectJavaLaunch::abort()
 {
-	auto state = m_process.state();
-	if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-	{
-		m_process.kill();
-	}
-	return true;
+    auto state = m_process.state();
+    if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
+    {
+        m_process.kill();
+    }
+    return true;
 }
 
diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.h b/api/logic/minecraft/launch/DirectJavaLaunch.h
index 8d2cc467..fb555e3e 100644
--- a/api/logic/minecraft/launch/DirectJavaLaunch.h
+++ b/api/logic/minecraft/launch/DirectJavaLaunch.h
@@ -21,29 +21,29 @@
 
 class DirectJavaLaunch: public LaunchStep
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit DirectJavaLaunch(LaunchTask *parent);
-	virtual ~DirectJavaLaunch() {};
+    explicit DirectJavaLaunch(LaunchTask *parent);
+    virtual ~DirectJavaLaunch() {};
 
-	virtual void executeTask();
-	virtual bool abort();
-	virtual void proceed();
-	virtual bool canAbort() const
-	{
-		return true;
-	}
-	void setWorkingDirectory(const QString &wd);
-	void setAuthSession(AuthSessionPtr session)
-	{
-		m_session = session;
-	}
+    virtual void executeTask();
+    virtual bool abort();
+    virtual void proceed();
+    virtual bool canAbort() const
+    {
+        return true;
+    }
+    void setWorkingDirectory(const QString &wd);
+    void setAuthSession(AuthSessionPtr session)
+    {
+        m_session = session;
+    }
 private slots:
-	void on_state(LoggedProcess::State state);
+    void on_state(LoggedProcess::State state);
 
 private:
-	LoggedProcess m_process;
-	QString m_command;
-	AuthSessionPtr m_session;
+    LoggedProcess m_process;
+    QString m_command;
+    AuthSessionPtr m_session;
 };
 
diff --git a/api/logic/minecraft/launch/ExtractNatives.cpp b/api/logic/minecraft/launch/ExtractNatives.cpp
index 7ddde374..336eddbd 100644
--- a/api/logic/minecraft/launch/ExtractNatives.cpp
+++ b/api/logic/minecraft/launch/ExtractNatives.cpp
@@ -25,76 +25,76 @@
 
 static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement)
 {
-	if (!target.endsWith(suffix))
-	{
-		return target;
-	}
-	target.resize(target.length() - suffix.length());
-	return target + replacement;
+    if (!target.endsWith(suffix))
+    {
+        return target;
+    }
+    target.resize(target.length() - suffix.length());
+    return target + replacement;
 }
 
 static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibHack)
 {
-	QuaZip zip(source);
-	if(!zip.open(QuaZip::mdUnzip))
-	{
-		return false;
-	}
-	QDir directory(targetFolder);
-	if (!zip.goToFirstFile())
-	{
-		return false;
-	}
-	do
-	{
-		QString name = zip.getCurrentFileName();
-		if(applyJnilibHack)
-		{
-			name = replaceSuffix(name, ".jnilib", ".dylib");
-		}
-		QString absFilePath = directory.absoluteFilePath(name);
-		if (!JlCompress::extractFile(&zip, "", absFilePath))
-		{
-			return false;
-		}
-	} while (zip.goToNextFile());
-	zip.close();
-	if(zip.getZipError()!=0)
-	{
-		return false;
-	}
-	return true;
+    QuaZip zip(source);
+    if(!zip.open(QuaZip::mdUnzip))
+    {
+        return false;
+    }
+    QDir directory(targetFolder);
+    if (!zip.goToFirstFile())
+    {
+        return false;
+    }
+    do
+    {
+        QString name = zip.getCurrentFileName();
+        if(applyJnilibHack)
+        {
+            name = replaceSuffix(name, ".jnilib", ".dylib");
+        }
+        QString absFilePath = directory.absoluteFilePath(name);
+        if (!JlCompress::extractFile(&zip, "", absFilePath))
+        {
+            return false;
+        }
+    } while (zip.goToNextFile());
+    zip.close();
+    if(zip.getZipError()!=0)
+    {
+        return false;
+    }
+    return true;
 }
 
 void ExtractNatives::executeTask()
 {
-	auto instance = m_parent->instance();
-	std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-	auto toExtract = minecraftInstance->getNativeJars();
-	if(toExtract.isEmpty())
-	{
-		emitSucceeded();
-		return;
-	}
-	auto outputPath  = minecraftInstance->getNativePath();
-	auto javaVersion = minecraftInstance->getJavaVersion();
-	bool jniHackEnabled = javaVersion.major() >= 8;
-	for(const auto &source: toExtract)
-	{
-		if(!unzipNatives(source, outputPath, jniHackEnabled))
-		{
-			auto reason = tr("Couldn't extract native jar '%1' to destination '%2'").arg(source, outputPath);
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-		}
-	}
-	emitSucceeded();
+    auto instance = m_parent->instance();
+    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
+    auto toExtract = minecraftInstance->getNativeJars();
+    if(toExtract.isEmpty())
+    {
+        emitSucceeded();
+        return;
+    }
+    auto outputPath  = minecraftInstance->getNativePath();
+    auto javaVersion = minecraftInstance->getJavaVersion();
+    bool jniHackEnabled = javaVersion.major() >= 8;
+    for(const auto &source: toExtract)
+    {
+        if(!unzipNatives(source, outputPath, jniHackEnabled))
+        {
+            auto reason = tr("Couldn't extract native jar '%1' to destination '%2'").arg(source, outputPath);
+            emit logLine(reason, MessageLevel::Fatal);
+            emitFailed(reason);
+        }
+    }
+    emitSucceeded();
 }
 
 void ExtractNatives::finalize()
 {
-	auto instance = m_parent->instance();
-	QString target_dir = FS::PathCombine(instance->instanceRoot(), "natives/");
-	QDir dir(target_dir);
-	dir.removeRecursively();
+    auto instance = m_parent->instance();
+    QString target_dir = FS::PathCombine(instance->instanceRoot(), "natives/");
+    QDir dir(target_dir);
+    dir.removeRecursively();
 }
diff --git a/api/logic/minecraft/launch/ExtractNatives.h b/api/logic/minecraft/launch/ExtractNatives.h
index 6e1e7cd4..d9587991 100644
--- a/api/logic/minecraft/launch/ExtractNatives.h
+++ b/api/logic/minecraft/launch/ExtractNatives.h
@@ -22,17 +22,17 @@
 // FIXME: temporary wrapper for existing task.
 class ExtractNatives: public LaunchStep
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit ExtractNatives(LaunchTask *parent) : LaunchStep(parent){};
-	virtual ~ExtractNatives(){};
+    explicit ExtractNatives(LaunchTask *parent) : LaunchStep(parent){};
+    virtual ~ExtractNatives(){};
 
-	void executeTask() override;
-	bool canAbort() const override
-	{
-		return false;
-	}
-	void finalize() override;
+    void executeTask() override;
+    bool canAbort() const override
+    {
+        return false;
+    }
+    void finalize() override;
 };
 
 
diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.cpp b/api/logic/minecraft/launch/LauncherPartLaunch.cpp
index 1fe9c323..466c1e46 100644
--- a/api/logic/minecraft/launch/LauncherPartLaunch.cpp
+++ b/api/logic/minecraft/launch/LauncherPartLaunch.cpp
@@ -24,8 +24,8 @@
 
 LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
 {
-	connect(&m_process, &LoggedProcess::log, this, &LauncherPartLaunch::logLines);
-	connect(&m_process, &LoggedProcess::stateChanged, this, &LauncherPartLaunch::on_state);
+    connect(&m_process, &LoggedProcess::log, this, &LauncherPartLaunch::logLines);
+    connect(&m_process, &LoggedProcess::stateChanged, this, &LauncherPartLaunch::on_state);
 }
 
 #ifdef Q_OS_WIN
@@ -33,187 +33,187 @@ LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
 #include <windows.h>
 QString shortPathName(const QString & file)
 {
-	auto input = file.toStdWString();
-	std::wstring output;
-	long length = GetShortPathNameW(input.c_str(), NULL, 0);
-	// NOTE: this resizing might seem weird...
-	// when GetShortPathNameW fails, it returns length including null character
-	// when it succeeds, it returns length excluding null character
-	// See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa364989(v=vs.85).aspx
-	output.resize(length);
-	GetShortPathNameW(input.c_str(),(LPWSTR)output.c_str(),length);
-	output.resize(length-1);
-	QString ret = QString::fromStdWString(output);
-	return ret;
+    auto input = file.toStdWString();
+    std::wstring output;
+    long length = GetShortPathNameW(input.c_str(), NULL, 0);
+    // NOTE: this resizing might seem weird...
+    // when GetShortPathNameW fails, it returns length including null character
+    // when it succeeds, it returns length excluding null character
+    // See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa364989(v=vs.85).aspx
+    output.resize(length);
+    GetShortPathNameW(input.c_str(),(LPWSTR)output.c_str(),length);
+    output.resize(length-1);
+    QString ret = QString::fromStdWString(output);
+    return ret;
 }
 #endif
 
 // if the string survives roundtrip through local 8bit encoding...
 bool fitsInLocal8bit(const QString & string)
 {
-	return string == QString::fromLocal8Bit(string.toLocal8Bit());
+    return string == QString::fromLocal8Bit(string.toLocal8Bit());
 }
 
 void LauncherPartLaunch::executeTask()
 {
-	auto instance = m_parent->instance();
-	std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
+    auto instance = m_parent->instance();
+    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
 
-	m_launchScript = minecraftInstance->createLaunchScript(m_session);
-	QStringList args = minecraftInstance->javaArguments();
-	QString allArgs = args.join(", ");
-	emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MultiMC);
+    m_launchScript = minecraftInstance->createLaunchScript(m_session);
+    QStringList args = minecraftInstance->javaArguments();
+    QString allArgs = args.join(", ");
+    emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MultiMC);
 
-	auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
+    auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
 
-	m_process.setProcessEnvironment(instance->createEnvironment());
+    m_process.setProcessEnvironment(instance->createEnvironment());
 
-	// make detachable - this will keep the process running even if the object is destroyed
-	m_process.setDetachable(true);
+    // make detachable - this will keep the process running even if the object is destroyed
+    m_process.setDetachable(true);
 
-	auto classPath = minecraftInstance->getClassPath();
-	classPath.prepend(FS::PathCombine(ENV.getJarsPath(), "NewLaunch.jar"));
+    auto classPath = minecraftInstance->getClassPath();
+    classPath.prepend(FS::PathCombine(ENV.getJarsPath(), "NewLaunch.jar"));
 
-	auto natPath = minecraftInstance->getNativePath();
+    auto natPath = minecraftInstance->getNativePath();
 #ifdef Q_OS_WIN
-	if (!fitsInLocal8bit(natPath))
-	{
-		args << "-Djava.library.path=" + shortPathName(natPath);
-	}
-	else
-	{
-		args << "-Djava.library.path=" + natPath;
-	}
+    if (!fitsInLocal8bit(natPath))
+    {
+        args << "-Djava.library.path=" + shortPathName(natPath);
+    }
+    else
+    {
+        args << "-Djava.library.path=" + natPath;
+    }
 #else
-	args << "-Djava.library.path=" + natPath;
+    args << "-Djava.library.path=" + natPath;
 #endif
 
-	args << "-cp";
+    args << "-cp";
 #ifdef Q_OS_WIN
-	QStringList processed;
-	for(auto & item: classPath)
-	{
-		if (!fitsInLocal8bit(item))
-		{
-			processed << shortPathName(item);
-		}
-		else
-		{
-			processed << item;
-		}
-	}
-	args << processed.join(';');
+    QStringList processed;
+    for(auto & item: classPath)
+    {
+        if (!fitsInLocal8bit(item))
+        {
+            processed << shortPathName(item);
+        }
+        else
+        {
+            processed << item;
+        }
+    }
+    args << processed.join(';');
 #else
-	args << classPath.join(':');
+    args << classPath.join(':');
 #endif
-	args << "org.multimc.EntryPoint";
-
-	qDebug() << args.join(' ');
-
-	QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
-	if(!wrapperCommandStr.isEmpty())
-	{
-		auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
-		auto wrapperCommand = wrapperArgs.takeFirst();
-		auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
-		if (realWrapperCommand.isEmpty())
-		{
-			QString reason = tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand);
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-			return;
-		}
-		emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::MultiMC);
-		args.prepend(javaPath);
-		m_process.start(wrapperCommand, wrapperArgs + args);
-	}
-	else
-	{
-		m_process.start(javaPath, args);
-	}
+    args << "org.multimc.EntryPoint";
+
+    qDebug() << args.join(' ');
+
+    QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
+    if(!wrapperCommandStr.isEmpty())
+    {
+        auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
+        auto wrapperCommand = wrapperArgs.takeFirst();
+        auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
+        if (realWrapperCommand.isEmpty())
+        {
+            QString reason = tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand);
+            emit logLine(reason, MessageLevel::Fatal);
+            emitFailed(reason);
+            return;
+        }
+        emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::MultiMC);
+        args.prepend(javaPath);
+        m_process.start(wrapperCommand, wrapperArgs + args);
+    }
+    else
+    {
+        m_process.start(javaPath, args);
+    }
 }
 
 void LauncherPartLaunch::on_state(LoggedProcess::State state)
 {
-	switch(state)
-	{
-		case LoggedProcess::FailedToStart:
-		{
-			//: Error message displayed if instace can't start
-			QString reason = tr("Could not launch minecraft!");
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-			return;
-		}
-		case LoggedProcess::Aborted:
-		case LoggedProcess::Crashed:
-
-		{
-			m_parent->setPid(-1);
-			emitFailed("Game crashed.");
-			return;
-		}
-		case LoggedProcess::Finished:
-		{
-			m_parent->setPid(-1);
-			// if the exit code wasn't 0, report this as a crash
-			auto exitCode = m_process.exitCode();
-			if(exitCode != 0)
-			{
-				emitFailed("Game crashed.");
-				return;
-			}
-			//FIXME: make this work again
-			// m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
-			// run post-exit
-			emitSucceeded();
-			break;
-		}
-		case LoggedProcess::Running:
-			emit logLine(tr("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
-			m_parent->setPid(m_process.processId());
-			m_parent->instance()->setLastLaunch();
-			// send the launch script to the launcher part
-			m_process.write(m_launchScript.toUtf8());
-
-			mayProceed = true;
-			emit readyForLaunch();
-			break;
-		default:
-			break;
-	}
+    switch(state)
+    {
+        case LoggedProcess::FailedToStart:
+        {
+            //: Error message displayed if instace can't start
+            QString reason = tr("Could not launch minecraft!");
+            emit logLine(reason, MessageLevel::Fatal);
+            emitFailed(reason);
+            return;
+        }
+        case LoggedProcess::Aborted:
+        case LoggedProcess::Crashed:
+
+        {
+            m_parent->setPid(-1);
+            emitFailed("Game crashed.");
+            return;
+        }
+        case LoggedProcess::Finished:
+        {
+            m_parent->setPid(-1);
+            // if the exit code wasn't 0, report this as a crash
+            auto exitCode = m_process.exitCode();
+            if(exitCode != 0)
+            {
+                emitFailed("Game crashed.");
+                return;
+            }
+            //FIXME: make this work again
+            // m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
+            // run post-exit
+            emitSucceeded();
+            break;
+        }
+        case LoggedProcess::Running:
+            emit logLine(tr("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
+            m_parent->setPid(m_process.processId());
+            m_parent->instance()->setLastLaunch();
+            // send the launch script to the launcher part
+            m_process.write(m_launchScript.toUtf8());
+
+            mayProceed = true;
+            emit readyForLaunch();
+            break;
+        default:
+            break;
+    }
 }
 
 void LauncherPartLaunch::setWorkingDirectory(const QString &wd)
 {
-	m_process.setWorkingDirectory(wd);
+    m_process.setWorkingDirectory(wd);
 }
 
 void LauncherPartLaunch::proceed()
 {
-	if(mayProceed)
-	{
-		QString launchString("launch\n");
-		m_process.write(launchString.toUtf8());
-		mayProceed = false;
-	}
+    if(mayProceed)
+    {
+        QString launchString("launch\n");
+        m_process.write(launchString.toUtf8());
+        mayProceed = false;
+    }
 }
 
 bool LauncherPartLaunch::abort()
 {
-	if(mayProceed)
-	{
-		mayProceed = false;
-		QString launchString("abort\n");
-		m_process.write(launchString.toUtf8());
-	}
-	else
-	{
-		auto state = m_process.state();
-		if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-		{
-			m_process.kill();
-		}
-	}
-	return true;
+    if(mayProceed)
+    {
+        mayProceed = false;
+        QString launchString("abort\n");
+        m_process.write(launchString.toUtf8());
+    }
+    else
+    {
+        auto state = m_process.state();
+        if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
+        {
+            m_process.kill();
+        }
+    }
+    return true;
 }
diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.h b/api/logic/minecraft/launch/LauncherPartLaunch.h
index 6ae85a3f..7fadbd66 100644
--- a/api/logic/minecraft/launch/LauncherPartLaunch.h
+++ b/api/logic/minecraft/launch/LauncherPartLaunch.h
@@ -21,31 +21,31 @@
 
 class LauncherPartLaunch: public LaunchStep
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit LauncherPartLaunch(LaunchTask *parent);
-	virtual ~LauncherPartLaunch() {};
+    explicit LauncherPartLaunch(LaunchTask *parent);
+    virtual ~LauncherPartLaunch() {};
 
-	virtual void executeTask();
-	virtual bool abort();
-	virtual void proceed();
-	virtual bool canAbort() const
-	{
-		return true;
-	}
-	void setWorkingDirectory(const QString &wd);
-	void setAuthSession(AuthSessionPtr session)
-	{
-		m_session = session;
-	}
+    virtual void executeTask();
+    virtual bool abort();
+    virtual void proceed();
+    virtual bool canAbort() const
+    {
+        return true;
+    }
+    void setWorkingDirectory(const QString &wd);
+    void setAuthSession(AuthSessionPtr session)
+    {
+        m_session = session;
+    }
 
 private slots:
-	void on_state(LoggedProcess::State state);
+    void on_state(LoggedProcess::State state);
 
 private:
-	LoggedProcess m_process;
-	QString m_command;
-	AuthSessionPtr m_session;
-	QString m_launchScript;
-	bool mayProceed = false;
+    LoggedProcess m_process;
+    QString m_command;
+    AuthSessionPtr m_session;
+    QString m_launchScript;
+    bool mayProceed = false;
 };
diff --git a/api/logic/minecraft/launch/ModMinecraftJar.cpp b/api/logic/minecraft/launch/ModMinecraftJar.cpp
index 34825b45..34472bb3 100644
--- a/api/logic/minecraft/launch/ModMinecraftJar.cpp
+++ b/api/logic/minecraft/launch/ModMinecraftJar.cpp
@@ -23,60 +23,60 @@
 
 void ModMinecraftJar::executeTask()
 {
-	auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
+    auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
 
-	if(!m_inst->getJarMods().size())
-	{
-		emitSucceeded();
-		return;
-	}
-	// nuke obsolete stripped jar(s) if needed
-	if(!FS::ensureFolderPathExists(m_inst->binRoot()))
-	{
-		emitFailed(tr("Couldn't create the bin folder for Minecraft.jar"));
-	}
+    if(!m_inst->getJarMods().size())
+    {
+        emitSucceeded();
+        return;
+    }
+    // nuke obsolete stripped jar(s) if needed
+    if(!FS::ensureFolderPathExists(m_inst->binRoot()))
+    {
+        emitFailed(tr("Couldn't create the bin folder for Minecraft.jar"));
+    }
 
-	auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
-	if(!removeJar())
-	{
-		emitFailed(tr("Couldn't remove stale jar file: %1").arg(finalJarPath));
-	}
+    auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
+    if(!removeJar())
+    {
+        emitFailed(tr("Couldn't remove stale jar file: %1").arg(finalJarPath));
+    }
 
-	// create temporary modded jar, if needed
-	auto components = m_inst->getComponentList();
-	auto profile = components->getProfile();
-	auto jarMods = m_inst->getJarMods();
-	if(jarMods.size())
-	{
-		auto mainJar = profile->getMainJar();
-		QStringList jars, temp1, temp2, temp3, temp4;
-		mainJar->getApplicableFiles(currentSystem, jars, temp1, temp2, temp3, m_inst->getLocalLibraryPath());
-		auto sourceJarPath = jars[0];
-		if(!MMCZip::createModdedJar(sourceJarPath, finalJarPath, jarMods))
-		{
-			emitFailed(tr("Failed to create the custom Minecraft jar file."));
-			return;
-		}
-	}
-	emitSucceeded();
+    // create temporary modded jar, if needed
+    auto components = m_inst->getComponentList();
+    auto profile = components->getProfile();
+    auto jarMods = m_inst->getJarMods();
+    if(jarMods.size())
+    {
+        auto mainJar = profile->getMainJar();
+        QStringList jars, temp1, temp2, temp3, temp4;
+        mainJar->getApplicableFiles(currentSystem, jars, temp1, temp2, temp3, m_inst->getLocalLibraryPath());
+        auto sourceJarPath = jars[0];
+        if(!MMCZip::createModdedJar(sourceJarPath, finalJarPath, jarMods))
+        {
+            emitFailed(tr("Failed to create the custom Minecraft jar file."));
+            return;
+        }
+    }
+    emitSucceeded();
 }
 
 void ModMinecraftJar::finalize()
 {
-	removeJar();
+    removeJar();
 }
 
 bool ModMinecraftJar::removeJar()
 {
-	auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
-	auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
-	QFile finalJar(finalJarPath);
-	if(finalJar.exists())
-	{
-		if(!finalJar.remove())
-		{
-			return false;
-		}
-	}
-	return true;
+    auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
+    auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
+    QFile finalJar(finalJarPath);
+    if(finalJar.exists())
+    {
+        if(!finalJar.remove())
+        {
+            return false;
+        }
+    }
+    return true;
 }
diff --git a/api/logic/minecraft/launch/ModMinecraftJar.h b/api/logic/minecraft/launch/ModMinecraftJar.h
index dca484f8..48e11736 100644
--- a/api/logic/minecraft/launch/ModMinecraftJar.h
+++ b/api/logic/minecraft/launch/ModMinecraftJar.h
@@ -20,17 +20,17 @@
 
 class ModMinecraftJar: public LaunchStep
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit ModMinecraftJar(LaunchTask *parent) : LaunchStep(parent) {};
-	virtual ~ModMinecraftJar(){};
+    explicit ModMinecraftJar(LaunchTask *parent) : LaunchStep(parent) {};
+    virtual ~ModMinecraftJar(){};
 
-	virtual void executeTask() override;
-	virtual bool canAbort() const override
-	{
-		return false;
-	}
-	void finalize() override;
+    virtual void executeTask() override;
+    virtual bool canAbort() const override
+    {
+        return false;
+    }
+    void finalize() override;
 private:
-	bool removeJar();
+    bool removeJar();
 };
diff --git a/api/logic/minecraft/launch/PrintInstanceInfo.h b/api/logic/minecraft/launch/PrintInstanceInfo.h
index 61615ba1..ae0a0400 100644
--- a/api/logic/minecraft/launch/PrintInstanceInfo.h
+++ b/api/logic/minecraft/launch/PrintInstanceInfo.h
@@ -22,17 +22,17 @@
 // FIXME: temporary wrapper for existing task.
 class PrintInstanceInfo: public LaunchStep
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit PrintInstanceInfo(LaunchTask *parent, AuthSessionPtr session) : LaunchStep(parent), m_session(session) {};
-	virtual ~PrintInstanceInfo(){};
+    explicit PrintInstanceInfo(LaunchTask *parent, AuthSessionPtr session) : LaunchStep(parent), m_session(session) {};
+    virtual ~PrintInstanceInfo(){};
 
-	virtual void executeTask();
-	virtual bool canAbort() const
-	{
-		return false;
-	}
+    virtual void executeTask();
+    virtual bool canAbort() const
+    {
+        return false;
+    }
 private:
-	AuthSessionPtr m_session;
+    AuthSessionPtr m_session;
 };