Merge branch 'PrismLauncher:master' into master

ibeticanhandlethis · May 3, 2024 · c74a107 · c74a107
2 parents ffe7990 + 5803c23
commit c74a107
Show file tree

Hide file tree

Showing 212 changed files with 97,260 additions and 569 deletions.
diff --git a/index.json b/index.json
@@ -8,27 +8,27 @@
         },
         {
             "name": "Fabric Loader",
-            "sha256": "08723fc46ba7ed8a2260225970bbe5a20688529f6cafcd9abe4be213ed61a3d2",
+            "sha256": "5fba46f0e6ad195c631ce062ed9e269190e667b9c2c1d197a95fe3a7f094b70a",
             "uid": "net.fabricmc.fabric-loader"
         },
         {
             "name": "Intermediary Mappings",
-            "sha256": "01fc252e759c46ec3ff9757e27dcb0767b51be2cad384a65bceba1079b08cc27",
+            "sha256": "ef9511961887eafa929719aaf803e601d37e189fa8419b3f4517fbacf6239f4c",
             "uid": "net.fabricmc.intermediary"
         },
         {
             "name": "Minecraft",
-            "sha256": "01fc0321dacbcfc30002ab67d4e7f124bbe5a4c92b701b960653380745e87368",
+            "sha256": "eabaa1c62118250258487a941c982feb7d25f21e060f6aae9857c5235d5df2a7",
             "uid": "net.minecraft"
         },
         {
             "name": "Forge",
-            "sha256": "fc40adbed98e32ce62152c68d4e1b0245072b3bb51000b88202d23d5eca47a73",
+            "sha256": "47c25fd8194eb33a550dc2211a760e5189a105211d980db9644095c3584f993f",
             "uid": "net.minecraftforge"
         },
         {
             "name": "NeoForge",
-            "sha256": "efd189222ee26a5892ce1a835ea58a2a403a74ef9c0b6bfeecb0dfe33f716c9b",
+            "sha256": "c67db6a6ee4274385e5ba64cfffd3b33ae5d93be20f0cbe3d719c3512ee04998",
             "uid": "net.neoforged"
         },
         {
@@ -43,7 +43,7 @@
         },
         {
             "name": "Quilt Loader",
-            "sha256": "f7ca20984978f54d88ca5fdd6ddcb5284b544d1ff813cd201577f16ab4c03f38",
+            "sha256": "7f08176c2575aed248d526b734eb5b452f814a8a2411a052e1595dd74f05c9ec",
             "uid": "org.quiltmc.quilt-loader"
         }
     ]

