AstralTransRocketries/FjordLauncher
1
0
Fork 0
mirror of https://github.com/unmojang/FjordLauncher.git synced 2025-08-03 18:27:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,890 Commits 14 Branches 54 Tags
Commit Graph

7890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Goode
5e93cff2d0 clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-08-11 22:06:38 -04:00
Evan Goode
5345b0b682 nix: sync changes from nixpkgs 
Brings in changes from the Prism Launcher derivation(s) in nixpkgs, notably
from https://github.com/NixOS/nixpkgs/pull/321851 and
https://github.com/NixOS/nixpkgs/pull/303880

Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-08-11 22:05:44 -04:00
Evan Goode
17da1f266c Oops, guess it's easier to not rename the qrc file 2024-07-20 21:15:02 -04:00
Evan Goode
d080962acf Use fjordlauncher icns and qrc icons 2024-07-20 20:37:43 -04:00
Evan Goode
a7cf31fd95 Recognize neoforge as a modloader in FTB instances 
Resolves https://github.com/unmojang/FjordLauncher/issues/17
 2024-07-02 19:18:25 -04:00
Evan Goode
27774b5143 Update flake.lock 2024-07-02 19:18:14 -04:00
Evan Goode
85971e99ab README: fjordlauncher MPR and AUR pkgs 2024-06-29 18:52:51 -04:00
Evan Goode
6bf88b7bfc Don't use archive.org for CurseForge launcher 8.4.1 2024-06-28 12:16:13 -04:00
Evan Goode
f4b7872823 Add Gentoo installation instructions 2024-06-25 18:21:12 -04:00
Evan Goode
d1b018e8d8 Fetch CurseForge API key from Linux app, not macOS 8.4 2024-06-25 13:05:35 -04:00
Evan Goode
c3bdc0f79b
Merge pull request #15 from unmojang/evan-goode/disable-updater 
Disable updater, news
 2024-06-24 00:10:14 -04:00
Evan Goode
b8f9d18e26 Remove news toolbar 2024-06-23 23:51:52 -04:00
Evan Goode
1b98be00f6 Disable updater, users should use package managers 2024-06-23 23:51:46 -04:00
Evan Goode
9a5edf7d41 We have a client ID, Fjord is usable 2024-06-23 23:46:11 -04:00
Evan Goode
bf997aa117
Merge pull request #14 from unmojang/evan-goode/msa 
Use Nintendo Switch client ID
 2024-06-23 23:16:59 -04:00
Evan Goode
5e9b3c2baa
Merge pull request #13 from unmojang/evan-goode/curseforge 
Fetch CurseForge API key from official files
 2024-06-23 22:58:01 -04:00
Evan Goode
62f87c423f Use Nintendo Switch client ID 
Reputable projects such as prismarine-auth and azalea-auth hardcode the
Nintendo Switch client ID instead of their own custom Azure application,
so we should be fine to go ahead and do the same.

Unfortunately, client IDs created for custom Azure applications, such as
Prism Launcher's client ID, will no longer work with Fjord Launcher, so
users who manually supplied a client ID will need to clear theirs.
 2024-06-23 22:57:31 -04:00
Evan Goode
810ab868b3 Fetch CurseForge API key from official files 
Instead of fetching the CurseForge API key from PolyMC's server, fetch
it from the files of the CurseForge app, mirrored by archive.org. We can
do this without downloading the entire 100MiB+ application by
range-requesting the specific DEFLATE block where the key is and
decompressing just that block.
 2024-06-23 22:35:06 -04:00
Evan Goode
51da756e19 Merge remote-tracking branch 'prismlauncher/release-8.x' into develop 2024-06-23 11:34:11 -04:00
Alexandru Ionut Tripon
a58f7bf240
Merge pull request #2537 from PrismLauncher/backport-2534-to-release-8.x 
[Backport release-8.x] fix: update datapack and resourcepack versions
 2024-06-18 21:07:06 +03:00
DioEgizio
81ea7cef5a fix: add more datapack formats and clang-format it 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit a63842c727eb3f4c2b02b6392f5f66cfa6832206)
 2024-06-18 18:06:49 +00:00
DioEgizio
0df7a8dd3c chore: clang-format ResourcePack.cpp 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit c07e791d7fdc5899b01945df68e4e347256e975f)
 2024-06-18 18:06:49 +00:00
DioEgizio
c254a8961c fix: update datapack and resourcepack versions 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 6af52c97c26aba0bd2c2375cb7e40640bd97c238)
 2024-06-18 18:06:49 +00:00
Alexandru Ionut Tripon
2cd69664ab
Merge pull request #2535 from PrismLauncher/backport-2531-to-release-8.x 
[Backport release-8.x] relax fat FS filename restrictions
 2024-06-18 12:52:00 +03:00
Trial97
0ea9190d25 relax fat FS filename restrictions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a587de8553527b771bec22cb9ef8b8044a6e673b)
 2024-06-18 09:51:34 +00:00
Alexandru Ionut Tripon
580e38a985
Merge pull request #2510 from PrismLauncher/backport-2509-to-release-8.x 
[Backport release-8.x] fix(flatpak): disable docs for glfw
 2024-06-14 08:59:31 +03:00
