From 78e758f7b6db08cc271330a4da3f9ccd10d9fc79 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 28 Dec 2021 22:48:09 +0100 Subject: [PATCH 1/7] Bump to v0.8.2 --- CHANGELOG.md | 2 ++ build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0e0ea3..02fdca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [v0.8.1] - 2021-12-28 + ### Added - Added support for Refined Storage v1.10.0-beta.4. diff --git a/build.gradle b/build.gradle index 4c16832..2f3a6c2 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ apply plugin: 'maven-publish' group = 'com.refinedmods' archivesBaseName = 'refinedstorageaddons' -version = '0.8.1' +version = '0.8.2' if (System.getenv('GITHUB_SHA') != null) { version += '+' + System.getenv('GITHUB_SHA').substring(0, 7) From a7041cf8435c1b1317d4cc948fb0a9c7b3d61f53 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 12 Feb 2022 16:41:28 +0100 Subject: [PATCH 2/7] Update minecraft version 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 fffe520..9188bf1 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 51bf4cf8b0fa9b6f9a5eaa9fdf0bc3b7fcbb9f1e Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 16 Feb 2022 13:24:05 +0100 Subject: [PATCH 3/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 1c65a7a..312b5f0 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 3335c263d5a9e50d002ad04b8f4d04cbc6a8e7cd Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 14 Mar 2022 10:21:08 +0100 Subject: [PATCH 4/7] Update personal access token --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2f3a6c2..af5d0ce 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ repositories { */ credentials { username = "anything" - password = "\u0067hp_pnP5hVDYXXhhXwe21IEkrUzGjquUJL0xjLzb" + password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX" } } } From 2b9430338a7ee344dda3c9b4d96ad47bdc19d0cd Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 26 Mar 2022 14:51:21 +0100 Subject: [PATCH 5/7] Port to Minecraft 1.18.2 and add CreeperHost repository publishing. --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/release.yml | 2 ++ CHANGELOG.md | 4 ++++ LICENSE.md | 2 +- build.gradle | 18 +++++++++++++----- src/main/resources/META-INF/mods.toml | 4 ++-- src/main/resources/pack.mcmeta | 2 +- 8 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ff0454b..eb87dcd 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -39,7 +39,7 @@ 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. +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 9188bf1..0299815 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -35,7 +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.18.2 - Minecraft 1.16.5 validations: required: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 680b655..ee48921 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,6 +42,8 @@ jobs: run: ./gradlew publish env: 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 02fdca9..77a6359 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. + ## [v0.8.1] - 2021-12-28 ### Added diff --git a/LICENSE.md b/LICENSE.md index e2896e2..3bd1174 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # The MIT License (MIT) -Copyright © 2017 - 2021 Refined Mods +Copyright © 2017 - 2022 Refined Mods Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/build.gradle b/build.gradle index af5d0ce..0c572e0 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,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 { @@ -94,9 +94,9 @@ processResources { } dependencies { - minecraft 'net.minecraftforge:forge:1.18.1-39.0.0' - compileOnly "com.refinedmods:refinedstorage:1.10.0-beta.4" - runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.10.0-beta.4") { + minecraft 'net.minecraftforge:forge:1.18.2-40.0.32' + compileOnly "com.refinedmods:refinedstorage:1.10.2" + runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.10.2") { transitive false } } @@ -123,7 +123,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" } @@ -143,6 +143,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 04ba6de..9577763 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/refinedstorageaddons" license = "MIT" [[mods]] @@ -13,7 +13,7 @@ An addon mod for Refined Storage ''' [[dependencies.refinedstorageaddons]] modId = "refinedstorage" -versionRange = "[1.10.0-beta,)" +versionRange = "[1.10.2,)" mandatory = true ordering = "AFTER" side = "BOTH" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 26861ec..ccbcffd 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Refined Storage Addons resources", - "pack_format": 8 + "pack_format": 9 } } From 53a4a6a37e24271bf11a32bee17a3889e63d7533 Mon Sep 17 00:00:00 2001 From: Soreth Date: Sun, 20 Mar 2022 16:03:10 +0100 Subject: [PATCH 6/7] add french storage --- .../resources/assets/refinedstorageaddons/lang/fr_fr.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/resources/assets/refinedstorageaddons/lang/fr_fr.json diff --git a/src/main/resources/assets/refinedstorageaddons/lang/fr_fr.json b/src/main/resources/assets/refinedstorageaddons/lang/fr_fr.json new file mode 100644 index 0000000..dfeb20e --- /dev/null +++ b/src/main/resources/assets/refinedstorageaddons/lang/fr_fr.json @@ -0,0 +1,6 @@ +{ + "itemGroup.refinedstorageaddons": "Refined Storage Addons", + "item.refinedstorageaddons.wireless_crafting_grid": "Grille d'artisanat sans fil", + "item.refinedstorageaddons.creative_wireless_crafting_grid": "Grille d'artisanat créative sans fil", + "key.refinedstorageaddons.openWirelessCraftingGrid": "Ouvrir la grille d'artisanat sans fil" +} \ No newline at end of file From 01be60d92af095c8c24e4ee93ace3fc3c02bdb30 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 26 Mar 2022 15:12:16 +0100 Subject: [PATCH 7/7] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77a6359..9823e71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added + +- French translation by [@dracnis](https://github.com/dracnis). + ### Changed - Ported to Minecraft 1.18.2.