brysonsteck/ServerCraft
brysonsteck/ServerCraft
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

version based on tags and fix eula text

Browse source
This commit is contained in:
Bryson Steck 2023-05-27 00:35:12 -06:00
parent 88802ece04
commit d1bf5734bf
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.gradle
View file

@ -115,7 +115,11 @@ task createProperties(dependsOn: processResources) {
def stdout = new ByteArrayOutputStream() def stdout = new ByteArrayOutputStream()
if (project.hasProperty("release")) { if (project.hasProperty("release")) {
project.version = 1.0 exec {
commandLine "git", "describe", "--tags", "--abbrev=0"
standardOutput = stdout
}
project.version = stdout.toString().trim().replaceAll("\"", "")
} else { } else {
exec { exec {
commandLine "git", "log", "-n", "1", "--pretty=format:\"%h\"" commandLine "git", "log", "-n", "1", "--pretty=format:\"%h\""

1
src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt
View file

@ -629,6 +629,7 @@ class PrimaryController {
imagePane.children.add(ImageView(icon)) imagePane.children.add(ImageView(icon))
val label = Label("Do you agree to the terms of the Minecraft End User License Agreement?") val label = Label("Do you agree to the terms of the Minecraft End User License Agreement?")
label.isWrapText = true label.isWrapText = true
label.maxWidth = 250.0
label.layoutX = 115.0 label.layoutX = 115.0
label.layoutY = 40.0 label.layoutY = 40.0
val buttonBar = ButtonBar() val buttonBar = ButtonBar()