Skip to content

Commit

Permalink
Merge branch 'develop' into 1.16
Browse files Browse the repository at this point in the history
  • Loading branch information
rlnt committed Oct 2, 2021
2 parents 097c493 + f15f6e0 commit f0db546
Show file tree
Hide file tree
Showing 13 changed files with 115 additions and 329 deletions.
319 changes: 56 additions & 263 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions .idea/prettier.xml

This file was deleted.

3 changes: 2 additions & 1 deletion .idea/saveactions_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ curseforge {
changelogType = 'markdown'
changelog = 'The whole changelog can be found [here](https://github.com/RLNT/minecraft_energymeter/blob/1.16/CHANGELOG.md).'
releaseType = 'release'
addGameVersion '1.16.5'
addGameVersion minecraft_version

mainArtifact(jar) {
displayName = "EnergyMeter-${minecraft_version}-${mod_version}"
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mod_id=energymeter
mod_name=Energy Meter
mod_version=1.0.3
mod_base_package=dev.rlnt
mod_authors=RLNT
mod_authors=RLNT, Relentless
mod_description=Easily measure your energy rates.
github_user=RLNT, Relentless
github_user=RLNT
github_repo=minecraft_energymeter
Loading

0 comments on commit f0db546

Please sign in to comment.