Merge remote-tracking branch 'source/master'

# Conflicts:
#	build.gradle.kts
This commit is contained in:
solonovamax committed 2020-11-06 22:29:43 -05:00
commit c0e0dad100
2 files changed
+6 -5

No files matched your search

+1 -2
View File
@@ -95,8 +95,7 @@ val setupServer = tasks.create("setupServer") {
val testWithPaper = task<JavaExec>(name = "testWithPaper") {
standardInput = System.`in`
dependsOn(setupServer)
//dependsOn(tasks.shadowJar)
dependsOn(tasks.shadowJar)
// Copy Terra into dir
doFirst {
copy {