diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-09 20:49:48 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-09 20:49:48 +0100 |
| commit | 1f6a484cb2368a5704cdb4820ac06194ea6d7e1a (patch) | |
| tree | f4ebfd97c25387b3e26d4a55c5c85d67782df25d /logic/OneSixInstance_p.h | |
| parent | f8df07c3272c0e02f31f46fda8a429292c7a446a (diff) | |
| parent | 18f532b0d7d873280ec17218196db15fa64175a2 (diff) | |
| download | PrismLauncher-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.gz PrismLauncher-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.bz2 PrismLauncher-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.zip | |
Merge branch 'integration_derpstances_groupview' into develop
Diffstat (limited to 'logic/OneSixInstance_p.h')
| -rw-r--r-- | logic/OneSixInstance_p.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/logic/OneSixInstance_p.h b/logic/OneSixInstance_p.h index 6b7ea431..0cc46f33 100644 --- a/logic/OneSixInstance_p.h +++ b/logic/OneSixInstance_p.h @@ -15,16 +15,14 @@ #pragma once -#include <memory> - -#include "logic/BaseInstance_p.h" -#include "logic/OneSixVersion.h" -#include "logic/OneSixLibrary.h" -#include "logic/ModList.h" +#include "BaseInstance_p.h" +#include "OneSixVersion.h" +#include "ModList.h" struct OneSixInstancePrivate : public BaseInstancePrivate { std::shared_ptr<OneSixVersion> version; + std::shared_ptr<OneSixVersion> vanillaVersion; std::shared_ptr<ModList> loader_mod_list; std::shared_ptr<ModList> resource_pack_list; -};
\ No newline at end of file +}; |