From 5ad512e43866ef3788a007303a7947a2d70a4839 Mon Sep 17 00:00:00 2001 From: Griefed Date: Sun, 20 Mar 2022 20:23:45 +0100 Subject: [PATCH] no message --- backend/main/resources/CHANGELOG.md | 9 ++++++++- backend/main/resources/README.md | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/backend/main/resources/CHANGELOG.md b/backend/main/resources/CHANGELOG.md index 1a82f17ae..2bc32955e 100644 --- a/backend/main/resources/CHANGELOG.md +++ b/backend/main/resources/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.0.0-beta.9](https://git.griefed.de/Griefed/ServerPackCreator/compare/3.0.0-beta.8...3.0.0-beta.9) (2022-03-02) + + +### 🛠 Fixes + +* **Configuration:** Correctly load default properties and allow overriding of application properties from serverpackcreator properties. ([2f03d33](https://git.griefed.de/Griefed/ServerPackCreator/commit/2f03d33f5634603d305b85a2681307a63a7ec10a)) + ## [3.0.0-beta.8](https://git.griefed.de/Griefed/ServerPackCreator/compare/3.0.0-beta.7...3.0.0-beta.8) (2022-03-01) @@ -962,7 +969,7 @@ * Empty commit so a new alpha will be generated... ([c1b5698](https://git.griefed.de/Griefed/ServerPackCreator/commit/c1b5698a0aac863518244998c72a4f21ff4d604c)) ## [3.0.0-alpha.16](https://git.griefed.de/Griefed/ServerPackCreator/compare/3.0.0-alpha.15...3.0.0-alpha.16) (2022-01-18) - + ### 👀 Reverts diff --git a/backend/main/resources/README.md b/backend/main/resources/README.md index c70a9a6ec..1cece90b4 100644 --- a/backend/main/resources/README.md +++ b/backend/main/resources/README.md @@ -151,11 +151,11 @@ A list of known issues can be found in [Known Issues](https://github.com/Griefed 4. Set a suffix for the server pack to be generated. 5. And much more! 10. **Webservice** - 1. Generate a server pack from zipped up modpacks. - 2. All generated server packs available for download to everyone. +1. Generate a server pack from zipped up modpacks. +2. All generated server packs available for download to everyone. 11. **Addons!** - 1. Users can provide addons which will be executed after the generation of a server pack. Add them to the `addons`-directory. - 2. Example addon at [ServerPackCreatorExampleAddon](https://github.com/Griefed/ServerPackCreatorExampleAddon) +1. Users can provide addons which will be executed after the generation of a server pack. Add them to the `addons`-directory. +2. Example addon at [ServerPackCreatorExampleAddon](https://github.com/Griefed/ServerPackCreatorExampleAddon) # 3. Versions @@ -304,7 +304,7 @@ de.griefed.serverpackcreator.curseforge.api.token= | de.griefed.serverpackcreator.configuration.directories.mustinclude | List of directories which must be included in a server pack. | | de.griefed.serverpackcreator.curseforge.api.token | CurseAPI token used for generating server packs from CurseForge projects. | -# 5.1.2 Default `application.properties` +# 5.1.2 Default `application.properties` `application.properties` ```properties @@ -715,13 +715,13 @@ A short excerpt: > > 1. Fork ServerPackCreator > 2. Create a new branch in your fork, following one of the following naming schemes: -> 1. The end of each branch name bust be suffixed with a one-word description fitting the changes made. Examples: -> - griefed_chore_readme + > 1. The end of each branch name bust be suffixed with a one-word description fitting the changes made. Examples: + > - griefed_chore_readme > - griefed_perf_curseforgemodpack > - griefed_feat_ziparchive > 2. For more details on what the naming scheme entails, see `.releaserc.yml` in the base directory of the repository or scroll down to the **Commits**-section. > 3. Schemes: -> 1. your_username_breaking_ + > 1. your_username_breaking_ > 2. your_username_build_ > 3. your_username_chore_ > 4. your_username_ci_ @@ -735,13 +735,13 @@ A short excerpt: > 12. your_username_test_ > 13. your_username_other_ > 3. Make your changes to your new branch: -> 1. Try to keep the changes atomic, so they best fit the name of the branch. + > 1. Try to keep the changes atomic, so they best fit the name of the branch. > 2. Follow conventional commit messages. See **Commits**-section for more details. Example: -> - feat: Allow upload of modpack-export zip-archive to web-frontend + > - feat: Allow upload of modpack-export zip-archive to web-frontend > - refactor: Use apache commons-io for copying, instead of Files > 4. Open an issue on the main repository, using the **Pull Request** template: -> 1. Issue title: Your Username - Branch type (e.g. feat) - Short description of your changes. Example: -> - Griefed - feat - Allow upload of modpack-export zip-archive to web-frontend + > 1. Issue title: Your Username - Branch type (e.g. feat) - Short description of your changes. Example: + > - Griefed - feat - Allow upload of modpack-export zip-archive to web-frontend > 2. Issue description: Fill in the sections the template provide. > 3. Submit the new issue > 5. I will then create a new branch in the main repository, with the same name as your branch, to which you will **then** create a pull request to.