diff --git a/.packwizignore b/.packwizignore index ccc14b1..a832a8e 100644 --- a/.packwizignore +++ b/.packwizignore @@ -11,13 +11,17 @@ run.sh *.jar *.jar.log run.bat -# Server/runtime config is never tracked; only explicit modpack-default configs -# (e.g. the FTB Chunks client config) are shipped. -config/* -!config/ftbchunks-client.snbt +# Server/runtime config is never tracked. +config/ kubejs/ defaultconfigs/ local/ + +# Authoring/review material - belongs in the repo, never in the pack +FINDINGS.md +MODLIST-*.md +analysis/ +phase0/ ftbbackups3/ patchouli_books/ .sable/ @@ -31,3 +35,8 @@ tools/ # C2ME runtime worldgen cache (regenerated at runtime) cache/ + +# Scratch artifacts from the map-migration tooling - never ship these +sp-world/ +*.tar.gz +*.tgz diff --git a/config/ftbchunks-client.snbt b/config/ftbchunks-client.snbt deleted file mode 100644 index bec3532..0000000 --- a/config/ftbchunks-client.snbt +++ /dev/null @@ -1,16 +0,0 @@ -# Onion MC modpack default. -# -# FTB Chunks computes "minimap.enabled" once as !hasOtherMinimapMod() and then -# persists the result. While Xaero's Minimap was in this pack that resolved to -# false and was written into players' configs, where it sticks -- removing the -# other minimap mod later does not re-enable it. Setting it explicitly here -# turns the FTB Chunks minimap on for everyone, including players whose config -# was already written with false. -# -# Players who want a different value can copy this to -# /local/ftbchunks-client.snbt, which is not overwritten on pack update. -{ - minimap: { - enabled: true - } -} diff --git a/index.toml b/index.toml index 07f91ac..654124d 100644 --- a/index.toml +++ b/index.toml @@ -1,9 +1,5 @@ hash-format = "sha256" -[[files]] -file = "config/ftbchunks-client.snbt" -hash = "6cbe2d3e5419a9ab0ded6f8d70f9be4a2cfb25f7a1d75c6a93fb4c1ed9e2329b" - [[files]] file = "mods/3dskinlayers.pw.toml" hash = "b3b67f83faf9dcc4985b7a13fa8affb71062461d271f80cc0958652df9f3126b" @@ -304,11 +300,6 @@ file = "mods/ftb-backups-3.pw.toml" hash = "893f9b4dbe36a0bcae29d87cd68ab84fed83c984c3f5649c155c0522c509a77d" metafile = true -[[files]] -file = "mods/ftb-chunks-forge.pw.toml" -hash = "670df7985eec05c6a339d90ebbcfda0e5f1f5c63846ac65a441412f123471e14" -metafile = true - [[files]] file = "mods/ftb-library-forge.pw.toml" hash = "2e72d40c6d7b128981b19b71c19d45eb6813f1af87ae1abe1cf92adfa5e8223f" @@ -499,6 +490,11 @@ file = "mods/oceans-delight.pw.toml" hash = "7bf7c8369bd28212a1e294c60310ccb72f1eb773630970e6ab106ae666766cd3" metafile = true +[[files]] +file = "mods/open-parties-and-claims.pw.toml" +hash = "97660396e7f075f4c9ca8447878ec3da58ebea9ed464cdb494d4db1d62989936" +metafile = true + [[files]] file = "mods/patchouli.pw.toml" hash = "d7f360ebb9f009d6dc0b368cd8fa399bdff70c0f6ef931687b2a35137f72715d" @@ -679,6 +675,21 @@ file = "mods/wings-of-fire.pw.toml" hash = "07b44e8f4c3e5dd41c13269005638e27d1fcf43e8fc96b2f08299ca3676313e3" metafile = true +[[files]] +file = "mods/xaeros-minimap-world-map-waystones-compatibility-forge.pw.toml" +hash = "637bc567eb5260d55ce89e6471c31e4369d454607f3d6f40139f7f7bdef90af9" +metafile = true + +[[files]] +file = "mods/xaeros-minimap.pw.toml" +hash = "64670072fa3b4db4a721769dd3d66a2865daac01c9a2480b9561675b1e9e9737" +metafile = true + +[[files]] +file = "mods/xaeros-world-map.pw.toml" +hash = "f8cc300d53ae8bf71d77124e6c46a5e85fe31654b39c5d73a1652a4d9c404af4" +metafile = true + [[files]] file = "mods/yacl.pw.toml" hash = "539f362e9e192cf3b2813e0dfdfc51a5e6814129c6e82a9733842529beea6242" diff --git a/mods/ftb-chunks-forge.pw.toml b/mods/ftb-chunks-forge.pw.toml deleted file mode 100644 index f02f6d3..0000000 --- a/mods/ftb-chunks-forge.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "FTB Chunks (NeoForge)" -filename = "ftb-chunks-neoforge-2101.1.22.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "a53f1bb7965c6954a348d4f321f03d3971ad503f" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 8791113 -project-id = 314906 diff --git a/mods/open-parties-and-claims.pw.toml b/mods/open-parties-and-claims.pw.toml new file mode 100644 index 0000000..ca9ee6a --- /dev/null +++ b/mods/open-parties-and-claims.pw.toml @@ -0,0 +1,13 @@ +name = "Open Parties and Claims" +filename = "open-parties-and-claims-neoforge-1.21.1-0.31.6.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/gF3BGWvG/versions/3i48dTzz/open-parties-and-claims-neoforge-1.21.1-0.31.6.jar" +hash-format = "sha512" +hash = "6f8f2d570b6f674a9180576524b3ba507a3ad046ff319353cee50738644bf46c03ca460fb7c6880eed76f07eb2a26a983166d2510951202af86b3e120b743181" + +[update] +[update.modrinth] +mod-id = "gF3BGWvG" +version = "3i48dTzz" diff --git a/mods/xaeros-minimap-world-map-waystones-compatibility-forge.pw.toml b/mods/xaeros-minimap-world-map-waystones-compatibility-forge.pw.toml new file mode 100644 index 0000000..60aee3d --- /dev/null +++ b/mods/xaeros-minimap-world-map-waystones-compatibility-forge.pw.toml @@ -0,0 +1,13 @@ +name = "Xaero's Minimap & World Map - Waystones Compatibility" +filename = "xaeros_waystones_compatibility-NeoForge-1.21.1-2.1.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/7mLhyqIY/versions/k8wIAiWT/xaeros_waystones_compatibility-NeoForge-1.21.1-2.1.0.jar" +hash-format = "sha512" +hash = "440da659b1c406ff410841248a28adba60b73f3d91f513ba335b9e5d44b3e48ab63d5ecc86484ff1e3d1a4f7830ad7566fc1efec2a03eba3c958b414b61feea0" + +[update] +[update.modrinth] +mod-id = "7mLhyqIY" +version = "k8wIAiWT" diff --git a/mods/xaeros-minimap.pw.toml b/mods/xaeros-minimap.pw.toml new file mode 100644 index 0000000..0fbf37b --- /dev/null +++ b/mods/xaeros-minimap.pw.toml @@ -0,0 +1,13 @@ +name = "Xaero's Minimap" +filename = "xaerominimap-neoforge-1.21.1-26.5.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/1bokaNcj/versions/Q1tuMQBB/xaerominimap-neoforge-1.21.1-26.5.0.jar" +hash-format = "sha512" +hash = "0fde1066dd922ac0796d166ba1bf1b843873b8d8563da3a08777df54bb377ff6466096650c730ad1b96e0aecf2d8974cd87c32165edf6a30f6653840c3f99abf" + +[update] +[update.modrinth] +mod-id = "1bokaNcj" +version = "Q1tuMQBB" diff --git a/mods/xaeros-world-map.pw.toml b/mods/xaeros-world-map.pw.toml new file mode 100644 index 0000000..75dfef9 --- /dev/null +++ b/mods/xaeros-world-map.pw.toml @@ -0,0 +1,13 @@ +name = "Xaero's World Map" +filename = "xaeroworldmap-neoforge-1.21.1-1.46.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/NcUtCpym/versions/9Ckiihkz/xaeroworldmap-neoforge-1.21.1-1.46.0.jar" +hash-format = "sha512" +hash = "fb14d11d66e0a6441981b18454c86534d8f534cd159ca19fa612950521788d858f37f18fe2093bb9b43ca0a88ae9af578eced5d140ff645a7681d7e452e8a268" + +[update] +[update.modrinth] +mod-id = "NcUtCpym" +version = "9Ckiihkz" diff --git a/pack.toml b/pack.toml index e9c4111..7216c4a 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "9fb9f6269363cbdef4f9635f168b71387b8f437901f775e09d639a6c40a74c24" +hash = "80220fc3f737beda7794679fb8a18b70b2b68c5cd7f88b479bc0380e7311bb64" [versions] minecraft = "1.21.1"