mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-21 19:32:52 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathan Coates 2022-06-23 22:26:09 +01:00
commit d2f94f2653
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -211,8 +211,7 @@ jar {
"Implementation-Title" : "CC: Tweaked", "Implementation-Title" : "CC: Tweaked",
"Implementation-Version" : "${mod_version}", "Implementation-Version" : "${mod_version}",
"Implementation-Vendor" : "SquidDev", "Implementation-Vendor" : "SquidDev",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
,
"MixinConfigs" : "computercraft.mixins.json", "MixinConfigs" : "computercraft.mixins.json",
]) ])
} }
@ -418,6 +417,7 @@ def testServer = tasks.register("testServer", JavaExec.class) {
exec.copyTo(it) exec.copyTo(it)
setClasspath(exec.getClasspath()) setClasspath(exec.getClasspath())
mainClass = exec.mainClass mainClass = exec.mainClass
javaLauncher = exec.javaLauncher
setArgs(exec.getArgs()) setArgs(exec.getArgs())
// Jacoco and modlauncher don't play well together as the classes loaded in-game don't // Jacoco and modlauncher don't play well together as the classes loaded in-game don't