aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
AgeCommit message (Collapse)Author
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-27Merge pull request #1532 from Trial97/curseforge-url-handleSefa Eyeoglu
2023-08-25minor dependency crash fixTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23reverted change for optionalTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23Added loaders check on versions loadTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23moved modloaderTypes to ModPlatformTrial97
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-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-19chore: add fixme about UI code in MinecraftinstanceSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-18Merge pull request #1498 from Scrumplex/neoforgeSefa Eyeoglu
2023-08-17Merge pull request #1392 from Scrumplex/feat-native-overrideSefa Eyeoglu
2023-08-17I was forced TheKodeToad
/j Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-16Merge branch 'develop' into better-launchTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-17feat:added flame install mod metadataTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15feat: add NeoForge to ModLoaderTypeSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15Merge pull request #1513 from lumiscosity/fix/skin_transparency_bugSefa Eyeoglu
2023-08-15fix: only add native library overrides if files existSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15fix: remove meta OpenAL workaroundSefa Eyeoglu
LWJGL 2 doesn't have a separate zip for OpenAL. So there is no reason for this code. 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-15feat: implement override for GLFW/OpenAL with split nativesSefa Eyeoglu
Fixes PrismLauncher/PrismLauncher#513 Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15Some warningsTrial97
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-14Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into stagingSefa Eyeoglu
2023-08-11fix: use QColorConstants in Qt 5.14+Sefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-11fix: fix more warningsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-10Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warningsSefa Eyeoglu
2023-08-10Fix transparency in skin iconmaple!
QPainter has a bug where drawing transparency to a freshly initialized, empty QPixmap causes garbage data to be drawn. This broke the rendering of the skin icon. The fix is simply to fill the QPixmap with empty transparent pixels beforehand. Signed-off-by: maple! <averyrudelphe@gmail.com>
2023-08-10Merge pull request #1324 from leia-uwu/ui-tweaksSefa Eyeoglu
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-02chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02fix: remove irregular enum initializationSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02fix: simplify switch statementSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02Merge pull request #1339 from TheKodeToad/remove-direct-launchSefa Eyeoglu
2023-08-01Fix: always false comparisonRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.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>
2023-07-30Merge branch 'develop' into chore/add-compiler-warningsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30Merge pull request #1449 from Trial97/tehnicSefa Eyeoglu
Reintroduce parsing of INI files
2023-07-26fix: add support for QByteArray inifileTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-26fix: typo in task.hseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-24Fix token "0" being replacedTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-22Merge branch 'develop' into better-launchTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19Merge pull request #1399 from Scrumplex/offline-uuidTheKodeToad
fix: generate predictable UUIDs for offline accounts
2023-07-18fix: generate predictable UUIDs for offline accountsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-17Make Launch Offline not launch online in 1.6+Josiah Glosson
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
2023-07-17fix: don't take modloaders by referenceSefa Eyeoglu
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>