Merge branch '1.21.1/dev' into 1.21.1/main

Author: desht

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Java CI - Build on Push
+
+on:
+  push:
+    branches: [ main, dev, "1.**" ]
+  workflow_dispatch:
+    inputs:
+      skip_maven_publish:
+        description: 'Skip Maven publishing'
+        required: true
+        default: 'false'
+
+jobs:
+  build:
+    if: |
+      !contains(github.event.head_commit.message, '[ciskip]')
+    uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
+    with:
+      curse-publish-task: ""
+      maven-snapshots: true
+      java-version: 21
+    secrets:
+      ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
+      saps-token: ${{ secrets.SAPS_TOKEN }}

.github/workflows/release.yaml

@@ -0,0 +1,22 @@
+name: Java CI - Build Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+'
+      - 'v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[a-z]+'
+      - 'v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[a-z]+\.[0-9]+'
+
+jobs:
+  build:
+    if: |
+      !contains(github.event.head_commit.message, '[ciskip]')
+    uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
+    with:
+      curse-publish-task: publishMods
+      java-version: 21
+    secrets:
+      ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
+      saps-token: ${{ secrets.SAPS_TOKEN }}
+      curse-token: ${{ secrets.CURSEFORGE_KEY }}
+      github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,9 +1,31 @@
-build
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+*.ipr
+*.iws
+*.iml
 .idea
-.DS_Store
+
+# gradle
+build
 .gradle
+
+# other
+eclipse
 run
 runs
-.kotlin
+run-data
+src/generated/resources/.cache
+
+# Mac
+repo
+.DS_Store
 
-fabric/src/main/generated/.cache/
+src/generated/resources-client/.cache/

.gitignore

@@ -1,3 +1,36 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [21.1.4]
+
+### Changed
+* Backported all new 26.1 development features
+* IMPORTANT: incompatible changes with previous 21.1.3 release!
+  * Now a NeoForge-only mod
+  * Unification functionality is now enabled by default
+    * If updating this in an existing modpack/server, you may wish to disable unification features via `ftbmaterials-startup.snbt`
+* Several improvements to recipe unification
+  * Better detection of modded items and tags in `/ftbmaterials dev build-unifier-db`
+  * Better handling of json arrays in recipes
+  * Raw storage blocks are now added to the Unifier DB
+  * Added blacklisting to `ftbmaterials-startup.snbt` to exclude specific items/item tags/blocks entirely from the unification DB
+  * Added overrides to `ftbmaterials-startup.snbt` to perform per-recipe-namespace replacements on specific strings in recipes
+* Changes to handling of custom rules file `config/ftbmaterials/custom-rules.json`
+  * The file is now located at `config/ftbmaterials/custom-rules-default.json` 
+  * Now scans `config/ftbmaterials/rules/` to load supplementary rules files (recommended to use these rather than edit the base `custom-rules-default.json` file)
+  * If updating on an existing world _and_ you have added rules, you will need to re-add those rules to a supplementary rules file (see above)
+  * The "sub" field in custom rules is now "output_value"
+  * Rules can take an optional "input_value" field which, if present, makes the rules run only on recipes with a matching input value
+  * If custom rules exist for a recipe type, but none match for a particular recipe of that type, the default recipe scanner (scanning for items and tags in the Unifier DB) is now run for that recipe
+* The `ftbmaterials dev build-unifier-db` now automatically marks the Unifier DB for reload
+  * No need to manually run `/ftbmaterials dev reload` anymore
+  * If you need the old functionality, use `/ftbmaterials dev build-unifier-db noreload`
+* Added crafting recipes for the copper nugget ↔ copper ingot
+* Added NeoForge datamap entries and recipes for tiny coal & charcoal (smelt 1 item in a furnace, 8:1 ratio with standard item)
+
 ## [21.1.3]
 
 ### Changed