From 1bc7c154c006e1aa7d43822e67347e11a41e0e94 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 14 Dec 2023 07:33:05 +0700 Subject: [PATCH] 123 --- .gitattributes | 3 +- gitattributes.txt | 2 -- modpack/mods/creativecore.pw.toml | 26 +++++++-------- modpack/mods/embeddium.pw.toml | 26 +++++++-------- modpack/mods/kubejs.pw.toml | 26 +++++++-------- modpack/mods/modernfix.pw.toml | 26 +++++++-------- modpack/mods/oculus.pw.toml | 26 +++++++-------- modpack/mods/roughly-enough-items.pw.toml | 26 +++++++-------- modpack/mods/sophisticated-backpacks.pw.toml | 26 +++++++-------- modpack/mods/sophisticated-core.pw.toml | 26 +++++++-------- pack.toml | 34 ++++++++++---------- 11 files changed, 123 insertions(+), 124 deletions(-) delete mode 100644 gitattributes.txt diff --git a/.gitattributes b/.gitattributes index 176a458f9..d790abdc4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -* text=auto +# Disable Git line ending conversion, to prevent packwiz index hashes changing when committing from Windows +* -text \ No newline at end of file diff --git a/gitattributes.txt b/gitattributes.txt deleted file mode 100644 index 5b3d8c557..000000000 --- a/gitattributes.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Disable Git line ending conversion, to prevent packwiz index hashes changing when committing from Windows -* -text \ No newline at end of file diff --git a/modpack/mods/creativecore.pw.toml b/modpack/mods/creativecore.pw.toml index b8464cc14..62a26c340 100644 --- a/modpack/mods/creativecore.pw.toml +++ b/modpack/mods/creativecore.pw.toml @@ -1,13 +1,13 @@ -name = "CreativeCore" -filename = "CreativeCore_FORGE_v2.11.11_mc1.20.1.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "8b0abc2f95751c798056692757bfbe1c496ba434" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4932637 -project-id = 257814 +name = "CreativeCore" +filename = "CreativeCore_FORGE_v2.11.11_mc1.20.1.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "8b0abc2f95751c798056692757bfbe1c496ba434" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4932637 +project-id = 257814 diff --git a/modpack/mods/embeddium.pw.toml b/modpack/mods/embeddium.pw.toml index 0533aca5d..08359028c 100644 --- a/modpack/mods/embeddium.pw.toml +++ b/modpack/mods/embeddium.pw.toml @@ -1,13 +1,13 @@ -name = "Embeddium" -filename = "embeddium-0.2.12+mc1.20.1.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "678d2a481c094955f91695de32712e36e671efd3" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4931288 -project-id = 908741 +name = "Embeddium" +filename = "embeddium-0.2.12+mc1.20.1.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "678d2a481c094955f91695de32712e36e671efd3" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4931288 +project-id = 908741 diff --git a/modpack/mods/kubejs.pw.toml b/modpack/mods/kubejs.pw.toml index 66794a8ab..fbc0aec87 100644 --- a/modpack/mods/kubejs.pw.toml +++ b/modpack/mods/kubejs.pw.toml @@ -1,13 +1,13 @@ -name = "KubeJS" -filename = "kubejs-forge-2001.6.4-build.111.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "36a6931622afb4ecf81757eee3f0b1da310fb311" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4940153 -project-id = 238086 +name = "KubeJS" +filename = "kubejs-forge-2001.6.4-build.111.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "36a6931622afb4ecf81757eee3f0b1da310fb311" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4940153 +project-id = 238086 diff --git a/modpack/mods/modernfix.pw.toml b/modpack/mods/modernfix.pw.toml index 231685869..6c279bcad 100644 --- a/modpack/mods/modernfix.pw.toml +++ b/modpack/mods/modernfix.pw.toml @@ -1,13 +1,13 @@ -name = "ModernFix" -filename = "modernfix-forge-5.10.0+mc1.20.1.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "a2f692102b9c0e6c66ca9a0f8a591416a0d65dda" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4924639 -project-id = 790626 +name = "ModernFix" +filename = "modernfix-forge-5.10.0+mc1.20.1.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "a2f692102b9c0e6c66ca9a0f8a591416a0d65dda" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4924639 +project-id = 790626 diff --git a/modpack/mods/oculus.pw.toml b/modpack/mods/oculus.pw.toml index a274c2346..2aa2387ab 100644 --- a/modpack/mods/oculus.pw.toml +++ b/modpack/mods/oculus.pw.toml @@ -1,13 +1,13 @@ -name = "Oculus" -filename = "oculus-mc1.20.1-1.6.9.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "406ad9995cd1ab803e0001f80a85498105b4d488" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4767500 -project-id = 581495 +name = "Oculus" +filename = "oculus-mc1.20.1-1.6.9.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "406ad9995cd1ab803e0001f80a85498105b4d488" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4767500 +project-id = 581495 diff --git a/modpack/mods/roughly-enough-items.pw.toml b/modpack/mods/roughly-enough-items.pw.toml index 9619af68a..e6466b191 100644 --- a/modpack/mods/roughly-enough-items.pw.toml +++ b/modpack/mods/roughly-enough-items.pw.toml @@ -1,13 +1,13 @@ -name = "Roughly Enough Items Fabric/Forge (REI)" -filename = "RoughlyEnoughItems-12.0.674.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "cf3fa6675978c4db32a214c08bdff3e3bd27c37d" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4834408 -project-id = 310111 +name = "Roughly Enough Items Fabric/Forge (REI)" +filename = "RoughlyEnoughItems-12.0.674.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "cf3fa6675978c4db32a214c08bdff3e3bd27c37d" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4834408 +project-id = 310111 diff --git a/modpack/mods/sophisticated-backpacks.pw.toml b/modpack/mods/sophisticated-backpacks.pw.toml index e16fbda63..b9208c93a 100644 --- a/modpack/mods/sophisticated-backpacks.pw.toml +++ b/modpack/mods/sophisticated-backpacks.pw.toml @@ -1,13 +1,13 @@ -name = "Sophisticated Backpacks" -filename = "sophisticatedbackpacks-1.20.1-3.19.1.962.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "a83580ca5f2c6a4a0dacb8db2b516496fee46077" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4913632 -project-id = 422301 +name = "Sophisticated Backpacks" +filename = "sophisticatedbackpacks-1.20.1-3.19.1.962.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "a83580ca5f2c6a4a0dacb8db2b516496fee46077" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4913632 +project-id = 422301 diff --git a/modpack/mods/sophisticated-core.pw.toml b/modpack/mods/sophisticated-core.pw.toml index 693fcd462..6653e8a8e 100644 --- a/modpack/mods/sophisticated-core.pw.toml +++ b/modpack/mods/sophisticated-core.pw.toml @@ -1,13 +1,13 @@ -name = "Sophisticated Core" -filename = "sophisticatedcore-1.20.1-0.5.108.504.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "6476a3b4439192e261be59891a62a764a3482fdf" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4913628 -project-id = 618298 +name = "Sophisticated Core" +filename = "sophisticatedcore-1.20.1-0.5.108.504.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "6476a3b4439192e261be59891a62a764a3482fdf" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4913628 +project-id = 618298 diff --git a/pack.toml b/pack.toml index 58f371efa..a55f826e8 100644 --- a/pack.toml +++ b/pack.toml @@ -1,17 +1,17 @@ -name = "TerraFirmaGreg-1.20.x" -author = "Exception, Xikaro" -version = "DEV" -pack-format = "packwiz:1.1.0" - -[index] -file = "index.toml" -hash-format = "sha256" -hash = "a97dbad8c3b270f2fa27e65a20afc531748ef3c9fc3013286d37cc47634ec7b1" - -[versions] -forge = "47.2.6" -minecraft = "1.20.1" - -[options] -acceptable-game-versions = ["1.20.1"] -meta-folder-base = "modpack" +name = "TerraFirmaGreg-1.20.x" +author = "Exception, Xikaro" +version = "DEV" +pack-format = "packwiz:1.1.0" + +[index] +file = "index.toml" +hash-format = "sha256" +hash = "a97dbad8c3b270f2fa27e65a20afc531748ef3c9fc3013286d37cc47634ec7b1" + +[versions] +forge = "47.2.6" +minecraft = "1.20.1" + +[options] +acceptable-game-versions = ["1.20.1"] +meta-folder-base = "modpack"