Sefa Eyeoglu
8d7f916f80 fix(flatpak): disable docs for glfw 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 52338f0e884bd4f7f22cca6ae34ef6dd06f4374b)
 2024-06-14 05:58:04 +00:00
Alexandru Ionut Tripon
658244574a
Merge pull request #2508 from PrismLauncher/backport-2405-to-release-8.x 
[Backport release-8.x] Fix portable if manifest is missing
 2024-06-13 19:16:39 +03:00
Alexandru Ionut Tripon
119295c87f Update launcher/updater/prismupdater/PrismUpdater.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit ab5f628453de6fc9301f73413027846451a78bd0)
 2024-06-13 16:16:28 +00:00
Alexandru Ionut Tripon
263b167aae Update launcher/updater/prismupdater/PrismUpdater.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 051e7886837090ba62ad81b6f835372649a93b69)
 2024-06-13 16:16:28 +00:00
Trial97
56b64edc44 Fix portable if manifest is missing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c15f6fcd2a8a380b59f7f49cae5010cc93efd386)
 2024-06-13 16:16:27 +00:00
Alexandru Ionut Tripon
1a51cb76ad
Merge pull request #2507 from PrismLauncher/backport-2439-to-release-8.x 
[Backport release-8.x] fix vanilla technic modpacks
 2024-06-13 19:16:21 +03:00
Trial97
e475f4ed36 fix vanilla technic modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f4f0a61bf23d5c40fa4310c050e4c39e6a8ce746)
 2024-06-13 16:15:57 +00:00
Alexandru Ionut Tripon
0a27d3859c
Merge pull request #2506 from PrismLauncher/backport-2499-to-release-8.x 
[Backport release-8.x] update imgur upload
 2024-06-12 23:45:55 +03:00
Trial97
cd6f061335 update imgur upload 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c1c182fd0c9051a202a0cc7c1d471b9de6997697)
 2024-06-12 20:45:31 +00:00
Alexandru Ionut Tripon
ab6c5c122e
Merge pull request #2497 from PrismLauncher/backport-2425-to-release-8.x 
[Backport release-8.x] improve invalid path name
 2024-06-10 12:13:25 +03:00
Trial97
317b127330 add some comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit d1286bbe909bb51b74ab266ed190682d38e29776)
 2024-06-10 09:11:36 +00:00
Trial97
354f4ef3d8 fix CI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 44a16c1ca1c340d3f7641fa12b0ffe59cdf92992)
 2024-06-10 09:11:36 +00:00
Trial97
8984cd5f66 improve invalid path name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a7a1b2876569704e842d942976ce39061ee5e899)
 2024-06-10 09:11:36 +00:00
Trial97
5934849d87 removed + from bad chars in filenames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 428889a68d67aa4e110b7de9346474e27a4f3ab9)
 2024-06-10 09:11:36 +00:00
Alexandru Ionut Tripon
786a452f28
Merge pull request #2492 from PrismLauncher/backport-2166-to-release-8.x 
[Backport release-8.x] Updated ftb app import instance detection
 2024-06-10 00:46:22 +03:00
Trial97
62a2217291 Added the new ftb settings path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1c3c9d24573d4f3cf25580129d3611f5082dcc29)
 2024-06-09 21:45:37 +00:00
Trial97
1af7126582 Removed static path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 27e76d0dcb69d0f34fa64fca89964b231c194387)
 2024-06-09 21:45:37 +00:00
Trial97
4d0e4f434f Updated ftb app import instance detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 344398f2382b879689aef7d4d02785faf0d9bff8)
 2024-06-09 21:45:37 +00:00
Alexandru Ionut Tripon
af936353b1
Merge pull request #2490 from PrismLauncher/backport-1032-to-release-8.x 
[Backport release-8.x] refactor: shorten desktop entry comment field
 2024-06-09 21:03:18 +03:00
deadmeu
c728f43533 refactor: shorten desktop entry comment field 
Signed-off-by: deadmeu <dmu@duck.com>
(cherry picked from commit ac223a29ef61643a2313914d180801ce6dcae139)
 2024-06-09 17:59:36 +00:00
Alexandru Ionut Tripon
bdf3497028
Merge pull request #2489 from Trial97/backport-2474-to-release-8.x 
Backport 2474 to release 8.x
 2024-06-09 16:37:40 +03:00
coolguy1842
9c7d1e80e3
DCO Remediation Commit for coolguy1842 <kian.goslett@protonmail.com> 
I, coolguy1842 <kian.goslett@protonmail.com>, hereby add my Signed-off-by to this commit: 448ded2387025b11d122d51b0abd907bec0452aa

Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
(cherry picked from commit aeb174fc550b16d8e01f8fff58cc9f4bceba5c56)
 2024-06-09 16:34:57 +03:00
coolguy1842
616556ea7b
fix formatting 
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
(cherry picked from commit 71b2c4b1fd0a45e2325d09ca93b0f441ee1b7a50)
 2024-06-09 16:34:32 +03:00
coolguy1842
d23fa73f52
simple fix for resizing too small causing an index out of range crash 
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com>
(cherry picked from commit 448ded2387025b11d122d51b0abd907bec0452aa)
 2024-06-09 16:34:32 +03:00