368 files changed, 159 insertions, 275 deletions

diff --git a/.gitmodules b/.gitmodules
index db3e347e71..e70d091947 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "depends/libnbtplusplus"]
-	path = depends/libnbtplusplus
+	path = libraries/libnbtplusplus
 	url = https://github.com/MultiMC/libnbtplusplus.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c02157802..a82c369573 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,30 +95,27 @@ else()
 set(QUAZIP_LIBRARIES -L"${CMAKE_CURRENT_BINARY_DIR}/External/Install/QuaZIP/lib" quazip)
 endif()
 
-add_subdirectory(depends/hoedown) # markdown parser
-add_subdirectory(depends/launcher) # java based launcher part for Minecraft
-add_subdirectory(depends/javacheck) # java compatibility checker
-add_subdirectory(depends/xz-embedded) # xz compression
-add_subdirectory(depends/pack200) # java pack200 compression
-add_subdirectory(depends/rainbow) # Qt extension for colors
-
 option(NBT_BUILD_SHARED "Build NBT shared library" ON)
 option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF)
 option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests.
-add_subdirectory(depends/libnbtplusplus)
-
-######## MultiMC Libs ########
+add_subdirectory(libraries/libnbtplusplus)
 
-add_subdirectory(depends/LogicalGui) # GUI -> Logic connection
-add_subdirectory(depends/iconfix) # fork of Qt's QIcon loader
+add_subdirectory(libraries/hoedown) # markdown parser
+add_subdirectory(libraries/launcher) # java based launcher part for Minecraft
+add_subdirectory(libraries/javacheck) # java compatibility checker
+add_subdirectory(libraries/xz-embedded) # xz compression
+add_subdirectory(libraries/pack200) # java pack200 compression
+add_subdirectory(libraries/rainbow) # Qt extension for colors
+add_subdirectory(libraries/iconfix) # fork of Qt's QIcon loader
 
 include(Coverity)
 
 ############################### Built Artifacts ###############################
 
 add_subdirectory(tests)
-add_subdirectory(libraries/logic)
-add_subdirectory(libraries/gui)
+
+add_subdirectory(api/logic)
+add_subdirectory(api/gui)
 
 add_subdirectory(application)
 add_subdirectory(wonkoclient)
diff --git a/libraries/gui/CMakeLists.txt b/api/gui/CMakeLists.txt
index 1551a927d0..1551a927d0 100644
--- a/libraries/gui/CMakeLists.txt
+++ b/api/gui/CMakeLists.txt
diff --git a/libraries/gui/DesktopServices.cpp b/api/gui/DesktopServices.cpp
index 3154ea013d..3154ea013d 100644
--- a/libraries/gui/DesktopServices.cpp
+++ b/api/gui/DesktopServices.cpp
diff --git a/libraries/gui/DesktopServices.h b/api/gui/DesktopServices.h
index 9daf192a09..9daf192a09 100644
--- a/libraries/gui/DesktopServices.h
+++ b/api/gui/DesktopServices.h
diff --git a/libraries/gui/SkinUtils.cpp b/api/gui/SkinUtils.cpp
index f69a1071f1..f69a1071f1 100644
--- a/libraries/gui/SkinUtils.cpp
+++ b/api/gui/SkinUtils.cpp
diff --git a/libraries/gui/SkinUtils.h b/api/gui/SkinUtils.h
index 29dcd6a616..29dcd6a616 100644
--- a/libraries/gui/SkinUtils.h
+++ b/api/gui/SkinUtils.h
diff --git a/libraries/gui/icons/IconList.cpp b/api/gui/icons/IconList.cpp
index 99def3b783..99def3b783 100644
--- a/libraries/gui/icons/IconList.cpp
+++ b/api/gui/icons/IconList.cpp
diff --git a/libraries/gui/icons/IconList.h b/api/gui/icons/IconList.h
index 971db8242c..971db8242c 100644
--- a/libraries/gui/icons/IconList.h
+++ b/api/gui/icons/IconList.h
diff --git a/libraries/gui/icons/MMCIcon.cpp b/api/gui/icons/MMCIcon.cpp
index 6b4eef397d..6b4eef397d 100644
--- a/libraries/gui/icons/MMCIcon.cpp
+++ b/api/gui/icons/MMCIcon.cpp
diff --git a/libraries/gui/icons/MMCIcon.h b/api/gui/icons/MMCIcon.h
index 6f9617c22b..6f9617c22b 100644
--- a/libraries/gui/icons/MMCIcon.h
+++ b/api/gui/icons/MMCIcon.h
diff --git a/libraries/logic/AbstractCommonModel.cpp b/api/logic/AbstractCommonModel.cpp
index 71d7582958..71d7582958 100644
--- a/libraries/logic/AbstractCommonModel.cpp
+++ b/api/logic/AbstractCommonModel.cpp
diff --git a/libraries/logic/AbstractCommonModel.h b/api/logic/AbstractCommonModel.h
index 31b86a23c9..31b86a23c9 100644
--- a/libraries/logic/AbstractCommonModel.h
+++ b/api/logic/AbstractCommonModel.h
diff --git a/libraries/logic/BaseConfigObject.cpp b/api/logic/BaseConfigObject.cpp
index 3040ac2ed4..3040ac2ed4 100644
--- a/libraries/logic/BaseConfigObject.cpp
+++ b/api/logic/BaseConfigObject.cpp
diff --git a/libraries/logic/BaseConfigObject.h b/api/logic/BaseConfigObject.h
index 1c96b3d1d6..1c96b3d1d6 100644
--- a/libraries/logic/BaseConfigObject.h
+++ b/api/logic/BaseConfigObject.h
diff --git a/libraries/logic/BaseInstaller.cpp b/api/logic/BaseInstaller.cpp
index cb762ebd6e..cb762ebd6e 100644
--- a/libraries/logic/BaseInstaller.cpp
+++ b/api/logic/BaseInstaller.cpp
diff --git a/libraries/logic/BaseInstaller.h b/api/logic/BaseInstaller.h
index a50c8cb1ca..a50c8cb1ca 100644
--- a/libraries/logic/BaseInstaller.h
+++ b/api/logic/BaseInstaller.h
diff --git a/libraries/logic/BaseInstance.cpp b/api/logic/BaseInstance.cpp
index ce55d5e444..ce55d5e444 100644
--- a/libraries/logic/BaseInstance.cpp
+++ b/api/logic/BaseInstance.cpp
diff --git a/libraries/logic/BaseInstance.h b/api/logic/BaseInstance.h
index 5e587c4839..5e587c4839 100644
--- a/libraries/logic/BaseInstance.h
+++ b/api/logic/BaseInstance.h
diff --git a/libraries/logic/BaseVersion.h b/api/logic/BaseVersion.h
index 807675185f..807675185f 100644
--- a/libraries/logic/BaseVersion.h
+++ b/api/logic/BaseVersion.h
diff --git a/libraries/logic/BaseVersionList.cpp b/api/logic/BaseVersionList.cpp
index b34f318c37..b34f318c37 100644
--- a/libraries/logic/BaseVersionList.cpp
+++ b/api/logic/BaseVersionList.cpp
diff --git a/libraries/logic/BaseVersionList.h b/api/logic/BaseVersionList.h
index 73d2ee1f26..73d2ee1f26 100644
--- a/libraries/logic/BaseVersionList.h
+++ b/api/logic/BaseVersionList.h
diff --git a/libraries/logic/CMakeLists.txt b/api/logic/CMakeLists.txt
index 317627d529..317627d529 100644
--- a/libraries/logic/CMakeLists.txt
+++ b/api/logic/CMakeLists.txt
diff --git a/libraries/logic/Commandline.cpp b/api/logic/Commandline.cpp
index 9a8ddbf1c0..9a8ddbf1c0 100644
--- a/libraries/logic/Commandline.cpp
+++ b/api/logic/Commandline.cpp
diff --git a/libraries/logic/Commandline.h b/api/logic/Commandline.h
index bee02bad8e..bee02bad8e 100644
--- a/libraries/logic/Commandline.h
+++ b/api/logic/Commandline.h
diff --git a/libraries/logic/DefaultVariable.h b/api/logic/DefaultVariable.h
index 38d7ecc292..38d7ecc292 100644
--- a/libraries/logic/DefaultVariable.h
+++ b/api/logic/DefaultVariable.h
diff --git a/libraries/logic/Env.cpp b/api/logic/Env.cpp
index cc0c598164..cc0c598164 100644
--- a/libraries/logic/Env.cpp
+++ b/api/logic/Env.cpp
diff --git a/libraries/logic/Env.h b/api/logic/Env.h
index 4d8945d7d8..4d8945d7d8 100644
--- a/libraries/logic/Env.h
+++ b/api/logic/Env.h
diff --git a/libraries/logic/Exception.h b/api/logic/Exception.h
index 30c7aa4500..30c7aa4500 100644
--- a/libraries/logic/Exception.h
+++ b/api/logic/Exception.h
diff --git a/libraries/logic/FileSystem.cpp b/api/logic/FileSystem.cpp
index 049f1e3878..049f1e3878 100644
--- a/libraries/logic/FileSystem.cpp
+++ b/api/logic/FileSystem.cpp
diff --git a/libraries/logic/FileSystem.h b/api/logic/FileSystem.h
index 80637f90fd..80637f90fd 100644
--- a/libraries/logic/FileSystem.h
+++ b/api/logic/FileSystem.h
diff --git a/libraries/logic/GZip.cpp b/api/logic/GZip.cpp
index 38605df678..38605df678 100644
--- a/libraries/logic/GZip.cpp
+++ b/api/logic/GZip.cpp
diff --git a/libraries/logic/GZip.h b/api/logic/GZip.h
index 6993a22247..6993a22247 100644
--- a/libraries/logic/GZip.h
+++ b/api/logic/GZip.h
diff --git a/libraries/logic/InstanceList.cpp b/api/logic/InstanceList.cpp
index 783df660b5..783df660b5 100644
--- a/libraries/logic/InstanceList.cpp
+++ b/api/logic/InstanceList.cpp
diff --git a/libraries/logic/InstanceList.h b/api/logic/InstanceList.h
index 074cca7cf7..074cca7cf7 100644
--- a/libraries/logic/InstanceList.h
+++ b/api/logic/InstanceList.h
diff --git a/libraries/logic/Json.cpp b/api/logic/Json.cpp
index f2cbc8a3a5..f2cbc8a3a5 100644
--- a/libraries/logic/Json.cpp
+++ b/api/logic/Json.cpp
diff --git a/libraries/logic/Json.h b/api/logic/Json.h
index 2cb60f0e5b..2cb60f0e5b 100644
--- a/libraries/logic/Json.h
+++ b/api/logic/Json.h
diff --git a/libraries/logic/MMCStrings.cpp b/api/logic/MMCStrings.cpp
index c50d596e53..c50d596e53 100644
--- a/libraries/logic/MMCStrings.cpp
+++ b/api/logic/MMCStrings.cpp
diff --git a/libraries/logic/MMCStrings.h b/api/logic/MMCStrings.h
index 5606b90996..5606b90996 100644
--- a/libraries/logic/MMCStrings.h
+++ b/api/logic/MMCStrings.h
diff --git a/libraries/logic/MMCZip.cpp b/api/logic/MMCZip.cpp
index 0f35bc707b..0f35bc707b 100644
--- a/libraries/logic/MMCZip.cpp
+++ b/api/logic/MMCZip.cpp
diff --git a/libraries/logic/MMCZip.h b/api/logic/MMCZip.h
index f350e66816..f350e66816 100644
--- a/libraries/logic/MMCZip.h
+++ b/api/logic/MMCZip.h
diff --git a/libraries/logic/NullInstance.h b/api/logic/NullInstance.h
index fbb2d9854e..fbb2d9854e 100644
--- a/libraries/logic/NullInstance.h
+++ b/api/logic/NullInstance.h
diff --git a/libraries/logic/QObjectPtr.h b/api/logic/QObjectPtr.h
index b81b3234f5..b81b3234f5 100644
--- a/libraries/logic/QObjectPtr.h
+++ b/api/logic/QObjectPtr.h
diff --git a/libraries/logic/RWStorage.h b/api/logic/RWStorage.h
index b1598ca4a9..b1598ca4a9 100644
--- a/libraries/logic/RWStorage.h
+++ b/api/logic/RWStorage.h
diff --git a/libraries/logic/RecursiveFileSystemWatcher.cpp b/api/logic/RecursiveFileSystemWatcher.cpp
index 59c3f0f076..59c3f0f076 100644
--- a/libraries/logic/RecursiveFileSystemWatcher.cpp
+++ b/api/logic/RecursiveFileSystemWatcher.cpp
diff --git a/libraries/logic/RecursiveFileSystemWatcher.h b/api/logic/RecursiveFileSystemWatcher.h
index 07bce0b90d..07bce0b90d 100644
--- a/libraries/logic/RecursiveFileSystemWatcher.h
+++ b/api/logic/RecursiveFileSystemWatcher.h
diff --git a/libraries/logic/SeparatorPrefixTree.h b/api/logic/SeparatorPrefixTree.h
index fd149af0a6..fd149af0a6 100644
--- a/libraries/logic/SeparatorPrefixTree.h
+++ b/api/logic/SeparatorPrefixTree.h
diff --git a/libraries/logic/TypeMagic.h b/api/logic/TypeMagic.h
index fa9d12a9e6..fa9d12a9e6 100644
--- a/libraries/logic/TypeMagic.h
+++ b/api/logic/TypeMagic.h
diff --git a/libraries/logic/Version.cpp b/api/logic/Version.cpp
index 3c4727ad21..3c4727ad21 100644
--- a/libraries/logic/Version.cpp
+++ b/api/logic/Version.cpp
diff --git a/libraries/logic/Version.h b/api/logic/Version.h
index b5946ced24..b5946ced24 100644
--- a/libraries/logic/Version.h
+++ b/api/logic/Version.h
diff --git a/libraries/logic/java/JavaChecker.cpp b/api/logic/java/JavaChecker.cpp
index 54d552a97e..54d552a97e 100644
--- a/libraries/logic/java/JavaChecker.cpp
+++ b/api/logic/java/JavaChecker.cpp
diff --git a/libraries/logic/java/JavaChecker.h b/api/logic/java/JavaChecker.h
index 650e7ce333..650e7ce333 100644
--- a/libraries/logic/java/JavaChecker.h
+++ b/api/logic/java/JavaChecker.h
diff --git a/libraries/logic/java/JavaCheckerJob.cpp b/api/logic/java/JavaCheckerJob.cpp
index 0b040e434b..0b040e434b 100644
--- a/libraries/logic/java/JavaCheckerJob.cpp
+++ b/api/logic/java/JavaCheckerJob.cpp
diff --git a/libraries/logic/java/JavaCheckerJob.h b/api/logic/java/JavaCheckerJob.h
index aca0d02e2b..aca0d02e2b 100644
--- a/libraries/logic/java/JavaCheckerJob.h
+++ b/api/logic/java/JavaCheckerJob.h
diff --git a/libraries/logic/java/JavaInstall.cpp b/api/logic/java/JavaInstall.cpp
index bb262b6e7d..bb262b6e7d 100644
--- a/libraries/logic/java/JavaInstall.cpp
+++ b/api/logic/java/JavaInstall.cpp
diff --git a/libraries/logic/java/JavaInstall.h b/api/logic/java/JavaInstall.h
index 882c73864b..882c73864b 100644
--- a/libraries/logic/java/JavaInstall.h
+++ b/api/logic/java/JavaInstall.h
diff --git a/libraries/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp
index c07292272c..c07292272c 100644
--- a/libraries/logic/java/JavaInstallList.cpp
+++ b/api/logic/java/JavaInstallList.cpp
diff --git a/libraries/logic/java/JavaInstallList.h b/api/logic/java/JavaInstallList.h
index cf0e578474..cf0e578474 100644
--- a/libraries/logic/java/JavaInstallList.h
+++ b/api/logic/java/JavaInstallList.h
diff --git a/libraries/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp
index 88996e9f53..88996e9f53 100644
--- a/libraries/logic/java/JavaUtils.cpp
+++ b/api/logic/java/JavaUtils.cpp
diff --git a/libraries/logic/java/JavaUtils.h b/api/logic/java/JavaUtils.h
index 3fb8834168..3fb8834168 100644
--- a/libraries/logic/java/JavaUtils.h
+++ b/api/logic/java/JavaUtils.h
diff --git a/libraries/logic/java/JavaVersion.cpp b/api/logic/java/JavaVersion.cpp
index 84fc48a481..84fc48a481 100644
--- a/libraries/logic/java/JavaVersion.cpp
+++ b/api/logic/java/JavaVersion.cpp
diff --git a/libraries/logic/java/JavaVersion.h b/api/logic/java/JavaVersion.h
index f9a733d305..f9a733d305 100644
--- a/libraries/logic/java/JavaVersion.h
+++ b/api/logic/java/JavaVersion.h
diff --git a/libraries/logic/launch/LaunchStep.cpp b/api/logic/launch/LaunchStep.cpp
index 3078043bb8..3078043bb8 100644
--- a/libraries/logic/launch/LaunchStep.cpp
+++ b/api/logic/launch/LaunchStep.cpp
diff --git a/libraries/logic/launch/LaunchStep.h b/api/logic/launch/LaunchStep.h
index ea472c0d6a..ea472c0d6a 100644
--- a/libraries/logic/launch/LaunchStep.h
+++ b/api/logic/launch/LaunchStep.h
diff --git a/libraries/logic/launch/LaunchTask.cpp b/api/logic/launch/LaunchTask.cpp
index 5b7ff18248..5b7ff18248 100644
--- a/libraries/logic/launch/LaunchTask.cpp
+++ b/api/logic/launch/LaunchTask.cpp
diff --git a/libraries/logic/launch/LaunchTask.h b/api/logic/launch/LaunchTask.h
index 447445cacb..447445cacb 100644
--- a/libraries/logic/launch/LaunchTask.h
+++ b/api/logic/launch/LaunchTask.h
diff --git a/libraries/logic/launch/LoggedProcess.cpp b/api/logic/launch/LoggedProcess.cpp
index 88ca40aa86..88ca40aa86 100644
--- a/libraries/logic/launch/LoggedProcess.cpp
+++ b/api/logic/launch/LoggedProcess.cpp
diff --git a/libraries/logic/launch/LoggedProcess.h b/api/logic/launch/LoggedProcess.h
index baa53d79b3..baa53d79b3 100644
--- a/libraries/logic/launch/LoggedProcess.h
+++ b/api/logic/launch/LoggedProcess.h
diff --git a/libraries/logic/launch/MessageLevel.cpp b/api/logic/launch/MessageLevel.cpp
index a5191290ef..a5191290ef 100644
--- a/libraries/logic/launch/MessageLevel.cpp
+++ b/api/logic/launch/MessageLevel.cpp
diff --git a/libraries/logic/launch/MessageLevel.h b/api/logic/launch/MessageLevel.h
index 0128148d0a..0128148d0a 100644
--- a/libraries/logic/launch/MessageLevel.h
+++ b/api/logic/launch/MessageLevel.h
diff --git a/libraries/logic/launch/steps/CheckJava.cpp b/api/logic/launch/steps/CheckJava.cpp
index a4eaa3076e..a4eaa3076e 100644
--- a/libraries/logic/launch/steps/CheckJava.cpp
+++ b/api/logic/launch/steps/CheckJava.cpp
diff --git a/libraries/logic/launch/steps/CheckJava.h b/api/logic/launch/steps/CheckJava.h
index b63dd4f463..b63dd4f463 100644
--- a/libraries/logic/launch/steps/CheckJava.h
+++ b/api/logic/launch/steps/CheckJava.h
diff --git a/libraries/logic/launch/steps/LaunchMinecraft.cpp b/api/logic/launch/steps/LaunchMinecraft.cpp
index 77a89f178c..9b8cc0fb5e 100644
--- a/libraries/logic/launch/steps/LaunchMinecraft.cpp
+++ b/api/logic/launch/steps/LaunchMinecraft.cpp
@@ -110,6 +110,7 @@ void LaunchMinecraft::on_state(LoggedProcess::State state)
 			m_parent->instance()->setLastLaunch();
 			// send the launch script to the launcher part
 			m_process.write(m_launchScript.toUtf8());
