Commit Graph

105 Commits

Author SHA1 Message Date
Evan Goode
07dac3127a Use api.feed-the-beast.com, not modpacks.ch 2025-02-25 22:25:17 -06:00
Luna
d08118b05a restore original versioning without causing nix breakage(?) 2024-11-29 08:31:50 -06:00
Luna
72a8ff070e Revert "Remove patch system as updater breaks."
This reverts commit fec49be639.
2024-11-29 08:31:27 -06:00
Luna
6f8fc48839 Revert "fix nix builds again(?)"
This reverts commit 25d90beb12.
2024-11-29 08:31:13 -06:00
Luna
25d90beb12 fix nix builds again(?) 2024-10-30 03:48:52 -05:00
Luna
fec49be639 Remove patch system as updater breaks. 2024-10-30 00:11:37 -05:00
Evan Goode
da9c085a06 Clean up some lingering differences from upstream 2024-10-26 17:52:25 -04:00
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
2024-10-25 15:34:57 -04:00
Trial97
b4ecb38ae5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields 2024-09-16 20:06:18 +03:00
Trial97
e53a5b3eca
replace TRANSLATIONS_BASE_URL with TRANSLATION_FILES_URL
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-16 17:51:35 +03:00
Alexandru Ionut Tripon
2e537e55de
Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-09-16 17:47:58 +03:00
Alexandru Ionut Tripon
db3c7d01fd
Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-09-16 16:36:05 +03:00
Trial97
ca6b62c773
move some URLs in cmake
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-16 15:51:51 +03:00
Trial97
2c2defb266
add Launcher_ prefix to enable java option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-16 14:30:23 +03:00
Evan Goode
7aeffa561f Add patch version number 2024-08-20 19:38:35 -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
Trial97
ca369ac2b0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 19:52:37 +03:00
Trial97
865fd91038 replace auth server ping
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b7008d2880)
2024-06-06 21:19:04 +00:00
Trial97
b7008d2880
replace auth server ping
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-06 00:09:08 +03:00
Trial97
ef4e5eb3cf
fixed java build option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-18 19:15:36 +02:00
Trial97
9120848278
Made java downloader as a build option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-06 19:33:14 +02:00
Evan Goode
9430026192 Merge tag '8.0' into unmojang-8.0
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - https://github.com/PrismLauncher/PrismLauncher/pull/1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658,
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - https://github.com/PrismLauncher/PrismLauncher/pull/1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  https://github.com/PrismLauncher/PrismLauncher/pull/1547,
  https://github.com/PrismLauncher/meta/pull/23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
2023-11-15 14:37:14 -05:00
Evan Goode
9d442a0348 authlib-injector
* 'Custom Yggdrasil' AccountType

Signed-off-by: Evan Goode <mail@evangoo.de>

* Allow multiple accounts with the same player UUID

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use correct services server URL for SkinDelete

Signed-off-by: Evan Goode <mail@evangoo.de>

* Correctly use CustomYggdrasilRefresh, add warning message

Signed-off-by: Evan Goode <mail@evangoo.de>

* Custom Yggdrasil: Readability fixes

Also made the MinecraftEntitlement for Custom Yggdrasil accounts work
just like offline accounts---instead of checking the reply from the auth
server, Custom Yggdrasil accounts are granted canPlayMinecraft and
ownsMinecraft when they are created, in MinecraftAccount.cpp.

Signed-off-by: Evan Goode <mail@evangoo.de>

* Custom Yggdrasil: Add extra confirmation dialog

Signed-off-by: Evan Goode <mail@evangoo.de>

* Add install authlib-injector button

Signed-off-by: Evan Goode <mail@evangoo.de>

* authlib-injector accounts

Signed-off-by: Evan Goode <mail@evangoo.de>

* Suggest installing authlib-injector when needed

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use Unmojang metadata

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use std::string for MANAGED_AGENTS, not QString

---------

Signed-off-by: Evan Goode <mail@evangoo.de>

Resolve X-Authlib-Injector-API-Location

Signed-off-by: Evan Goode <mail@evangoo.de>

Prefetch authlib-injector metadata

Resolves https://github.com/unmojang/PrismLauncher/issues/4

See https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US#%E9%85%8D%E7%BD%AE%E9%A2%84%E8%8E%B7%E5%8F%96

Signed-off-by: Evan Goode <mail@evangoo.de>

drag-and-drop authlib-injector URL, clang-format

