mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 04:00:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mc-1.18.x' into mc-1.19.x

Browse Source
This commit is contained in:
Jonathan Coates 2022-11-02 09:55:10 +00:00
commit 0f1f5247ca
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -372,7 +372,7 @@ val publishCurseForge by tasks.registering(TaskPublishCurseForge::class) {
apiToken = findProperty("curseForgeApiKey") ?: "" apiToken = findProperty("curseForgeApiKey") ?: ""
enabled = apiToken != "" enabled = apiToken != ""
val mainFile = upload("282001", tasks.shadowJar) val mainFile = upload("282001", tasks.shadowJar.get().archiveFile)
dependsOn(tasks.shadowJar) // Ughr. dependsOn(tasks.shadowJar) // Ughr.
mainFile.changelog = "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion)." mainFile.changelog = "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion)."
mainFile.changelogType = "markdown" mainFile.changelogType = "markdown"
@ -453,6 +453,8 @@ publishing {
repositories { repositories {
maven("https://squiddev.cc/maven") { maven("https://squiddev.cc/maven") {
name = "SquidDev" name = "SquidDev"
credentials(PasswordCredentials::class)
} }
} }
} }

4
buildSrc/src/main/kotlin/cc/tweaked/gradle/CCTweakedExtension.kt
View File

@ -26,12 +26,12 @@ abstract class CCTweakedExtension(
) { ) {
/** Get the hash of the latest git commit. */ /** Get the hash of the latest git commit. */
val gitHash: Provider<String> = gitProvider(project, "<no git hash>") { val gitHash: Provider<String> = gitProvider(project, "<no git hash>") {
ProcessHelpers.captureOut("git", "-C", project.projectDir.absolutePath, "rev-parse", "HEAD") ProcessHelpers.captureOut("git", "-C", project.projectDir.absolutePath, "rev-parse", "HEAD").trim()
} }
/** Get the current git branch. */ /** Get the current git branch. */
val gitBranch: Provider<String> = gitProvider(project, "<no git branch>") { val gitBranch: Provider<String> = gitProvider(project, "<no git branch>") {
ProcessHelpers.captureOut("git", "-C", project.projectDir.absolutePath, "rev-parse", "--abbrev-ref", "HEAD") ProcessHelpers.captureOut("git", "-C", project.projectDir.absolutePath, "rev-parse", "--abbrev-ref", "HEAD").trim()
} }
/** Get a list of all contributors to the project. */ /** Get a list of all contributors to the project. */

2
src/main/resources/data/computercraft/lua/rom/help/changelog.md
View File

@ -1,6 +1,6 @@
# New features in CC: Tweaked 1.101.0 # New features in CC: Tweaked 1.101.0
* Improvee Dutch translation (Quezler) * Improve Dutch translation (Quezler)
* Better reporting of fatal computer timeouts in the server log. * Better reporting of fatal computer timeouts in the server log.
* Convert detail providers into a registry, allowing peripheral mods to read item/block details. * Convert detail providers into a registry, allowing peripheral mods to read item/block details.
* Redesign the metrics system. `/computercraft track` now allows computing aggregates (total, max, avg) on any metric, not just computer time. * Redesign the metrics system. `/computercraft track` now allows computing aggregates (total, max, avg) on any metric, not just computer time.

2
src/main/resources/data/computercraft/lua/rom/help/whatsnew.md
View File

@ -1,6 +1,6 @@
New features in CC: Tweaked 1.101.0 New features in CC: Tweaked 1.101.0
* Improvee Dutch translation (Quezler) * Improve Dutch translation (Quezler)
* Better reporting of fatal computer timeouts in the server log. * Better reporting of fatal computer timeouts in the server log.
* Convert detail providers into a registry, allowing peripheral mods to read item/block details. * Convert detail providers into a registry, allowing peripheral mods to read item/block details.
* Redesign the metrics system. `/computercraft track` now allows computing aggregates (total, max, avg) on any metric, not just computer time. * Redesign the metrics system. `/computercraft track` now allows computing aggregates (total, max, avg) on any metric, not just computer time.