chore(rc and simply): update mods

CONTRIBUTING.md

@@ -6,3 +6,6 @@ The Content Monorepo has some guidelines and suggestions to keep the commits of
 
 Please adhere to the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) handbook for writing your commits. Please also tag your commits according to the project, ie, if you are fixing an issue on Re-Console Plus, do fix(rc-plus), or fix(rc):.
 
+### CI/CD
+Please refer to the README.md for instructions and explanations on our CI/CD.
+

README.md

@@ -10,30 +10,35 @@ This repository hosts all the source and files for all of our resource packs, da
 ## Contributing
 First, please refer to the CONTRIBUTING.md file in the repository. This will tell you some basics
 
-## Actions
+# Actions
 The repository makes usage of Forgejo actions, for CI/CD and general QoL improvements to our dev process.
 
 ## Current Functions
 - Auto Publish
 - Auto Update and Auto Refresh*
 - Auto Build
-- Datapack and Resourcepack validator
 - JSON Linter
-- Resource Pack Compressor**
+- TOML Linter
+- PNG Compressor
 *for modpacks only
 **on publish and build only
 
 ### Using Auto Publish (for devs)
 Every project in the repo must have a manifest.json. This manifest.json specifies stuff that our publish.yml then uses to auto publish. Once it is set up, you may simply bump version in the manifest.json and it will update across platforms.
 
-### Incremental Builds
+### Using Builds
+All builds in the repo occur when a commit happens to their specific subdirectory. This produces a build that is slightly different than the source, as our build script auto-minifies JSON files. These builds are the same as what Auto Publish uses.
+
 Only the pack modified within a commit will be built. So if you modified something in, lets say Simply Legacy, your commit would only build Simply Legacy, and not Re-Console or 2000's Edition.
 License
 
-### Credits
+### Using Linters
-justfile from skywardmc, stale.yml from JEI. Licensed under MIT
+All linters automatically run on commit, and will fail if the modified JSON/TOML is broken. This is helpful in the case of making a minor mistake in syntax/
+
+## Credits
+justfile forked from skywardmc, stale.yml from JEI. Both licensed under MIT.
 
 # License
 As all of these projects are different, the license may vary. Most packs are under GPL-3.0, or MIT. Please check the pack folder or the pages on official sites (Modrinth, CurseForge) for the license.
 
-All* actions are licensed under AGPL-3.0 and written in Rust.
+All* actions are licensed under AGPL-3.0 and written in Rust/Typescript.

modpacks/rc-plus/1.21.10-cf/pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "6a487c364e77b4ca5f4422b8513558c2e2df6a1b44382d8e80b4a7c479c988e8"
+hash = "e526357b93dc24b87ab6a74b7f709446a84d9adc8d12ef43cb240b984c29f997"
 
 [versions]
 fabric = "0.18.5"

modpacks/rc-plus/1.21.10-cf/resourcepacks/fresh-animations-extensions.pw.toml

@@ -1,13 +1,13 @@
 name = "Fresh Animations: Extensions"
-filename = "FA+All_Extensions-v1.8.zip"
+filename = "FA+All_Extensions-v1.8.1.zip"
 side = "both"
 
 [download]
 hash-format = "sha1"
-hash = "3afa94a3dac35526e98e328b7e633ca5206a7b79"
+hash = "d39eefcb1d3a24debc979bbf7aa3e42b92cc5a80"
 mode = "metadata:curseforge"
 
 [update]
 [update.curseforge]
-file-id = 7674538
+file-id = 7953813
 project-id = 813608

modpacks/rc-plus/1.21.10-mr/mods/kryptonfnp-patcher.pw.toml

@@ -1,13 +1,13 @@
 name = "KryptonFNP Patcher"
-filename = "fnp_patcher-26.1.2+1.21.9.jar"
+filename = "fnp_patcher-25.09.2+1.21.5.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/yzkasIPx/versions/ey8a3O3j/fnp_patcher-26.1.2%2B1.21.9.jar"
+url = "https://cdn.modrinth.com/data/yzkasIPx/versions/G2u3uyZr/fnp_patcher-25.09.2%2B1.21.5.jar"
 hash-format = "sha512"
-hash = "52d4a39b860770e87c5b39bae49f7df43252433592190f7fa9d6255a2d06a5847c8839ca9ee604516f11fc609660203fcf6186073b5680662de71f428fb01ab0"
+hash = "eaaaba4824aeceed63019d0d5a84fa0c8ee8bcb2cac5a5d9e1b4c3863eec341f3686b8277d314652b454512cd7c68d20c09b8e126ea2e15cda6daaac1301d18e"
 
 [update]
 [update.modrinth]
 mod-id = "yzkasIPx"
-version = "ey8a3O3j"
+version = "G2u3uyZr"

modpacks/rc-plus/1.21.10-mr/pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "f6593b668ee83b4b9c378f0b05a7ff2fcbcf9657fabd1dfa7eedfae31c14a812"
+hash = "cf05c89a2cae32b1d5aed6aeb81284dd503e33397feac8cc5b677783d7f9fb14"
 
 [versions]
 fabric = "0.19.2"

