Merge pull request #3177 from refinedmods/develop

v1.10.0-beta.2
refinedmods · Dec 16, 2021 · c77ca19 · c77ca19
2 parents d1b2286 + 48873ab
commit c77ca19
Show file tree

Hide file tree

Showing 598 changed files with 2,265 additions and 1,342 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,23 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed all Refined Storage advancements being granted when joining a world.
+- Fixed potential Pattern crash when loading Minecraft.
+
+## [v1.10.0-beta.1] - 2021-12-15
+
+### Fixed
+
+- Fixed Relay not working.
+- Fixed Wireless Transmitter only working upright.
+- Fixed Portable Grid not opening when pointing at a block.
+- Fixed being able to circumvent locked slots by scrolling.
+
 ### Changed
 
+- Added more slots to the Pattern Grid.
+- Combined fluid and item view in the Pattern Grid.
 - Ported to Minecraft 1.18.1.
 - Focused side buttons now display their tooltip properly.
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ apply plugin: 'maven-publish'
 
 group = 'com.refinedmods'
 archivesBaseName = 'refinedstorage'
-version = '1.10.0-beta.1'
+version = '1.10.0-beta.2'
 
 if (System.getenv('GITHUB_SHA') != null) {
     version += '+' + System.getenv('GITHUB_SHA').substring(0, 7)

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
diff --git a/...refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_controller.json b/...refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_controller.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...ta/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter.json b/...ta/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter_manager.json b/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter_manager.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...inedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_grid.json b/...inedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_grid.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...dstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_monitor.json b/...dstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafting_monitor.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...a/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_detector.json b/...a/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_detector.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...dstorage/advancements/recipes/refinedstorage/coloring_recipes/black_disk_manipulator.json b/...dstorage/advancements/recipes/refinedstorage/coloring_recipes/black_disk_manipulator.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_fluid_grid.json b/...refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_fluid_grid.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/.../data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_grid.json b/.../data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_grid.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...dstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_receiver.json b/...dstorage/advancements/recipes/refinedstorage/coloring_recipes/black_network_receiver.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...orage/advancements/recipes/refinedstorage/coloring_recipes/black_network_transmitter.json b/...orage/advancements/recipes/refinedstorage/coloring_recipes/black_network_transmitter.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...finedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_pattern_grid.json b/...finedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_pattern_grid.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_relay.json b/...data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_relay.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...dstorage/advancements/recipes/refinedstorage/coloring_recipes/black_security_manager.json b/...dstorage/advancements/recipes/refinedstorage/coloring_recipes/black_security_manager.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...rage/advancements/recipes/refinedstorage/coloring_recipes/black_wireless_transmitter.json b/...rage/advancements/recipes/refinedstorage/coloring_recipes/black_wireless_transmitter.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/.../refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_controller.json b/.../refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_controller.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...ata/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter.json b/...ata/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...nedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter_manager.json b/...nedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafter_manager.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...finedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_grid.json b/...finedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_grid.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_monitor.json b/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_crafting_monitor.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...ta/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_detector.json b/...ta/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_detector.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_disk_manipulator.json b/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_disk_manipulator.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/.../refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_fluid_grid.json b/.../refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_fluid_grid.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...s/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_grid.json b/...s/data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_grid.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_receiver.json b/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_receiver.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...torage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_transmitter.json b/...torage/advancements/recipes/refinedstorage/coloring_recipes/blue_network_transmitter.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...efinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_pattern_grid.json b/...efinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_pattern_grid.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/.../data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_relay.json b/.../data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_relay.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_security_manager.json b/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/blue_security_manager.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...orage/advancements/recipes/refinedstorage/coloring_recipes/blue_wireless_transmitter.json b/...orage/advancements/recipes/refinedstorage/coloring_recipes/blue_wireless_transmitter.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_controller.json b/...refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_controller.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...ta/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter.json b/...ta/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }

diff --git a/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter_manager.json b/...edstorage/advancements/recipes/refinedstorage/coloring_recipes/brown_crafter_manager.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:controller"
+            "items": [
+              "refinedstorage:controller"
+            ]
           }
         ]
       }