diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-06-11 01:27:37 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-06-11 01:27:37 +0800 |
| commit | 27921ce9373a4dc9bf98aee39df715708d42ecdb (patch) | |
| tree | faac4d3cbc9122ef482f7e86819f983e44ad9887 | |
| parent | 9ac223c1e21e9dfc3e1eb8476ccfa9159da6ea01 (diff) | |
| download | RoughlyEnoughItems-27921ce9373a4dc9bf98aee39df715708d42ecdb.tar.gz RoughlyEnoughItems-27921ce9373a4dc9bf98aee39df715708d42ecdb.tar.bz2 RoughlyEnoughItems-27921ce9373a4dc9bf98aee39df715708d42ecdb.zip | |
Fix merge conflicts
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gradle.properties b/gradle.properties index 534272bd1..786998c1e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,6 @@ fabricloader_version=0.14.6 cloth_config_version=7.0.69 modmenu_version=4.0.0 fabric_api=0.55.2+1.19 -architectury_version=5.5.16 +architectury_version=5.6.22 api_exculde= #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java index 9bc1b55c4..932ed9704 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java @@ -436,10 +436,10 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget { String name = ConfigObject.getInstance().getFavoriteKeyCode().getLocalizedName().getString(); if (reverseFavoritesAction()) tooltip.addAllTexts(Stream.of(I18n.get("text.rei.remove_favorites_tooltip", name).split("\n")) - .map(TextComponent::new).collect(Collectors.toList())); + .map(Component::literal).collect(Collectors.toList())); else tooltip.addAllTexts(Stream.of(I18n.get("text.rei.favorites_tooltip", name).split("\n")) - .map(TextComponent::new).collect(Collectors.toList())); + .map(Component::literal).collect(Collectors.toList())); } if (tooltipProcessors != null) { |