Compare commits

...

18 Commits

Author SHA1 Message Date
8fbd2d07fd
Merge branch 'staging/quilt/mixed/1.20.1' into staging/fabric/mixed/1.20.1 2023-07-11 19:25:00 -04:00
432cc75441
Merge branch 'staging/quilt/1.20.1' into staging/quilt/mixed/1.20.1 2023-07-11 19:24:00 -04:00
4c357e04f8
Merge branch 'staging/quilt/mixed/1.20.1' into staging/fabric/mixed/1.20.1 2023-07-11 19:10:56 -04:00
8256cc6712
Merge branch 'staging/quilt/1.20.1' into staging/quilt/mixed/1.20.1 2023-07-11 19:06:38 -04:00
55c1557d36
Merge branch 'staging/fabric/1.20.1' into staging/fabric/mixed/1.20.1 2023-07-11 19:01:15 -04:00
1bce1942d9
No-op merge 'staging/quilt/1.20.1' 2023-07-11 18:59:33 -04:00
b6a6cbe74c
Merge branch 'staging/quilt/mixed/1.20.1' into staging/fabric/mixed/1.20.1 2023-07-11 18:44:45 -04:00
e7e818d621
Merge branch 'staging/quilt/1.20.1' into staging/quilt/mixed/1.20.1 2023-07-11 18:43:45 -04:00
87e332a2bd
Merge branch 'feature/fix-resource-packs-quilt' into staging/fabric/1.20.1 2023-07-11 18:42:12 -04:00
1c548521fa
Merge branch 'staging/quilt/mixed/1.20.1' into staging/fabric/mixed/1.20.1 2023-07-11 18:09:02 -04:00
0064907adb
Revert "Remove non-modrinth asset from pack"
This reverts commit 50cfe214d9c33502d1f914f4b2011eac852837a7.
I am allowing this asset in the mixed variant of the pack.
2023-07-11 17:55:51 -04:00
30e68b120a
Add farsight (first curseforge mod kill me) 2023-07-11 17:55:51 -04:00
55467b1493
Merge branch 'feature/remove-dashloader' into staging/fabric/1.20.1 2023-07-11 17:28:41 -04:00
b524c64800
Fix missing hash 2023-07-11 01:47:51 -04:00
4aa7770ed5
Merge branch 'staging/quilt/1.20.1' into staging/fabric/1.20.1 2023-07-11 01:28:29 -04:00
43e0d855f2
Merge branch 'staging/quilt/1.20.1' into staging/fabric/1.20.1 2023-07-11 00:41:58 -04:00
299cc0b3bb
Merge branch 'staging/quilt/1.20.1' into staging/fabric/1.20.1 2023-07-10 22:32:26 -04:00
94193c064e
Merge branch 'staging/1.20.1' into fabric/staging/1.20.1
special merge commit to ignore Quilt specific stuff
2023-07-10 19:46:27 -04:00
11 changed files with 75 additions and 62 deletions

View File

@ -1,5 +1,6 @@
version:3465
autoJump:false
darkMojangStudiosBackground:true
snooperEnabled:false
operatorItemsTab:true
simulationDistance:6

View File

