aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages
AgeCommit message (Collapse)Author
2023-08-27Merge pull request #1560 from Trial97/curse_multiple_loaders2TheKodeToad
Add suport for flame multiple loaders
2023-08-27Merge pull request #1536 from Trial97/time3TheKodeToad
Allow showing playtime in hours
2023-08-27Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curse_multiple_loaders2 Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-25added condition for empty loader typeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23Merge pull request #1552 from Trial97/memory_quick_setupSefa Eyeoglu
2023-08-23Added loaders check on versions loadTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23added loaders for flame versionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23moved modloaderTypes to ModPlatformTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-22Update launcher/ui/pages/instance/InstanceSettingsPage.cppAlexandru Ionut Tripon
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-22Update launcher/ui/pages/global/JavaPage.cppAlexandru Ionut Tripon
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-22Added warning to settings pageTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-21Merge pull request #1553 from TheKodeToad/list-fixesTheKodeToad
A few boring list-related fixes
2023-08-21List fixesTheKodeToad
Double-click to toggle profile components. Restore double-click to toggle resources. Fix clicking on checkbox to select account. Double-click to select account. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-20Update “Welcome” message on account list pageDanny Dorazio
2023-08-20Replace instances of “Minecraft account”Danny Dorazio
2023-08-20Revert "feat: add toggle for quilt beacon"Sefa Eyeoglu
This reverts commit 89aaedc06c3eb7a035d8be593a7bbe417cb2f712. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-20Revert "chore: better explain quilt loader beacon"Sefa Eyeoglu
This reverts commit a2a09ffe01fe8eb6cd1f557b0feb98ed0271151e. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-19Merge pull request #1320 from TheKodeToad/better-launchTheKodeToad
Combine launch buttons in instance window, persist profiler
2023-08-18Merge pull request #1498 from Scrumplex/neoforgeSefa Eyeoglu
2023-08-18Update launcher/ui/pages/global/MinecraftPage.uiAlexandru Ionut Tripon
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-18feat:added option to show playtime in hoursTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-17Merge pull request #1392 from Scrumplex/feat-native-overrideSefa Eyeoglu
2023-08-17removed lineTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-16Merge branch 'develop' into better-launchTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-15Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curseforge-url-handle3 Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15feat: add NeoForge to UIsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15fix: add missing headerSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15feat: add custom native library path settingsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15Some warningsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into staging Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-14chore: update license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-14chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-12Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warningsSefa Eyeoglu
2023-08-12Merge remote-tracking branch 'upstream/staging' into curseforge-url-handleSefa Eyeoglu
2023-08-11Merge pull request #1230 from TheKodeToad/better-component-installationSefa Eyeoglu
Revamp loader installation UI
2023-08-10Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warningsSefa Eyeoglu
2023-08-10Merge pull request #1324 from leia-uwu/ui-tweaksSefa Eyeoglu
2023-08-06Merge remote-tracking branch 'upstream/staging' into curseforge-url-handleSefa Eyeoglu
2023-08-06fix: makeShared for QByteArraySefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-05Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into pack_changelog
2023-08-05Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into icons
2023-08-04Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-classSefa Eyeoglu
2023-08-04chore: update license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02Merge branch 'PrismLauncher:develop' into better-component-installationTheKodeToad
2023-08-02chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02Merge pull request #1359 from Trial97/importSefa Eyeoglu
2023-08-02Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.hAlexandru Ionut Tripon
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-31Merge branch 'develop' into refactor/net-split-headers-to-proxy-classRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>