Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.2.1 #10

Merged
merged 18 commits into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
types: [ opened, synchronize, reopened ]
jobs:
build:
uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.12.1
uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.13.4
with:
mutation-testing: false
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
type: string
jobs:
draft:
uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.12.1
uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.13.4
with:
release-type: ${{ inputs.release-type }}
version-number-override: ${{ inputs.version-number-override }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-for-unsupported-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on:
types: [ labeled, unlabeled, reopened ]
jobs:
unsupported-labeler:
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.12.1
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.13.4
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- closed
jobs:
publish-release:
uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.12.1
uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.13.4
secrets: inherit
with:
project-name: 'Refined Storage - JEI Integration'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/resolved-issue-locking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on:
- cron: '0 0 * * *'
jobs:
lock:
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.12.1
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.13.4
2 changes: 1 addition & 1 deletion .github/workflows/validate-branch-name.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: Validate branch name
on: [ pull_request ]
jobs:
validate-branch-name:
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.12.1
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.13.4
2 changes: 1 addition & 1 deletion .github/workflows/validate-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on:
types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
jobs:
validate-changelog:
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.12.1
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.13.4
2 changes: 1 addition & 1 deletion .github/workflows/validate-commit-messages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: Validate commit messages
on: [ pull_request ]
jobs:
validate-commit-messages:
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.12.1
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.13.4
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.2.1] - 2024-06-16

### Fixed

- Support for Refined Storage v2.0.0-milestone.3.9.

## [0.2.0] - 2024-06-09

### Fixed
Expand All @@ -23,7 +29,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Recipe transfer integration for the Crafting Grid.
- Grid / JEI search box synchronization options.

[Unreleased]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.2.0...HEAD
[Unreleased]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.2.1...HEAD

[0.2.1]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.2.0...v0.2.1

[0.2.0]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.1.0...v0.2.0

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

## About

JEI integration for [Refined Storage](https://github.com/refinedmods/refinedstorage2).
[Just Enough Items](https://github.com/mezz/JustEnoughItems) integration
for [Refined Storage](https://github.com/refinedmods/refinedstorage2).

Adds support for:

Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
refinedstorageVersion=2.0.0-milestone.3.8
refinedstorageVersion=2.0.0-milestone.3.10
jeiVersion=17.3.0.52
# Gradle
org.gradle.jvmargs=-Xmx1G
11 changes: 6 additions & 5 deletions refinedstorage-jei-integration-common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
plugins {
id 'java-library'
}

archivesBaseName = 'refinedstorage-jei-integration-common'

repositories {
Expand All @@ -17,11 +21,8 @@ repositories {
commonProject()

dependencies {
compileOnly common.jei.api
implementation "com.refinedmods.refinedstorage2:refinedstorage2-platform-common:${refinedstorageVersion}"
implementation "com.refinedmods.refinedstorage2:refinedstorage2-platform-api:${refinedstorageVersion}"
implementation "com.refinedmods.refinedstorage2:refinedstorage2-resource-api:${refinedstorageVersion}"
implementation "com.refinedmods.refinedstorage2:refinedstorage2-grid-api:${refinedstorageVersion}"
api "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
api "com.refinedmods.refinedstorage2:refinedstorage2-platform-common:${refinedstorageVersion}"
}

enablePublishing()
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Synchronisieren Sie das Suchfeld Text mit dem JEI Filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI beidseitig",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Synchronisieren Sie das Suchfeld Text mit dem JEI Filter und den JEI Filter mit dem Suchfeld Text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
"gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
"gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
"gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
}
17 changes: 5 additions & 12 deletions refinedstorage-jei-integration-fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,9 @@ repositories {
url 'https://maven.terraformersmc.com/'
}
maven {
name = 'Cloth Config, REI'
name = 'Cloth Config'
url 'https://maven.shedaniel.me/'
}
maven {
name = 'wthit'
url "https://maven.bai.lol"
}
maven {
name = 'NoIndium'
url = 'https://maven.cafeteria.dev/releases/'
Expand All @@ -37,13 +33,10 @@ repositories {
}

dependencies {
modImplementation "com.refinedmods.refinedstorage2:refinedstorage2-platform-fabric:${refinedstorageVersion}"
implementation "com.refinedmods.refinedstorage2:refinedstorage2-platform-api:${refinedstorageVersion}"
implementation "com.refinedmods.refinedstorage2:refinedstorage2-resource-api:${refinedstorageVersion}"
implementation "com.refinedmods.refinedstorage2:refinedstorage2-grid-api:${refinedstorageVersion}"
modCompileOnly common.jei.api
modCompileOnly fabric.jei.api
modRuntimeOnly fabric.jei.impl
modApi "com.refinedmods.refinedstorage2:refinedstorage2-platform-fabric:${refinedstorageVersion}"
modApi "mezz.jei:jei-${minecraftVersion}-fabric:${jeiVersion}"
modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-fabric-api:${jeiVersion}"
}

enablePublishing()
20 changes: 12 additions & 8 deletions refinedstorage-jei-integration-forge/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
plugins {
id 'java-library'
}

archivesBaseName = 'refinedstorage-jei-integration-forge'

forgeProject("refinedstorage_jei_integration", project(":refinedstorage-jei-integration-common"))
Expand All @@ -7,6 +11,10 @@ repositories {
name = 'JEI'
url = "https://maven.blamejared.com/"
}
maven {
name = 'Curios'
url = "https://maven.theillusivec4.top/"
}
maven {
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
credentials {
Expand All @@ -17,14 +25,10 @@ repositories {
}

dependencies {
implementation("com.refinedmods.refinedstorage2:refinedstorage2-platform-forge:${refinedstorageVersion}") {
transitive = false
}

compileOnly common.jei.api
testCompileOnly common.jei.api
compileOnly forge.jei.api
runtimeOnly forge.jei.impl
api "com.refinedmods.refinedstorage2:refinedstorage2-platform-forge:${refinedstorageVersion}"
api "mezz.jei:jei-${minecraftVersion}-neoforge:${jeiVersion}"
compileOnlyApi "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
compileOnlyApi "mezz.jei:jei-${minecraftVersion}-neoforge-api:${jeiVersion}"
}

enablePublishing()
13 changes: 1 addition & 12 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
gradle.ext.refinedArchitectVersion = "0.12.1"
gradle.ext.refinedArchitectVersion = "0.13.4"

dependencyResolutionManagement {
repositories {
Expand All @@ -10,17 +10,6 @@ dependencyResolutionManagement {
}
}
}
versionCatalogs {
create("common") {
from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-common:${gradle.ext.refinedArchitectVersion}")
}
create("fabric") {
from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-fabric:${gradle.ext.refinedArchitectVersion}")
}
create("forge") {
from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-forge:${gradle.ext.refinedArchitectVersion}")
}
}
}

rootProject.name = 'refinedstorage-jei-integration'
Expand Down
Loading