diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2024-06-13 19:08:05 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2024-06-13 19:08:05 +0300 |
| commit | b3fee53e50b181b22639eac9d7874c820ac0f2af (patch) | |
| tree | 5aa872e9a216a9938baaf300a7964bdcde962aee /meta | |
| parent | e233614c5414272409f523b9c3506f828a957fd9 (diff) | |
| parent | 69ca5a1ee35f88da45987821071cb35cd6ad1fd5 (diff) | |
| download | Project-Tick-b3fee53e50b181b22639eac9d7874c820ac0f2af.tar.gz Project-Tick-b3fee53e50b181b22639eac9d7874c820ac0f2af.zip | |
Merge branch 'main' of https://github.com/PrismLauncher/meta into javas
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/common/mojang-minecraft-experiments.json | 4 | ||||
| -rwxr-xr-x | meta/run/generate_mojang.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/common/mojang-minecraft-experiments.json b/meta/common/mojang-minecraft-experiments.json index 94b50c1a60..02572c78c7 100644 --- a/meta/common/mojang-minecraft-experiments.json +++ b/meta/common/mojang-minecraft-experiments.json @@ -53,7 +53,7 @@ { "id": "1_16_combat-4", "wiki": "https://minecraft.wiki/w/Java_Edition_Combat_Test_8", - "url": "https://cdn.discordapp.com/attachments/369990015096455168/947864881028272198/1_16_combat-4.zip" + "url": "https://archive.org/download/1-16-combat-4_202404/1_16_combat-4.zip" }, { "id": "1_16_combat-3", @@ -101,4 +101,4 @@ "url": "https://launcher.mojang.com/experiments/combat/610f5c9874ba8926d5ae1bcce647e5f0e6e7c889/1_14_combat-212796.zip" } ] -}
\ No newline at end of file +} diff --git a/meta/run/generate_mojang.py b/meta/run/generate_mojang.py index e0068c24ec..6a0d0d9b9e 100755 --- a/meta/run/generate_mojang.py +++ b/meta/run/generate_mojang.py @@ -90,8 +90,7 @@ LOG4J_HASHES = { # We want versions that contain natives for all platforms. If there are multiple, pick the latest one # LWJGL versions we want PASS_VARIANTS = [ - # TODO: needs arm64 for Linux? - "8a9b08f11271eb4de3b50e5d069949500b2c7bc1", # 3.3.3 (2024-04-03 11:49:39+00:00) + "73974b3af2afeb5b272ffbadcd7963014387c84f", # 3.3.3 (2024-05-22 16:25:41+00:00) "765b4ab443051d286bdbb1c19cd7dc86b0792dce", # 3.3.2 (2024-01-17 13:19:20+00:00) "54c4fb1d6a96ac3007c947bf310c8bcf94a862be", # 3.3.1 (2023-04-20 11:55:19+00:00) split natives, with WoA natives "ea4973ebc9eadf059f30f0958c89f330898bff51", # 3.2.2 (2019-07-04 14:41:05+00:00) will be patched, missing tinyfd @@ -107,6 +106,8 @@ PASS_VARIANTS = [ # LWJGL versions we def. don't want! BAD_VARIANTS = [ + "6f32ef730d05562ede7db0b845b72ea16dd239d5", # 3.3.3 (2024-05-29 12:04:43+00:00) missing os rule for freetype natives-macos-patch + "8a9b08f11271eb4de3b50e5d069949500b2c7bc1", # 3.3.3 (2024-04-03 11:49:39+00:00) seems to have a broken libfreetype for macOS x86_64 "79bde9e46e9ad9accebda11e8293ed08d80dbdc3", # 3.3.2 (2023-08-30 11:24:35+00:00) does not have lwjgl-freetype "8836c419f90f69a278b97d945a34af165c24ff60", # 3.3.1 (2022-05-18 13:51:54+00:00) split natives, with workaround, replaced by 23w26a "3c624b94c06dbc4abae08fe6156d74abe4a2cca5", # 3.3.1 (2022-05-04 14:41:35+00:00) we already have a nice 3.3.1 |