@ -34,7 +34,7 @@ hash = "29e8afe5258e9f0cbeb96d3e8ab0cbdb4eadacf48621a6df06a6dece25410547"
[[files]]
file = "config/yosbr/options.txt"
hash = "7ddd41029052fd0b4affd666ddcb183919d93fcf331bd3aa1110bb4734be038d"
hash = "9b49e7162aeeb2a53a1df56d3a785db854f219b66025501d185d250b82784c92"
[[files]]
file = "config/yosbr/shaderpacks/ComplementaryReimagined_r2.2.zip.txt"
@ -148,6 +148,16 @@ file = "mods/entitytexturefeatures.pw.toml"
hash = "49a42a2456b0d0024bb61afdfeb279c51d581901fbd59a4d00ff772b206fefaa"
metafile = true
[[files]]
file = "mods/fabric-api.pw.toml"
hash = "2205239199b4a1e74afcdba1151807d2e4487ce2cf116cee9f62d25f1659a3f5"
metafile = true
[[files]]
file = "mods/fabric-language-kotlin.pw.toml"
hash = "de9b5bac4165fb069bf6df9da2bb6028d50dd51fa0d294f0fb62d1d0c64b707b"
metafile = true
[[files]]
file = "mods/fabricskyboxes-interop.pw.toml"
hash = "3a86b3417b781abc294b6e41c475e5ac1831944527db6f07f0107a30e5bde0bd"
@ -158,6 +168,11 @@ file = "mods/fabricskyboxes.pw.toml"
hash = "08b843dfc24cc97afeba5b3a60a1263c8aa4fc786398a1972cc69741f0253e22"
metafile = true
[[files]]
file = "mods/farsight-fabric.pw.toml"
hash = "825458a5e2a5ffe04e07e92643be57bdbef5861a6670fa996bf0b6a5a10cba9e"
metafile = true
[[files]]
file = "mods/ferrite-core.pw.toml"
hash = "03e174cf691b52da20bd973b955fae6f3720d3d2120f9d6cc1de5fdf3180013c"
@ -263,21 +278,6 @@ file = "mods/puzzle.pw.toml"
hash = "684594797d13dbc0ca57a5a6349a4597c03f629617bff83621bafb147a22ee76"
metafile = true
[[files]]
file = "mods/qkl.pw.toml"
hash = "02343a477f6f4ffd9cbedd4f93252f443c599b2f8d250037920d3a47f5756e6a"
metafile = true
[[files]]
file = "mods/qsl.pw.toml"
hash = "be8073079bf41847c3aa1fb80c9941fa52b8c0ae39eb44a1475618d31c33e1d9"
metafile = true
[[files]]
file = "mods/quilt-loading-screen.pw.toml"
hash = "0431d2fbc92b56108c48fc955caafbefcafeb69bc9773c5413daa89af5d87966"
metafile = true
[[files]]
file = "mods/reeses-sodium-options.pw.toml"
hash = "a1d419cad5a32a4a442b37b2e2fe2db3e761429d6ab60dd3bb79f43d36df2297"
@ -315,7 +315,7 @@ metafile = true
[[files]]
file = "mods/wthit.pw.toml"
hash = "ba1c6b53100f4b5666ccd77de55a8a29daf7b5b1b961f16dcbb8127959221a61"
hash = "5d920f14136c4e3b7731846bd21dbb5ace512d962b61338ffffeae284525b520"
metafile = true
[[files]]
@ -343,6 +343,11 @@ file = "mods/zoomify.pw.toml"
hash = "fe67f559bf7c07593f1eb0e3cfabb56635de7e566b26241559452dc04484bd4e"
metafile = true
[[files]]
file = "resourcepacks/vanillatweaks.pw.toml"
hash = "2ada98e4a07f325283f285b9ac397636df3414e2b578d3f6e4d55ed00904f23d"
metafile = true
[[files]]
file = "shaderpacks/bsl-shaders.pw.toml"
hash = "ef5060e4fee094045e79fad89880359d0f3ad6042a63c74314adde206f8f208c"

13
mods/fabric-api.pw.toml Normal file
View File

@ -0,0 +1,13 @@
name = "Fabric API"
filename = "fabric-api-0.85.0+1.20.1.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/hFdJG9fY/fabric-api-0.85.0%2B1.20.1.jar"
hash-format = "sha1"
hash = "02ae17b8122b176f2884cae49af440e27bee7161"
[update]
[update.modrinth]
mod-id = "P7dR8mSH"
version = "hFdJG9fY"

View File

@ -0,0 +1,13 @@
name = "Fabric Language Kotlin"
filename = "fabric-language-kotlin-1.10.0+kotlin.1.9.0.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/65oEzjEs/fabric-language-kotlin-1.10.0%2Bkotlin.1.9.0.jar"
hash-format = "sha1"
hash = "e0a7c6564243009f9bf2476b70e9af98dd2dd944"
[update]
[update.modrinth]
mod-id = "Ha28R6CL"
version = "65oEzjEs"

