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

4042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sefa Eyeoglu
940455f81c Merge pull request #645 from PolyMC/revert-609-feature/fix-blocked-modpacks 2022-05-26 19:20:39 +02:00
Ryan Cao
f541ea659c better new icon 2022-05-26 18:16:32 +08: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
Sefa Eyeoglu
7f73e57c67 Merge pull request #630 from jamierocks/h-atl-depends 2022-05-25 14:52:34 +02:00
Ryan Cao
e50ec31351 fix 2022-05-25 14:44:47 +08:00
Ryan Cao
a28fa219d7 fix indent width 2022-05-25 14:21:09 +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
Sefa Eyeoglu
e8b7e70ec9 Merge pull request #637 from byquanton/patch-1 2022-05-24 20:53:19 +02:00
byquanton
67c5aa0be9 Update org.polymc.PolyMC.metainfo.xml.in 
Should fix Flatpak/Flathub build
 2022-05-24 17:44:23 +02:00
Ryan Cao
17b30b2ae2 clean up .clang-format 2022-05-24 22:37:00 +08:00
Sefa Eyeoglu
3cc26b15a1 Merge pull request #631 from kthchew/fix/quazip-warn 2022-05-24 10:25:04 +02:00
Kenneth Chew
fce5c57548 Silence CMake QuaZip not found warnings 
These are expected most of the time, and thus just noise.
 2022-05-23 17:27:35 -04: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
Kenneth Chew
997bf91442 Add desktop shortcut to Windows installer 2022-05-23 14:15:49 -04: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
flow
59d628208b feat: allow trying to use multiple hash types 2022-05-23 14:43:31 -03:00
flow
5c5699bba5 refactor: move individual pack version parsing to its own function 2022-05-23 14:43:31 -03:00