0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,042 Commits 1 Branch 0 Tags
46e403b20b8f14269aebc163f2bc481d3dea43c5
Commit Graph

753 Commits

Author SHA1 Message Date
flow
46e403b20b fix: properly parse mrpacks without the 'env' field 
It's optional, so some files may not have it (like most of FO).
 2022-06-09 19:53:29 -03:00
flow
8966364648 Merge pull request #685 from kthchew/fix/technic-quilt 
Add Quilt support for Technic modpacks
 2022-06-06 18:03:05 -03:00
DioEgizio
91b85f9919 Revert "Merge pull request #315 from txtsd/display_scaling" 
This reverts commit fcf728f3b5.
 2022-06-04 17:09:11 +02:00
Sefa Eyeoglu
1ab00ca8b2 Merge pull request #426 from flowln/mod_perma 
Add on-disk mod metadata information
 2022-06-04 13:23:38 +02:00
glowiak
1a004f0c4d Update MCEditTool.cpp 2022-06-01 15:50:43 +02:00
glowiak
7d21bf15e8 Update UpdateController.cpp 2022-06-01 15:50:02 +02:00
Sefa Eyeoglu
a88ad8025b Merge pull request #682 from istudyatuni/fix-add-account-behaviour 2022-06-01 10:13:35 +02:00
Kenneth Chew
7ac16ed073 Use QStringList instead of QSet<QString> 
Co-authored-by: flow <flowlnlnln@gmail.com>
 2022-05-30 14:40:20 -04:00