View File

@ -0,0 +1,13 @@
name = "Farsight [Fabric]"
filename = "farsight-fabric-1.20.1-3.7.jar"
side = "both"
[download]
hash-format = "sha1"
hash = "fcc303ad8d7b937e175f1dec2e74f5a4bbc5389f"
mode = "metadata:curseforge"
[update]
[update.curseforge]
file-id = 4595154
project-id = 579192

View File

@ -1,13 +0,0 @@
name = "Quilt Kotlin Libraries (QKL)"
filename = "quilt-kotlin-libraries-2.1.0+kt.1.8.22+flk.1.9.4.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/lwVhp9o5/versions/AD5KqMGz/quilt-kotlin-libraries-2.1.0%2Bkt.1.8.22%2Bflk.1.9.4.jar"
hash-format = "sha1"
hash = "2c94176466a836d289c3af3dde39d97a167f8070"
[update]
[update.modrinth]
mod-id = "lwVhp9o5"
version = "AD5KqMGz"

View File

@ -1,13 +0,0 @@
name = "Quilted Fabric API (QFAPI) / Quilt Standard Libraries (QSL)"
filename = "qfapi-7.0.6_qsl-6.0.4_fapi-0.85.0_mc-1.20.1.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/qvIfYCYJ/versions/4JBkYQUF/qfapi-7.0.6_qsl-6.0.4_fapi-0.85.0_mc-1.20.1.jar"
hash-format = "sha1"
hash = "96f0d25eceddfbbc65be529c59d3211b47664b32"
[update]
[update.modrinth]
mod-id = "qvIfYCYJ"
version = "4JBkYQUF"

View File

@ -1,13 +0,0 @@
name = "Quilt Loading Screen"
filename = "quilt_loading_screen-6.0.0+1.20.1.jar"
side = "client"
[download]
url = "https://cdn.modrinth.com/data/VPU6VYVP/versions/ZxKclDRW/quilt_loading_screen-6.0.0%2B1.20.1.jar"
hash-format = "sha1"
hash = "b257e89ff9bb3cf2cad5ffd6de781722f37f02ee"
[update]
[update.modrinth]
mod-id = "VPU6VYVP"
version = "ZxKclDRW"

View File

@ -1,13 +1,13 @@
name = "WTHIT"
filename = "wthit-quilt-8.1.1.jar"
filename = "wthit-fabric-8.1.1.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/6AQIaxuO/versions/Q8mlBOGM/wthit-quilt-8.1.1.jar"
url = "https://cdn.modrinth.com/data/6AQIaxuO/versions/k8RgJjbP/wthit-fabric-8.1.1.jar"
hash-format = "sha1"
hash = "fcfcd6c0b5c65f68246043f372fd7e85de615d07"
hash = "9a8640b2af89537ade0da2d16f0c39bb5b76d04e"
[update]
[update.modrinth]
mod-id = "6AQIaxuO"
version = "Q8mlBOGM"
version = "k8RgJjbP"

View File

@ -6,11 +6,11 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "252a746236470551e591cd316052995f6f7270975b220adb7240daa7f592a278"
hash = "91f6a7c6690dd0cdcee7931124439a2e37d63c60f6453801eecc85f494bf1028"
[versions]
fabric = "0.14.21"
minecraft = "1.20.1"
quilt = "0.19.2"
[options]
acceptable-game-versions = ["1.20"]

View File

@ -0,0 +1,7 @@
name = "resourcepacks/vanillatweaks"
filename = "VanillaTweaks_r265009.zip"
[download]
url = "https://f002.backblazeb2.com/file/nullbite-personal/fabric-lite/VanillaTweaks_r265009.zip"
hash-format = "sha256"
hash = "72909653977df8ea25db672708ae3ac546da197db6972d551202b3784c904fc7"