Merge branch 'develop' into 'main'

Merge develop into main See merge request !263

Merge branch 'develop' into 'main'
d3ee454a · Griefed · aa2b7a16 · 30c9033a · d3ee454a · d3ee454a
Commit d3ee454a authored 2 years ago by Griefed
--- a/backend/main/java/de/griefed/serverpackcreator/versionmeta/minecraft/MinecraftServer.java
+++ b/backend/main/java/de/griefed/serverpackcreator/versionmeta/minecraft/MinecraftServer.java
--- a/backend/main/java/de/griefed/serverpackcreator/versionmeta/minecraft/MinecraftServerMeta.java
+++ b/backend/main/java/de/griefed/serverpackcreator/versionmeta/minecraft/MinecraftServerMeta.java
--- a/backend/main/java/de/griefed/serverpackcreator/versionmeta/quilt/QuiltInstaller.java
+++ b/backend/main/java/de/griefed/serverpackcreator/versionmeta/quilt/QuiltInstaller.java
--- a/backend/main/java/de/griefed/serverpackcreator/versionmeta/quilt/QuiltLoader.java
+++ b/backend/main/java/de/griefed/serverpackcreator/versionmeta/quilt/QuiltLoader.java
--- a/backend/main/java/de/griefed/serverpackcreator/versionmeta/quilt/QuiltMeta.java
+++ b/backend/main/java/de/griefed/serverpackcreator/versionmeta/quilt/QuiltMeta.java
--- a/backend/main/resources/CHANGELOG.md
+++ b/backend/main/resources/CHANGELOG.md
--- a/backend/main/resources/de/griefed/resources/lang/lang_de_de.properties
+++ b/backend/main/resources/de/griefed/resources/lang/lang_de_de.properties
--- a/backend/main/resources/de/griefed/resources/lang/lang_en_us.properties
+++ b/backend/main/resources/de/griefed/resources/lang/lang_en_us.properties
--- a/backend/main/resources/de/griefed/resources/lang/lang_uk_ua.properties
+++ b/backend/main/resources/de/griefed/resources/lang/lang_uk_ua.properties
--- a/backend/main/resources/de/griefed/resources/server_files/default_template.ps1
+++ b/backend/main/resources/de/griefed/resources/server_files/default_template.ps1
--- a/backend/main/resources/de/griefed/resources/server_files/default_template.sh
+++ b/backend/main/resources/de/griefed/resources/server_files/default_template.sh
--- a/backend/main/resources/serverpackcreator.properties
+++ b/backend/main/resources/serverpackcreator.properties
@@ -19,4 +19,5 @@ de.griefed.serverpackcreator.configuration.saveloadedconfig=false
 de.griefed.serverpackcreator.configuration.directories.mustinclude=mods,config,defaultconfigs
 de.griefed.serverpackcreator.plugins.directory=./plugins
 de.griefed.serverpackcreator.serverpack.zip.exclude=minecraft_server.MINECRAFT_VERSION.jar,server.jar,libraries/net/minecraft/server/MINECRAFT_VERSION/server-MINECRAFT_VERSION.jar
 de.griefed.serverpackcreator.serverpack.zip.exclude.enabled=true
\ No newline at end of file
+de.griefed.serverpackcreator.serverpack.script.template=default_template.ps1,default_template.sh
\ No newline at end of file
--- a/backend/test/java/de/griefed/serverpackcreator/ApplicationPropertiesTest.java
+++ b/backend/test/java/de/griefed/serverpackcreator/ApplicationPropertiesTest.java
--- a/backend/test/java/de/griefed/serverpackcreator/ConfigurationHandlerTest.java
+++ b/backend/test/java/de/griefed/serverpackcreator/ConfigurationHandlerTest.java
--- a/backend/test/java/de/griefed/serverpackcreator/ServerPackCreatorTest.java
+++ b/backend/test/java/de/griefed/serverpackcreator/ServerPackCreatorTest.java
--- a/backend/test/java/de/griefed/serverpackcreator/ServerPackHandlerTest.java
+++ b/backend/test/java/de/griefed/serverpackcreator/ServerPackHandlerTest.java
--- a/backend/test/java/de/griefed/serverpackcreator/WebServiceTest.java
+++ b/backend/test/java/de/griefed/serverpackcreator/WebServiceTest.java
--- a/backend/test/java/de/griefed/serverpackcreator/i18n/LocalizationManagerTest.java
+++ b/backend/test/java/de/griefed/serverpackcreator/i18n/LocalizationManagerTest.java
--- a/backend/test/java/de/griefed/serverpackcreator/utilities/ConfigUtilitiesTest.java
+++ b/backend/test/java/de/griefed/serverpackcreator/utilities/ConfigUtilitiesTest.java
--- a/backend/test/java/de/griefed/serverpackcreator/utilities/common/BooleanUtilitiesTest.java
+++ b/backend/test/java/de/griefed/serverpackcreator/utilities/common/BooleanUtilitiesTest.java