diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-24 06:36:16 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-24 06:36:16 +0100 |
| commit | ca297fca79a7b1b96e41ba5abed4956af9383c16 (patch) | |
| tree | 5c6cf2a486c4015f5e52842acb412e39b8498acd /logic/OneSixUpdate.h | |
| parent | 4124faf474908e4d79d93b0f624bf8fd81bd9972 (diff) | |
| download | MultiMC-ca297fca79a7b1b96e41ba5abed4956af9383c16.tar MultiMC-ca297fca79a7b1b96e41ba5abed4956af9383c16.tar.gz MultiMC-ca297fca79a7b1b96e41ba5abed4956af9383c16.tar.lz MultiMC-ca297fca79a7b1b96e41ba5abed4956af9383c16.tar.xz MultiMC-ca297fca79a7b1b96e41ba5abed4956af9383c16.zip | |
Prepare for rework of instance launch/update
Added missing licenses
Added a Java functionality checker (detects 32/64bit java)
Refactor of *Update - no longer based on BaseUpdate, but Task directly
Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there.
Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there.
Used the Java checker in the main settings dialog (TODO: instance settings).
Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded.
Diffstat (limited to 'logic/OneSixUpdate.h')
| -rw-r--r-- | logic/OneSixUpdate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h index e5f553c7..a66da067 100644 --- a/logic/OneSixUpdate.h +++ b/logic/OneSixUpdate.h @@ -21,12 +21,11 @@ #include "logic/net/NetJob.h" #include "logic/tasks/Task.h" -#include "logic/BaseUpdate.h" class MinecraftVersion; class BaseInstance; -class OneSixUpdate : public BaseUpdate +class OneSixUpdate : public Task { Q_OBJECT public: @@ -49,4 +48,5 @@ private: // target version, determined during this task std::shared_ptr<MinecraftVersion> targetVersion; + BaseInstance *m_inst; }; |