summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-01 19:42:47 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-01 19:42:47 +0100
commit866d7029afa10293a57d71aecbe3629399c95d06 (patch)
tree9251f02e21a78c2f90d0f1746e84a64762865f27
parent8637cce4333aaf56a231d5fab866b0e770436783 (diff)
downloadMultiMC-866d7029afa10293a57d71aecbe3629399c95d06.tar
MultiMC-866d7029afa10293a57d71aecbe3629399c95d06.tar.gz
MultiMC-866d7029afa10293a57d71aecbe3629399c95d06.tar.lz
MultiMC-866d7029afa10293a57d71aecbe3629399c95d06.tar.xz
MultiMC-866d7029afa10293a57d71aecbe3629399c95d06.zip
Fix some bugs that got uncovered while trying to get liteloader 1.7 to work
-rw-r--r--logic/OneSixVersionBuilder.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/logic/OneSixVersionBuilder.cpp b/logic/OneSixVersionBuilder.cpp
index a541766b..9832d4a0 100644
--- a/logic/OneSixVersionBuilder.cpp
+++ b/logic/OneSixVersionBuilder.cpp
@@ -483,8 +483,15 @@ struct VersionFile
static std::shared_ptr<OneSixLibrary> createLibrary(const Library &lib)
{
std::shared_ptr<OneSixLibrary> out(new OneSixLibrary(lib.name));
- out->setBaseUrl(lib.url);
+ if (!lib.url.isEmpty())
+ {
+ out->setBaseUrl(lib.url);
+ }
out->setHint(lib.hint);
+ if (!lib.absoluteUrl.isEmpty())
+ {
+ out->setAbsoluteUrl(lib.absoluteUrl);
+ }
out->setAbsoluteUrl(lib.absoluteUrl);
out->extract_excludes = lib.excludes;
for (auto native : lib.natives)
@@ -725,6 +732,10 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
{
return false;
}
+ file.name = "custom.json";
+ file.filename = "custom.json";
+ file.fileId = "org.multimc.custom.json";
+ file.version = QString();
bool isError = false;
file.applyTo(m_version, isError);
if (isError)