Merge branch 'master' into future

# Conflicts:
#	src/main/java/carpet/settings/SettingsManager.java

src/main/java/carpet/settings/SettingsManager.java

@@ -564,7 +564,7 @@ public class SettingsManager
                 smartSuggestionList.add(listItem);
             }
             // Regular prefix matching, reference: CommandSource.suggestMatching
-            if (CommandSource.shouldSuggest(query, listItem.toLowerCase())) {
+            if (CommandSource.shouldSuggest(query, listItem.toLowerCase(Locale.ROOT))) {
                 regularSuggestionList.add(listItem);
             }
         });