Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21

Author: rubensworks

.github/workflows/ci.yml

@@ -64,12 +64,13 @@ jobs:
           if-no-files-found: error
           path: build/libs/*
       - name: 'Deploy to CurseForge'
-        if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/master')
+        if: startsWith(github.ref, 'refs/tags/') || (!startsWith(github.event.head_commit.message, 'Bump mod version') && startsWith(github.ref, 'refs/heads/master'))
         env:
           CURSEFORGE_KEY_SECRET: ${{ secrets.CURSEFORGE_KEY_SECRET }}
         run: ./gradlew publishCurseForge
       - name: 'Deploy to Modrinth'
-        if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/master')
+        continue-on-error: true
+        if: startsWith(github.ref, 'refs/tags/') || (!startsWith(github.event.head_commit.message, 'Bump mod version') && startsWith(github.ref, 'refs/heads/master'))
         env:
           MODRINTH_KEY_SECRET: ${{ secrets.MODRINTH_KEY_SECRET }}
         run: ./gradlew modrinth

.github/workflows/crowdin.yml

@@ -16,7 +16,7 @@ jobs:
         uses: crowdin/github-action@v2
         with:
           upload_sources: true
-          upload_translations: true
+          upload_translations: false
           download_translations: true
           localization_branch_name: l10n_crowdin_translations
           create_pull_request: true

README.md

@@ -4,12 +4,12 @@
 [![Coverage Status](https://coveralls.io/repos/github/CyclopsMC/IntegratedCrafting/badge.svg)](https://coveralls.io/github/CyclopsMC/IntegratedCrafting)
 [![Crowdin](https://badges.crowdin.net/cyclopsmc-integratedcrafting/localized.svg)](https://crowdin.com/project/cyclopsmc-integratedcrafting)
 [![Download](https://img.shields.io/static/v1?label=Maven&message=GitHub%20Packages&color=blue)](https://github.com/CyclopsMC/packages/packages/770037)
-[![CurseForge](http://cf.way2muchnoise.eu/full_287357_downloads.svg)](http://minecraft.curseforge.com/projects/287357)
+[![CurseForge](http://cf.way2muchnoise.eu/full_287357_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/integrated-crafting)
 [![Discord](https://img.shields.io/discord/386052815128100865.svg?colorB=7289DA&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAABWAgMAAABnZYq0AAAACVBMVEUAAB38%2FPz%2F%2F%2F%2Bm8P%2F9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfhBxwQJhxy2iqrAAABoElEQVRIx7WWzdGEIAyGgcMeKMESrMJ6rILZCiiBg4eYKr%2Fd1ZAfgXFm98sJfAyGNwno3G9sLucgYGpQ4OGVRxQTREMDZjF7ILSWjoiHo1n%2BE03Aw8p7CNY5IhkYd%2F%2F6MtO3f8BNhR1QWnarCH4tr6myl0cWgUVNcfMcXACP1hKrGMt8wcAyxide7Ymcgqale7hN6846uJCkQxw6GG7h2MH4Czz3cLqD1zHu0VOXMfZjHLoYvsdd0Q7ZvsOkafJ1P4QXxrWFd14wMc60h8JKCbyQvImzlFjyGoZTKzohwWR2UzSONHhYXBQOaKKsySsahwGGDnb%2FiYPJw22sCqzirSULYy1qtHhXGbtgrM0oagBV4XiTJok3GoLoDNH8ooTmBm7ZMsbpFzi2bgPGoXWXME6XT%2BRJ4GLddxJ4PpQy7tmfoU2HPN6cKg%2BledKHBKlF8oNSt5w5g5o8eXhu1IOlpl5kGerDxIVT%2BztzKepulD8utXqpChamkzzuo7xYGk%2FkpSYuviLXun5bzdRf0Krejzqyz7Z3p0I1v2d6HmA07dofmS48njAiuMgAAAAASUVORK5CYII%3D)](https://discord.gg/9yDxubB)
 
 Craft stuff in Integrated Dynamics networks
 
-All stable releases (including deobfuscated builds) can be found on [CurseForge](http://minecraft.curseforge.com/projects/287357/files).
+All stable releases (including deobfuscated builds) can be found on [CurseForge](https://www.curseforge.com/minecraft/mc-mods/integrated-crafting/files).
 
 [Development builds](https://github.com/CyclopsMC/packages/packages/) are hosted as GitHub packages.
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'net.neoforged.gradle.userdev' version '7.0.171'
+	id 'net.neoforged.gradle.userdev' version '7.0.180'
     id 'net.darkhax.curseforgegradle' version '1.0.8'
     id 'com.github.kt3k.coveralls' version '2.12.0'
     id 'com.diffplug.spotless' version '6.25.0'
@@ -84,12 +84,20 @@ def getChangelog() {
 sourceSets {
     main
     test
+    integrationtest {
+        compileClasspath += sourceSets.main.output
+        runtimeClasspath += sourceSets.main.output
+    }
 }
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 configurations {
     modLib
     implementation.extendsFrom modLib
+
+    integrationtestImplementation.extendsFrom(implementation)
+    integrationtestRuntimeOnly.extendsFrom(runtimeOnly)
+    javadoc.classpath += sourceSets.integrationtest.output
 }
 
 test {
@@ -160,6 +168,7 @@ runs {
         systemProperty 'forge.logging.console.level', 'debug'
         systemProperty 'forge.logging.console.level', 'debug'
         modSource project.sourceSets.main
+        modSource project.sourceSets.integrationtest
 
         dependencies {
             runtime project.configurations.modLib

resources/changelog/1.19.2-1.1.9.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Fix rare crash when finalizing crafting jobs, Closes #133

resources/changelog/1.20.1-1.1.10.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.4 or higher.
+
+Fixes:
+* Fix rare crash when finalizing crafting jobs, Closes #133

resources/changelog/1.21.1-1.1.14.txt

@@ -0,0 +1,8 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.25.5 or higher.
+
+Additions:
+* Add tr_tr translations
+
+Fixes:
+* Fix rare crash when finalizing crafting jobs, Closes #133

resources/changelog/1.21.1-1.1.15.txt

@@ -0,0 +1,17 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.25.5 or higher.
+
+Fixes:
+* Fix over-estimation of storage contents when calculating jobs
+
+This could occur when an ingredient could be partially extracted from
+storage and partially had to be autocrafted via a sub-job.
+The simulated extraction memory was being set to an amount that was too
+low, which caused the algorithm to incorrectly think there was more to
+extract.
+The flaw in reasoning before this commit was that the simulation
+extraction memory would only increment. But this is false, since it will
+decrement when sub-jobs are calculated, and this decrement was not taken
+into account.
+
+Closes #125

resources/changelog/1.21.1-1.1.16.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.25.5 or higher.
+
+Fixes:
+* Fix broken advancement icons

src/integrationtest/resources/data/integratedcrafting/recipe/special/minecraft_dead_bush.json

@@ -0,0 +1,3 @@
+{
+  "type": "integratedcrafting:crafting_special_dead_bush"
+}