AstralTransRocketries/FjordLauncher
1
0
Fork 0
mirror of https://github.com/unmojang/FjordLauncher.git synced 2025-09-12 16:55:13 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,900 Commits 15 Branches 55 Tags
Commit Graph

3425 Commits

Author SHA1 Message Date
Evan Goode
5be25307bb
Merge pull request #22 from unmojang/evan-goode/nix-sync 
nix: sync changes from nixpkgs
 2024-08-11 22:49:56 -04:00
Evan Goode
5e93cff2d0 clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-08-11 22:06:38 -04:00
Evan Goode
f0140ee56b Allow using custom authlib-injector JAR 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-28 23:57:14 -04:00
Evan Goode
e1041ddc61 Add tests for MANIFEST.MF parser 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-27 01:00:42 -04:00
Evan Goode
c7de09bcc6 Implement MANIFEST.MF parser 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-27 00:49:51 -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
6bf88b7bfc Don't use archive.org for CurseForge launcher 2024-06-28 12:16:13 -04:00
Evan Goode
d1b018e8d8 Fetch CurseForge API key from Linux app, not macOS 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
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
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
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
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
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
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
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
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
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
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
Fourmisain
dda7e3073d please the pre-commit check 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit 23095b70a4cead08e8b0e38bdf62d4d14482c41d)
 2024-06-07 19:17:34 +00:00
Fourmisain
a800b86689 detect IBM Semeru Certified Edition on linux 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit dbe4adc034a578484a6c4b7ba8d21c7c4d0bbb56)
 2024-06-07 19:17:34 +00:00
Fourmisain
cfeb72450e fix x86 detection on 64 bit windows 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit af157c1613c697cd0cbff78abe28d6e958372775)
 2024-06-07 19:17:34 +00:00
Fourmisain
67e0b68cd5 add detection for IBM Semeru Java runtime 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit 08918be11eaefd708634bf75ea6f688f0c3f3df9)
 2024-06-07 19:17:34 +00:00
Trial97
be2ecff97c fix qt5 build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 83883cadf9dd4e71db257821e0c46ef6421021eb)
 2024-06-07 06:37:36 +00:00
Trial97
a053a4040c force initial size for the Add Instance dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f3509181869a789cb413f6704e276f58e847dcb0)
 2024-06-07 06:37:36 +00:00
Trial97
975b0b5761 fix double borders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c9c39b8203bbfaf2205847e80a979baaf6c007a7)
 2024-06-07 06:37:36 +00:00
Trial97
446740ba4f Made Custom New Instance scrollable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f7120a4f6ff64e8e28096a51f5d99dd2565471bc)
 2024-06-07 06:37:36 +00:00
Trial97
865fd91038 replace auth server ping 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b7008d2880091db64587362a3bb72fb51541be5f)
 2024-06-06 21:19:04 +00:00
SabrePenguin
fa2c2a7c85
Made Regex static and const, removed dist 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
f43873a8ba
Regex correction 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
6a49f513d8
Fixed more clang formatting 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
5d25e21719
Fixing CI format issues 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
da2a67227a
Added patch to all setHtml calls 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
875c6bbada
Switched </ul> to a Regex expression 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
401de52f61
Moved html patch to StringUtils 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
0c84d58915
Fix img tag allowing img.... 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
096028f1a6
Pleasing the format check 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00