Merge branch 'develop' into 'main'

Develop See merge request Griefed/ServerPackCreator!609
Griefed · Sep 20, 2024 · be93e0f · be93e0f
2 parents 3ef0ce2 + 6d1a855
commit be93e0f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt b/serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt
@@ -2590,7 +2590,7 @@ class ApiProperties(propertiesFile: File = File("serverpackcreator.properties"))
         }
         fallbackUpdated = false
         if (properties != null) {
-            val newBlacklist = properties!!.getProperty(pConfigurationFallbackModsWhiteList)
+            val newBlacklist = properties!!.getProperty(pConfigurationFallbackModsList)
             val currentBlacklist = internalProps.getProperty(pConfigurationFallbackModsList)
             if (newBlacklist != null && currentBlacklist != newBlacklist) {
                 internalProps.setProperty(pConfigurationFallbackModsList, newBlacklist)

diff --git a/...kcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/UpdateDialogs.kt b/...kcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/UpdateDialogs.kt
@@ -239,7 +239,7 @@ class UpdateDialogs(
                             val cause = e.cause
                             // UserCanceledException means that the user has canceled the proxy dialog
                             if (cause !is UserCanceledException) {
-                                log.error("Update could not be executed.", e)
+                                log.error("Update could not be executed: ${e.message}.")
                             }
                         }
                     }