aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryson Steck <brysonsteck@protonmail.com>2023-05-27 00:35:12 -0600
committerBryson Steck <brysonsteck@protonmail.com>2023-05-27 00:35:12 -0600
commitd1bf5734bf86ef81e11414f30a03670660838998 (patch)
treebbba3d28727bcb8c79fe01fd2078960b3d1eb41f
parent88802ece0407cbf83ab5dbe50fe694ebfe98f2f3 (diff)
downloadServerCraft-0.1-beta.tar
ServerCraft-0.1-beta.tar.gz
ServerCraft-0.1-beta.tar.bz2
version based on tags and fix eula text0.1-beta
-rw-r--r--build.gradle6
-rw-r--r--src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt1
2 files changed, 6 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle
index c660a31..28d0928 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,7 +115,11 @@ task createProperties(dependsOn: processResources) {
def stdout = new ByteArrayOutputStream()
if (project.hasProperty("release")) {
- project.version = 1.0
+ exec {
+ commandLine "git", "describe", "--tags", "--abbrev=0"
+ standardOutput = stdout
+ }
+ project.version = stdout.toString().trim().replaceAll("\"", "")
} else {
exec {
commandLine "git", "log", "-n", "1", "--pretty=format:\"%h\""
diff --git a/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt
index 7ec04e9..6c64a76 100644
--- a/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt
+++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt
@@ -629,6 +629,7 @@ class PrimaryController {
imagePane.children.add(ImageView(icon))
val label = Label("Do you agree to the terms of the Minecraft End User License Agreement?")
label.isWrapText = true
+ label.maxWidth = 250.0
label.layoutX = 115.0
label.layoutY = 40.0
val buttonBar = ButtonBar()