modpacks/simply/1.21.10-cf/pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "3a71a6f14e521d2c1a53dd53ce86a36bbd75becad431cefdfceff8d70f28991d"
+hash = "864724eab52699d6a05622c45893a763fc214498fda9518e323d9f6f2b025f91"
 
 [versions]
 fabric = "0.18.5"

modpacks/simply/1.21.10-mr/mods/e4mc.pw.toml

@@ -1,13 +1,13 @@
 name = "e4mc"
-filename = "e4mc-fabric-6.0.6.jar"
+filename = "e4mc-fabric-6.1.0.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/qANg5Jrr/versions/JSmcqwxn/e4mc-fabric-6.0.6.jar"
+url = "https://cdn.modrinth.com/data/qANg5Jrr/versions/9QMfnrh4/e4mc-fabric-6.1.0.jar"
 hash-format = "sha512"
-hash = "c171e4d8eab6bcd4cfc8f685a4766334ba8cf7feeb1ef19fb52562e144cdf8dcbf4f206e4b4e7e6d8194688c49490d41c7b9a0296ae9f37d2272189382ebe1eb"
+hash = "70acb611cb523fb6bff231e214775b7882cb3c30cabdec29623799b04b3b10c08d9c451323d858b5bf18cbe09b7e6069ae922edb9165ac166766849969bdc3dc"
 
 [update]
 [update.modrinth]
 mod-id = "qANg5Jrr"
-version = "JSmcqwxn"
+version = "9QMfnrh4"

modpacks/simply/1.21.10-mr/mods/kryptonfnp-patcher.pw.toml

@@ -1,13 +1,13 @@
 name = "KryptonFNP Patcher"
-filename = "fnp_patcher-26.1.2+1.21.9.jar"
+filename = "fnp_patcher-25.09.2+1.21.5.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/yzkasIPx/versions/ey8a3O3j/fnp_patcher-26.1.2%2B1.21.9.jar"
+url = "https://cdn.modrinth.com/data/yzkasIPx/versions/G2u3uyZr/fnp_patcher-25.09.2%2B1.21.5.jar"
 hash-format = "sha512"
-hash = "52d4a39b860770e87c5b39bae49f7df43252433592190f7fa9d6255a2d06a5847c8839ca9ee604516f11fc609660203fcf6186073b5680662de71f428fb01ab0"
+hash = "eaaaba4824aeceed63019d0d5a84fa0c8ee8bcb2cac5a5d9e1b4c3863eec341f3686b8277d314652b454512cd7c68d20c09b8e126ea2e15cda6daaac1301d18e"
 
 [update]
 [update.modrinth]
 mod-id = "yzkasIPx"
-version = "ey8a3O3j"
+version = "G2u3uyZr"

modpacks/simply/1.21.10-mr/pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "31842f63bb503b7048c36a4fb548802333c43b39fdeff72b5c5e01b4ddbf862a"
+hash = "e4e5ce67892fc21582406a7c143300e620883fd9eb35115fa814cd0345d2c297"
 
 [versions]
 fabric = "0.19.2"

tools/templates/manifest.rb

@@ -1,46 +0,0 @@
-require 'json'
-
-class Project
-  attr_accessor :id, :name, :type, :version, :mc_versions, :modrinth_id, :curseforge_id, :author, :license
-
-  def initialize
-    @mc_versions = []
-    yield(self) if block_given?
-  end
-
-  def to_h
-    {
-      id: @id,
-      name: @name,
-      type: @type,
-      version: @version,
-      mc_versions: @mc_versions,
-      modrinth_id: @modrinth_id,
-      curseforge_id: @curseforge_id,
-      author: @author,
-      license: @license
-    }
-  end
-end
-
-rc_plus = Project.new do |p|
-  p.id            = "rc-plus"
-  p.name          = "Re-Console Plus"
-  p.type          = "modpack" # choices: modpack, datapack, resourcepack
-  p.version       = "26.04.1"
-  
-  # ordered by publish priority
-  p.mc_versions   = [
-    "1.21.11-mr", 
-    "1.21.11-cf", 
-    "1.21.10-mr",
-    "1.21.10-cf"
-  ]
-
-  p.modrinth_id   = "legacy-minecraft"
-  p.curseforge_id = "re-console"
-  p.author        = "omo50, Cjnator38, Technocality"
-  p.license       = "GPL-3.0"
-end
-
-puts JSON.pretty_generate(rc_plus.to_h)

tools/templates/template-unfinished.rb

@@ -1,21 +0,0 @@
-{
-  id: "rc-plus", # project folder
-  name: "Re-Console Plus", # project name
-  type: "modpack", # this could be resourcepack, datapack, or modpack
-  
-  version: "26.04.1", 
-  
-# this will be the order versions are published in, so set it up properly. version is equal to folder name
-  mc_versions: [
-    "1.21.11-mr", 
-    "1.21.11-cf", 
-    "1.21.10-mr",
-    "1.21.10-cf"
-  ],
-# your page ids on mr and cf
-  modrinth_id: "legacy-minecraft",
-  curseforge_id: "re-console",
-
-  author: "omo50, Cjnator38, Technocality",
-  license: "GPL-3.0"
-}