Skip to content

Commit

Permalink
Merge pull request #90 from refinedmods/develop
Browse files Browse the repository at this point in the history
v0.8.2
  • Loading branch information
raoulvdberge authored Mar 26, 2022
2 parents 8020a32 + 01be60d commit 9ca9a2b
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 8 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
- Minecraft 1.16.5
validations:
required: true
- type: input
id: forge
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
blank_issues_enabled: true
blank_issues_enabled: false
contact_links:
- name: Discord Community Support
url: https://discordapp.com/invite/VYzsydb
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### Added

- French translation by [@dracnis](https://github.com/dracnis).

### Changed

- Ported to Minecraft 1.18.2.

## [v0.8.1] - 2021-12-28

### Added

- Added support for Refined Storage v1.10.0-beta.4.
- Added Korean translation by [@mindy15963](https://github.com/mindy15963).

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 15 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repositories {
*/
credentials {
username = "anything"
password = "\u0067hp_pnP5hVDYXXhhXwe21IEkrUzGjquUJL0xjLzb"
password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
}
}
}
Expand All @@ -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)
Expand All @@ -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 {
Expand Down Expand Up @@ -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
}
}
Expand All @@ -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"
}
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader = "javafml"
loaderVersion = "[39,)"
loaderVersion = "[40,)"
issueTrackerURL = "https://github.com/refinedmods/refinedstorageaddons"
license = "MIT"
[[mods]]
Expand All @@ -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"
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"pack": {
"description": "Refined Storage Addons resources",
"pack_format": 8
"pack_format": 9
}
}

0 comments on commit 9ca9a2b

Please sign in to comment.