+			qDebug() << m_launchScript;
 
 			mayProceed = true;
 			emit readyForLaunch();
diff --git a/libraries/logic/launch/steps/LaunchMinecraft.h b/api/logic/launch/steps/LaunchMinecraft.h
index 6b9f79193b..6b9f79193b 100644
--- a/libraries/logic/launch/steps/LaunchMinecraft.h
+++ b/api/logic/launch/steps/LaunchMinecraft.h
diff --git a/libraries/logic/launch/steps/ModMinecraftJar.cpp b/api/logic/launch/steps/ModMinecraftJar.cpp
index fce2d70a74..fce2d70a74 100644
--- a/libraries/logic/launch/steps/ModMinecraftJar.cpp
+++ b/api/logic/launch/steps/ModMinecraftJar.cpp
diff --git a/libraries/logic/launch/steps/ModMinecraftJar.h b/api/logic/launch/steps/ModMinecraftJar.h
index b35dfafa2a..b35dfafa2a 100644
--- a/libraries/logic/launch/steps/ModMinecraftJar.h
+++ b/api/logic/launch/steps/ModMinecraftJar.h
diff --git a/libraries/logic/launch/steps/PostLaunchCommand.cpp b/api/logic/launch/steps/PostLaunchCommand.cpp
index 29a45f1ba6..29a45f1ba6 100644
--- a/libraries/logic/launch/steps/PostLaunchCommand.cpp
+++ b/api/logic/launch/steps/PostLaunchCommand.cpp
diff --git a/libraries/logic/launch/steps/PostLaunchCommand.h b/api/logic/launch/steps/PostLaunchCommand.h
index 4d5b0a52f8..4d5b0a52f8 100644
--- a/libraries/logic/launch/steps/PostLaunchCommand.h
+++ b/api/logic/launch/steps/PostLaunchCommand.h
diff --git a/libraries/logic/launch/steps/PreLaunchCommand.cpp b/api/logic/launch/steps/PreLaunchCommand.cpp
index 47197a82be..47197a82be 100644
--- a/libraries/logic/launch/steps/PreLaunchCommand.cpp
+++ b/api/logic/launch/steps/PreLaunchCommand.cpp
diff --git a/libraries/logic/launch/steps/PreLaunchCommand.h b/api/logic/launch/steps/PreLaunchCommand.h
index 077bdfca98..077bdfca98 100644
--- a/libraries/logic/launch/steps/PreLaunchCommand.h
+++ b/api/logic/launch/steps/PreLaunchCommand.h
diff --git a/libraries/logic/launch/steps/TextPrint.cpp b/api/logic/launch/steps/TextPrint.cpp
index f307b1fdee..f307b1fdee 100644
--- a/libraries/logic/launch/steps/TextPrint.cpp
+++ b/api/logic/launch/steps/TextPrint.cpp
diff --git a/libraries/logic/launch/steps/TextPrint.h b/api/logic/launch/steps/TextPrint.h
index fdd9014a70..fdd9014a70 100644
--- a/libraries/logic/launch/steps/TextPrint.h
+++ b/api/logic/launch/steps/TextPrint.h
diff --git a/libraries/logic/launch/steps/Update.cpp b/api/logic/launch/steps/Update.cpp
index 4901f001fc..4901f001fc 100644
--- a/libraries/logic/launch/steps/Update.cpp
+++ b/api/logic/launch/steps/Update.cpp
diff --git a/libraries/logic/launch/steps/Update.h b/api/logic/launch/steps/Update.h
index 14928253c1..14928253c1 100644
--- a/libraries/logic/launch/steps/Update.h
+++ b/api/logic/launch/steps/Update.h
diff --git a/libraries/logic/minecraft/AssetsUtils.cpp b/api/logic/minecraft/AssetsUtils.cpp
index 7a525abe06..7a525abe06 100644
--- a/libraries/logic/minecraft/AssetsUtils.cpp
+++ b/api/logic/minecraft/AssetsUtils.cpp
diff --git a/libraries/logic/minecraft/AssetsUtils.h b/api/logic/minecraft/AssetsUtils.h
index 90251c2dab..90251c2dab 100644
--- a/libraries/logic/minecraft/AssetsUtils.h
+++ b/api/logic/minecraft/AssetsUtils.h
diff --git a/libraries/logic/minecraft/GradleSpecifier.h b/api/logic/minecraft/GradleSpecifier.h
index 1830853766..1830853766 100644
--- a/libraries/logic/minecraft/GradleSpecifier.h
+++ b/api/logic/minecraft/GradleSpecifier.h
diff --git a/libraries/logic/minecraft/JarMod.h b/api/logic/minecraft/JarMod.h
index 42d05da93b..42d05da93b 100644
--- a/libraries/logic/minecraft/JarMod.h
+++ b/api/logic/minecraft/JarMod.h
diff --git a/libraries/logic/minecraft/Library.cpp b/api/logic/minecraft/Library.cpp
index 922db84e74..922db84e74 100644
--- a/libraries/logic/minecraft/Library.cpp
+++ b/api/logic/minecraft/Library.cpp
diff --git a/libraries/logic/minecraft/Library.h b/api/logic/minecraft/Library.h
index fdce93f324..fdce93f324 100644
--- a/libraries/logic/minecraft/Library.h
+++ b/api/logic/minecraft/Library.h
diff --git a/libraries/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp
index 405ccd26de..405ccd26de 100644
--- a/libraries/logic/minecraft/MinecraftInstance.cpp
+++ b/api/logic/minecraft/MinecraftInstance.cpp
diff --git a/libraries/logic/minecraft/MinecraftInstance.h b/api/logic/minecraft/MinecraftInstance.h
index cd3a8d909d..cd3a8d909d 100644
--- a/libraries/logic/minecraft/MinecraftInstance.h
+++ b/api/logic/minecraft/MinecraftInstance.h
diff --git a/libraries/logic/minecraft/MinecraftProfile.cpp b/api/logic/minecraft/MinecraftProfile.cpp
index 70d0cee4ea..70d0cee4ea 100644
--- a/libraries/logic/minecraft/MinecraftProfile.cpp
+++ b/api/logic/minecraft/MinecraftProfile.cpp
diff --git a/libraries/logic/minecraft/MinecraftProfile.h b/api/logic/minecraft/MinecraftProfile.h
index ca9288ad1b..ca9288ad1b 100644
--- a/libraries/logic/minecraft/MinecraftProfile.h
+++ b/api/logic/minecraft/MinecraftProfile.h
diff --git a/libraries/logic/minecraft/MinecraftVersion.cpp b/api/logic/minecraft/MinecraftVersion.cpp
index 1e1d273c2d..1e1d273c2d 100644
--- a/libraries/logic/minecraft/MinecraftVersion.cpp
+++ b/api/logic/minecraft/MinecraftVersion.cpp
diff --git a/libraries/logic/minecraft/MinecraftVersion.h b/api/logic/minecraft/MinecraftVersion.h
index b21427d923..b21427d923 100644
--- a/libraries/logic/minecraft/MinecraftVersion.h
+++ b/api/logic/minecraft/MinecraftVersion.h
diff --git a/libraries/logic/minecraft/MinecraftVersionList.cpp b/api/logic/minecraft/MinecraftVersionList.cpp
index a5cc3a39ef..a5cc3a39ef 100644
--- a/libraries/logic/minecraft/MinecraftVersionList.cpp
+++ b/api/logic/minecraft/MinecraftVersionList.cpp
diff --git a/libraries/logic/minecraft/MinecraftVersionList.h b/api/logic/minecraft/MinecraftVersionList.h
index 0fca02a75f..0fca02a75f 100644
--- a/libraries/logic/minecraft/MinecraftVersionList.h
+++ b/api/logic/minecraft/MinecraftVersionList.h
diff --git a/libraries/logic/minecraft/Mod.cpp b/api/logic/minecraft/Mod.cpp
index 9b9f76f9b2..9b9f76f9b2 100644
--- a/libraries/logic/minecraft/Mod.cpp
+++ b/api/logic/minecraft/Mod.cpp
diff --git a/libraries/logic/minecraft/Mod.h b/api/logic/minecraft/Mod.h
index 19f4c74048..19f4c74048 100644
--- a/libraries/logic/minecraft/Mod.h
+++ b/api/logic/minecraft/Mod.h
diff --git a/libraries/logic/minecraft/ModList.cpp b/api/logic/minecraft/ModList.cpp
index d9ed48863e..d9ed48863e 100644
--- a/libraries/logic/minecraft/ModList.cpp
+++ b/api/logic/minecraft/ModList.cpp
diff --git a/libraries/logic/minecraft/ModList.h b/api/logic/minecraft/ModList.h
index 05ada8ee76..05ada8ee76 100644
--- a/libraries/logic/minecraft/ModList.h
+++ b/api/logic/minecraft/ModList.h
diff --git a/libraries/logic/minecraft/MojangDownloadInfo.h b/api/logic/minecraft/MojangDownloadInfo.h
index 1f3306e077..1f3306e077 100644
--- a/libraries/logic/minecraft/MojangDownloadInfo.h
+++ b/api/logic/minecraft/MojangDownloadInfo.h
diff --git a/libraries/logic/minecraft/MojangVersionFormat.cpp b/api/logic/minecraft/MojangVersionFormat.cpp
index 34129c9e63..34129c9e63 100644
--- a/libraries/logic/minecraft/MojangVersionFormat.cpp
+++ b/api/logic/minecraft/MojangVersionFormat.cpp
diff --git a/libraries/logic/minecraft/MojangVersionFormat.h b/api/logic/minecraft/MojangVersionFormat.h
index 4e141088db..4e141088db 100644
--- a/libraries/logic/minecraft/MojangVersionFormat.h
+++ b/api/logic/minecraft/MojangVersionFormat.h
diff --git a/libraries/logic/minecraft/OpSys.cpp b/api/logic/minecraft/OpSys.cpp
index 4c2a236dc3..4c2a236dc3 100644
--- a/libraries/logic/minecraft/OpSys.cpp
+++ b/api/logic/minecraft/OpSys.cpp
diff --git a/libraries/logic/minecraft/OpSys.h b/api/logic/minecraft/OpSys.h
index 9ebea3deea..9ebea3deea 100644
--- a/libraries/logic/minecraft/OpSys.h
+++ b/api/logic/minecraft/OpSys.h
diff --git a/libraries/logic/minecraft/ParseUtils.cpp b/api/logic/minecraft/ParseUtils.cpp
index ca188432c6..ca188432c6 100644
--- a/libraries/logic/minecraft/ParseUtils.cpp
+++ b/api/logic/minecraft/ParseUtils.cpp
diff --git a/libraries/logic/minecraft/ParseUtils.h b/api/logic/minecraft/ParseUtils.h
index 2b367a10a4..2b367a10a4 100644
--- a/libraries/logic/minecraft/ParseUtils.h
+++ b/api/logic/minecraft/ParseUtils.h
diff --git a/libraries/logic/minecraft/ProfilePatch.h b/api/logic/minecraft/ProfilePatch.h
index f0c653602d..f0c653602d 100644
--- a/libraries/logic/minecraft/ProfilePatch.h
+++ b/api/logic/minecraft/ProfilePatch.h
diff --git a/libraries/logic/minecraft/ProfileStrategy.h b/api/logic/minecraft/ProfileStrategy.h
index b4dfc4b3a4..b4dfc4b3a4 100644
--- a/libraries/logic/minecraft/ProfileStrategy.h
+++ b/api/logic/minecraft/ProfileStrategy.h
diff --git a/libraries/logic/minecraft/ProfileUtils.cpp b/api/logic/minecraft/ProfileUtils.cpp
index ef9b3b283b..ef9b3b283b 100644
--- a/libraries/logic/minecraft/ProfileUtils.cpp
+++ b/api/logic/minecraft/ProfileUtils.cpp
diff --git a/libraries/logic/minecraft/ProfileUtils.h b/api/logic/minecraft/ProfileUtils.h
index 267fd42b3d..267fd42b3d 100644
--- a/libraries/logic/minecraft/ProfileUtils.h
+++ b/api/logic/minecraft/ProfileUtils.h
diff --git a/libraries/logic/minecraft/Rule.cpp b/api/logic/minecraft/Rule.cpp
index c8ba297b16..c8ba297b16 100644
--- a/libraries/logic/minecraft/Rule.cpp
+++ b/api/logic/minecraft/Rule.cpp
diff --git a/libraries/logic/minecraft/Rule.h b/api/logic/minecraft/Rule.h
index c8bf6eaade..c8bf6eaade 100644
--- a/libraries/logic/minecraft/Rule.h
+++ b/api/logic/minecraft/Rule.h
diff --git a/libraries/logic/minecraft/VersionBuildError.h b/api/logic/minecraft/VersionBuildError.h
index fda453e5f1..fda453e5f1 100644
--- a/libraries/logic/minecraft/VersionBuildError.h
+++ b/api/logic/minecraft/VersionBuildError.h
diff --git a/libraries/logic/minecraft/VersionFile.cpp b/api/logic/minecraft/VersionFile.cpp
index 573c4cb45b..573c4cb45b 100644
--- a/libraries/logic/minecraft/VersionFile.cpp
+++ b/api/logic/minecraft/VersionFile.cpp
diff --git a/libraries/logic/minecraft/VersionFile.h b/api/logic/minecraft/VersionFile.h
index 1b692f0f4e..1b692f0f4e 100644
--- a/libraries/logic/minecraft/VersionFile.h
+++ b/api/logic/minecraft/VersionFile.h
diff --git a/libraries/logic/minecraft/VersionFilterData.cpp b/api/logic/minecraft/VersionFilterData.cpp
index 0c4a6e3d82..0c4a6e3d82 100644
--- a/libraries/logic/minecraft/VersionFilterData.cpp
+++ b/api/logic/minecraft/VersionFilterData.cpp
diff --git a/libraries/logic/minecraft/VersionFilterData.h b/api/logic/minecraft/VersionFilterData.h
index f7d4ebe7c4..f7d4ebe7c4 100644
--- a/libraries/logic/minecraft/VersionFilterData.h
+++ b/api/logic/minecraft/VersionFilterData.h
diff --git a/libraries/logic/minecraft/World.cpp b/api/logic/minecraft/World.cpp
index 6081a8ecd6..6081a8ecd6 100644
--- a/libraries/logic/minecraft/World.cpp
+++ b/api/logic/minecraft/World.cpp
diff --git a/libraries/logic/minecraft/World.h b/api/logic/minecraft/World.h
index 3cde5ea487..3cde5ea487 100644
--- a/libraries/logic/minecraft/World.h
+++ b/api/logic/minecraft/World.h
diff --git a/libraries/logic/minecraft/WorldList.cpp b/api/logic/minecraft/WorldList.cpp
index 42c8a3e609..42c8a3e609 100644
--- a/libraries/logic/minecraft/WorldList.cpp
+++ b/api/logic/minecraft/WorldList.cpp
diff --git a/libraries/logic/minecraft/WorldList.h b/api/logic/minecraft/WorldList.h
index 34b30e9cf1..34b30e9cf1 100644
--- a/libraries/logic/minecraft/WorldList.h
+++ b/api/logic/minecraft/WorldList.h
diff --git a/libraries/logic/minecraft/auth/AuthSession.cpp b/api/logic/minecraft/auth/AuthSession.cpp
index 8758bfbd36..8758bfbd36 100644
--- a/libraries/logic/minecraft/auth/AuthSession.cpp
+++ b/api/logic/minecraft/auth/AuthSession.cpp
diff --git a/libraries/logic/minecraft/auth/AuthSession.h b/api/logic/minecraft/auth/AuthSession.h
index dede90a9e7..dede90a9e7 100644
--- a/libraries/logic/minecraft/auth/AuthSession.h
+++ b/api/logic/minecraft/auth/AuthSession.h
diff --git a/libraries/logic/minecraft/auth/MojangAccount.cpp b/api/logic/minecraft/auth/MojangAccount.cpp
index 69a24c0966..69a24c0966 100644
--- a/libraries/logic/minecraft/auth/MojangAccount.cpp
+++ b/api/logic/minecraft/auth/MojangAccount.cpp
diff --git a/libraries/logic/minecraft/auth/MojangAccount.h b/api/logic/minecraft/auth/MojangAccount.h
index 2de0c19c5b..2de0c19c5b 100644
--- a/libraries/logic/minecraft/auth/MojangAccount.h
+++ b/api/logic/minecraft/auth/MojangAccount.h
diff --git a/libraries/logic/minecraft/auth/MojangAccountList.cpp b/api/logic/minecraft/auth/MojangAccountList.cpp
index 26cbc81a42..26cbc81a42 100644
--- a/libraries/logic/minecraft/auth/MojangAccountList.cpp
+++ b/api/logic/minecraft/auth/MojangAccountList.cpp
diff --git a/libraries/logic/minecraft/auth/MojangAccountList.h b/api/logic/minecraft/auth/MojangAccountList.h
index c40fa6a38c..c40fa6a38c 100644
--- a/libraries/logic/minecraft/auth/MojangAccountList.h
+++ b/api/logic/minecraft/auth/MojangAccountList.h
diff --git a/libraries/logic/minecraft/auth/YggdrasilTask.cpp b/api/logic/minecraft/auth/YggdrasilTask.cpp
index c6971c9f7f..c6971c9f7f 100644
--- a/libraries/logic/minecraft/auth/YggdrasilTask.cpp
+++ b/api/logic/minecraft/auth/YggdrasilTask.cpp
diff --git a/libraries/logic/minecraft/auth/YggdrasilTask.h b/api/logic/minecraft/auth/YggdrasilTask.h
index c84cfc06c8..c84cfc06c8 100644
--- a/libraries/logic/minecraft/auth/YggdrasilTask.h
+++ b/api/logic/minecraft/auth/YggdrasilTask.h
diff --git a/libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp b/api/logic/minecraft/auth/flows/AuthenticateTask.cpp
index 8d136f0be7..8d136f0be7 100644
--- a/libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp
+++ b/api/logic/minecraft/auth/flows/AuthenticateTask.cpp
diff --git a/libraries/logic/minecraft/auth/flows/AuthenticateTask.h b/api/logic/minecraft/auth/flows/AuthenticateTask.h
index 398fab987b..398fab987b 100644
--- a/libraries/logic/minecraft/auth/flows/AuthenticateTask.h
+++ b/api/logic/minecraft/auth/flows/AuthenticateTask.h
diff --git a/libraries/logic/minecraft/auth/flows/RefreshTask.cpp b/api/logic/minecraft/auth/flows/RefreshTask.cpp
index a0fb2e485c..a0fb2e485c 100644
--- a/libraries/logic/minecraft/auth/flows/RefreshTask.cpp
+++ b/api/logic/minecraft/auth/flows/RefreshTask.cpp
diff --git a/libraries/logic/minecraft/auth/flows/RefreshTask.h b/api/logic/minecraft/auth/flows/RefreshTask.h
index 17714b4f20..17714b4f20 100644
--- a/libraries/logic/minecraft/auth/flows/RefreshTask.h
+++ b/api/logic/minecraft/auth/flows/RefreshTask.h
diff --git a/libraries/logic/minecraft/auth/flows/ValidateTask.cpp b/api/logic/minecraft/auth/flows/ValidateTask.cpp
index 4deceb6ac7..4deceb6ac7 100644
--- a/libraries/logic/minecraft/auth/flows/ValidateTask.cpp
+++ b/api/logic/minecraft/auth/flows/ValidateTask.cpp
diff --git a/libraries/logic/minecraft/auth/flows/ValidateTask.h b/api/logic/minecraft/auth/flows/ValidateTask.h
index 77d628a0a5..77d628a0a5 100644
--- a/libraries/logic/minecraft/auth/flows/ValidateTask.h
+++ b/api/logic/minecraft/auth/flows/ValidateTask.h
diff --git a/libraries/logic/minecraft/forge/ForgeInstaller.cpp b/api/logic/minecraft/forge/ForgeInstaller.cpp
index 353328ab05..353328ab05 100644
--- a/libraries/logic/minecraft/forge/ForgeInstaller.cpp
+++ b/api/logic/minecraft/forge/ForgeInstaller.cpp
diff --git a/libraries/logic/minecraft/forge/ForgeInstaller.h b/api/logic/minecraft/forge/ForgeInstaller.h
index 499a6fb360..499a6fb360 100644
--- a/libraries/logic/minecraft/forge/ForgeInstaller.h
+++ b/api/logic/minecraft/forge/ForgeInstaller.h
diff --git a/libraries/logic/minecraft/forge/ForgeVersion.cpp b/api/logic/minecraft/forge/ForgeVersion.cpp
index b859a28cd1..b859a28cd1 100644
--- a/libraries/logic/minecraft/forge/ForgeVersion.cpp
+++ b/api/logic/minecraft/forge/ForgeVersion.cpp
diff --git a/libraries/logic/minecraft/forge/ForgeVersion.h b/api/logic/minecraft/forge/ForgeVersion.h
index e77d32f1a1..e77d32f1a1 100644
--- a/libraries/logic/minecraft/forge/ForgeVersion.h
+++ b/api/logic/minecraft/forge/ForgeVersion.h
diff --git a/libraries/logic/minecraft/forge/ForgeVersionList.cpp b/api/logic/minecraft/forge/ForgeVersionList.cpp
index de185e5fa8..de185e5fa8 100644
--- a/libraries/logic/minecraft/forge/ForgeVersionList.cpp
+++ b/api/logic/minecraft/forge/ForgeVersionList.cpp
diff --git a/libraries/logic/minecraft/forge/ForgeVersionList.h b/api/logic/minecraft/forge/ForgeVersionList.h
index 62c08b2ae6..62c08b2ae6 100644
--- a/libraries/logic/minecraft/forge/ForgeVersionList.h
+++ b/api/logic/minecraft/forge/ForgeVersionList.h
diff --git a/libraries/logic/minecraft/forge/ForgeXzDownload.cpp b/api/logic/minecraft/forge/ForgeXzDownload.cpp
index adf96552e6..adf96552e6 100644
--- a/libraries/logic/minecraft/forge/ForgeXzDownload.cpp
+++ b/api/logic/minecraft/forge/ForgeXzDownload.cpp
diff --git a/libraries/logic/minecraft/forge/ForgeXzDownload.h b/api/logic/minecraft/forge/ForgeXzDownload.h
index 675244054e..675244054e 100644
--- a/libraries/logic/minecraft/forge/ForgeXzDownload.h
+++ b/api/logic/minecraft/forge/ForgeXzDownload.h
diff --git a/libraries/logic/minecraft/forge/LegacyForge.cpp b/api/logic/minecraft/forge/LegacyForge.cpp
index aa2c806344..aa2c806344 100644
--- a/libraries/logic/minecraft/forge/LegacyForge.cpp
+++ b/api/logic/minecraft/forge/LegacyForge.cpp
diff --git a/libraries/logic/minecraft/forge/LegacyForge.h b/api/logic/minecraft/forge/LegacyForge.h
index f51d5e85b4..f51d5e85b4 100644
--- a/libraries/logic/minecraft/forge/LegacyForge.h
+++ b/api/logic/minecraft/forge/LegacyForge.h
diff --git a/libraries/logic/minecraft/ftb/FTBPlugin.cpp b/api/logic/minecraft/ftb/FTBPlugin.cpp
index a142c1061b..a142c1061b 100644
--- a/libraries/logic/minecraft/ftb/FTBPlugin.cpp
+++ b/api/logic/minecraft/ftb/FTBPlugin.cpp
diff --git a/libraries/logic/minecraft/ftb/FTBPlugin.h b/api/logic/minecraft/ftb/FTBPlugin.h
index 6851d8a520..6851d8a520 100644
--- a/libraries/logic/minecraft/ftb/FTBPlugin.h
+++ b/api/logic/minecraft/ftb/FTBPlugin.h
diff --git a/libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp
index f5faacae76..f5faacae76 100644
--- a/libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp
+++ b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp
diff --git a/libraries/logic/minecraft/ftb/FTBProfileStrategy.h b/api/logic/minecraft/ftb/FTBProfileStrategy.h
index 522af09835..522af09835 100644
--- a/libraries/logic/minecraft/ftb/FTBProfileStrategy.h
+++ b/api/logic/minecraft/ftb/FTBProfileStrategy.h
diff --git a/libraries/logic/minecraft/ftb/FTBVersion.h b/api/logic/minecraft/ftb/FTBVersion.h
index 805319b436..805319b436 100644
--- a/libraries/logic/minecraft/ftb/FTBVersion.h
+++ b/api/logic/minecraft/ftb/FTBVersion.h
diff --git a/libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp b/api/logic/minecraft/ftb/LegacyFTBInstance.cpp
index a7091f1dbe..a7091f1dbe 100644
--- a/libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp
+++ b/api/logic/minecraft/ftb/LegacyFTBInstance.cpp
diff --git a/libraries/logic/minecraft/ftb/LegacyFTBInstance.h b/api/logic/minecraft/ftb/LegacyFTBInstance.h
index 7178bca46d..7178bca46d 100644
--- a/libraries/logic/minecraft/ftb/LegacyFTBInstance.h
+++ b/api/logic/minecraft/ftb/LegacyFTBInstance.h
diff --git a/libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp
index 81e939a151..81e939a151 100644
--- a/libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp
+++ b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp
diff --git a/libraries/logic/minecraft/ftb/OneSixFTBInstance.h b/api/logic/minecraft/ftb/OneSixFTBInstance.h
index e7f8f4859a..e7f8f4859a 100644
--- a/libraries/logic/minecraft/ftb/OneSixFTBInstance.h
+++ b/api/logic/minecraft/ftb/OneSixFTBInstance.h
diff --git a/libraries/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp
index f8264f204e..f8264f204e 100644
--- a/libraries/logic/minecraft/legacy/LegacyInstance.cpp
+++ b/api/logic/minecraft/legacy/LegacyInstance.cpp
diff --git a/libraries/logic/minecraft/legacy/LegacyInstance.h b/api/logic/minecraft/legacy/LegacyInstance.h
index 3bef240daf..3bef240daf 100644
--- a/libraries/logic/minecraft/legacy/LegacyInstance.h
+++ b/api/logic/minecraft/legacy/LegacyInstance.h
diff --git a/libraries/logic/minecraft/legacy/LegacyUpdate.cpp b/api/logic/minecraft/legacy/LegacyUpdate.cpp
index 2d7e8dd278..2d7e8dd278 100644
--- a/libraries/logic/minecraft/legacy/LegacyUpdate.cpp
+++ b/api/logic/minecraft/legacy/LegacyUpdate.cpp
diff --git a/libraries/logic/minecraft/legacy/LegacyUpdate.h b/api/logic/minecraft/legacy/LegacyUpdate.h
index c52bf934f7..c52bf934f7 100644
--- a/libraries/logic/minecraft/legacy/LegacyUpdate.h
+++ b/api/logic/minecraft/legacy/LegacyUpdate.h
diff --git a/libraries/logic/minecraft/legacy/LwjglVersionList.cpp b/api/logic/minecraft/legacy/LwjglVersionList.cpp
index bb017368af..bb017368af 100644
--- a/libraries/logic/minecraft/legacy/LwjglVersionList.cpp
+++ b/api/logic/minecraft/legacy/LwjglVersionList.cpp
diff --git a/libraries/logic/minecraft/legacy/LwjglVersionList.h b/api/logic/minecraft/legacy/LwjglVersionList.h
index f043f6e232..f043f6e232 100644
--- a/libraries/logic/minecraft/legacy/LwjglVersionList.h
+++ b/api/logic/minecraft/legacy/LwjglVersionList.h
diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp b/api/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
index 25297fa4e9..25297fa4e9 100644
--- a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
+++ b/api/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h b/api/logic/minecraft/liteloader/LiteLoaderInstaller.h
index fe0aee3d36..fe0aee3d36 100644
--- a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h
+++ b/api/logic/minecraft/liteloader/LiteLoaderInstaller.h
diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp b/api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
index b0c9736a75..b0c9736a75 100644
--- a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
+++ b/api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h b/api/logic/minecraft/liteloader/LiteLoaderVersionList.h
index 1dba4b6a3e..1dba4b6a3e 100644
--- a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h
+++ b/api/logic/minecraft/liteloader/LiteLoaderVersionList.h
diff --git a/libraries/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp
index 258e26c5f6..258e26c5f6 100644
--- a/libraries/logic/minecraft/onesix/OneSixInstance.cpp
+++ b/api/logic/minecraft/onesix/OneSixInstance.cpp
diff --git a/libraries/logic/minecraft/onesix/OneSixInstance.h b/api/logic/minecraft/onesix/OneSixInstance.h
index 2dfab48c26..2dfab48c26 100644
--- a/libraries/logic/minecraft/onesix/OneSixInstance.h
+++ b/api/logic/minecraft/onesix/OneSixInstance.h
diff --git a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
index af42286d9b..af42286d9b 100644
--- a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp
+++ b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
diff --git a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.h b/api/logic/minecraft/onesix/OneSixProfileStrategy.h
index 96c1ba7b78..96c1ba7b78 100644
--- a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.h
+++ b/api/logic/minecraft/onesix/OneSixProfileStrategy.h
diff --git a/libraries/logic/minecraft/onesix/OneSixUpdate.cpp b/api/logic/minecraft/onesix/OneSixUpdate.cpp
index 1c2cd19680..1c2cd19680 100644
--- a/libraries/logic/minecraft/onesix/OneSixUpdate.cpp
+++ b/api/logic/minecraft/onesix/OneSixUpdate.cpp
diff --git a/libraries/logic/minecraft/onesix/OneSixUpdate.h b/api/logic/minecraft/onesix/OneSixUpdate.h
index b51953640c..b51953640c 100644
--- a/libraries/logic/minecraft/onesix/OneSixUpdate.h
+++ b/api/logic/minecraft/onesix/OneSixUpdate.h
diff --git a/libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
index 541fb10990..541fb10990 100644
--- a/libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp
+++ b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
diff --git a/libraries/logic/minecraft/onesix/OneSixVersionFormat.h b/api/logic/minecraft/onesix/OneSixVersionFormat.h
index 5696e79e0f..5696e79e0f 100644
--- a/libraries/logic/minecraft/onesix/OneSixVersionFormat.h
+++ b/api/logic/minecraft/onesix/OneSixVersionFormat.h
diff --git a/libraries/logic/net/ByteArrayDownload.cpp b/api/logic/net/ByteArrayDownload.cpp
index 21990eeb7d..21990eeb7d 100644
--- a/libraries/logic/net/ByteArrayDownload.cpp
+++ b/api/logic/net/ByteArrayDownload.cpp
diff --git a/libraries/logic/net/ByteArrayDownload.h b/api/logic/net/ByteArrayDownload.h
index e2fc2911d9..e2fc2911d9 100644
--- a/libraries/logic/net/ByteArrayDownload.h
+++ b/api/logic/net/ByteArrayDownload.h
diff --git a/libraries/logic/net/CacheDownload.cpp b/api/logic/net/CacheDownload.cpp
index 1ac5518054..1ac5518054 100644
--- a/libraries/logic/net/CacheDownload.cpp
+++ b/api/logic/net/CacheDownload.cpp
diff --git a/libraries/logic/net/CacheDownload.h b/api/logic/net/CacheDownload.h
index d83b2a0f16..d83b2a0f16 100644
--- a/libraries/logic/net/CacheDownload.h
+++ b/api/logic/net/CacheDownload.h
diff --git a/libraries/logic/net/HttpMetaCache.cpp b/api/logic/net/HttpMetaCache.cpp
index ea3e2834a2..ea3e2834a2 100644
--- a/libraries/logic/net/HttpMetaCache.cpp
+++ b/api/logic/net/HttpMetaCache.cpp
diff --git a/libraries/logic/net/HttpMetaCache.h b/api/logic/net/HttpMetaCache.h
index 7b626c70a3..7b626c70a3 100644
--- a/libraries/logic/net/HttpMetaCache.h
+++ b/api/logic/net/HttpMetaCache.h
diff --git a/libraries/logic/net/MD5EtagDownload.cpp b/api/logic/net/MD5EtagDownload.cpp
index 3b4d5dcddd..3b4d5dcddd 100644
--- a/libraries/logic/net/MD5EtagDownload.cpp
+++ b/api/logic/net/MD5EtagDownload.cpp
diff --git a/libraries/logic/net/MD5EtagDownload.h b/api/logic/net/MD5EtagDownload.h
index cd1cb55083..cd1cb55083 100644
--- a/libraries/logic/net/MD5EtagDownload.h
+++ b/api/logic/net/MD5EtagDownload.h
diff --git a/libraries/logic/net/NetAction.h b/api/logic/net/NetAction.h
index 3c39560501..3c39560501 100644
--- a/libraries/logic/net/NetAction.h
+++ b/api/logic/net/NetAction.h
diff --git a/libraries/logic/net/NetJob.cpp b/api/logic/net/NetJob.cpp
index 76c61c3587..76c61c3587 100644
--- a/libraries/logic/net/NetJob.cpp
+++ b/api/logic/net/NetJob.cpp
diff --git a/libraries/logic/net/NetJob.h b/api/logic/net/NetJob.h
index 167fe176e9..167fe176e9 100644
--- a/libraries/logic/net/NetJob.h
+++ b/api/logic/net/NetJob.h
diff --git a/libraries/logic/net/PasteUpload.cpp b/api/logic/net/PasteUpload.cpp
index 4b671d6f39..4b671d6f39 100644
--- a/libraries/logic/net/PasteUpload.cpp
+++ b/api/logic/net/PasteUpload.cpp
diff --git a/libraries/logic/net/PasteUpload.h b/api/logic/net/PasteUpload.h
index 06e3f95536..06e3f95536 100644
--- a/libraries/logic/net/PasteUpload.h
+++ b/api/logic/net/PasteUpload.h
diff --git a/libraries/logic/net/URLConstants.cpp b/api/logic/net/URLConstants.cpp
index bd476b2cb1..bd476b2cb1 100644
--- a/libraries/logic/net/URLConstants.cpp
+++ b/api/logic/net/URLConstants.cpp
diff --git a/libraries/logic/net/URLConstants.h b/api/logic/net/URLConstants.h
index 8923ef54c5..8923ef54c5 100644
--- a/libraries/logic/net/URLConstants.h
+++ b/api/logic/net/URLConstants.h
diff --git a/libraries/logic/news/NewsChecker.cpp b/api/logic/news/NewsChecker.cpp
index be4aa1d121..be4aa1d121 100644
--- a/libraries/logic/news/NewsChecker.cpp
+++ b/api/logic/news/NewsChecker.cpp
diff --git a/libraries/logic/news/NewsChecker.h b/api/logic/news/NewsChecker.h
index b8b90728d5..b8b90728d5 100644
--- a/libraries/logic/news/NewsChecker.h
+++ b/api/logic/news/NewsChecker.h
diff --git a/libraries/logic/news/NewsEntry.cpp b/api/logic/news/NewsEntry.cpp
index 79abbaa321..79abbaa321 100644
--- a/libraries/logic/news/NewsEntry.cpp
+++ b/api/logic/news/NewsEntry.cpp
diff --git a/libraries/logic/news/NewsEntry.h b/api/logic/news/NewsEntry.h
index adb79e8f9e..adb79e8f9e 100644
--- a/libraries/logic/news/NewsEntry.h
+++ b/api/logic/news/NewsEntry.h
diff --git a/libraries/logic/notifications/NotificationChecker.cpp b/api/logic/notifications/NotificationChecker.cpp
index ab2570b702..ab2570b702 100644
--- a/libraries/logic/notifications/NotificationChecker.cpp
+++ b/api/logic/notifications/NotificationChecker.cpp
diff --git a/libraries/logic/notifications/NotificationChecker.h b/api/logic/notifications/NotificationChecker.h
index a2d92ab90f..a2d92ab90f 100644
--- a/libraries/logic/notifications/NotificationChecker.h
+++ b/api/logic/notifications/NotificationChecker.h
diff --git a/libraries/logic/pathmatcher/FSTreeMatcher.h b/api/logic/pathmatcher/FSTreeMatcher.h
index a5bed57c36..a5bed57c36 100644
--- a/libraries/logic/pathmatcher/FSTreeMatcher.h
+++ b/api/logic/pathmatcher/FSTreeMatcher.h
diff --git a/libraries/logic/pathmatcher/IPathMatcher.h b/api/logic/pathmatcher/IPathMatcher.h
index 1d41094790..1d41094790 100644
--- a/libraries/logic/pathmatcher/IPathMatcher.h
+++ b/api/logic/pathmatcher/IPathMatcher.h
diff --git a/libraries/logic/pathmatcher/MultiMatcher.h b/api/logic/pathmatcher/MultiMatcher.h
index 91f70aa43f..91f70aa43f 100644
--- a/libraries/logic/pathmatcher/MultiMatcher.h
+++ b/api/logic/pathmatcher/MultiMatcher.h
diff --git a/libraries/logic/pathmatcher/RegexpMatcher.h b/api/logic/pathmatcher/RegexpMatcher.h
index da5521238d..da5521238d 100644
--- a/libraries/logic/pathmatcher/RegexpMatcher.h
+++ b/api/logic/pathmatcher/RegexpMatcher.h
diff --git a/libraries/logic/resources/Resource.cpp b/api/logic/resources/Resource.cpp
index e95675d7cd..e95675d7cd 100644
--- a/libraries/logic/resources/Resource.cpp
+++ b/api/logic/resources/Resource.cpp
diff --git a/libraries/logic/resources/Resource.h b/api/logic/resources/Resource.h
index 63e97b889b..63e97b889b 100644
--- a/libraries/logic/resources/Resource.h
+++ b/api/logic/resources/Resource.h
diff --git a/libraries/logic/resources/ResourceHandler.cpp b/api/logic/resources/ResourceHandler.cpp
index 46a4422c3a..46a4422c3a 100644
--- a/libraries/logic/resources/ResourceHandler.cpp
+++ b/api/logic/resources/ResourceHandler.cpp
diff --git a/libraries/logic/resources/ResourceHandler.h b/api/logic/resources/ResourceHandler.h
index f09d890488..f09d890488 100644
--- a/libraries/logic/resources/ResourceHandler.h
+++ b/api/logic/resources/ResourceHandler.h
diff --git a/libraries/logic/resources/ResourceObserver.cpp b/api/logic/resources/ResourceObserver.cpp
index 4f168fd242..4f168fd242 100644
--- a/libraries/logic/resources/ResourceObserver.cpp
+++ b/api/logic/resources/ResourceObserver.cpp
diff --git a/libraries/logic/resources/ResourceObserver.h b/api/logic/resources/ResourceObserver.h
index c42e41ba3c..c42e41ba3c 100644
--- a/libraries/logic/resources/ResourceObserver.h
+++ b/api/logic/resources/ResourceObserver.h
diff --git a/libraries/logic/resources/ResourceProxyModel.cpp b/api/logic/resources/ResourceProxyModel.cpp
index f026d9a9bf..f026d9a9bf 100644
--- a/libraries/logic/resources/ResourceProxyModel.cpp
+++ b/api/logic/resources/ResourceProxyModel.cpp
diff --git a/libraries/logic/resources/ResourceProxyModel.h b/api/logic/resources/ResourceProxyModel.h
index 98a3dbd169..98a3dbd169 100644
--- a/libraries/logic/resources/ResourceProxyModel.h
+++ b/api/logic/resources/ResourceProxyModel.h
diff --git a/libraries/logic/screenshots/ImgurAlbumCreation.cpp b/api/logic/screenshots/ImgurAlbumCreation.cpp
index e009ef4df7..e009ef4df7 100644
--- a/libraries/logic/screenshots/ImgurAlbumCreation.cpp
+++ b/api/logic/screenshots/ImgurAlbumCreation.cpp
diff --git a/libraries/logic/screenshots/ImgurAlbumCreation.h b/api/logic/screenshots/ImgurAlbumCreation.h
index 469174e47a..469174e47a 100644
--- a/libraries/logic/screenshots/ImgurAlbumCreation.h
+++ b/api/logic/screenshots/ImgurAlbumCreation.h
diff --git a/libraries/logic/screenshots/ImgurUpload.cpp b/api/logic/screenshots/ImgurUpload.cpp
index 48e0ec182b..48e0ec182b 100644
--- a/libraries/logic/screenshots/ImgurUpload.cpp
+++ b/api/logic/screenshots/ImgurUpload.cpp
diff --git a/libraries/logic/screenshots/ImgurUpload.h b/api/logic/screenshots/ImgurUpload.h
index 0a766b8f2d..0a766b8f2d 100644
--- a/libraries/logic/screenshots/ImgurUpload.h
+++ b/api/logic/screenshots/ImgurUpload.h
diff --git a/libraries/logic/screenshots/Screenshot.h b/api/logic/screenshots/Screenshot.h
index b48cbe9990..b48cbe9990 100644
--- a/libraries/logic/screenshots/Screenshot.h
+++ b/api/logic/screenshots/Screenshot.h
diff --git a/libraries/logic/settings/INIFile.cpp b/api/logic/settings/INIFile.cpp
index 69a6b87e19..69a6b87e19 100644
--- a/libraries/logic/settings/INIFile.cpp
+++ b/api/logic/settings/INIFile.cpp
diff --git a/libraries/logic/settings/INIFile.h b/api/logic/settings/INIFile.h
index 5013eb2df7..5013eb2df7 100644
--- a/libraries/logic/settings/INIFile.h
+++ b/api/logic/settings/INIFile.h
diff --git a/libraries/logic/settings/INISettingsObject.cpp b/api/logic/settings/INISettingsObject.cpp
index 5ccc7446c6..5ccc7446c6 100644
--- a/libraries/logic/settings/INISettingsObject.cpp
+++ b/api/logic/settings/INISettingsObject.cpp
diff --git a/libraries/logic/settings/INISettingsObject.h b/api/logic/settings/INISettingsObject.h
index 4afa2a2cf2..4afa2a2cf2 100644
--- a/libraries/logic/settings/INISettingsObject.h
+++ b/api/logic/settings/INISettingsObject.h
diff --git a/libraries/logic/settings/OverrideSetting.cpp b/api/logic/settings/OverrideSetting.cpp
index 25162dff9e..25162dff9e 100644
--- a/libraries/logic/settings/OverrideSetting.cpp
+++ b/api/logic/settings/OverrideSetting.cpp
diff --git a/libraries/logic/settings/OverrideSetting.h b/api/logic/settings/OverrideSetting.h
index 68595cdeaf..68595cdeaf 100644
--- a/libraries/logic/settings/OverrideSetting.h
+++ b/api/logic/settings/OverrideSetting.h
diff --git a/libraries/logic/settings/PassthroughSetting.cpp b/api/logic/settings/PassthroughSetting.cpp
index 45a560de7b..45a560de7b 100644
--- a/libraries/logic/settings/PassthroughSetting.cpp
+++ b/api/logic/settings/PassthroughSetting.cpp
diff --git a/libraries/logic/settings/PassthroughSetting.h b/api/logic/settings/PassthroughSetting.h
index c4dc646cfe..c4dc646cfe 100644
--- a/libraries/logic/settings/PassthroughSetting.h
+++ b/api/logic/settings/PassthroughSetting.h
diff --git a/libraries/logic/settings/Setting.cpp b/api/logic/settings/Setting.cpp
index b17101a261..b17101a261 100644
--- a/libraries/logic/settings/Setting.cpp
+++ b/api/logic/settings/Setting.cpp
diff --git a/libraries/logic/settings/Setting.h b/api/logic/settings/Setting.h
index 6d53ac6d06..6d53ac6d06 100644
--- a/libraries/logic/settings/Setting.h
+++ b/api/logic/settings/Setting.h
diff --git a/libraries/logic/settings/SettingsObject.cpp b/api/logic/settings/SettingsObject.cpp
index f2ffdf9b65..f2ffdf9b65 100644
--- a/libraries/logic/settings/SettingsObject.cpp
+++ b/api/logic/settings/SettingsObject.cpp
diff --git a/libraries/logic/settings/SettingsObject.h b/api/logic/settings/SettingsObject.h
index 821939030f..821939030f 100644
--- a/libraries/logic/settings/SettingsObject.h
+++ b/api/logic/settings/SettingsObject.h
diff --git a/libraries/logic/status/StatusChecker.cpp b/api/logic/status/StatusChecker.cpp
index 13cac03748..13cac03748 100644
--- a/libraries/logic/status/StatusChecker.cpp
+++ b/api/logic/status/StatusChecker.cpp
diff --git a/libraries/logic/status/StatusChecker.h b/api/logic/status/StatusChecker.h
index c1a54dbac2..c1a54dbac2 100644
--- a/libraries/logic/status/StatusChecker.h
+++ b/api/logic/status/StatusChecker.h
diff --git a/libraries/logic/tasks/SequentialTask.cpp b/api/logic/tasks/SequentialTask.cpp
index ac0e7820c6..ac0e7820c6 100644
--- a/libraries/logic/tasks/SequentialTask.cpp
+++ b/api/logic/tasks/SequentialTask.cpp
diff --git a/libraries/logic/tasks/SequentialTask.h b/api/logic/tasks/SequentialTask.h
index 69031095e2..69031095e2 100644
--- a/libraries/logic/tasks/SequentialTask.h
+++ b/api/logic/tasks/SequentialTask.h
diff --git a/libraries/logic/tasks/Task.cpp b/api/logic/tasks/Task.cpp
index 3c4e318834..3c4e318834 100644
--- a/libraries/logic/tasks/Task.cpp
+++ b/api/logic/tasks/Task.cpp
diff --git a/libraries/logic/tasks/Task.h b/api/logic/tasks/Task.h
index 2b0ccbcdd3..2b0ccbcdd3 100644
--- a/libraries/logic/tasks/Task.h
+++ b/api/logic/tasks/Task.h
diff --git a/libraries/logic/tasks/ThreadTask.cpp b/api/logic/tasks/ThreadTask.cpp
index ddd1dee5fc..ddd1dee5fc 100644
--- a/libraries/logic/tasks/ThreadTask.cpp
+++ b/api/logic/tasks/ThreadTask.cpp
diff --git a/libraries/logic/tasks/ThreadTask.h b/api/logic/tasks/ThreadTask.h
index 718dbc91a4..718dbc91a4 100644
--- a/libraries/logic/tasks/ThreadTask.h
+++ b/api/logic/tasks/ThreadTask.h
diff --git a/libraries/logic/tools/BaseExternalTool.cpp b/api/logic/tools/BaseExternalTool.cpp
index 2b97c3c907..2b97c3c907 100644
--- a/libraries/logic/tools/BaseExternalTool.cpp
+++ b/api/logic/tools/BaseExternalTool.cpp
diff --git a/libraries/logic/tools/BaseExternalTool.h b/api/logic/tools/BaseExternalTool.h
index fe1b5dc657..fe1b5dc657 100644
--- a/libraries/logic/tools/BaseExternalTool.h
+++ b/api/logic/tools/BaseExternalTool.h
diff --git a/libraries/logic/tools/BaseProfiler.cpp b/api/logic/tools/BaseProfiler.cpp
index 5ff0fa44f7..5ff0fa44f7 100644
--- a/libraries/logic/tools/BaseProfiler.cpp
+++ b/api/logic/tools/BaseProfiler.cpp
diff --git a/libraries/logic/tools/BaseProfiler.h b/api/logic/tools/BaseProfiler.h
index 3340b7e4a9..3340b7e4a9 100644
--- a/libraries/logic/tools/BaseProfiler.h
+++ b/api/logic/tools/BaseProfiler.h
diff --git a/libraries/logic/tools/JProfiler.cpp b/api/logic/tools/JProfiler.cpp
index a0e3c89593..a0e3c89593 100644
--- a/libraries/logic/tools/JProfiler.cpp
+++ b/api/logic/tools/JProfiler.cpp
diff --git a/libraries/logic/tools/JProfiler.h b/api/logic/tools/JProfiler.h
index d658d6c226..d658d6c226 100644
--- a/libraries/logic/tools/JProfiler.h
+++ b/api/logic/tools/JProfiler.h
diff --git a/libraries/logic/tools/JVisualVM.cpp b/api/logic/tools/JVisualVM.cpp
index 169967d96f..169967d96f 100644
--- a/libraries/logic/tools/JVisualVM.cpp
+++ b/api/logic/tools/JVisualVM.cpp
diff --git a/libraries/logic/tools/JVisualVM.h b/api/logic/tools/JVisualVM.h
index 0674da136e..0674da136e 100644
--- a/libraries/logic/tools/JVisualVM.h
+++ b/api/logic/tools/JVisualVM.h
diff --git a/libraries/logic/tools/MCEditTool.cpp b/api/logic/tools/MCEditTool.cpp
index 32695c8daf..f3d550d017 100644
--- a/libraries/logic/tools/MCEditTool.cpp
+++ b/api/logic/tools/MCEditTool.cpp
@@ -15,7 +15,6 @@ MCEditTool::MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject
 
 QString MCEditTool::getSave() const
 {
-	// FIXME: mixing logic and UI!!!!
 	auto mcInstance = std::dynamic_pointer_cast<MinecraftInstance>(m_instance);
 	if(!mcInstance)
 	{
@@ -33,6 +32,7 @@ QString MCEditTool::getSave() const
 		}
 	}
 	bool ok = true;
