Merge pull request #116 from refinedmods/develop

v0.6.2
refinedmods · Jun 4, 2022 · 51cf136 · 51cf136
2 parents 33a47fa + a02989a
commit 51cf136
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 72 deletions.
diff --git 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
@@ -2,56 +2,59 @@ 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?
-            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?
-            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
+  - 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.2
+    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
diff --git 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

diff --git 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
@@ -7,6 +7,12 @@ 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
 
 - Added German translation by [@Wizqok](https://github.com/Wizqok).
@@ -23,6 +29,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

diff --git 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
@@ -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)
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "Refined Pipes resources",
-    "pack_format": 8
+    "pack_format": 9
   }
 }