0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,994 Commits 1 Branch 0 Tags 29 MiB
2727df704f
Commit Graph

718 Commits

Author SHA1 Message Date
Sefa Eyeoglu
9054ee18a1
Merge pull request #505 from flowln/improve_download_ux 2022-05-30 13:41:02 +02: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
Ryan Cao
6d0ea13f97
make JVM args PlainTextEdit 2022-05-23 16:52:12 +08:00
Sefa Eyeoglu
dca4ea5cea
Merge pull request #621 from Scrumplex/remove-curseforge-workarounds 2022-05-23 10:47:30 +02:00
flow
ac4497a1f2
Merge pull request #605 from jamierocks/h-atl-improv 
ATLauncher: Various work to improve the platform support
 2022-05-22 20:09:13 -03:00
Sefa Eyeoglu
cb69869836
revert: remove CurseForge workaround 
We have been asked by CurseForge to remove this workaround as it
violates their terms of service. This is just a partial revert, as the
UI changes were otherwise unrelated.

This reverts commit 92e8aaf36f, reversing
changes made to 88a93945d4.
 2022-05-22 22:07:03 +02:00
Sefa Eyeoglu
f2e2053134
feat: add trailing slash to meta URL if it is missing 2022-05-22 21:36:31 +02:00
Sefa Eyeoglu
b181f4bc30
fix: improve spacing in APIPage 2022-05-22 21:36:30 +02:00
dada513
f00dbdc215
Make Metaserver changable in settings 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Co-authored-by: flow <flowlnlnln@gmail.com>
 2022-05-22 21:35:20 +02:00
Sefa Eyeoglu
7d91db607f
Merge pull request #554 from PolyMC/more_paste_services 2022-05-22 20:49:11 +02:00
Sefa Eyeoglu
b191291737
Merge pull request #577 from PolyMC/fix/toolbar_🦀_fix 2022-05-22 18:11:00 +02:00
Sefa Eyeoglu
29ef1e2c4b
Merge pull request #597 from Scrumplex/refactor-modloader-modapi 2022-05-22 13:17:53 +02:00
Ezekiel Smith
bc450e4cee
Merge pull request #612 from DioEgizio/update-cf-logo-real 
change cf icon to a more fancy one
 2022-05-21 09:53:31 -07:00
LennyMcLennington
de02deac98
Make if statement condition more readable 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-05-21 17:30:54 +01:00
Lenny McLennington
e2ad3b0183
Add migration wizard, fix migration from custom paste instance 
- Very basic wizard just to allow the user to choose whether to keep
  their old paste settings or use the new default settings.

- People who used custom 0x0 instances would just be kept on those
  settings and won't see the wizard.
 2022-05-21 17:30:19 +01:00
Lenny McLennington
caf6d02728
Change paste settings and add copyright headers 
- There's now a notice reminding people to change the base URL if they
  had a custom base URL and change the paste type (that was something I
  personally had problems with when I was testing, so a reminder was
  helpful for me).

- Broke down some of the long lines on APIPage.cpp to be more readable.

- Added copyright headers where they were missing.

- Changed the paste service display names to the names they are more
  commonly known by.

- Changed the default hastebin base URL to https://hst.sh due to the
  acquisition of https://hastebin.com by Toptal.
 2022-05-21 17:30:09 +01:00
Lenny McLennington
35f71f5793
Support paste.gg, hastebin, and mclo.gs 2022-05-21 17:28:22 +01:00