diff --git a/net.fabricmc.fabric-loader/0.15.11.json b/net.fabricmc.fabric-loader/0.15.11.json
@@ -0,0 +1,45 @@
+{
+    "formatVersion": 1,
+    "libraries": [
+        {
+            "name": "org.ow2.asm:asm:9.6",
+            "url": "https://maven.fabricmc.net/"
+        },
+        {
+            "name": "org.ow2.asm:asm-analysis:9.6",
+            "url": "https://maven.fabricmc.net/"
+        },
+        {
+            "name": "org.ow2.asm:asm-commons:9.6",
+            "url": "https://maven.fabricmc.net/"
+        },
+        {
+            "name": "org.ow2.asm:asm-tree:9.6",
+            "url": "https://maven.fabricmc.net/"
+        },
+        {
+            "name": "org.ow2.asm:asm-util:9.6",
+            "url": "https://maven.fabricmc.net/"
+        },
+        {
+            "name": "net.fabricmc:sponge-mixin:0.13.3+mixin.0.8.5",
+            "url": "https://maven.fabricmc.net/"
+        },
+        {
+            "name": "net.fabricmc:fabric-loader:0.15.11",
+            "url": "https://maven.fabricmc.net"
+        }
+    ],
+    "mainClass": "net.fabricmc.loader.impl.launch.knot.KnotClient",
+    "name": "Fabric Loader",
+    "order": 10,
+    "releaseTime": "2024-05-03T13:26:12+00:00",
+    "requires": [
+        {
+            "uid": "net.fabricmc.intermediary"
+        }
+    ],
+    "type": "release",
+    "uid": "net.fabricmc.fabric-loader",
+    "version": "0.15.11"
+}
diff --git a/net.fabricmc.fabric-loader/index.json b/net.fabricmc.fabric-loader/index.json
@@ -5,6 +5,18 @@
     "versions": [
         {
             "recommended": true,
+            "releaseTime": "2024-05-03T13:26:12+00:00",
+            "requires": [
+                {
+                    "uid": "net.fabricmc.intermediary"
+                }
+            ],
+            "sha256": "424f3b2447ccc6c4c9510c980ff89ed4e4fd64015d05e5bac03f911ca23ae453",
+            "type": "release",
+            "version": "0.15.11"
+        },
+        {
+            "recommended": false,
             "releaseTime": "2024-04-12T09:48:00+00:00",
             "requires": [
                 {

diff --git a/net.fabricmc.fabric-loader/package.json b/net.fabricmc.fabric-loader/package.json
@@ -7,7 +7,7 @@
     "name": "Fabric Loader",
     "projectUrl": "https://fabricmc.net",
     "recommended": [
-        "0.15.10"
+        "0.15.11"
     ],
     "uid": "net.fabricmc.fabric-loader"
 }
diff --git a/net.fabricmc.intermediary/1.20.6.json b/net.fabricmc.intermediary/1.20.6.json
@@ -0,0 +1,22 @@
+{
+    "formatVersion": 1,
+    "libraries": [
+        {
+            "name": "net.fabricmc:intermediary:1.20.6",
+            "url": "https://maven.fabricmc.net"
+        }
+    ],
+    "name": "Intermediary Mappings",
+    "order": 11,
+    "releaseTime": "2024-04-29T15:04:53+00:00",
+    "requires": [
+        {
+            "equals": "1.20.6",
+            "uid": "net.minecraft"
+        }
+    ],
+    "type": "release",
+    "uid": "net.fabricmc.intermediary",
+    "version": "1.20.6",
+    "volatile": true
+}
diff --git a/net.fabricmc.intermediary/24w18a.json b/net.fabricmc.intermediary/24w18a.json
@@ -0,0 +1,22 @@
+{
+    "formatVersion": 1,
+    "libraries": [
+        {
+            "name": "net.fabricmc:intermediary:24w18a",
+            "url": "https://maven.fabricmc.net"
+        }
+    ],
+    "name": "Intermediary Mappings",
+    "order": 11,
+    "releaseTime": "2024-05-03T13:20:21+00:00",
+    "requires": [
+        {
+            "equals": "24w18a",
+            "uid": "net.minecraft"
+        }
+    ],
+    "type": "release",
+    "uid": "net.fabricmc.intermediary",
+    "version": "24w18a",
+    "volatile": true
+}
diff --git a/net.fabricmc.intermediary/index.json b/net.fabricmc.intermediary/index.json
@@ -3,6 +3,34 @@
     "name": "Intermediary Mappings",
     "uid": "net.fabricmc.intermediary",
     "versions": [
+        {
+            "recommended": true,
+            "releaseTime": "2024-05-03T13:20:21+00:00",
+            "requires": [
+                {
+                    "equals": "24w18a",
+                    "uid": "net.minecraft"
+                }
+            ],
+            "sha256": "ad322bd5d38c9b4eb9bf1447881fc3c63b7a8433a2f98d084417c9cb30af734b",
+            "type": "release",
+            "version": "24w18a",
+            "volatile": true
+        },
+        {
+            "recommended": true,
+            "releaseTime": "2024-04-29T15:04:53+00:00",
+            "requires": [
+                {
+                    "equals": "1.20.6",
+                    "uid": "net.minecraft"
+                }
+            ],
+            "sha256": "62fa4fa1e6a1aabed1d6eb2a46716edcbada2fdfb754b43e4437b77c7efc936e",
+            "type": "release",
+            "version": "1.20.6",
+            "volatile": true
+        },
         {
             "recommended": true,
             "releaseTime": "2024-04-26T12:54:45+00:00",

diff --git a/net.fabricmc.intermediary/package.json b/net.fabricmc.intermediary/package.json
@@ -7,6 +7,8 @@
     "name": "Intermediary Mappings",
     "projectUrl": "https://fabricmc.net",
     "recommended": [
+        "24w18a",
+        "1.20.6",
         "1.20.6-rc1",
         "1.20.5",
         "1.20.5-rc3",

diff --git a/net.minecraft/1.19.3-pre1.json b/net.minecraft/1.19.3-pre1.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "2",
-        "sha1": "cef9567ec4ba92e5e98ec11aa91a54170b64aaf9",
+        "sha1": "f64e210f56b085c52f8cabf5ea1f7f8630e37f3c",
         "size": 406181,
-        "totalSize": 566308664,
-        "url": "https://piston-meta.mojang.com/v1/packages/cef9567ec4ba92e5e98ec11aa91a54170b64aaf9/2.json"
+        "totalSize": 566308889,
+        "url": "https://piston-meta.mojang.com/v1/packages/f64e210f56b085c52f8cabf5ea1f7f8630e37f3c/2.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.3-pre2.json b/net.minecraft/1.19.3-pre2.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "2",
-        "sha1": "cef9567ec4ba92e5e98ec11aa91a54170b64aaf9",
+        "sha1": "f64e210f56b085c52f8cabf5ea1f7f8630e37f3c",
         "size": 406181,
-        "totalSize": 566308664,
-        "url": "https://piston-meta.mojang.com/v1/packages/cef9567ec4ba92e5e98ec11aa91a54170b64aaf9/2.json"
+        "totalSize": 566308889,
+        "url": "https://piston-meta.mojang.com/v1/packages/f64e210f56b085c52f8cabf5ea1f7f8630e37f3c/2.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.3-pre3.json b/net.minecraft/1.19.3-pre3.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "2",
-        "sha1": "cef9567ec4ba92e5e98ec11aa91a54170b64aaf9",
+        "sha1": "f64e210f56b085c52f8cabf5ea1f7f8630e37f3c",
         "size": 406181,
-        "totalSize": 566308664,
-        "url": "https://piston-meta.mojang.com/v1/packages/cef9567ec4ba92e5e98ec11aa91a54170b64aaf9/2.json"
+        "totalSize": 566308889,
+        "url": "https://piston-meta.mojang.com/v1/packages/f64e210f56b085c52f8cabf5ea1f7f8630e37f3c/2.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.3-rc1.json b/net.minecraft/1.19.3-rc1.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "2",
-        "sha1": "cef9567ec4ba92e5e98ec11aa91a54170b64aaf9",
+        "sha1": "f64e210f56b085c52f8cabf5ea1f7f8630e37f3c",
         "size": 406181,
-        "totalSize": 566308664,
-        "url": "https://piston-meta.mojang.com/v1/packages/cef9567ec4ba92e5e98ec11aa91a54170b64aaf9/2.json"
+        "totalSize": 566308889,
+        "url": "https://piston-meta.mojang.com/v1/packages/f64e210f56b085c52f8cabf5ea1f7f8630e37f3c/2.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.3-rc2.json b/net.minecraft/1.19.3-rc2.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "2",
-        "sha1": "cef9567ec4ba92e5e98ec11aa91a54170b64aaf9",
+        "sha1": "f64e210f56b085c52f8cabf5ea1f7f8630e37f3c",
         "size": 406181,
-        "totalSize": 566308664,
-        "url": "https://piston-meta.mojang.com/v1/packages/cef9567ec4ba92e5e98ec11aa91a54170b64aaf9/2.json"
+        "totalSize": 566308889,
+        "url": "https://piston-meta.mojang.com/v1/packages/f64e210f56b085c52f8cabf5ea1f7f8630e37f3c/2.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.3-rc3.json b/net.minecraft/1.19.3-rc3.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "2",
-        "sha1": "cef9567ec4ba92e5e98ec11aa91a54170b64aaf9",
+        "sha1": "f64e210f56b085c52f8cabf5ea1f7f8630e37f3c",
         "size": 406181,
-        "totalSize": 566308664,
-        "url": "https://piston-meta.mojang.com/v1/packages/cef9567ec4ba92e5e98ec11aa91a54170b64aaf9/2.json"
+        "totalSize": 566308889,
+        "url": "https://piston-meta.mojang.com/v1/packages/f64e210f56b085c52f8cabf5ea1f7f8630e37f3c/2.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.3.json b/net.minecraft/1.19.3.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "2",
-        "sha1": "cef9567ec4ba92e5e98ec11aa91a54170b64aaf9",
+        "sha1": "f64e210f56b085c52f8cabf5ea1f7f8630e37f3c",
         "size": 406181,
-        "totalSize": 566308664,
-        "url": "https://piston-meta.mojang.com/v1/packages/cef9567ec4ba92e5e98ec11aa91a54170b64aaf9/2.json"
+        "totalSize": 566308889,
+        "url": "https://piston-meta.mojang.com/v1/packages/f64e210f56b085c52f8cabf5ea1f7f8630e37f3c/2.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.4-pre1.json b/net.minecraft/1.19.4-pre1.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "3",
-        "sha1": "5d7262b78a6886030e10c79115e652ca16e1932a",
+        "sha1": "3bbfcb45266be1742b298c00e8306a6bddfdb657",
         "size": 410292,
-        "totalSize": 567066747,
-        "url": "https://piston-meta.mojang.com/v1/packages/5d7262b78a6886030e10c79115e652ca16e1932a/3.json"
+        "totalSize": 567066972,
+        "url": "https://piston-meta.mojang.com/v1/packages/3bbfcb45266be1742b298c00e8306a6bddfdb657/3.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.4-pre2.json b/net.minecraft/1.19.4-pre2.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "3",
-        "sha1": "5d7262b78a6886030e10c79115e652ca16e1932a",
+        "sha1": "3bbfcb45266be1742b298c00e8306a6bddfdb657",
         "size": 410292,
-        "totalSize": 567066747,
-        "url": "https://piston-meta.mojang.com/v1/packages/5d7262b78a6886030e10c79115e652ca16e1932a/3.json"
+        "totalSize": 567066972,
+        "url": "https://piston-meta.mojang.com/v1/packages/3bbfcb45266be1742b298c00e8306a6bddfdb657/3.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.4-pre3.json b/net.minecraft/1.19.4-pre3.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "3",
-        "sha1": "5d7262b78a6886030e10c79115e652ca16e1932a",
+        "sha1": "3bbfcb45266be1742b298c00e8306a6bddfdb657",
         "size": 410292,
-        "totalSize": 567066747,
-        "url": "https://piston-meta.mojang.com/v1/packages/5d7262b78a6886030e10c79115e652ca16e1932a/3.json"
+        "totalSize": 567066972,
+        "url": "https://piston-meta.mojang.com/v1/packages/3bbfcb45266be1742b298c00e8306a6bddfdb657/3.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.4-pre4.json b/net.minecraft/1.19.4-pre4.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "3",
-        "sha1": "5d7262b78a6886030e10c79115e652ca16e1932a",
+        "sha1": "3bbfcb45266be1742b298c00e8306a6bddfdb657",
         "size": 410292,
-        "totalSize": 567066747,
-        "url": "https://piston-meta.mojang.com/v1/packages/5d7262b78a6886030e10c79115e652ca16e1932a/3.json"
+        "totalSize": 567066972,
+        "url": "https://piston-meta.mojang.com/v1/packages/3bbfcb45266be1742b298c00e8306a6bddfdb657/3.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.4-rc1.json b/net.minecraft/1.19.4-rc1.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "3",
-        "sha1": "5d7262b78a6886030e10c79115e652ca16e1932a",
+        "sha1": "3bbfcb45266be1742b298c00e8306a6bddfdb657",
         "size": 410292,
-        "totalSize": 567066747,
-        "url": "https://piston-meta.mojang.com/v1/packages/5d7262b78a6886030e10c79115e652ca16e1932a/3.json"
+        "totalSize": 567066972,
+        "url": "https://piston-meta.mojang.com/v1/packages/3bbfcb45266be1742b298c00e8306a6bddfdb657/3.json"
     },
     "compatibleJavaMajors": [
         17

diff --git a/net.minecraft/1.19.4-rc2.json b/net.minecraft/1.19.4-rc2.json
@@ -5,10 +5,10 @@
     ],
     "assetIndex": {
         "id": "3",
-        "sha1": "5d7262b78a6886030e10c79115e652ca16e1932a",
+        "sha1": "3bbfcb45266be1742b298c00e8306a6bddfdb657",
         "size": 410292,
-        "totalSize": 567066747,
-        "url": "https://piston-meta.mojang.com/v1/packages/5d7262b78a6886030e10c79115e652ca16e1932a/3.json"
+        "totalSize": 567066972,
+        "url": "https://piston-meta.mojang.com/v1/packages/3bbfcb45266be1742b298c00e8306a6bddfdb657/3.json"
     },
     "compatibleJavaMajors": [
         17