From e3756e01265a749ed8de16e69c9e8b2b49454d19 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 25 Jan 2022 18:38:18 +0100 Subject: [PATCH 1/6] Bump to v1.10.1 --- CHANGELOG.md | 2 ++ build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb8bda729a..1d251bd0a4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [v1.10.0] - 2022-01-25 + ### Fixed - Fixed multiple bugs related to transferring recipes into the Crafting Grid. diff --git a/build.gradle b/build.gradle index 15a7cea0c2..ee172a6948 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ apply plugin: 'maven-publish' group = 'com.refinedmods' archivesBaseName = 'refinedstorage' -version = '1.10.0' +version = '1.10.1' if (System.getenv('GITHUB_SHA') != null) { version += '+' + System.getenv('GITHUB_SHA').substring(0, 7) From e1c10fee88439d54445964f263d53c80e689432a Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 12 Feb 2022 16:40:57 +0100 Subject: [PATCH 2/6] Make minecraft version required in bug template --- .github/ISSUE_TEMPLATE/bug_report.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 40c6f28959..5410d5be97 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -31,10 +31,14 @@ body: - type: dropdown id: minecraft attributes: - label: What Minecraft version is this happening on? - options: - - Minecraft 1.18.1 - - Minecraft 1.16.5 + label: What Minecraft version is this happening on? + description: | + If your Minecraft version isn't listed here, it means that it's no longer supported. In that case, don't create an issue. + options: + - Minecraft 1.18.1 + - Minecraft 1.16.5 + validations: + required: true - type: input id: forge attributes: From bacacbca72f929dc36b72858063a5f992ddbd3a5 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 16 Feb 2022 13:22:41 +0100 Subject: [PATCH 3/6] Disable blank issue creation --- .github/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 1c65a7aa62..312b5f0dc1 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ -blank_issues_enabled: true +blank_issues_enabled: false contact_links: - name: Discord Community Support url: https://discordapp.com/invite/VYzsydb From 42192e05cdb48180b60e067f3a4efbfa5597ca48 Mon Sep 17 00:00:00 2001 From: Darkere Date: Sat, 26 Feb 2022 12:53:09 +0100 Subject: [PATCH 4/6] fix crash when opening AlternativesScreen f ixes #3234 --- .../refinedstorage/screen/grid/AlternativesScreen.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java index 23ab215d4e..784157da03 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java @@ -3,14 +3,14 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.blockentity.config.IType; +import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; +import com.refinedmods.refinedstorage.blockentity.grid.GridBlockEntity; import com.refinedmods.refinedstorage.container.AlternativesContainerMenu; import com.refinedmods.refinedstorage.render.FluidRenderer; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; -import com.refinedmods.refinedstorage.blockentity.config.IType; -import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; -import com.refinedmods.refinedstorage.blockentity.grid.GridBlockEntity; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; @@ -47,7 +47,7 @@ public class AlternativesScreen extends BaseScreen { private FluidStack fluid; private AlternativesScreen(Screen parent, Player player, Component title) { - super(new AlternativesContainerMenu(player), 175, 143, null, title); + super(new AlternativesContainerMenu(player), 175, 143, player.getInventory(), title); this.parent = parent; this.scrollbar = new ScrollbarWidget(this, 155, 20, 12, 89); From c5f69b7deab64997efe39b2bd53e58b8f91a1a63 Mon Sep 17 00:00:00 2001 From: Darkere Date: Sat, 26 Feb 2022 13:30:38 +0100 Subject: [PATCH 5/6] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d251bd0a4..e8f6370e2b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +- Fixed crash when opening alternatives screen + ## [v1.10.0] - 2022-01-25 ### Fixed From 6aa8b6fb0ea517794d2ce3809a310e2bc7d5449d Mon Sep 17 00:00:00 2001 From: Darkere Date: Sat, 26 Feb 2022 16:42:31 +0100 Subject: [PATCH 6/6] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8f6370e2b..67f691536a 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed + - Fixed crash when opening alternatives screen ## [v1.10.0] - 2022-01-25