Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt
#	serverpackcreator-api/src/main/resources/serverpackcreator.properties
  • Loading branch information
Griefed committed Mar 26, 2024
2 parents 13130a6 + 79dba08 commit 8524c00
Show file tree
Hide file tree
Showing 8 changed files with 327 additions and 360 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
## [5.1.18](https://git.griefed.de/Griefed/ServerPackCreator/compare/5.1.17...5.1.18) (2024-03-21)


### 🛠 Fixes

* Allow repeated viewing of step-by-step guide ([6a352fe](https://git.griefed.de/Griefed/ServerPackCreator/commit/6a352feb4f16ea6ba4648092c7d5dc640d1be55c))

## [5.1.17](https://git.griefed.de/Griefed/ServerPackCreator/compare/5.1.16...5.1.17) (2024-03-01)


### 🛠 Fixes

* Prevent NPEs in JDBC URL and settings tab title fetch in GUI. ([919b017](https://git.griefed.de/Griefed/ServerPackCreator/commit/919b017722aacbbe284d4da3b7b9d78c474c4862))

## [5.1.16](https://git.griefed.de/Griefed/ServerPackCreator/compare/5.1.15...5.1.16) (2024-02-25)


### :scissors: Refactor

* Change expected class and interface accordingly ([ba66889](https://git.griefed.de/Griefed/ServerPackCreator/commit/ba668897e75d8a129a22f692d2c7533d49c1bd61))


### 💎 Improvements

* Support XMinecraftLaunchers instance.json ([4bc10d2](https://git.griefed.de/Griefed/ServerPackCreator/commit/4bc10d25b907c493adfd41bdb5707951b4e2b92b))

## [5.1.15](https://git.griefed.de/Griefed/ServerPackCreator/compare/5.1.14...5.1.15) (2024-02-24)


Expand Down
290 changes: 145 additions & 145 deletions serverpackcreator-api/src/main/i18n/Translations_pt_BR.properties

Large diffs are not rendered by default.

Loading

0 comments on commit 8524c00

Please sign in to comment.