CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,385 Commits 10 Branches 30 Tags
bd60c5491109711c7812bc28b5edef61d0e1210b
Commit Graph

341 Commits

Author SHA1 Message Date
Ezekiel Smith
eb06d0116f Merge pull request #334 from flowln/right_file_2 
Fix skipping file in mod version parsing
 2022-03-24 11:10:11 +01:00
Sefa Eyeoglu
ce05ce92bb Merge pull request #322 from oynqr/build/static-rainbow 
Build with static rainbow
 2022-03-22 20:11:15 +01:00
Sefa Eyeoglu
a5fc640f2c Merge pull request #298 from Scrumplex/fix-i18n 
Fix translatable strings
 2022-03-22 20:11:15 +01:00
Ezekiel Smith
0a4a3fece5 Merge pull request #323 from Scrumplex/retranslate-pages 
Retranslate all settings pages
 2022-03-22 20:11:15 +01:00
Ezekiel Smith
fcf728f3b5 Merge pull request #315 from txtsd/display_scaling 
Allow fractional DPI scaling
 2022-03-22 20:11:15 +01:00
txtsd
cd4851c98b Merge pull request #311 from DioEgizio/patch-2 
fix webp
 2022-03-22 20:11:15 +01:00
Sefa Eyeoglu
3db5f30403 Merge pull request #316 from Scrumplex/fix-disabled-controls 2022-03-22 20:11:15 +01:00
Ezekiel Smith
58957122b9 Merge pull request #306 from Scrumplex/limit-instance-lengths 
Limit instance names to 128 chars
 2022-03-22 20:11:15 +01:00
Sefa Eyeoglu
571e322d66 Merge pull request #200 from Scrumplex/scrumplex-license-header 2022-03-22 20:11:15 +01:00
Sefa Eyeoglu
ddda02f092 Merge pull request #292 from lack/offline_username_limits 
Limit offline username to 16 characters with override
 2022-03-22 20:11:15 +01:00
Ezekiel Smith
025a3cf730 Merge pull request #296 from flowln/right_file 
Use primary file for mod downloading on Modrinth
 2022-03-22 20:11:15 +01:00
Ezekiel Smith
7471ce4530 Merge pull request #299 from flowln/paste_serv 
Remove paste.polymc.org
 2022-03-22 20:11:15 +01:00
Sefa Eyeoglu
d16c6b0e69 Merge pull request #265 from Scrumplex/fix-javacheck-appimage 
Define JARs path relative to application root
 2022-03-22 20:11:15 +01:00
Ezekiel Smith
c560d06b8d Merge pull request #270 from flowln/dialog 
Make a better "Mod download confirmation dialog"
 2022-03-22 20:11:15 +01:00
flow
a3d7ad731d fix missing translation strings 
my mistake, sorry! ToT
 2022-03-11 18:43:17 -03:00
Ezekiel Smith
07e4c4d189 Merge pull request #242 from deadmeu/develop 
Fix missing space in "No Accounts" message
 2022-03-11 14:53:05 +11:00
dada513
d814e21f0d add matrix button 2022-03-08 18:41:23 +01:00
deadmeu
49d122a2c4 Fix missing space in "No Accounts" message 2022-03-08 23:24:11 +10:00
Ezekiel Smith
dc9e250868 Merge pull request #232 from Scrumplex/fix-help-links 
Switch to polymc.org wiki
 2022-03-08 01:22:34 +11:00
Ezekiel Smith
b6cf0359fa Merge pull request #230 from Scrumplex/fix-iconthemes 
Reorganize icon themes
 2022-03-08 01:20:35 +11:00
Sefa Eyeoglu
6545d250e8 refactor: move help URL into buildconfig 2022-03-06 11:31:50 +01:00
Sefa Eyeoglu
b162351ff4 fix: switch to polymc.org wiki 2022-03-05 21:49:13 +01:00
Sefa Eyeoglu
3697d70b48 fix: reorganize icon themes 
Rename MultiMC to Legacy
Simple (Colored) is now the first icon theme
Custom is now the last icon theme, which also fixes a loading issue when
Legacy was selected
Fix loading of Legacy theme
 2022-03-05 20:29:54 +01:00
flow
e0c025b162 fix extra spacing in resource packs and shader packs, and move button up 
hopefully now its finally ok
 2022-03-03 09:51:46 -03:00
