0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,987 Commits 1 Branch 0 Tags
3585e4764b1bbd6e3e90d322f51ddb9d49a2ceec
Commit Graph

3987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenneth Chew
3585e4764b Add Quilt support for Technic modpacks 2022-05-30 14:14:03 -04:00
Sefa Eyeoglu
d7fad4bd04 Merge pull request #677 from timoreo22/fix-modrinth-link 
Fix modrinth search filters
 2022-05-29 18:36:03 +02:00
timoreo
2746251dcd Fix modrinth search filters 2022-05-29 18:23:34 +02:00
Sefa Eyeoglu
73e46e569f Merge pull request #662 from Scrumplex/chore-bump-1.3.1 2022-05-29 17:05:02 +02:00
flow
4f0f74d201 Merge pull request #675 from muscaln/nix 
Nix updates
 2022-05-29 11:21:47 -03: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
Mustafa Çalışkan
ee00a5d8ee nix: make LTO optional 2022-05-29 17:07:12 +03:00
Sefa Eyeoglu
65d23fc9b9 Merge pull request #671 from Scrumplex/fix-importing-flame-mmc-packs 2022-05-29 15:15:18 +02:00
txtsd
3448d7cb70 Merge pull request #659 from Scrumplex/fix-apikey-tos 
Clarify terms and conditions for API keys
 2022-05-29 18:44:32 +05:30
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
Ezekiel Smith
36d78577e2 Merge pull request #669 from Scrumplex/fix-binary-version-windows 
Set version for Windows binaries
 2022-05-29 22:37:23 +10: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
Sefa Eyeoglu
4a0b0d8735 Merge pull request #653 from muscaln/nix 2022-05-29 13:08:56 +02:00
Sefa Eyeoglu
7b9f67f4b4 Merge pull request #667 from DioEgizio/patch-7 2022-05-29 13:07:25 +02:00
DioEgizio
577f17c916 remove vista support from the manifest 
we don't support qt <5.12 anymore anyways
 2022-05-29 09:45:20 +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
Sefa Eyeoglu
80627b4f89 chore: bump version 2022-05-28 15:42:54 +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
53e0d13142 Merge pull request #625 from ryanccn/light-macos-icon 
Use light background macOS icon
 2022-05-28 15:36:26 +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
timoreo22
f19e27e875 Merge pull request #629 from kthchew/feature/desktop-shortcut 
Add desktop shortcut to Windows installer
 2022-05-28 15:36:12 +02:00
timoreo22
c864046cee Merge pull request #623 from ryanccn/clang-format 
Add a .clang-format
 2022-05-28 15:36:01 +02:00
Ryan Cao
2d68235e55 Merge branch 'develop' into global-jvm-args 2022-05-28 21:15:19 +08:00
Ryan Cao
2be8100e7c Merge branch 'develop' into global-jvm-args 2022-05-28 21:15:00 +08:00
Sefa Eyeoglu
ab3e2562db fix: clarify terms and conditions for API keys 2022-05-28 13:52:22 +02:00
Mustafa Çalışkan
123d6c72e4 nix: fix nix-build 2022-05-28 11:32:16 +03:00
Mustafa Çalışkan
0ea2135aa5 nix: initial support for qt6 2022-05-28 11:32:13 +03: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
Mustafa Çalışkan
0ffe0b6894 nix: move files to nix/ 2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
338156500b nix: override msa id via cmake flag 2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
bfd9bd43c9 flake.lock: update 
• Updated input 'flake-compat':
    'github:edolstra/flake-compat/64a525ee38886ab9028e6f61790de0832aa3ef03' (2022-03-25)
  → 'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/30d3d79b7d3607d56546dd2a6b49e156ba0ec634' (2022-03-25)
  → 'github:nixos/nixpkgs/41cc1d5d9584103be4108c1815c350e07c807036' (2022-05-23)
• Removed input 'quazip'
 2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
283e50e670 nix: use nixpkgs's quazip 2022-05-27 22:56:40 +03: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
flow
88c1e504b0 Merge pull request #618 from DioEgizio/patch-6 
fix appimage not having imageformats
 2022-05-26 20:03:03 -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