diff options
author | flow <thiagodonato300@gmail.com> | 2022-02-25 13:43:27 -0300 |
---|---|---|
committer | flow <thiagodonato300@gmail.com> | 2022-02-25 13:43:27 -0300 |
commit | c4f4e9e620ee4a7094542190bc18cc167d00a7ff (patch) | |
tree | ddb23a5782c2388eb59c02d72c0478c94dbdf6f9 /launcher/BaseInstance.cpp | |
parent | 40a9828fbab0e9a8b7f070714bdd87d3f279e18c (diff) | |
parent | f2b850ad200b1b871402c4d4bb2676f1e1288d3d (diff) | |
download | PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.tar.gz PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.tar.bz2 PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.zip |
merge upstream and resolve conflicts
Diffstat (limited to 'launcher/BaseInstance.cpp')
-rw-r--r-- | launcher/BaseInstance.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/launcher/BaseInstance.cpp b/launcher/BaseInstance.cpp index 374d4a29..1bff9e1d 100644 --- a/launcher/BaseInstance.cpp +++ b/launcher/BaseInstance.cpp @@ -39,6 +39,7 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s m_settings->registerSetting("lastLaunchTime", 0); m_settings->registerSetting("totalTimePlayed", 0); m_settings->registerSetting("lastTimePlayed", 0); + m_settings->registerSetting("InstanceType", "OneSix"); // Custom Commands auto commandSetting = m_settings->registerSetting({"OverrideCommands","OverrideLaunchCmd"}, false); |