Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

8f565d61

Commit 8f565d61 authored 2 months ago by Griefed

Downloads
- Plain Diff

Merge branch 'develop' into 'main'

Develop

See merge request !635

parents aab0debf 6e7b4fcb

No related branches found

No related tags found

1 merge request!635Develop

Pipeline #9182 passed 2 months ago

Stage: Tests

Stage: Documentation

Stage: Release

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.github/workflows/devbuild.yml 1 addition, 2 deletions

.github/workflows/devbuild.yml
serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt 2 additions, 0 deletions

.../kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt
serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/serverpack/ServerPackHandler.kt 32 additions, 18 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/window/configs/components/inclusions/InclusionsEditor.kt 2 additions, 5 deletions

.../window/configs/components/inclusions/InclusionsEditor.kt

with 38 additions and 26 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