flow
9e443faba3 hack: hide 'Download Mods' button when not in the mods tab 2022-03-03 04:02:22 -03:00
flow
f95cebaf06 change 'Install Mods' -> 'Download Mods' and change position 2022-03-03 01:10:10 -03:00
timoreo22
8bdd2befe9 Merge pull request #205 from timoreo22/fix-version-select 
Fixed wrong version info
 2022-03-01 16:56:10 +01:00
Ezekiel Smith
e1f28be151 Merge pull request #163 from txtsd/windows_data_dir 
Replace build layouts with Launcher_PORTABLE cmake flag
 2022-03-02 00:03:31 +11:00
flow
4e8f075ff3 fix: Do not loop when its not a fabric mod on Flame version validation 
Since there's no validation for forge mods since the start, we were just
looping with no porpuse in this situation.
 2022-02-27 22:02:43 -03:00
flow
075d900d45 fix: Always tell Flame API which modloader we are using 
Fixes #206 partially. Although we don't list mods that have no
compatibility with the mod loader we are using, mods that have support
for both loaders still show up, and the versions for both the loaders
are still shown.

Also simplifies a little the logic in
FlameModIndex::loadIndexedPackVersions
 2022-02-27 16:07:45 -03:00
txtsd
5d1ca33b84 Apply suggestions from code review 
Co-authored-by: LennyMcLennington <lenny@sneed.church>
 2022-02-27 08:35:47 -08:00
timoreo
ccc493cb2b Cleanly free NetJob in flame modpack 2022-02-27 13:14:12 +01:00
timoreo
2745325ae0 Fixed wrong version info 2022-02-27 11:55:24 +01:00
Sefa Eyeoglu
88fc1e32ee Merge pull request #201 from Scrumplex/fix-instancetype-reregistration 2022-02-26 14:37:27 +01:00
Sefa Eyeoglu
c9bf7f9896 fix: load instances no matter their instance type 2022-02-26 00:31:37 +01:00
flow
c4f4e9e620 merge upstream and resolve conflicts 2022-02-25 13:43:27 -03:00
Ezekiel Smith
f2b850ad20 Merge pull request #183 from timoreo22/fix-versions-segfault 
Fixed segfault in mod download
 2022-02-26 01:55:11 +11:00
Ezekiel Smith
ccc27d1b7c Merge pull request #192 from Scrumplex/refactor-remove-legacy-instances 
Drop legacy instances
 2022-02-26 01:54:15 +11:00
flow
40a9828fba fix: improve readability and set ok button as disabled by default 2022-02-23 19:17:33 -03:00
flow
04840d0638 fix(ui): add translation func to text in the confirm dialog 2022-02-23 14:44:55 -03:00
flow
38f12c50f7 Merge branch 'PolyMC:develop' into develop 2022-02-23 14:34:51 -03:00
Sefa Eyeoglu
ca8b62291f fix: use legacy data path if it exists 2022-02-23 16:22:53 +05:30
txtsd
69d01204e0 Implement PR suggestions 2022-02-23 16:22:53 +05:30
txtsd
1e3b896fda Replace layouts with LAUNCH_PORTABLE 2022-02-23 16:22:23 +05:30
Sefa Eyeoglu
e2c2a38005 Merge pull request #186 from theglitch76-forks/develop 
Enable WSL support
 2022-02-22 08:23:57 +01:00
flow
f8b0d6453a fix: sort mod list in confirmation dialog 2022-02-21 23:25:33 -03:00
flow
0102e91940 feat: add confirm dialog for installing mods 
When selecting multiple mods at once, it can become hard to keep track
of which ones you selected.

To address this, a dialog is now displayed
when you finish selecting the mods to download, showing you which ones
you selected and their filenames. From there, you can either accept it
and download the mods, or you can cancel it and go back to the mod
selection dialog.
 2022-02-21 23:09:14 -03:00
flow
1004211a66 fix(ui): change text in selection button when there's no valid version 2022-02-21 22:52:50 -03:00
flow
f5cf4eb45f feat(ui): allow downloading multiple mods from CurseForge at once 2022-02-21 21:53:21 -03:00
flow
512395e3f1 feat(ui): allow downloading multiple mods in Modrinth at once 2022-02-21 21:34:53 -03:00