CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,958 Commits 10 Branches 30 Tags
09a10a916bad12d3ae0f4dda794747d306959852
Commit Graph

6958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
09a10a916b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:23:42 +03:00
Sefa Eyeoglu
531b58093e Merge pull request #1263 from Trial97/develop 2023-09-28 22:03:14 +02:00
Sefa Eyeoglu
2ff9ef0620 Merge pull request #1363 from Trial97/download_threads 2023-09-28 22:02:57 +02:00
Sefa Eyeoglu
59e565ef96 Merge pull request #1643 from bolli24/develop 2023-09-27 17:34:32 +02:00
TheKodeToad
0406e168e7 Merge pull request #1655 from 0xallie/minecraft-wiki-migration 
Update links to Minecraft Wiki
 2023-09-25 15:26:37 +01:00
alexia
1684cff7ac Update links to Minecraft Wiki 
Minecraft Wiki has officially moved from Fandom to their own wiki.
I updated some links I found in comments.

Signed-off-by: alexia <me@alexia.lol>
 2023-09-25 15:49:12 +02:00
Sefa Eyeoglu
ad9fb7349f Merge pull request #1647 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-24 09:02:43 +02:00
bolli24
14af7044be Update launcher/ui/dialogs/ModUpdateDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: bolli24 <9805065+bolli24@users.noreply.github.com>
 2023-09-24 03:01:47 +02:00
github-actions[bot]
fa65ac3ff7 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nix-filter':
    'github:numtide/nix-filter/ac030bd9ba98e318e1f4c4328d60766ade8ebe8b' (2023-09-04)
  → 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15)
  → 'github:nixos/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
 2023-09-24 00:18:03 +00:00
bolli24
f3c089792a Skip folders when updating mods. 
Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder.

Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com>
 2023-09-22 21:36:19 +02:00
Alexandru Ionut Tripon
81a3ba18bc Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-09-20 18:45:23 +03:00
Sefa Eyeoglu
98bc102f5b Merge pull request #1618 from getchoo/cool-nix-stuff 
filter source in flake & add controller support
 2023-09-20 07:47:22 +02:00
seth
97da8892b9 chore(nix): add meta.mainProgram attribute 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-19 16:41:40 -04:00
seth
97ced1f459 fix(nix): include libusb1 as a runtime dependency 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-19 16:41:37 -04:00
Sefa Eyeoglu
d72c3aba80 Merge pull request #1632 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-17 09:30:30 +02:00
github-actions[bot]
9afe80b0e0 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b200e0df08f80c32974a6108ce431d8a8a5e6547' (2023-09-07)
  → 'github:nixos/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa' (2023-08-17)
  → 'github:cachix/pre-commit-hooks.nix/4f883a76282bc28eb952570afc3d8a1bf6f481d7' (2023-09-10)
 2023-09-17 00:18:04 +00:00
Sefa Eyeoglu
00af385619 Merge pull request #1572 from Trial97/catpacks2 2023-09-16 18:22:13 +02:00
Sefa Eyeoglu
bf6dc10f35 Merge pull request #1605 from TheKodeToad/flame-shaders 2023-09-16 18:20:45 +02:00
seth
4cb424470b Merge pull request #1619 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-10 15:57:03 -04:00
github-actions[bot]
82a0a5bca1 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bfb7dfec93f3b5d7274db109f2990bc889861caf' (2023-09-02)
  → 'github:nixos/nixpkgs/b200e0df08f80c32974a6108ce431d8a8a5e6547' (2023-09-07)
 2023-09-10 00:17:57 +00:00
