Merge branch '1.20.1' into 1.20.2

# Conflicts:
#	CHANGELOG.md

Author: ZsoltMolnarrr

CHANGELOG.md

@@ -13,6 +13,7 @@ Added new presets:
 
 Other changes:
 - (1.20.2) Fix packet handling issues preventing multiplayer, and rejoining a world in single player
+- Fix corrupted fallback config causing crash 
 - Keep order of `player_relations` in server config
 - Add Japanese translation, thanks to SAGA23456 #289
 - Update Russian translation, thanks to mpustovoi #288

common/src/main/java/net/bettercombat/BetterCombat.java

@@ -53,6 +53,10 @@ public void onInitialize() {
 
     private void loadFallbackConfig() {
         fallbackConfig.load();
+        if (fallbackConfig.value == null) {
+            // Most likely corrupt config
+            fallbackConfig.value = FallbackConfig.createDefault();
+        }
         if (fallbackConfig.value.schema_version < fallbackDefault.schema_version) {
             fallbackConfig.value = FallbackConfig.migrate(fallbackConfig.value, FallbackConfig.createDefault());
         }