Skip to content

Commit

Permalink
Merge branch '1.20_plus' into 1.20_modded
Browse files Browse the repository at this point in the history
# Conflicts:
#	pack.toml
  • Loading branch information
sisby-folk committed Apr 16, 2024
2 parents 9597b48 + 6a8bf12 commit d915d21
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ In addition to the below, Tinkerer's Quilt has support for the majority of optif
| Relevant Mod | Summary |
|------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [Vanilla Tweaks](https://vanillatweaks.net/) | Decaying tools, less obtrusive shields and fire, and minor texture changes. |
| [Sodium](https://modrinth.com/mod/sodium) | Client go fast. |
| [Sodium](https://modrinth.com/mod/sodium) | Modern-day holy grail of client performance mods. |
| [Iris](https://modrinth.com/mod/iris) | Allows using shaders like [Complementary](https://modrinth.com/shader/complementary-shaders-v4), [Prismarine](https://github.com/Septonious/Prismarine-Shader), and [Super Duper Vanilla](https://modrinth.com/shader/super-duper-vanilla) |
| [Xali's Enchanted Books](https://modrinth.com/resourcepack/xalis-enchanted-books) | Unique textures for enchanted books. |
| [Sully's Peeves](https://www.curseforge.com/minecraft/texture-packs/sullys-peeves) | Texture improvements for many everyday blocks and items. |
Expand Down Expand Up @@ -253,7 +253,7 @@ If you experience arachnophobia or otherwise need to disable the spawning of a m

If you'd like to play with a controller, install [MidnightControls](https://modrinth.com/mod/midnightcontrols) before playing.

If you get lost without a map mod, try our [fork of Antique Atlas](https://github.com/sisby-folk/AntiqueAtlas/releases/tag/v8.0.2%2Bitemless) without items. Still required on both sides.
If you get lost without a map mod, try [Antique Atlas 4](https://modrinth.com/mod/antique-atlas-4) - which we include in other editions.

## Full Modlist

Expand Down
2 changes: 1 addition & 1 deletion index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ metafile = true

[[files]]
file = "mods/fallingleaves.pw.toml"
hash = "eac1a56fa3de852de28a0fcad1410f1af63ecd360cfe92425b01807daecfa2ff"
hash = "948e8a5d65ede4a8612a2f476d7b3b0f2fe00436ab3b8dd73829d4bdcf0cdf22"
metafile = true

[[files]]
Expand Down
2 changes: 1 addition & 1 deletion mods/fallingleaves.pw.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = "Falling Leaves"
updatefilename = "fallingleaves-1.15.6+1.20.1.jar"
filename = "fallingleaves-1.15.6+1.20.1.jar"
side = "client"

[download]
Expand Down
2 changes: 1 addition & 1 deletion pack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "6843d859da031d5b6805a07b1977c2ff477762169501db712376e07015e7ed28"
hash = "75a2b808de418ff1f5897f1f323e1927706eec194de7ea2b4c935b0bfc200cb2"

[versions]
minecraft = "1.20.1"
Expand Down

0 comments on commit d915d21

Please sign in to comment.