diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-06-08 19:01:19 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-09 01:38:31 +0200 |
| commit | 223a7aba7bfa6019d8a2cfa5e8f8a4791a96d136 (patch) | |
| tree | 438609315448ac51ce9b6c62452e1355b0536a38 | |
| parent | 84ae67fff5bfa9de011daf4144802569687f1e6b (diff) | |
| download | MultiMC-223a7aba7bfa6019d8a2cfa5e8f8a4791a96d136.tar MultiMC-223a7aba7bfa6019d8a2cfa5e8f8a4791a96d136.tar.gz MultiMC-223a7aba7bfa6019d8a2cfa5e8f8a4791a96d136.tar.lz MultiMC-223a7aba7bfa6019d8a2cfa5e8f8a4791a96d136.tar.xz MultiMC-223a7aba7bfa6019d8a2cfa5e8f8a4791a96d136.zip | |
Hardcode LWJGL 2.9.1 for OneSix, only allow chancging Minecraft versions for now.
| -rw-r--r-- | gui/pages/VersionPage.cpp | 8 | ||||
| -rw-r--r-- | logic/minecraft/VersionBuilder.cpp | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp index cc728e75..359e71c4 100644 --- a/gui/pages/VersionPage.cpp +++ b/gui/pages/VersionPage.cpp @@ -368,4 +368,12 @@ void VersionPage::versionCurrent(const QModelIndex ¤t, const QModelIndex & ui->moveLibraryDownBtn->setEnabled(enabled); ui->moveLibraryUpBtn->setEnabled(enabled); } + if(m_version->versionFileId(current.row()) == "net.minecraft") + { + ui->changeMCVersionBtn->setEnabled(true); + } + else + { + ui->changeMCVersionBtn->setEnabled(false); + } } diff --git a/logic/minecraft/VersionBuilder.cpp b/logic/minecraft/VersionBuilder.cpp index 29418fe3..ddcf6333 100644 --- a/logic/minecraft/VersionBuilder.cpp +++ b/logic/minecraft/VersionBuilder.cpp @@ -185,7 +185,8 @@ void VersionBuilder::buildFromMultilayer() minecraftPatch->setOrder(-2); m_version->VersionPatches.append(minecraftPatch); - QResource LWJGL(":/versions/LWJGL/2.9.0.json"); + // TODO: this is obviously fake. + QResource LWJGL(":/versions/LWJGL/2.9.1.json"); auto lwjgl = parseJsonFile(LWJGL.absoluteFilePath(), false, false); auto lwjglPatch = std::dynamic_pointer_cast<VersionPatch>(lwjgl); if (!lwjglPatch) |