seth
10192c540b feat(nix): add source filtering 
this - along with garnix - should mostly eliminate unneeded (re)builds

Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:41 -04:00
seth
6aa821df9c refactor(nix): match inputs value in flake 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:39 -04:00
seth
89e434bd5b refactor(nix): don't concat final attr in fixed point 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:33 -04:00
Sefa Eyeoglu
78f8a31cd6 Merge pull request #1613 from PrismLauncher/renovate/actions-cache-3.x 2023-09-08 23:28:03 +02:00
renovate[bot]
e7d6be531f chore(deps): update actions/cache action to v3.3.2 2023-09-08 17:22:12 +00:00
Sefa Eyeoglu
ba3a1b6280 Merge pull request #1606 from PrismLauncher/renovate/actions-checkout-4.x 2023-09-04 17:11:45 +02:00
Sefa Eyeoglu
d483b613b1 Merge pull request #1578 from TheKodeToad/antialiasing 2023-09-04 17:05:29 +02:00
Sefa Eyeoglu
cf599865f6 Merge pull request #1581 from getchoo/old-gcc 2023-09-04 17:04:10 +02:00
Sefa Eyeoglu
546d49e183 Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
renovate[bot]
7dd2530027 chore(deps): update actions/checkout action to v4 2023-09-04 15:02:01 +00:00
Sefa Eyeoglu
e9ecdd05b9 Merge pull request #1574 from Scrumplex/refactor-flake 2023-09-04 17:02:01 +02:00
Sefa Eyeoglu
ad6f15f293 Merge pull request #1604 from PrismLauncher/renovate/cachix-install-nix-action-23.x 2023-09-04 17:01:43 +02:00
TheKodeToad
94c1cd6bcf CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01:00
renovate[bot]
e155844671 chore(deps): update cachix/install-nix-action action to v23 2023-09-04 10:22:11 +00:00
Sefa Eyeoglu
2918d61b16 refactor(nix): use pre-commit flake module 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-09-04 08:53:10 +02:00
seth
bbf4e3b04d refactor(nix): use fixed points over rec 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-03 19:07:39 -04:00
Sefa Eyeoglu
caf925cbad Merge pull request #1601 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-03 09:42:31 +02:00
github-actions[bot]
88f3e19f81 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
  → 'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01)
  → 'github:NixOS/nixpkgs/3e52e76b70d5508f3cec70b882a29199f4d1ee85?dir=lib' (2023-08-31)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/cddebdb60de376c1bdb7a4e6ee3d98355453fe56' (2023-08-27)
  → 'github:nixos/nixpkgs/bfb7dfec93f3b5d7274db109f2990bc889861caf' (2023-09-02)
 2023-09-03 00:17:45 +00:00
TheKodeToad
c01e95b79c Merge pull request #1592 from kumquat-ir/desktop-open-fix 
Fix opening files from curseforge:// and file:// links etc on linux
 2023-09-01 16:13:48 +01:00
kumquat-ir
984e870bca actually it can handle multiple files just fine 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-09-01 10:32:35 -04:00
kumquat-ir
eb66e37b83 fix opening files from curseforge: links on linux 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-09-01 10:29:56 -04:00
Trial97
7e65aea2ef format json 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-31 19:04:41 +03:00
Trial97
6cfe2dbc50 moved catpack data to testdata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-31 17:34:05 +03:00
TheKodeToad
25ce11d85d Merge pull request #1539 from Trial97/refactor_modpack_ux 
Improvements to modpack UX
 2023-08-31 14:58:54 +01:00
Sefa Eyeoglu
707da5a25a fix(nix): include udev dependency 
See https://github.com/NixOS/nixpkgs/pull/252425

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-30 21:59:42 +02:00
seth
584e800279 fix: remove -Wextra-semi 
this flag is unavailable on gcc versions < 8. we could detect the
version of the compiler here, but i don't think we lose much in this
flags removal and this is a simpler option

Signed-off-by: seth <getchoo@tuta.io>
 2023-08-30 11:14:49 -04:00
TheKodeToad
f23a8e4b4b Enable antialiasing for mod and pack icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 23:34:19 +01:00
Sefa Eyeoglu
b83fdbd1b7 Merge pull request #1575 from TheKodeToad/more-pack-export-fixes 2023-08-28 22:18:58 +02:00
TheKodeToad
0e67686295 Hide index folder in pack export dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:25:07 +01:00
TheKodeToad
e98bca4749 Fix cancelling pack save 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:09:40 +01:00