Merge branch 'master' into develop

pull/95/head^2
Trivernis 4 years ago committed by GitHub
commit b72c473854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -22,6 +22,7 @@ idea {
} }
group "net.trivernis" group "net.trivernis"
version "1.3.2" version "1.3.2"
sourceCompatibility = 1.8 sourceCompatibility = 1.8

@ -52,6 +52,7 @@ class CmdList(private val chunkmaster: Chunkmaster) : Subcommand {
val genTask = task.generationTask val genTask = task.generationTask
val progress = genTask.shape.progress(if (genTask.radius < 0) (genTask.world.worldBorder.size / 32).toInt() else null) val progress = genTask.shape.progress(if (genTask.radius < 0) (genTask.world.worldBorder.size / 32).toInt() else null)
val percentage = " (%.1f".format(progress * 100) + "%)." val percentage = " (%.1f".format(progress * 100) + "%)."
val count = if (genTask.radius > 0) { val count = if (genTask.radius > 0) {
"${genTask.count} / ${ceil(genTask.shape.total()).toInt()}" "${genTask.count} / ${ceil(genTask.shape.total()).toInt()}"
} else { } else {

Loading…
Cancel
Save