Merge pull request #3590 from refinedmods/release/1.12.4

Release v1.12.4

.github/CONTRIBUTING.md

@@ -88,7 +88,7 @@ Documentation must be kept up to date when adding or changing functionality.
 
 ### Javadoc
 
-Javadoc is available after every release on https://refinedmods.com/refinedstorage/.
+Javadoc is available after every release on https://refinedmods.com/javadoc/refinedstorage.
 
 ### API annotations
 
@@ -196,7 +196,7 @@ The workflow takes care of the following:
 - Running a build.
 - Publishing on [GitHub packages](https://github.com/refinedmods/refinedstorage/packages) and
   CreeperHost Maven.
-- Publishing Javadoc on [GitHub pages](https://github.com/refinedmods/refinedstorage/tree/gh-pages).
+- Publishing Javadoc on [GitHub pages](https://github.com/refinedmods/javadoc).
 - Deploying on [GitHub releases](https://github.com/refinedmods/refinedstorage/releases).
 - Announcing the release on Discord and Twitter.
 - Creating a PR that merges `main` back into `develop` to get the changes to `CHANGELOG.md` and `build.gradle`

CHANGELOG.md

@@ -7,6 +7,26 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.12.4] - 2023-11-05
+
+### Added
+
+-   Re-added compatibility with Inventory Sorter.
+
+### Fixed
+
+-   Various world corruption issues if Refined Storage blocks were removed unexpectedly or with another mod.
+-   Fixed Grid search bar not being able to lose focus.
+-   Fixed JEI transfer crash for larger processing recipes.
+-   Fixed rare autocrafting crash.
+-   Fixed some models in inactive state being emissive.
+-   Fixed Controller item not rendering energy state correctly.
+-   Fixed duplication bug with the Crafting Grid.
+-   Fixed fluid duplication bug with the Importer and GregTechCEu machines.
+-   Attempted to fix issue where Grid doesn't load items and requires a client restart.
+-   Fixed Crafter Manager slots being able to sort with Inventory Sorter.
+-   Fixed duplication bug in the Crafter with Inventory Sorter.
+
 ## [1.12.3] - 2023-07-07
 
 ### Fixed
@@ -3475,7 +3495,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 -   Internal test release.
 
-[Unreleased]: https://github.com/refinedmods/refinedstorage/compare/v1.12.3...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage/compare/v1.12.4...HEAD
+
+[1.12.4]: https://github.com/refinedmods/refinedstorage/compare/v1.12.3...v1.12.4
 
 [1.12.3]: https://github.com/refinedmods/refinedstorage/compare/v1.12.2...v1.12.3
 

README.md

@@ -4,7 +4,7 @@
   <p>Refined Storage is a mass storage mod for Minecraft that offers the player a network-based storage system, allowing
 them to store items and fluids on a massively expandable device network.</p>
 
-[![Build Status](https://github.com/refinedmods/refinedstorage/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/refinedmods/refinedstorage/actions/workflows/build.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage&metric=coverage)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage) [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage) [![Downloads on CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](http://minecraft.curseforge.com/projects/refined-storage) [![Discord](https://img.shields.io/discord/342942776494653441)](https://discordapp.com/invite/VYzsydb) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE.md)
+[![Build Status](https://github.com/refinedmods/refinedstorage/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/refinedmods/refinedstorage/actions/workflows/build.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage&metric=coverage)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage) [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage) [![Downloads on CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](http://minecraft.curseforge.com/projects/refined-storage) [![Downloads on Modrinth](https://img.shields.io/modrinth/dt/refined-storage?logo=modrinth)](https://modrinth.com/mod/refined-storage) [![Discord](https://img.shields.io/discord/342942776494653441)](https://discordapp.com/invite/VYzsydb) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE.md)
 </div>
 
 ## About
@@ -27,6 +27,7 @@ this mod that allow the player to setup auto-crafting, allowing the crafting of
 - [CurseForge](https://curseforge.com/minecraft/mc-mods/refined-storage)
 - [Modrinth](https://modrinth.com/mod/refined-storage)
 - [Wiki](https://refinedmods.com/refined-storage/)
+- [Javadoc](https://refinedmods.com/javadoc/refinedstorage)
 - [Discord](https://discordapp.com/invite/VYzsydb)
 - [Twitter](https://twitter.com/refinedmods)
 - [Mastodon](https://anvil.social/@refinedmods)

build.gradle

@@ -1,5 +1,10 @@
 apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.7.1/helper.gradle"
 
+// TODO: remove in 1.21
+ext {
+    forgeVersion = "47.1.0"
+}
+
 repositories {
     maven {
         name = 'JEI'
@@ -38,8 +43,23 @@ dependencies {
 
     compileOnly fg.deobf('curse.maven:crafting-tweaks-233071:4596466')
 
-    // TODO mixin issue
-    // runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:5.2.0-beta.3+1.20.1")
-    // can't depend on API due to Javadoc build error (CuriosApi imports stuff from common)
-    compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:5.2.0-beta.3+1.20.1")
+    implementation fg.deobf("top.theillusivec4.curios:curios-forge:5.2.0-beta.3+1.20.1")
 }
+
+// TODO: remove in 1.21
+minecraft {
+    runs {
+        server {
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+        }
+        client {
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+        }
+        data {
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+        }
+    }
+}

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-03T11:19:34.4889238	Loot Tables
+// 1.20.1	2023-11-05T14:19:25.383214243	Loot Tables
 24df81614f6b28c4c7e59589d79fd2c929d71727 data/refinedstorage/loot_tables/blocks/black_controller.json
 aadbec0f79a3fb95d39e866a453cfec0cbbacd36 data/refinedstorage/loot_tables/blocks/black_crafter.json
 a792eb6ac90ce775052c9c4a1b29bf9551477b5d data/refinedstorage/loot_tables/blocks/black_crafter_manager.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-03T11:19:34.5209453	Recipes
+// 1.20.1	2023-11-05T14:19:25.387472745	Recipes
 1ccdc8b9da42fbc8d8c954215c76634af2d5254e data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_controller.json
 b4936ab0116ecd65cc2ca1f8342b18d9019d9bf4 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter.json
 6632b2a29739b77ca01b29a33688640d63ba85fb data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter_manager.json

src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c

@@ -1,2 +1,2 @@
-// 1.20.1	2023-07-03T11:19:34.4768009	Block Entity Type Tags
+// 1.20.1	2023-11-05T14:19:25.380203046	Block Entity Type Tags
 98555d946827da8ddb7a7c451a1c99f4d0184ad3 data/packingtape/tags/block_entity_type/blacklist/problematic.json

src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2

@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-03T11:19:34.4829224	Tags for minecraft:item mod id refinedstorage
+// 1.20.1	2023-11-05T14:19:25.382491537	Tags for minecraft:item mod id refinedstorage
 061bf4c2f3bdd530115615f2b04e55c2602908bd data/refinedstorage/tags/items/controller.json
 407a16e5d941c69915f75b135a13e9144cc9c43e data/refinedstorage/tags/items/crafter.json
 dc1342f1d3e6a4cd8eaaa52429a011c10c6c2d96 data/refinedstorage/tags/items/crafter_manager.json

src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e

@@ -1,5 +1,5 @@
-// 1.20.1	2023-07-03T11:19:34.5471111	Tags for minecraft:block mod id refinedstorage
-3f3a0c830f4ddc021ae2c2a36f75311d8df1fb2e data/forge/tags/blocks/relocation_not_supported.json
+// 1.20.1	2023-11-05T14:52:30.007687009	Tags for minecraft:block mod id refinedstorage
+885d292a69d67240dbf2e57e951bf4fff5c7a064 data/forge/tags/blocks/relocation_not_supported.json
 061bf4c2f3bdd530115615f2b04e55c2602908bd data/refinedstorage/tags/blocks/controller.json
 407a16e5d941c69915f75b135a13e9144cc9c43e data/refinedstorage/tags/blocks/crafter.json
 dc1342f1d3e6a4cd8eaaa52429a011c10c6c2d96 data/refinedstorage/tags/blocks/crafter_manager.json