Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ServerPackCreator
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

263a8fc6

Commit 263a8fc6 authored 3 months ago by Griefed

🕹️

Downloads
- Plain Diff

Merge branch 'develop' into 'main'

Develop

See merge request !630

parents f45fd910 9673eff9

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt 7 additions, 17 deletions

.../kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt
serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiWrapper.kt 14 additions, 2 deletions

...ain/kotlin/de/griefed/serverpackcreator/api/ApiWrapper.kt
serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/serverpack/ServerPackHandler.kt 9 additions, 13 deletions

...fed/serverpackcreator/api/serverpack/ServerPackHandler.kt
serverpackcreator-api/src/main/resources/serverpackcreator.properties 1 addition, 1 deletion

...eator-api/src/main/resources/serverpackcreator.properties
serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/MainWindow.kt 2 additions, 2 deletions

...kotlin/de/griefed/serverpackcreator/app/gui/MainWindow.kt

with 33 additions and 35 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Me haz all ze repositoriiiiiiiiiiiiiiiiiies