Skip to content

Commit

Permalink
Merge branch '1.20.1/fabric/prod' into 1.20.1/fabric/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepy-evelyn committed Nov 30, 2024
2 parents 83315c7 + 244e898 commit 098bdbd
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 14 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
# Exclude exported Modrinth modpacks
*.mrpack

# Exclude jetbrains IDE files
# Exclude IDE files
.idea
.vscode

# Exclude Mac metadata files
.DS_Store

# Exclude Packwiz Binary
packwiz.exe
packwiz.exe
packwiz

# Output dir
Expand Down
4 changes: 0 additions & 4 deletions index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -369,10 +369,6 @@ hash = "c602ad2f5d370579a6f530355b2c60852fbbbfa6c230ebb568cbf79ec290e76b"
file = "config/yosbr/options.txt"
hash = "72333902e61b680eeca1f42e4dde22138777ae1743d6f183c4594e4336c56f74"

[[files]]
file = "kubejs/.vscode/settings.json"
hash = "afb76563b06f66bd43192519a59f355d17a0b6e2f7a52a1dff08940d5237f4d6"

[[files]]
file = "kubejs/assets/phonos/textures/item/antenna.png"
hash = "958be02577e9def636498145d5078d5340c482590137172f3985a11149aebe2f"
Expand Down
5 changes: 0 additions & 5 deletions kubejs/.vscode/settings.json

This file was deleted.

2 changes: 1 addition & 1 deletion pack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ hash-format = "sha256"
hash = "901e6acf1cddf5787c5ffe1611b809e20f3fcfe36e34be48b5f91041d066cb66"

[versions]
fabric = "0.16.5"
fabric = "0.16.9"
minecraft = "1.20.1"

[options]
Expand Down
4 changes: 2 additions & 2 deletions prism/mmc-pack.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
"uid": "net.fabricmc.intermediary"
}
],
"cachedVersion": "0.16.5",
"cachedVersion": "0.16.9",
"uid": "net.fabricmc.fabric-loader",
"version": "0.16.5"
"version": "0.16.9"
},
{
"cachedName": "unsup",
Expand Down

0 comments on commit 098bdbd

Please sign in to comment.