Commit Graph

3980 Commits

Author SHA1 Message Date
adf1e1982a fix: remove unnecessary translation (#674) 2022-05-29 16:14:01 +02:00
f5405e835e Merge pull request #624 from ryanccn/global-jvm-args
Make global JVM arguments multi-line
2022-05-29 16:10:55 +02:00
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
65d23fc9b9 Merge pull request #671 from Scrumplex/fix-importing-flame-mmc-packs 2022-05-29 15:15:18 +02:00
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
db1abb02d6 Merge pull request #661 from flowln/wow_curseforge_is_being_uncompetitive_im_so_surprised 2022-05-29 14:42:49 +02:00
36d78577e2 Merge pull request #669 from Scrumplex/fix-binary-version-windows
Set version for Windows binaries
2022-05-29 22:37:23 +10:00
20832682ef Update launcher/ui/pages/global/JavaPage.cpp
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-05-29 20:35:57 +08:00
8e6c592ad9 fix: add version to Legacy FTB packs 2022-05-29 14:28:54 +02:00
0b3115997a fix: fix importing Flame/MMC packs 2022-05-29 14:16:13 +02:00
b07c5982e1 fix: set version for Windows binaries 2022-05-29 13:09:13 +02:00
4a0b0d8735 Merge pull request #653 from muscaln/nix 2022-05-29 13:08:56 +02:00
7b9f67f4b4 Merge pull request #667 from DioEgizio/patch-7 2022-05-29 13:07:25 +02:00
577f17c916 remove vista support from the manifest
we don't support qt <5.12 anymore anyways
2022-05-29 09:45:20 +02:00
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
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
abd240468e clean up validateDownloadUrl 2022-05-28 17:11:55 -03:00
b5e00027d1 change: add 'gitlab.com' to whitelisted Modrinth modpack urls 2022-05-28 17:01:58 -03:00
1698554024 debug: add non-translated debug logging for 'non-whitelisted url' fails 2022-05-28 17:01:57 -03:00
f4604bbf79 change: update whitelisted hosts in Modrinth modpacks 2022-05-28 17:01:52 -03:00
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
fcbe233fdb Merge pull request #651 from Scrumplex/fix-mnemonic-apipage
Fix mnemonics in APIPage
2022-05-28 15:46:38 +02:00
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
83078cd49a Merge pull request #657 from JJL772/fix/misc-fixes
Fix crash when aborting instance import
2022-05-28 15:38:36 +02:00
53e0d13142 Merge pull request #625 from ryanccn/light-macos-icon
Use light background macOS icon
2022-05-28 15:36:26 +02:00
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
f19e27e875 Merge pull request #629 from kthchew/feature/desktop-shortcut
Add desktop shortcut to Windows installer
2022-05-28 15:36:12 +02:00
c864046cee Merge pull request #623 from ryanccn/clang-format
Add a .clang-format
2022-05-28 15:36:01 +02:00
2d68235e55 Merge branch 'develop' into global-jvm-args 2022-05-28 21:15:19 +08:00
2be8100e7c Merge branch 'develop' into global-jvm-args 2022-05-28 21:15:00 +08:00
ab3e2562db fix: clarify terms and conditions for API keys 2022-05-28 13:52:22 +02:00
123d6c72e4 nix: fix nix-build 2022-05-28 11:32:16 +03:00
0ea2135aa5 nix: initial support for qt6 2022-05-28 11:32:13 +03:00
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
0ffe0b6894 nix: move files to nix/ 2022-05-27 22:56:42 +03:00
338156500b nix: override msa id via cmake flag 2022-05-27 22:56:42 +03:00
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
283e50e670 nix: use nixpkgs's quazip 2022-05-27 22:56:40 +03:00
6fb5bb6a5e fix: fix mnemonics in APIPage 2022-05-27 14:50:06 +02:00
5d3bef32ca fix: use absolute path when installing icons 2022-05-27 09:15:32 -03:00
3ff26d5cfe Merge pull request #642 from ryanccn/metaserver-show-default
Show default metaserver in settings
2022-05-26 20:09:07 -03:00
88c1e504b0 Merge pull request #618 from DioEgizio/patch-6
fix appimage not having imageformats
2022-05-26 20:03:03 -03:00
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
940455f81c Merge pull request #645 from PolyMC/revert-609-feature/fix-blocked-modpacks 2022-05-26 19:20:39 +02:00
f541ea659c better new icon 2022-05-26 18:16:32 +08:00
938cae1130 revert: remove CurseForge workaround for packs too
Partial revert. Handles missing download URLs.
2022-05-25 23:14:13 +02:00
7f73e57c67 Merge pull request #630 from jamierocks/h-atl-depends 2022-05-25 14:52:34 +02:00
e50ec31351 fix 2022-05-25 14:44:47 +08:00
a28fa219d7 fix indent width 2022-05-25 14:21:09 +08:00
8a1ba03bcb show default metaserver 2022-05-25 11:46:15 +08:00