Skip to content

Commit

Permalink
Merge branch 'ms6' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/github-prerelease.yml
#	.github/workflows/github_release.yml
#	serverpackcreator-api/src/commonMain/kotlin/de/griefed/serverpackcreator/api/Api.kt
#	serverpackcreator-api/src/commonMain/kotlin/de/griefed/serverpackcreator/api/Configuration.kt
#	serverpackcreator-api/src/commonMain/kotlin/de/griefed/serverpackcreator/api/ServerPack.kt
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiWrapper.kt
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/PackConfig.kt
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ServerPackFile.kt
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/utilities/common/FileUtilities.kt
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/utilities/common/JarUtilities.kt
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/utilities/common/SystemUtilities.kt
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/utilities/common/WebUtilities.kt
#	spc.install4j
  • Loading branch information
Griefed committed Feb 25, 2024
2 parents 6923408 + f69ddc5 commit 22b70a5
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
log4j.configurationFile=log4j2.xml
log4j.formatMsgNoLookups=true
log4j.configurationFactory=de.griefed.serverpackcreator.api.LoggingConfig
log4j.configurationFactory=de.griefed.serverpackcreator.api.ApiProperties

0 comments on commit 22b70a5

Please sign in to comment.