External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2026-01-03 06:10:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Sebastian-byte
2021-10-24 17:15:27 -05:00
parent 9a26dcba9a 6f6c9c6f68
commit dd5a930739
27 changed files with 232 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/minecraft/MinecraftInstance.h
View File

@@ -119,9 +119,6 @@ protected:
QStringList validLaunchMethods();
QString launchMethod();
private:
QString prettifyTimeDuration(int64_t duration);
protected: // data
std::shared_ptr<PackProfile> m_components;
mutable std::shared_ptr<ModFolderModel> m_loader_mod_list;