Kenneth Chew
3585e4764b Add Quilt support for Technic modpacks 2022-05-30 14:14:03 -04:00
Sefa Eyeoglu
9054ee18a1 Merge pull request #505 from flowln/improve_download_ux 2022-05-30 13:41:02 +02:00
Ilia
9d8b95107d fix: do not show the "profile select" dialog if the user refused to add an account 2022-05-30 13:33:07 +03:00
timoreo
2746251dcd Fix modrinth search filters 2022-05-29 18:23:34 +02:00
Sefa Eyeoglu
adf1e1982a fix: remove unnecessary translation (#674) 2022-05-29 16:14:01 +02:00
Sefa Eyeoglu
f5405e835e Merge pull request #624 from ryanccn/global-jvm-args 
Make global JVM arguments multi-line
 2022-05-29 16:10:55 +02:00
Sefa Eyeoglu
85ee7fb3a4 Merge pull request #672 from Scrumplex/fix-ftblegacy-pack-version 
fix: add version to Legacy FTB packs
 2022-05-29 16:10:43 +02:00
Sefa Eyeoglu
65d23fc9b9 Merge pull request #671 from Scrumplex/fix-importing-flame-mmc-packs 2022-05-29 15:15:18 +02:00
Sefa Eyeoglu
db1abb02d6 Merge pull request #661 from flowln/wow_curseforge_is_being_uncompetitive_im_so_surprised 2022-05-29 14:42:49 +02:00
Ryan Cao
20832682ef Update launcher/ui/pages/global/JavaPage.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-05-29 20:35:57 +08:00
Sefa Eyeoglu
8e6c592ad9 fix: add version to Legacy FTB packs 2022-05-29 14:28:54 +02:00
Sefa Eyeoglu
0b3115997a fix: fix importing Flame/MMC packs 2022-05-29 14:16:13 +02:00
Sefa Eyeoglu
b07c5982e1 fix: set version for Windows binaries 2022-05-29 13:09:13 +02:00
Ryan Cao
d4c1d62781 Update launcher/ui/pages/global/JavaPage.cpp 
Co-authored-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2022-05-29 12:15:20 +08:00
flow
f0ec165d42 feat: add warning of non-whitelisted URLs instead of a hard fail 
Based on people's votes on Discord :^)
 2022-05-28 18:04:16 -03:00
Lenny McLennington
abd240468e clean up validateDownloadUrl 2022-05-28 17:11:55 -03:00
flow
b5e00027d1 change: add 'gitlab.com' to whitelisted Modrinth modpack urls 2022-05-28 17:01:58 -03:00
flow
1698554024 debug: add non-translated debug logging for 'non-whitelisted url' fails 2022-05-28 17:01:57 -03:00
flow
f4604bbf79 change: update whitelisted hosts in Modrinth modpacks 2022-05-28 17:01:52 -03:00
timoreo22
699ad316f0 Rework curseforge download (#611) 
* Use the bulk endpoint on mod resolution for faster download
* Search on modrinth for api blocked mods
* Display a dialog for manually downloading blocked mods
 2022-05-28 21:53:12 +02:00
timoreo22
fcbe233fdb Merge pull request #651 from Scrumplex/fix-mnemonic-apipage 
Fix mnemonics in APIPage
 2022-05-28 15:46:38 +02:00
timoreo22
4af8a9ed2d Merge pull request #650 from flowln/modrinth_icons 
Fix modpack icon importing with non-standard icon paths
 2022-05-28 15:45:26 +02:00
timoreo22
83078cd49a Merge pull request #657 from JJL772/fix/misc-fixes 
Fix crash when aborting instance import
 2022-05-28 15:38:36 +02:00
timoreo22
85901082a2 Merge pull request #639 from Scrumplex/fix-prio-modpack-formats 
Prefer stricter modpack formats during import
 2022-05-28 15:36:18 +02:00
Ryan Cao
2be8100e7c Merge branch 'develop' into global-jvm-args 2022-05-28 21:15:00 +08:00
Jeremy Lorelli
48e20cb5f7 Fix crash when aborting instance import 
Also turned a loop var into a reference to avoid copies on each iteration
 2022-05-27 16:41:57 -07:00
Sefa Eyeoglu
6fb5bb6a5e fix: fix mnemonics in APIPage 2022-05-27 14:50:06 +02:00
flow
5d3bef32ca fix: use absolute path when installing icons 2022-05-27 09:15:32 -03:00
flow
3ff26d5cfe Merge pull request #642 from ryanccn/metaserver-show-default 
Show default metaserver in settings
 2022-05-26 20:09:07 -03:00
Sefa Eyeoglu
0263677e1f fix: prefer stricter modpack formats during import 
Flame modpacks use "manifest.json" as their only characteristic for
identification. Some modpacks might have other files called
"manifest.json", which is why we should prefer modpack formats that have
a stricter structure.
 2022-05-26 22:41:20 +02:00
Sefa Eyeoglu
938cae1130 revert: remove CurseForge workaround for packs too 
Partial revert. Handles missing download URLs.
 2022-05-25 23:14:13 +02:00
Ryan Cao
e50ec31351 fix 2022-05-25 14:44:47 +08:00
Ryan Cao
8a1ba03bcb show default metaserver 2022-05-25 11:46:15 +08:00
flow
f8e7fb3d48 fix: better handle corner case 2022-05-24 20:27:25 -03:00
Jamie Mansfield
4ee5264e24 ATLauncher: Delete files from configs if they conflict with a mod 2022-05-23 21:44:01 +01:00
Jamie Mansfield
101ca60b2b ATLauncher: Handle extra arguments depends 2022-05-23 20:57:15 +01:00
Jamie Mansfield
f28a0aa666 ATLauncher: Handle main class depends 2022-05-23 20:57:14 +01:00
flow
5a1de15332 fix: use a more robust method of finding metadata indexes 
Often times, mods can have their name in different forms, changing one
letter to caps or the other way (e.g. JourneyMaps -> Journeymaps).
This makes it possible to find those as well, which is not perfect by
any means, but should suffice for the majority of cases.
 2022-05-23 14:58:15 -03:00
flow
42f8ec5b14 fix: do modrinth changes on flame too 
Also fix a dumb moment
 2022-05-23 14:58:14 -03:00
flow
2fc1b99911 chore: add license headers 
Prevents a massive inload of Scrumplex ditto's :)

I didn't add it to every file modified in this PR because the other
changes are pretty minor, and would explode the diff of the PR. I hope
that's not a problem O_O
 2022-05-23 14:58:14 -03:00
flow
3a923060ce fix: use correct hash_type when creating metadata 
also fix: wrong parameter name in LocalModUpdateTask's constructor
also fix: correct hash_format in CF
 2022-05-23 14:58:14 -03:00
flow
0985adfd74 change: support newest changes with packwiz regarding CF 2022-05-23 14:58:08 -03:00