Resolves https://github.com/unmojang/PrismLauncher/issues/2

Signed-off-by: Evan Goode <mail@evangoo.de>
2023-09-04 19:00:18 +01:00
fn2006
b6904ba50a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-09-04 00:39:20 +01:00
TheKodeToad
befa3baa6a
Merge branch 'develop' into feat/launcher-updater
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-30 11:47:33 +01:00
Trial97
1faf741004
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 13:29:42 +03:00
Sefa Eyeoglu
83aa0062c7
feat: add custom native library path settings
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15 10:51:21 +02:00
fn2006
847430b113 Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-10 10:09:08 +01:00
Sefa Eyeoglu
1d638e018a
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-04 19:41:47 +02:00
Sefa Eyeoglu
1d468ac35a
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:35 +02:00
Rachel Powers
7c1a465ec9
Merge branch 'develop' into feat/launcher-updater
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30 14:19:31 -07:00
Sefa Eyeoglu
3c5ec5d967 chore: remove obsolete macOS warning
We don't support that macOS version. This check also never worked, as we
never set the platform to that value.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0aaec9ae4f)
2023-07-16 21:16:11 +00:00
flow
1d75c58d6c fix: hide git commit when the build doesn't have git stuff support
This fixes the Git commit string being "GITDIR-NOTFOUND" on the About
page when building a package from the bundled source archive.

Signed-off-by: flow <flowlnlnln@gmail.com>
(cherry picked from commit 2d00a727f6)
2023-07-16 17:49:15 +00:00
Rachel Powers
e38adf6006
fix(updater) fixes form first round of testing
- reset update time after check

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-29 14:01:11 -07:00
Rachel Powers
4123343130
no need for pre release tag
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-28 00:25:09 -07:00
Rachel Powers
cb35fb8d0e
add optional pre-release tag
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-27 20:37:42 -07:00
Rachel Powers
6f7454243e
fix: prep for changes in #1276
- sign updater

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-26 23:25:07 -07:00
Sefa Eyeoglu
0aaec9ae4f
chore: remove obsolete macOS warning
We don't support that macOS version. This check also never worked, as we
never set the platform to that value.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-26 11:53:48 +02:00
Rachel Powers
e099a3f7e8
feat(updater): packaging - know the updater git repo
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-25 13:47:32 -07:00
flow
2d00a727f6
fix: hide git commit when the build doesn't have git stuff support
This fixes the Git commit string being "GITDIR-NOTFOUND" on the About
page when building a package from the bundled source archive.

Signed-off-by: flow <flowlnlnln@gmail.com>
2023-06-17 11:09:05 -03:00
fn2006
cc85b44ff2 Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-09 13:35:03 +01:00
TheKodeToad
b8e0c8ebc6 Boring changes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-04-17 10:16:03 +01:00
TheKodeToad
871d647c93 Use local metadata
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-04-06 19:18:36 +01:00
fn2006
1821081521 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-02-05 22:11:58 +00:00
seth
f932ffcc5b
fix: check if GIT_REFSPEC is empty
Signed-off-by: seth <getchoo@tuta.io>
2022-12-23 20:50:08 -05:00
seth
01139c3b50
fix: assume builds are stable when git isn't installed
Signed-off-by: seth <getchoo@tuta.io>
2022-12-22 19:25:04 -05:00
fn2006
979d33ab83
Use PolyMC's CurseForge workaround (#47)
* Curseforge workarounds

This should allow people to use Curseforge without having to manually
paste a working key into the settings or change the user agent.

Signed-off-by: Lenny McLennington <lenny@sneed.church>

* chore: update cf api key api url

Sascha says the domain name we're using is not gonna be renewed, so I'm
switching it to a domain controlled by me instead so that this won't be
a problem in the future.

Signed-off-by: Lenny McLennington <lenny@sneed.church>

* feat: add ability to disable cf api key fetching

by setting the cf api key api url to a blank string

Signed-off-by: Lenny McLennington <lenny@sneed.church>

* don't ask before fetching key

* change polymc mention to pollymc

Signed-off-by: Lenny McLennington <lenny@sneed.church>
Co-authored-by: Lenny McLennington <lenny@sneed.church>
2022-12-20 22:42:34 +00:00
flow
527c1113f1
feat(ManagedPackPage): add Flame UI
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-06 17:00:33 -03:00
fn2006
b142a6da5b fix hardcoded svg
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
2022-10-29 16:42:37 +01:00