Skip to content

Commit

Permalink
Merge pull request #16 from refinedmods/release/0.3.1
Browse files Browse the repository at this point in the history
Release v0.3.1
  • Loading branch information
raoulvdberge authored Jul 10, 2024
2 parents 58dc98f + 7a00e2e commit a7fe33d
Show file tree
Hide file tree
Showing 21 changed files with 181 additions and 131 deletions.
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.15.2
uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.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.15.2
uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.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.15.2
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.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.15.2
uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.4
secrets: inherit
with:
project-name: 'Refined Storage - EMI 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.15.2
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.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.15.2
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.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.15.2
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.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.15.2
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.4
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.3.1] - 2024-07-10

## [0.3.0] - 2024-07-06

### Added
Expand Down Expand Up @@ -43,7 +45,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Recipe transfer integration for the Crafting Grid.
- Grid / EMI search box synchronization options.

[Unreleased]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.3.0...HEAD
[Unreleased]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.3.1...HEAD

[0.3.1]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.3.0...v0.3.1

[0.3.0]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.2.1...v0.3.0

Expand Down
7 changes: 0 additions & 7 deletions build.gradle

This file was deleted.

12 changes: 12 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
plugins {
id("refinedarchitect.root")
id("refinedarchitect.base")
}

refinedarchitect {
sonarQube("refinedmods_refinedstorage-emi-integration", "refinedmods")
}

subprojects {
group = "com.refinedmods.refinedstorage"
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
refinedstorageVersion=2.0.0-milestone.4.2
refinedstorageVersion=2.0.0-milestone.4.4
emiVersion=1.1.10+1.21
# Gradle
org.gradle.jvmargs=-Xmx1G
28 changes: 0 additions & 28 deletions refinedstorage-emi-integration-common/build.gradle

This file was deleted.

36 changes: 36 additions & 0 deletions refinedstorage-emi-integration-common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
plugins {
id("refinedarchitect.common")
}

repositories {
maven {
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
credentials {
username = "anything"
password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
}
}
maven {
name = "EMI"
url = uri("https://maven.terraformersmc.com/")
}
}

refinedarchitect {
common()
publishing {
maven = true
}
}

base {
archivesName.set("refinedstorage-emi-integration-common")
}

val refinedstorageVersion: String by project
val emiVersion: String by project

dependencies {
api("com.refinedmods.refinedstorage:refinedstorage-platform-common:${refinedstorageVersion}")
compileOnlyApi("dev.emi:emi-xplat-mojmap:${emiVersion}")
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import dev.emi.emi.api.widget.SlotWidget;
import dev.emi.emi.api.widget.Widget;
import dev.emi.emi.runtime.EmiDrawContext;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;

Expand Down Expand Up @@ -85,7 +84,6 @@ public boolean craft(final EmiRecipe recipe, final EmiCraftContext<CraftingGridC
.map(this::getStacks)
.toList();
context.getScreenHandler().transferRecipe(inputs);
Minecraft.getInstance().setScreen(context.getScreen());
return true;
}

Expand Down
37 changes: 0 additions & 37 deletions refinedstorage-emi-integration-fabric/build.gradle

This file was deleted.

47 changes: 47 additions & 0 deletions refinedstorage-emi-integration-fabric/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
plugins {
id("refinedarchitect.fabric")
}

repositories {
maven {
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
credentials {
username = "anything"
password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
}
}
maven {
name = "ModMenu"
url = uri("https://maven.terraformersmc.com/")
}
maven {
name = "Cloth Config"
url = uri("https://maven.shedaniel.me/")
}
maven {
name = "EMI"
url = uri("https://maven.terraformersmc.com/")
}
}

refinedarchitect {
modId = "refinedstorage_emi_integration"
fabric()
compileWithProject(project(":refinedstorage-emi-integration-common"))
publishing {
maven = true
}
}

base {
archivesName.set("refinedstorage-emi-integration-fabric")
}

val refinedstorageVersion: String by project
val emiVersion: String by project

dependencies {
modApi("com.refinedmods.refinedstorage:refinedstorage-platform-fabric:${refinedstorageVersion}")
modRuntimeOnly("dev.emi:emi-fabric:${emiVersion}")
modCompileOnlyApi("dev.emi:emi-fabric:${emiVersion}")
}
29 changes: 0 additions & 29 deletions refinedstorage-emi-integration-neoforge/build.gradle

This file was deleted.

39 changes: 39 additions & 0 deletions refinedstorage-emi-integration-neoforge/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
plugins {
id("refinedarchitect.neoforge")
}

repositories {
maven {
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
credentials {
username = "anything"
password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
}
}
maven {
name = "EMI"
url = uri("https://maven.terraformersmc.com/")
}
}

refinedarchitect {
modId = "refinedstorage_emi_integration"
neoForge()
compileWithProject(project(":refinedstorage-emi-integration-common"))
publishing {
maven = true
}
}

base {
archivesName.set("refinedstorage-emi-integration-neoforge")
}

val refinedstorageVersion: String by project
val emiVersion: String by project

dependencies {
api("com.refinedmods.refinedstorage:refinedstorage-platform-neoforge:${refinedstorageVersion}")
runtimeOnly("dev.emi:emi-neoforge:${emiVersion}")
compileOnlyApi("dev.emi:emi-neoforge:${emiVersion}")
}
18 changes: 0 additions & 18 deletions settings.gradle

This file was deleted.

Loading

0 comments on commit a7fe33d

Please sign in to comment.