Merge branch 'master' into future

# Conflicts:
#	src/main/java/carpet/settings/SettingsManager.java
This commit is contained in:
gnembon committed 2021-11-17 20:49:05 +01:00
commit 4cdb1bae28
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -43,7 +43,7 @@ import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
{
public static final String carpetVersion = "1.4.53+v211111";
public static final String carpetVersion = "1.4.54+v211117";
public static final Logger LOG = LogManager.getLogger("carpet");
public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);
@@ -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);
}
});