+	// FIXME: mixing logic and UI!!!!
 	/*
 	const QString save = QInputDialog::getItem(QApplication::activeWindow(), tr("MCEdit"), tr("Choose which world to open:"),
 		worlds, 0, false, &ok);
diff --git a/libraries/logic/tools/MCEditTool.h b/api/logic/tools/MCEditTool.h
index c287f1ea06..c287f1ea06 100644
--- a/libraries/logic/tools/MCEditTool.h
+++ b/api/logic/tools/MCEditTool.h
diff --git a/libraries/logic/trans/TranslationDownloader.cpp b/api/logic/trans/TranslationDownloader.cpp
index ee5c1fd2b0..ee5c1fd2b0 100644
--- a/libraries/logic/trans/TranslationDownloader.cpp
+++ b/api/logic/trans/TranslationDownloader.cpp
diff --git a/libraries/logic/trans/TranslationDownloader.h b/api/logic/trans/TranslationDownloader.h
index e7893805cc..e7893805cc 100644
--- a/libraries/logic/trans/TranslationDownloader.h
+++ b/api/logic/trans/TranslationDownloader.h
diff --git a/libraries/logic/updater/DownloadTask.cpp b/api/logic/updater/DownloadTask.cpp
index 6947e8bf1e..6947e8bf1e 100644
--- a/libraries/logic/updater/DownloadTask.cpp
+++ b/api/logic/updater/DownloadTask.cpp
diff --git a/libraries/logic/updater/DownloadTask.h b/api/logic/updater/DownloadTask.h
index 83b4a14262..83b4a14262 100644
--- a/libraries/logic/updater/DownloadTask.h
+++ b/api/logic/updater/DownloadTask.h
diff --git a/libraries/logic/updater/GoUpdate.cpp b/api/logic/updater/GoUpdate.cpp
index 60d50e043f..4e465d5cc2 100644
--- a/libraries/logic/updater/GoUpdate.cpp
+++ b/api/logic/updater/GoUpdate.cpp
@@ -2,7 +2,6 @@
 #include <QDebug>
 #include <QDomDocument>
 #include <QFile>
-#include <Env.h>
 #include <FileSystem.h>
 
 namespace GoUpdate
diff --git a/libraries/logic/updater/GoUpdate.h b/api/logic/updater/GoUpdate.h
index b8a534decf..b8a534decf 100644
--- a/libraries/logic/updater/GoUpdate.h
+++ b/api/logic/updater/GoUpdate.h
diff --git a/libraries/logic/updater/UpdateChecker.cpp b/api/logic/updater/UpdateChecker.cpp
index 1cdac916be..1cdac916be 100644
--- a/libraries/logic/updater/UpdateChecker.cpp
+++ b/api/logic/updater/UpdateChecker.cpp
diff --git a/libraries/logic/updater/UpdateChecker.h b/api/logic/updater/UpdateChecker.h
index c7fad10e3a..c7fad10e3a 100644
--- a/libraries/logic/updater/UpdateChecker.h
+++ b/api/logic/updater/UpdateChecker.h
diff --git a/libraries/logic/wonko/BaseWonkoEntity.cpp b/api/logic/wonko/BaseWonkoEntity.cpp
index f5c59363d8..f5c59363d8 100644
--- a/libraries/logic/wonko/BaseWonkoEntity.cpp
+++ b/api/logic/wonko/BaseWonkoEntity.cpp
diff --git a/libraries/logic/wonko/BaseWonkoEntity.h b/api/logic/wonko/BaseWonkoEntity.h
index 191b418456..191b418456 100644
--- a/libraries/logic/wonko/BaseWonkoEntity.h
+++ b/api/logic/wonko/BaseWonkoEntity.h
diff --git a/libraries/logic/wonko/WonkoIndex.cpp b/api/logic/wonko/WonkoIndex.cpp
index 8306af84b3..8306af84b3 100644
--- a/libraries/logic/wonko/WonkoIndex.cpp
+++ b/api/logic/wonko/WonkoIndex.cpp
diff --git a/libraries/logic/wonko/WonkoIndex.h b/api/logic/wonko/WonkoIndex.h
index 8b149c7da4..8b149c7da4 100644
--- a/libraries/logic/wonko/WonkoIndex.h
+++ b/api/logic/wonko/WonkoIndex.h
diff --git a/libraries/logic/wonko/WonkoReference.cpp b/api/logic/wonko/WonkoReference.cpp
index 519d59aad9..519d59aad9 100644
--- a/libraries/logic/wonko/WonkoReference.cpp
+++ b/api/logic/wonko/WonkoReference.cpp
diff --git a/libraries/logic/wonko/WonkoReference.h b/api/logic/wonko/WonkoReference.h
index 73a85d76db..73a85d76db 100644
--- a/libraries/logic/wonko/WonkoReference.h
+++ b/api/logic/wonko/WonkoReference.h
diff --git a/libraries/logic/wonko/WonkoUtil.cpp b/api/logic/wonko/WonkoUtil.cpp
index 94726c6b57..94726c6b57 100644
--- a/libraries/logic/wonko/WonkoUtil.cpp
+++ b/api/logic/wonko/WonkoUtil.cpp
diff --git a/libraries/logic/wonko/WonkoUtil.h b/api/logic/wonko/WonkoUtil.h
index b618ab7185..b618ab7185 100644
--- a/libraries/logic/wonko/WonkoUtil.h
+++ b/api/logic/wonko/WonkoUtil.h
diff --git a/libraries/logic/wonko/WonkoVersion.cpp b/api/logic/wonko/WonkoVersion.cpp
index 7b7da86cae..7b7da86cae 100644
--- a/libraries/logic/wonko/WonkoVersion.cpp
+++ b/api/logic/wonko/WonkoVersion.cpp
diff --git a/libraries/logic/wonko/WonkoVersion.h b/api/logic/wonko/WonkoVersion.h
index a1de4d9b85..a1de4d9b85 100644
--- a/libraries/logic/wonko/WonkoVersion.h
+++ b/api/logic/wonko/WonkoVersion.h
diff --git a/libraries/logic/wonko/WonkoVersionList.cpp b/api/logic/wonko/WonkoVersionList.cpp
index e9d793272f..e9d793272f 100644
--- a/libraries/logic/wonko/WonkoVersionList.cpp
+++ b/api/logic/wonko/WonkoVersionList.cpp
diff --git a/libraries/logic/wonko/WonkoVersionList.h b/api/logic/wonko/WonkoVersionList.h
index 8ea35be62b..8ea35be62b 100644
--- a/libraries/logic/wonko/WonkoVersionList.h
+++ b/api/logic/wonko/WonkoVersionList.h
diff --git a/libraries/logic/wonko/format/WonkoFormat.cpp b/api/logic/wonko/format/WonkoFormat.cpp
index 11192cbe6d..11192cbe6d 100644
--- a/libraries/logic/wonko/format/WonkoFormat.cpp
+++ b/api/logic/wonko/format/WonkoFormat.cpp
diff --git a/libraries/logic/wonko/format/WonkoFormat.h b/api/logic/wonko/format/WonkoFormat.h
index 450d6cccd0..450d6cccd0 100644
--- a/libraries/logic/wonko/format/WonkoFormat.h
+++ b/api/logic/wonko/format/WonkoFormat.h
diff --git a/libraries/logic/wonko/format/WonkoFormatV1.cpp b/api/logic/wonko/format/WonkoFormatV1.cpp
index 363eebfb66..363eebfb66 100644
--- a/libraries/logic/wonko/format/WonkoFormatV1.cpp
+++ b/api/logic/wonko/format/WonkoFormatV1.cpp
diff --git a/libraries/logic/wonko/format/WonkoFormatV1.h b/api/logic/wonko/format/WonkoFormatV1.h
index 9275980421..9275980421 100644
--- a/libraries/logic/wonko/format/WonkoFormatV1.h
+++ b/api/logic/wonko/format/WonkoFormatV1.h
diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp b/api/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
index b54c592fc8..b54c592fc8 100644
--- a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
+++ b/api/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h b/api/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h
index 2affa17fa7..2affa17fa7 100644
--- a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h
+++ b/api/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h
diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
index 727ec89d50..727ec89d50 100644
--- a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
+++ b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
index 91ed6af09e..91ed6af09e 100644
--- a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
+++ b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
diff --git a/depends/LogicalGui/CMakeLists.txt b/depends/LogicalGui/CMakeLists.txt
deleted file mode 100644
index 12665738b4..0000000000
--- a/depends/LogicalGui/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-project(LogicalGui)
-add_library(LogicalGui STATIC LogicalGui.h)
-target_include_directories(LogicalGui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
-qt5_use_modules(LogicalGui Core)
diff --git a/depends/LogicalGui/LogicalGui.h b/depends/LogicalGui/LogicalGui.h
deleted file mode 100644
index 729f0353e2..0000000000
--- a/depends/LogicalGui/LogicalGui.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* Copyright 2013-2015 Jan Dalheimer
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QMetaMethod>
-#include <QThread>
-#include <QCoreApplication>
-#include <QSemaphore>
-#include <memory>
-
-#if QT_VERSION == QT_VERSION_CHECK(5, 1, 1)
-#include <5.1.1/QtCore/private/qobject_p.h>
-#elif QT_VERSION == QT_VERSION_CHECK(5, 2, 0)
-#include <5.2.0/QtCore/private/qobject_p.h>
-#elif QT_VERSION == QT_VERSION_CHECK(5, 2, 1)
-#include <5.2.1/QtCore/private/qobject_p.h>
-#elif QT_VERSION == QT_VERSION_CHECK(5, 3, 0)
-#include <5.3.0/QtCore/private/qobject_p.h>
-#elif QT_VERSION == QT_VERSION_CHECK(5, 3, 1)
-#include <5.3.1/QtCore/private/qobject_p.h>
-#else
-#error Please add support for this version of Qt
-#endif
-
-class Bindable
-{
-	friend class tst_LogicalGui;
-
-public:
-	Bindable(Bindable *parent = 0) : m_parent(parent)
-	{
-	}
-	virtual ~Bindable()
-	{
-	}
-
-	void setBindableParent(Bindable *parent)
-	{
-		m_parent = parent;
-	}
-
-	void bind(const QString &id, const QObject *receiver, const char *methodSignature)
-	{
-		auto mo = receiver->metaObject();
-		Q_ASSERT_X(mo, "Bindable::bind",
-				   "Invalid metaobject. Did you forget the QObject macro?");
-		const QMetaMethod method = mo->method(mo->indexOfMethod(
-			QMetaObject::normalizedSignature(methodSignature + 1).constData()));
-		Q_ASSERT_X(method.isValid(), "Bindable::bind", "Invalid method signature");
-		m_bindings.insert(id, Binding(receiver, method));
-	}
-	template <typename Func>
-	void bind(const QString &id,
-			  const typename QtPrivate::FunctionPointer<Func>::Object *receiver, Func slot)
-	{
-		typedef QtPrivate::FunctionPointer<Func> SlotType;
-		m_bindings.insert(
-			id,
-			Binding(receiver, new QtPrivate::QSlotObject<Func, typename SlotType::Arguments,
-														 typename SlotType::ReturnType>(slot)));
-	}
-	template <typename Func> void bind(const QString &id, Func slot)
-	{
-		typedef QtPrivate::FunctionPointer<Func> SlotType;
-		m_bindings.insert(
-			id,
-			Binding(nullptr, new QtPrivate::QSlotObject<Func, typename SlotType::Arguments,
-														typename SlotType::ReturnType>(slot)));
-	}
-	void unbind(const QString &id)
-	{
-		m_bindings.remove(id);
-	}
-
-private:
-	struct Binding
-	{
-		Binding(const QObject *receiver, const QMetaMethod &method)
-			: receiver(receiver), method(method)
-		{
-		}
-		Binding(const QObject *receiver, QtPrivate::QSlotObjectBase *object)
-			: receiver(receiver), object(object)
-		{
-		}
-		Binding()
-		{
-		}
-		const QObject *receiver;
-		QMetaMethod method;
-		QtPrivate::QSlotObjectBase *object = nullptr;
-	};
-	QMap<QString, Binding> m_bindings;
-
-	Bindable *m_parent;
-
-private:
-	inline Qt::ConnectionType connectionType(const QObject *receiver)
-	{
-		return receiver == nullptr ? Qt::DirectConnection
-								   : (QThread::currentThread() == receiver->thread()
-										  ? Qt::DirectConnection
-										  : Qt::BlockingQueuedConnection);
-	}
-
-protected:
-	template <typename Ret, typename... Params> Ret wait(const QString &id, Params... params)
-	{
-		static_assert(!std::is_same<Ret, void>::value, "You need to use Bindable::waitVoid");
-
-		if (!m_bindings.contains(id) && m_parent)
-		{
-			return m_parent->wait<Ret, Params...>(id, params...);
-		}
-		Q_ASSERT(m_bindings.contains(id));
-		const auto binding = m_bindings[id];
-		const Qt::ConnectionType type = connectionType(binding.receiver);
-		Ret ret;
-		if (binding.object)
-		{
-			void *args[] = {&ret,
-							const_cast<void *>(reinterpret_cast<const void *>(&params))...};
-			if (type == Qt::BlockingQueuedConnection)
-			{
-				QSemaphore semaphore;
-				QMetaCallEvent *ev =
-					new QMetaCallEvent(binding.object, nullptr, -1, 0, 0, args, &semaphore);
-				QCoreApplication::postEvent(const_cast<QObject *>(binding.receiver), ev);
-				semaphore.acquire();
-			}
-			else
-			{
-				binding.object->call(const_cast<QObject *>(binding.receiver), args);
-			}
-		}
-		else
-		{
-			const QMetaMethod method = binding.method;
-			Q_ASSERT_X(method.parameterCount() == sizeof...(params), "Bindable::wait",
-					   qPrintable(QString("Incompatible argument count (expected %1, got %2)")
-									  .arg(method.parameterCount(), sizeof...(params))));
-			Q_ASSERT_X(
-				qMetaTypeId<Ret>() != QMetaType::UnknownType, "Bindable::wait",
-				"Requested return type is not registered, please use the Q_DECLARE_METATYPE "
-				"macro to make it known to Qt's meta-object system");
-			Q_ASSERT_X(
-				method.returnType() == qMetaTypeId<Ret>() ||
-					QMetaType::hasRegisteredConverterFunction(method.returnType(),
-															  qMetaTypeId<Ret>()),
-				"Bindable::wait",
-				qPrintable(
-					QString(
-						"Requested return type (%1) is incompatible method return type (%2)")
-						.arg(QMetaType::typeName(qMetaTypeId<Ret>()),
-							 QMetaType::typeName(method.returnType()))));
-			const auto retArg = QReturnArgument<Ret>(
-				QMetaType::typeName(qMetaTypeId<Ret>()),
-				ret); // because Q_RETURN_ARG doesn't work with templates...
-			method.invoke(const_cast<QObject *>(binding.receiver), type, retArg,
-						  Q_ARG(Params, params)...);
-		}
-		return ret;
-	}
-	template <typename... Params>
-	typename std::enable_if<sizeof...(Params) != 0, void>::type waitVoid(const QString &id,
-																		 Params... params)
-	{
-		if (!m_bindings.contains(id) && m_parent)
-		{
-			m_parent->waitVoid<Params...>(id, params...);
-			return;
-		}
-		Q_ASSERT(m_bindings.contains(id));
-		const auto binding = m_bindings[id];
-		const Qt::ConnectionType type = connectionType(binding.receiver);
-		if (binding.object)
-		{
-			void *args[] = {0, const_cast<void *>(reinterpret_cast<const void *>(&params))...};
-			if (type == Qt::BlockingQueuedConnection)
-			{
-				QSemaphore semaphore;
-				QMetaCallEvent *ev =
-					new QMetaCallEvent(binding.object, nullptr, -1, 0, 0, args, &semaphore);
-				QCoreApplication::postEvent(const_cast<QObject *>(binding.receiver), ev);
-				semaphore.acquire();
-			}
-			else
-			{
-				binding.object->call(const_cast<QObject *>(binding.receiver), args);
-			}
-		}
-		else
-		{
-			const QMetaMethod method = binding.method;
-			Q_ASSERT_X(method.parameterCount() == sizeof...(params), "Bindable::wait",
-					   qPrintable(QString("Incompatible argument count (expected %1, got %2)")
-									  .arg(method.parameterCount(), sizeof...(params))));
-			method.invoke(const_cast<QObject *>(binding.receiver), type,
-						  Q_ARG(Params, params)...);
-		}
-	}
-	void waitVoid(const QString &id)
-	{
-		if (!m_bindings.contains(id) && m_parent)
-		{
-			m_parent->waitVoid(id);
-			return;
-		}
-		Q_ASSERT(m_bindings.contains(id));
-		const auto binding = m_bindings[id];
-		const Qt::ConnectionType type = connectionType(binding.receiver);
-		if (binding.object)
-		{
-			void *args[] = {0};
-			if (type == Qt::BlockingQueuedConnection)
-			{
-				QSemaphore semaphore;
-				QMetaCallEvent *ev =
-					new QMetaCallEvent(binding.object, nullptr, -1, 0, 0, args, &semaphore);
-				QCoreApplication::postEvent(const_cast<QObject *>(binding.receiver), ev);
-				semaphore.acquire();
-			}
-			else
-			{
-				binding.object->call(const_cast<QObject *>(binding.receiver), args);
-			}
-		}
-		else
-		{
-			const QMetaMethod method = binding.method;
-			Q_ASSERT_X(method.parameterCount() == 0, "Bindable::wait",
-					   qPrintable(QString("Incompatible argument count (expected %1, got %2)")
-									  .arg(method.parameterCount(), 0)));
-			method.invoke(const_cast<QObject *>(binding.receiver), type);
-		}
-	}
-};
-
-// used frequently
-Q_DECLARE_METATYPE(bool *)
diff --git a/libraries/README.md b/libraries/README.md
new file mode 100644
index 0000000000..809acb166a
--- /dev/null
+++ b/libraries/README.md
@@ -0,0 +1,145 @@
+# Third-party libraries
+
+This folder has third-party or otherwise external libraries needed for other parts to work.
+
+## classparser
+A simplistic parser for Java class files.
+
+This library has served as a base for some (much more full-featured and advanced) work under NDA for AVG. It, however, should NOT be confused with that work.
+
+Copyright belongs to Petr Mrázek, unless explicitly stated otherwise in the source files. Available under the Apache 2.0 license.
+
+## hoedown
+Hoedown is a revived fork of Sundown, the Markdown parser based on the original code of the Upskirt library by Natacha Porté.
+
+See [github repo](https://github.com/hoedown/hoedown).
+
+## iconfix
+This was originally part of the razor-qt project and the Qt toolkit, respecitvely. Its sole purpose is to reimplement Qt's icon loading logic to prevent it from using any platform plugins that could break icon loading.
+
+Licensed under LGPL 2.1
+
+## javacheck
+Simple Java tool that prints the JVM details - version and platform bitness.
+
+Do what you want with it. It is so trivial that noone cares.
+
+## launcher
+Java launcher part for Minecraft.
+
+It:
+* Starts a process
+* Waits for a launch script on stdin
+* Consumes the launch script you feed it
+* Proceeds with launch when it gets the `launcher` command
+
+This means the process is essentially idle until the final command is sent. You can, for example, attach a profiler before you send it.
+
+A `legacy` and `onesix` launchers are available.
+
+* `legacy` is intended for use with Minecraft versions < 1.6 and is deprecated.
+* `onesix` can handle launching any Minecraft version, at the cost of some extra features `legacy` enables (custom window icon and title).
+
+Example (some parts have been censored):
+```
+mod legacyjavafixer-1.0
+mainClass net.minecraft.launchwrapper.Launch
+param --username
+param CENSORED
+param --version
+param MultiMC5
+param --gameDir
+param /home/peterix/minecraft/FTB/17ForgeTest/minecraft
+param --assetsDir
+param /home/peterix/minecraft/mmc5/assets
+param --assetIndex
+param 1.7.10
+param --uuid
+param CENSORED
+param --accessToken
+param CENSORED
+param --userProperties
+param {}
+param --userType
+param mojang
+param --tweakClass
+param cpw.mods.fml.common.launcher.FMLTweaker
+windowTitle MultiMC: 172ForgeTest
+windowParams 854x480
+userName CENSORED
+sessionId token:CENSORED:CENSORED
+cp /home/peterix/minecraft/FTB/libraries/com/mojang/realms/1.3.5/realms-1.3.5.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar
+cp /home/peterix/minecraft/FTB/libraries/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar
+cp /home/peterix/minecraft/FTB/libraries/java3d/vecmath/1.3.1/vecmath-1.3.1.jar
+cp /home/peterix/minecraft/FTB/libraries/net/sf/trove4j/trove4j/3.0.3/trove4j-3.0.3.jar
+cp /home/peterix/minecraft/FTB/libraries/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar
+cp /home/peterix/minecraft/FTB/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar
+cp /home/peterix/minecraft/FTB/libraries/io/netty/netty-all/4.0.10.Final/netty-all-4.0.10.Final.jar
+cp /home/peterix/minecraft/FTB/libraries/com/google/guava/guava/16.0/guava-16.0.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1.jar
+cp /home/peterix/minecraft/FTB/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar
+cp /home/peterix/minecraft/FTB/libraries/commons-codec/commons-codec/1.9/commons-codec-1.9.jar
+cp /home/peterix/minecraft/FTB/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar
+cp /home/peterix/minecraft/FTB/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar
+cp /home/peterix/minecraft/FTB/libraries/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar
+cp /home/peterix/minecraft/FTB/libraries/com/mojang/authlib/1.5.16/authlib-1.5.16.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar
+cp /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl/2.9.1/lwjgl-2.9.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.1/lwjgl_util-2.9.1.jar
+cp /home/peterix/minecraft/FTB/libraries/tv/twitch/twitch/5.16/twitch-5.16.jar
+cp /home/peterix/minecraft/FTB/libraries/net/minecraftforge/forge/1.7.10-10.13.0.1178/forge-1.7.10-10.13.0.1178.jar
+cp /home/peterix/minecraft/FTB/libraries/net/minecraft/launchwrapper/1.9/launchwrapper-1.9.jar
+cp /home/peterix/minecraft/FTB/libraries/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar
+cp /home/peterix/minecraft/FTB/libraries/com/typesafe/akka/akka-actor_2.11/2.3.3/akka-actor_2.11-2.3.3.jar
+cp /home/peterix/minecraft/FTB/libraries/com/typesafe/config/1.2.1/config-1.2.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-actors-migration_2.11/1.1.0/scala-actors-migration_2.11-1.1.0.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-compiler/2.11.1/scala-compiler-2.11.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/plugins/scala-continuations-library_2.11/1.0.2/scala-continuations-library_2.11-1.0.2.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/plugins/scala-continuations-plugin_2.11.1/1.0.2/scala-continuations-plugin_2.11.1-1.0.2.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-swing_2.11/1.0.1/scala-swing_2.11-1.0.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar
+cp /home/peterix/minecraft/FTB/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar
+ext /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl-platform/2.9.1/lwjgl-platform-2.9.1-natives-linux.jar
+ext /home/peterix/minecraft/FTB/libraries/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar
+natives /home/peterix/minecraft/FTB/17ForgeTest/natives
+cp /home/peterix/minecraft/FTB/versions/1.7.10/1.7.10.jar
+launcher onesix
+```
+
+Available under the Apache 2.0 license.
+
+## libnbtplusplus
+libnbt++ is a free C++ library for Minecraft's file format Named Binary Tag (NBT). It can read and write compressed and uncompressed NBT files and provides a code interface for working with NBT data.
+
+See [github repo](https://github.com/ljfa-ag/libnbtplusplus).
+
+Available either under LGPL version 3 or later.
+
+## pack200
+Unpacks pack200 archives (squished, compression-optimized Java jars). This format is only used by Forge to save bandwidth.
+
+A horrible little thing extracted from the depths of the OpenJDK codebase. Please don't look at it, or you will praise Cthulhu for his clean code for the rest of your days.
+
+Available under GPL 2 with classpath exception.
+
+## rainbow
+Color functions extracted from [KGuiAddons](https://inqlude.org/libraries/kguiaddons.html). Used for adaptive text coloring.
+
+Available either under LGPL version 2.1 or later.
+
+## xz-embedded
+Tiny implementation of LZMA2 de/compression. This format is only used by Forge to save bandwidth.
+
+Public domain.
\ No newline at end of file
diff --git a/depends/classparser/CMakeLists.txt b/libraries/classparser/CMakeLists.txt
index a6c3fa14d1..a6c3fa14d1 100644
--- a/depends/classparser/CMakeLists.txt
+++ b/libraries/classparser/CMakeLists.txt
diff --git a/depends/classparser/include/classparser_config.h b/libraries/classparser/include/classparser_config.h
index bfd4dcb4d6..bfd4dcb4d6 100644
--- a/depends/classparser/include/classparser_config.h
+++ b/libraries/classparser/include/classparser_config.h
diff --git a/depends/classparser/include/javautils.h b/libraries/classparser/include/javautils.h
index 43cca4bc4b..43cca4bc4b 100644
--- a/depends/classparser/include/javautils.h
+++ b/libraries/classparser/include/javautils.h
diff --git a/depends/classparser/src/annotations.cpp b/libraries/classparser/src/annotations.cpp
index d1a7c0462e..d1a7c0462e 100644
--- a/depends/classparser/src/annotations.cpp
+++ b/libraries/classparser/src/annotations.cpp
diff --git a/depends/classparser/src/annotations.h b/libraries/classparser/src/annotations.h
index aa25d24189..aa25d24189 100644
--- a/depends/classparser/src/annotations.h
+++ b/libraries/classparser/src/annotations.h
diff --git a/depends/classparser/src/classfile.h b/libraries/classparser/src/classfile.h
index a5e7ee50d8..a5e7ee50d8 100644
--- a/depends/classparser/src/classfile.h
+++ b/libraries/classparser/src/classfile.h
diff --git a/depends/classparser/src/constants.h b/libraries/classparser/src/constants.h
index 242b943e9a..242b943e9a 100644
--- a/depends/classparser/src/constants.h
+++ b/libraries/classparser/src/constants.h
diff --git a/depends/classparser/src/errors.h b/libraries/classparser/src/errors.h
index ddbbd82868..ddbbd82868 100644
--- a/depends/classparser/src/errors.h
+++ b/libraries/classparser/src/errors.h
diff --git a/depends/classparser/src/javaendian.h b/libraries/classparser/src/javaendian.h
index d488b382d8..d488b382d8 100644
--- a/depends/classparser/src/javaendian.h
+++ b/libraries/classparser/src/javaendian.h
diff --git a/depends/classparser/src/javautils.cpp b/libraries/classparser/src/javautils.cpp
index f9310e5f97..f9310e5f97 100644
--- a/depends/classparser/src/javautils.cpp
+++ b/libraries/classparser/src/javautils.cpp
diff --git a/depends/classparser/src/membuffer.h b/libraries/classparser/src/membuffer.h
index ab83412a22..ab83412a22 100644
--- a/depends/classparser/src/membuffer.h
+++ b/libraries/classparser/src/membuffer.h
diff --git a/depends/hoedown/CMakeLists.txt b/libraries/hoedown/CMakeLists.txt
index 7902e734de..7902e734de 100644
--- a/depends/hoedown/CMakeLists.txt
+++ b/libraries/hoedown/CMakeLists.txt
diff --git a/depends/hoedown/LICENSE b/libraries/hoedown/LICENSE
index 4e75de4dfe..4e75de4dfe 100644
--- a/depends/hoedown/LICENSE
+++ b/libraries/hoedown/LICENSE
diff --git a/depends/hoedown/README.md b/libraries/hoedown/README.md
index abe2b6ca08..abe2b6ca08 100644
--- a/depends/hoedown/README.md
+++ b/libraries/hoedown/README.md
diff --git a/depends/hoedown/include/hoedown/autolink.h b/libraries/hoedown/include/hoedown/autolink.h
index 528885c98b..528885c98b 100644
--- a/depends/hoedown/include/hoedown/autolink.h
+++ b/libraries/hoedown/include/hoedown/autolink.h
diff --git a/depends/hoedown/include/hoedown/buffer.h b/libraries/hoedown/include/hoedown/buffer.h
index d7703f8d50..d7703f8d50 100644
--- a/depends/hoedown/include/hoedown/buffer.h
+++ b/libraries/hoedown/include/hoedown/buffer.h
diff --git a/depends/hoedown/include/hoedown/document.h b/libraries/hoedown/include/hoedown/document.h
index a8178fec23..a8178fec23 100644
--- a/depends/hoedown/include/hoedown/document.h
+++ b/libraries/hoedown/include/hoedown/document.h
diff --git a/depends/hoedown/include/hoedown/escape.h b/libraries/hoedown/include/hoedown/escape.h
index d7659c27d7..d7659c27d7 100644
--- a/depends/hoedown/include/hoedown/escape.h
+++ b/libraries/hoedown/include/hoedown/escape.h
diff --git a/depends/hoedown/include/hoedown/html.h b/libraries/hoedown/include/hoedown/html.h
index e46e7fd672..e46e7fd672 100644
--- a/depends/hoedown/include/hoedown/html.h
+++ b/libraries/hoedown/include/hoedown/html.h
diff --git a/depends/hoedown/include/hoedown/stack.h b/libraries/hoedown/include/hoedown/stack.h
index bf9b439b91..bf9b439b91 100644
--- a/depends/hoedown/include/hoedown/stack.h
+++ b/libraries/hoedown/include/hoedown/stack.h
diff --git a/depends/hoedown/include/hoedown/version.h b/libraries/hoedown/include/hoedown/version.h
index 4938cae56e..4938cae56e 100644
--- a/depends/hoedown/include/hoedown/version.h
+++ b/libraries/hoedown/include/hoedown/version.h
diff --git a/depends/hoedown/src/autolink.c b/libraries/hoedown/src/autolink.c
index 9bc7fad52c..9bc7fad52c 100644
--- a/depends/hoedown/src/autolink.c
+++ b/libraries/hoedown/src/autolink.c
diff --git a/depends/hoedown/src/buffer.c b/libraries/hoedown/src/buffer.c
index 1c7ba55a7c..1c7ba55a7c 100644
--- a/depends/hoedown/src/buffer.c
+++ b/libraries/hoedown/src/buffer.c
diff --git a/depends/hoedown/src/document.c b/libraries/hoedown/src/document.c
index 8ba82e47dc..8ba82e47dc 100644
--- a/depends/hoedown/src/document.c
+++ b/libraries/hoedown/src/document.c
diff --git a/depends/hoedown/src/escape.c b/libraries/hoedown/src/escape.c
index b4a275baeb..b4a275baeb 100644
--- a/depends/hoedown/src/escape.c
+++ b/libraries/hoedown/src/escape.c
diff --git a/depends/hoedown/src/html.c b/libraries/hoedown/src/html.c
index 4b18d804a0..4b18d804a0 100644
--- a/depends/hoedown/src/html.c
+++ b/libraries/hoedown/src/html.c
diff --git a/depends/hoedown/src/html_blocks.c b/libraries/hoedown/src/html_blocks.c
index f5e9dce9ac..f5e9dce9ac 100644
--- a/depends/hoedown/src/html_blocks.c
+++ b/libraries/hoedown/src/html_blocks.c
diff --git a/depends/hoedown/src/html_smartypants.c b/libraries/hoedown/src/html_smartypants.c
index e24b6bf0f1..e24b6bf0f1 100644
--- a/depends/hoedown/src/html_smartypants.c
+++ b/libraries/hoedown/src/html_smartypants.c
diff --git a/depends/hoedown/src/stack.c b/libraries/hoedown/src/stack.c
index 46ead232c1..46ead232c1 100644
--- a/depends/hoedown/src/stack.c
+++ b/libraries/hoedown/src/stack.c
diff --git a/depends/hoedown/src/version.c b/libraries/hoedown/src/version.c
index 625ed19692..625ed19692 100644
--- a/depends/hoedown/src/version.c
+++ b/libraries/hoedown/src/version.c
diff --git a/depends/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt
index 4dfc39a986..4dfc39a986 100644
--- a/depends/iconfix/CMakeLists.txt
+++ b/libraries/iconfix/CMakeLists.txt
diff --git a/depends/iconfix/internal/qhexstring_p.h b/libraries/iconfix/internal/qhexstring_p.h
index f01b4cddbd..f01b4cddbd 100644
--- a/depends/iconfix/internal/qhexstring_p.h
+++ b/libraries/iconfix/internal/qhexstring_p.h
diff --git a/depends/iconfix/internal/qiconloader.cpp b/libraries/iconfix/internal/qiconloader.cpp
index b1195893e3..b1195893e3 100644
--- a/depends/iconfix/internal/qiconloader.cpp
+++ b/libraries/iconfix/internal/qiconloader.cpp
diff --git a/depends/iconfix/internal/qiconloader_p.h b/libraries/iconfix/internal/qiconloader_p.h
index b71bdd8313..b71bdd8313 100644
--- a/depends/iconfix/internal/qiconloader_p.h
+++ b/libraries/iconfix/internal/qiconloader_p.h
diff --git a/depends/iconfix/xdgicon.cpp b/libraries/iconfix/xdgicon.cpp
index a36d80a9a2..a36d80a9a2 100644
--- a/depends/iconfix/xdgicon.cpp
+++ b/libraries/iconfix/xdgicon.cpp
diff --git a/depends/iconfix/xdgicon.h b/libraries/iconfix/xdgicon.h
index 9c11683a85..9c11683a85 100644
--- a/depends/iconfix/xdgicon.h
+++ b/libraries/iconfix/xdgicon.h
diff --git a/depends/javacheck/.gitignore b/libraries/javacheck/.gitignore
index cc1c52bf4d..cc1c52bf4d 100644
--- a/depends/javacheck/.gitignore
+++ b/libraries/javacheck/.gitignore
diff --git a/depends/javacheck/CMakeLists.txt b/libraries/javacheck/CMakeLists.txt
index 9768650ed3..9768650ed3 100644
--- a/depends/javacheck/CMakeLists.txt
+++ b/libraries/javacheck/CMakeLists.txt
diff --git a/depends/javacheck/JavaCheck.java b/libraries/javacheck/JavaCheck.java
index 11420b86d2..11420b86d2 100644
--- a/depends/javacheck/JavaCheck.java
+++ b/libraries/javacheck/JavaCheck.java
diff --git a/depends/launcher/.gitignore b/libraries/launcher/.gitignore
index cc1c52bf4d..cc1c52bf4d 100644
--- a/depends/launcher/.gitignore
+++ b/libraries/launcher/.gitignore
diff --git a/depends/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
index b62805e011..b62805e011 100644
--- a/depends/launcher/CMakeLists.txt
+++ b/libraries/launcher/CMakeLists.txt
diff --git a/depends/launcher/net/minecraft/Launcher.java b/libraries/launcher/net/minecraft/Launcher.java
index a53501ec44..a53501ec44 100644
--- a/depends/launcher/net/minecraft/Launcher.java
+++ b/libraries/launcher/net/minecraft/Launcher.java
diff --git a/depends/launcher/org/multimc/EntryPoint.java b/libraries/launcher/org/multimc/EntryPoint.java
index d1fc54a841..d1fc54a841 100644
--- a/depends/launcher/org/multimc/EntryPoint.java
+++ b/libraries/launcher/org/multimc/EntryPoint.java
diff --git a/depends/launcher/org/multimc/IconLoader.java b/libraries/launcher/org/multimc/IconLoader.java
index f1638f3a6f..f1638f3a6f 100644
--- a/depends/launcher/org/multimc/IconLoader.java
+++ b/libraries/launcher/org/multimc/IconLoader.java
diff --git a/depends/launcher/org/multimc/Launcher.java b/libraries/launcher/org/multimc/Launcher.java
index 1aa2b21f2a..1aa2b21f2a 100644
--- a/depends/launcher/org/multimc/Launcher.java
+++ b/libraries/launcher/org/multimc/Launcher.java
diff --git a/depends/launcher/org/multimc/LegacyFrame.java b/libraries/launcher/org/multimc/LegacyFrame.java
index a081f3ae3c..a081f3ae3c 100644
--- a/depends/launcher/org/multimc/LegacyFrame.java
+++ b/libraries/launcher/org/multimc/LegacyFrame.java
diff --git a/depends/launcher/org/multimc/NotFoundException.java b/libraries/launcher/org/multimc/NotFoundException.java
index fe154a2ff0..fe154a2ff0 100644
--- a/depends/launcher/org/multimc/NotFoundException.java
+++ b/libraries/launcher/org/multimc/NotFoundException.java
diff --git a/depends/launcher/org/multimc/ParamBucket.java b/libraries/launcher/org/multimc/ParamBucket.java
index 2e197d9f02..2e197d9f02 100644
--- a/depends/launcher/org/multimc/ParamBucket.java
+++ b/libraries/launcher/org/multimc/ParamBucket.java
diff --git a/depends/launcher/org/multimc/ParseException.java b/libraries/launcher/org/multimc/ParseException.java
index d9e8e53e66..d9e8e53e66 100644
--- a/depends/launcher/org/multimc/ParseException.java
+++ b/libraries/launcher/org/multimc/ParseException.java
diff --git a/depends/launcher/org/multimc/Utils.java b/libraries/launcher/org/multimc/Utils.java
index 32cf79199e..32cf79199e 100644
--- a/depends/launcher/org/multimc/Utils.java
+++ b/libraries/launcher/org/multimc/Utils.java
diff --git a/depends/launcher/org/multimc/legacy/LegacyLauncher.java b/libraries/launcher/org/multimc/legacy/LegacyLauncher.java
index 347bb1a234..347bb1a234 100644
--- a/depends/launcher/org/multimc/legacy/LegacyLauncher.java
+++ b/libraries/launcher/org/multimc/legacy/LegacyLauncher.java
diff --git a/depends/launcher/org/multimc/onesix/OneSixLauncher.java b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
index 179df0eee8..179df0eee8 100644
--- a/depends/launcher/org/multimc/onesix/OneSixLauncher.java
+++ b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
diff --git a/depends/launcher/org/simplericity/macify/eawt/Application.java b/libraries/launcher/org/simplericity/macify/eawt/Application.java
index 153bb9ee22..153bb9ee22 100644
--- a/depends/launcher/org/simplericity/macify/eawt/Application.java
+++ b/libraries/launcher/org/simplericity/macify/eawt/Application.java
diff --git a/depends/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
index e9c3db7d59..e9c3db7d59 100644
--- a/depends/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
+++ b/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
diff --git a/depends/launcher/org/simplericity/macify/eawt/ApplicationEvent.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
index 7842035566..7842035566 100644
--- a/depends/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
+++ b/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
diff --git a/depends/launcher/org/simplericity/macify/eawt/ApplicationListener.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java
index a291bee490..a291bee490 100644
--- a/depends/launcher/org/simplericity/macify/eawt/ApplicationListener.java
+++ b/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java
diff --git a/depends/launcher/org/simplericity/macify/eawt/DefaultApplication.java b/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java
index 5752a3505f..5752a3505f 100644
--- a/depends/launcher/org/simplericity/macify/eawt/DefaultApplication.java
+++ b/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java
diff --git a/depends/libnbtplusplus b/libraries/libnbtplusplus
-Subproject 5d0ffb50a526173ce58ae57136bf5d79a7e1920
+Subproject 5d0ffb50a526173ce58ae57136bf5d79a7e1920
diff --git a/depends/pack200/CMakeLists.txt b/libraries/pack200/CMakeLists.txt
index b060905b3f..b060905b3f 100644
--- a/depends/pack200/CMakeLists.txt
+++ b/libraries/pack200/CMakeLists.txt
diff --git a/depends/pack200/LICENSE b/libraries/pack200/LICENSE
index b40a0f457d..b40a0f457d 100644
--- a/depends/pack200/LICENSE
+++ b/libraries/pack200/LICENSE
diff --git a/depends/pack200/anti200.cpp b/libraries/pack200/anti200.cpp
index 1e1ec0c89b..1e1ec0c89b 100644
--- a/depends/pack200/anti200.cpp
+++ b/libraries/pack200/anti200.cpp
diff --git a/depends/pack200/include/unpack200.h b/libraries/pack200/include/unpack200.h
index 9c3eda2d7e..9c3eda2d7e 100644
--- a/depends/pack200/include/unpack200.h
+++ b/libraries/pack200/include/unpack200.h
diff --git a/depends/pack200/src/bands.cpp b/libraries/pack200/src/bands.cpp
index 1608d838db..1608d838db 100644
--- a/depends/pack200/src/bands.cpp
+++ b/libraries/pack200/src/bands.cpp
diff --git a/depends/pack200/src/bands.h b/libraries/pack200/src/bands.h
index a56cd7d5bf..a56cd7d5bf 100644
--- a/depends/pack200/src/bands.h
+++ b/libraries/pack200/src/bands.h
diff --git a/depends/pack200/src/bytes.cpp b/libraries/pack200/src/bytes.cpp
index d3808afaa1..d3808afaa1 100644
--- a/depends/pack200/src/bytes.cpp
+++ b/libraries/pack200/src/bytes.cpp
diff --git a/depends/pack200/src/bytes.h b/libraries/pack200/src/bytes.h
index b116efda38..b116efda38 100644
--- a/depends/pack200/src/bytes.h
+++ b/libraries/pack200/src/bytes.h
diff --git a/depends/pack200/src/coding.cpp b/libraries/pack200/src/coding.cpp
index 6bd17a3ce4..6bd17a3ce4 100644
--- a/depends/pack200/src/coding.cpp
+++ b/libraries/pack200/src/coding.cpp
diff --git a/depends/pack200/src/coding.h b/libraries/pack200/src/coding.h
index f9bd6ca204..f9bd6ca204 100644
--- a/depends/pack200/src/coding.h
+++ b/libraries/pack200/src/coding.h
diff --git a/depends/pack200/src/constants.h b/libraries/pack200/src/constants.h
index 2cc14b7d06..2cc14b7d06 100644
--- a/depends/pack200/src/constants.h
+++ b/libraries/pack200/src/constants.h
diff --git a/depends/pack200/src/defines.h b/libraries/pack200/src/defines.h
index cfe5fc286d..cfe5fc286d 100644
--- a/depends/pack200/src/defines.h
+++ b/libraries/pack200/src/defines.h
diff --git a/depends/pack200/src/unpack.cpp b/libraries/pack200/src/unpack.cpp
index 55d253b2f2..55d253b2f2 100644
--- a/depends/pack200/src/unpack.cpp
+++ b/libraries/pack200/src/unpack.cpp
diff --git a/depends/pack200/src/unpack.h b/libraries/pack200/src/unpack.h
index 0100700d95..0100700d95 100644
--- a/depends/pack200/src/unpack.h
+++ b/libraries/pack200/src/unpack.h
diff --git a/depends/pack200/src/unpack200.cpp b/libraries/pack200/src/unpack200.cpp
index 22b7f3b095..22b7f3b095 100644
--- a/depends/pack200/src/unpack200.cpp
+++ b/libraries/pack200/src/unpack200.cpp
diff --git a/depends/pack200/src/utils.cpp b/libraries/pack200/src/utils.cpp
index 0b7d91caf4..0b7d91caf4 100644
--- a/depends/pack200/src/utils.cpp
+++ b/libraries/pack200/src/utils.cpp
diff --git a/depends/pack200/src/utils.h b/libraries/pack200/src/utils.h
index 5a3dc8f6b0..5a3dc8f6b0 100644
--- a/depends/pack200/src/utils.h
+++ b/libraries/pack200/src/utils.h
diff --git a/depends/pack200/src/zip.cpp b/libraries/pack200/src/zip.cpp
index 32e8bd5009..32e8bd5009 100644
--- a/depends/pack200/src/zip.cpp
+++ b/libraries/pack200/src/zip.cpp
diff --git a/depends/pack200/src/zip.h b/libraries/pack200/src/zip.h
index 67ec24da0c..67ec24da0c 100644
--- a/depends/pack200/src/zip.h
+++ b/libraries/pack200/src/zip.h
diff --git a/depends/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt
index 01342d1bd6..01342d1bd6 100644
--- a/depends/rainbow/CMakeLists.txt
+++ b/libraries/rainbow/CMakeLists.txt
diff --git a/depends/rainbow/COPYING.LIB b/libraries/rainbow/COPYING.LIB
index e69de29bb2..e69de29bb2 100644
--- a/depends/rainbow/COPYING.LIB
+++ b/libraries/rainbow/COPYING.LIB
diff --git a/depends/rainbow/include/rainbow.h b/libraries/rainbow/include/rainbow.h
index b12052b190..b12052b190 100644
--- a/depends/rainbow/include/rainbow.h
+++ b/libraries/rainbow/include/rainbow.h
diff --git a/depends/rainbow/include/rainbow_config.h b/libraries/rainbow/include/rainbow_config.h
index ccd500ed4f..ccd500ed4f 100644
--- a/depends/rainbow/include/rainbow_config.h
+++ b/libraries/rainbow/include/rainbow_config.h
diff --git a/depends/rainbow/src/rainbow.cpp b/libraries/rainbow/src/rainbow.cpp
index 8502fcd0a1..8502fcd0a1 100644
--- a/depends/rainbow/src/rainbow.cpp
+++ b/libraries/rainbow/src/rainbow.cpp
diff --git a/depends/xz-embedded/CMakeLists.txt b/libraries/xz-embedded/CMakeLists.txt
index 5f744671db..5f744671db 100644
--- a/depends/xz-embedded/CMakeLists.txt
+++ b/libraries/xz-embedded/CMakeLists.txt
diff --git a/depends/xz-embedded/include/xz.h b/libraries/xz-embedded/include/xz.h
index eef8ef6917..eef8ef6917 100644
--- a/depends/xz-embedded/include/xz.h
+++ b/libraries/xz-embedded/include/xz.h
diff --git a/depends/xz-embedded/src/xz_config.h b/libraries/xz-embedded/src/xz_config.h
index 40805b75e6..40805b75e6 100644
--- a/depends/xz-embedded/src/xz_config.h
+++ b/libraries/xz-embedded/src/xz_config.h
diff --git a/depends/xz-embedded/src/xz_crc32.c b/libraries/xz-embedded/src/xz_crc32.c
index c412662b72..c412662b72 100644
--- a/depends/xz-embedded/src/xz_crc32.c
+++ b/libraries/xz-embedded/src/xz_crc32.c
diff --git a/depends/xz-embedded/src/xz_crc64.c b/libraries/xz-embedded/src/xz_crc64.c
index 4794b9d3e4..4794b9d3e4 100644
--- a/depends/xz-embedded/src/xz_crc64.c
+++ b/libraries/xz-embedded/src/xz_crc64.c
diff --git a/depends/xz-embedded/src/xz_dec_bcj.c b/libraries/xz-embedded/src/xz_dec_bcj.c
index 9ffda3bd1e..9ffda3bd1e 100644
--- a/depends/xz-embedded/src/xz_dec_bcj.c
+++ b/libraries/xz-embedded/src/xz_dec_bcj.c
diff --git a/depends/xz-embedded/src/xz_dec_lzma2.c b/libraries/xz-embedded/src/xz_dec_lzma2.c
index 3d7b9a2e3a..3d7b9a2e3a 100644
--- a/depends/xz-embedded/src/xz_dec_lzma2.c
+++ b/libraries/xz-embedded/src/xz_dec_lzma2.c
diff --git a/depends/xz-embedded/src/xz_dec_stream.c b/libraries/xz-embedded/src/xz_dec_stream.c
index 6e935ded23..6e935ded23 100644
--- a/depends/xz-embedded/src/xz_dec_stream.c
+++ b/libraries/xz-embedded/src/xz_dec_stream.c
diff --git a/depends/xz-embedded/src/xz_lzma2.h b/libraries/xz-embedded/src/xz_lzma2.h
index 3976033a84..3976033a84 100644
--- a/depends/xz-embedded/src/xz_lzma2.h
+++ b/libraries/xz-embedded/src/xz_lzma2.h
diff --git a/depends/xz-embedded/src/xz_private.h b/libraries/xz-embedded/src/xz_private.h
index 55a3af1c19..55a3af1c19 100644
--- a/depends/xz-embedded/src/xz_private.h
+++ b/libraries/xz-embedded/src/xz_private.h
diff --git a/depends/xz-embedded/src/xz_stream.h b/libraries/xz-embedded/src/xz_stream.h
index c0e191e60a..c0e191e60a 100644
--- a/depends/xz-embedded/src/xz_stream.h
+++ b/libraries/xz-embedded/src/xz_stream.h
diff --git a/depends/xz-embedded/xzminidec.c b/libraries/xz-embedded/xzminidec.c
index bb62c3ac32..bb62c3ac32 100644
--- a/depends/xz-embedded/xzminidec.c
+++ b/libraries/xz-embedded/xzminidec.c