From 0ad81bb583bce375ea3a087dc5847db4333e1549 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 30 Jan 2022 12:56:02 +0100 Subject: [PATCH 1/7] Bump to 0.6.2 --- CHANGELOG.md | 2 ++ build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 714276f..d7110b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.6.1] - 2022-01-30 + ### Added - Added German translation by [@Wizqok](https://github.com/Wizqok). diff --git a/build.gradle b/build.gradle index 2126a3f..4a763fd 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'maven-publish' group = 'com.refinedmods' archivesBaseName = 'refinedpipes' -version = '0.6.1' +version = '0.6.2' if (System.getenv('GITHUB_SHA') != null) { version += '+' + System.getenv('GITHUB_SHA').substring(0, 7) From 55a8fe8d70dd3e0efb42fdcb0aa236b1f21d17ea Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 30 Jan 2022 15:06:44 +0100 Subject: [PATCH 2/7] Add changelog for v0.5.2 (MC 1.16.5) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7110b7..1fc0998 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,13 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Ported to Minecraft 1.18.1. +## [0.5.2] - 2022-01-30 + +### Fixed + +- Fixed random client crashes by [@malte0811](https://github.com/malte0811). +- Fixed crash when Extractor Attachment is interacting with inventories that have no slots. + ## [0.5.1] - 2021-11-28 ### Added From 23225f59696e99b8bb142a0e0995505981d83006 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 12 Feb 2022 16:42:39 +0100 Subject: [PATCH 3/7] Update minecraft version in bug template --- .github/ISSUE_TEMPLATE/bug_report.yml | 38 +++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index c3d4b35..1265e13 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -28,23 +28,27 @@ body: 3. validations: required: true - - type: dropdown - id: minecraft - attributes: - label: What Minecraft version is this happening on? - options: - - Minecraft 1.18.1 - - Minecraft 1.16.5 - - type: input - id: forge - attributes: - label: What Forge version is this happening on? - validations: - required: true - - type: input - id: refined-pipes - attributes: - label: What Refined Pipes version is this happening on? + - type: dropdown + id: minecraft + attributes: + 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: + label: What Forge version is this happening on? + validations: + required: true + - type: input + id: refined-pipes + attributes: + label: What Refined Pipes version is this happening on? description: | Ensure that you are running on the latest Refined Pipes version. validations: From 0acd278198a7dae4e7cd2da3b1b8852635244aba Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 12 Feb 2022 16:43:01 +0100 Subject: [PATCH 4/7] Update minecraft version in bug template --- .github/ISSUE_TEMPLATE/bug_report.yml | 112 +++++++++++++------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 1265e13..832ad59 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -2,60 +2,60 @@ name: Bug report description: Found a bug or encountered a crash? Please report it here. labels: [ bug ] body: - - type: markdown - attributes: - value: | - Provide a summary of the issue in the title above. - - type: textarea - id: description - attributes: - label: Describe the bug - description: | - Be as detailed as possible. - If applicable, also tell us what you expected to happen instead. - validations: - required: true - - type: textarea - id: reproduce - attributes: - label: How can we reproduce this bug or crash? - description: | - Provide us with steps on how to reproduce this issue. - Try to reproduce the issue with only Refined Pipes installed, if possible. - placeholder: | - 1. - 2. - 3. - validations: - required: true - - type: dropdown - id: minecraft - attributes: - 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 + - type: markdown + attributes: + value: | + Provide a summary of the issue in the title above. + - type: textarea + id: description + attributes: + label: Describe the bug + description: | + Be as detailed as possible. + If applicable, also tell us what you expected to happen instead. + validations: + required: true + - type: textarea + id: reproduce + attributes: + label: How can we reproduce this bug or crash? + description: | + Provide us with steps on how to reproduce this issue. + Try to reproduce the issue with only Refined Pipes installed, if possible. + placeholder: | + 1. + 2. + 3. + validations: + required: true + - type: dropdown + id: minecraft + attributes: + 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: + label: What Forge version is this happening on? + validations: + required: true + - type: input + id: refined-pipes + attributes: + label: What Refined Pipes version is this happening on? + description: | + Ensure that you are running on the latest Refined Pipes version. validations: - required: true - - type: input - id: forge - attributes: - label: What Forge version is this happening on? - validations: - required: true - - type: input - id: refined-pipes - attributes: - label: What Refined Pipes version is this happening on? - description: | - Ensure that you are running on the latest Refined Pipes version. - validations: - required: true - - type: textarea - id: logs - attributes: - label: Relevant log output - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. - render: shell + required: true + - type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + render: shell From e30efab75af7885e954624241d8e73273ef852df Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 12 Feb 2022 16:43:25 +0100 Subject: [PATCH 5/7] Update minecraft version in bug template --- .github/ISSUE_TEMPLATE/bug_report.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 832ad59..0341eeb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -49,10 +49,10 @@ body: id: refined-pipes attributes: label: What Refined Pipes version is this happening on? - description: | - Ensure that you are running on the latest Refined Pipes version. - validations: - required: true + description: | + Ensure that you are running on the latest Refined Pipes version. + validations: + required: true - type: textarea id: logs attributes: From b153bf99086760613e7596276fa2c96bddd8665e Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 16 Feb 2022 13:23:18 +0100 Subject: [PATCH 6/7] 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 9e5add6..074c357 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 a02989a32cba9b70999370537b5986e4823e09e4 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 2 Apr 2022 14:51:53 +0200 Subject: [PATCH 7/7] Port to 1.18.2 --- .github/CONTRIBUTING.md | 2 ++ .github/ISSUE_TEMPLATE/bug_report.yml | 3 +-- .github/workflows/release.yml | 6 ++++-- CHANGELOG.md | 4 ++++ LICENSE.md | 14 +++++--------- build.gradle | 16 ++++++++++++---- src/main/resources/META-INF/mods.toml | 2 +- src/main/resources/pack.mcmeta | 2 +- 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index beb85bb..53d6375 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -39,6 +39,8 @@ The build pipeline triggers when a commit is pushed to a branch or pull request. The release pipeline triggers when a tag is pushed. This will run all the steps that our build pipeline does. +After that succeeds, it will publish to GitHub packages and CreeperHost Maven repository. + The "Unreleased" section in `CHANGELOG.md` is parsed and a GitHub release is created with the changelog body and relevant artifacts. diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 0341eeb..49358a7 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -35,8 +35,7 @@ body: 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 + - Minecraft 1.18.2 validations: required: true - type: input diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 369d1b8..3485e84 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,8 +41,10 @@ jobs: - name: Publish run: ./gradlew publish env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE: ${{ steps.tagName.outputs.tag }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CREEPERHOST_MAVEN_USERNAME: ${{ secrets.CREEPERHOST_MAVEN_USERNAME }} + CREEPERHOST_MAVEN_TOKEN: ${{ secrets.CREEPERHOST_MAVEN_TOKEN }} + RELEASE: ${{ steps.tagName.outputs.tag }} - name: Retrieve changelog id: changelog_reader uses: mindsers/changelog-reader-action@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fc0998..bb331b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed + +- Ported to Minecraft 1.18.2. + ## [0.6.1] - 2022-01-30 ### Added diff --git a/LICENSE.md b/LICENSE.md index 11fb89b..4795dee 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,15 +1,11 @@ # The MIT License (MIT) -Copyright © 2020 - 2021 Refined Mods +Copyright © 2020 - 2022 Refined Mods -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the “Software”), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +documentation files (the “Software”), to deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/build.gradle b/build.gradle index 4a763fd..3ac8e23 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ if (System.getenv('RELEASE') != null) { java.toolchain.languageVersion = JavaLanguageVersion.of(17) minecraft { - mappings channel: 'official', version: '1.18.1' + mappings channel: 'official', version: '1.18.2' runs { client { @@ -86,8 +86,8 @@ processResources { } dependencies { - minecraft 'net.minecraftforge:forge:1.18.1-39.0.59' - runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.41") + minecraft 'net.minecraftforge:forge:1.18.2-40.0.32' + runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.4.171") } jar { @@ -112,7 +112,7 @@ if (System.getenv("CURSEFORGE_TOKEN") != null) { changelog = System.getenv("CHANGELOG") changelogType = 'markdown' releaseType = project.version.toString().contains('beta') ? 'beta' : (project.version.toString().contains('alpha') ? 'alpha' : 'release') - addGameVersion "1.18.1" + addGameVersion "1.18.2" mainArtifact(jar) { displayName = "v$project.version" } @@ -130,6 +130,14 @@ publishing { password = System.getenv("GITHUB_TOKEN") } } + maven { + name = "CreeperHost" + url = uri("https://maven.creeperhost.net/release") + credentials { + username = System.getenv("CREEPERHOST_MAVEN_USERNAME") + password = System.getenv("CREEPERHOST_MAVEN_TOKEN") + } + } } publications { gpr(MavenPublication) { diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b0c0061..0f446ff 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[39,)" +loaderVersion="[40,)" issueTrackerURL="https://github.com/refinedmods/refinedpipes" license="MIT" [[mods]] diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 57ecf30..7731ec1 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Refined Pipes resources", - "pack_format": 8 + "pack_format": 9 } }