aboutsummaryrefslogtreecommitdiff
path: root/fabric/src
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-06-11 01:13:58 +0800
committershedaniel <daniel@shedaniel.me>2022-06-11 01:13:58 +0800
commit92a438eef6f217d7b2d3ee21c6efb68ac2498d0a (patch)
treead45925f49339f39494455a62e991ae2573fd817 /fabric/src
parentb99ba98ffeaff540a15dd7b188a9793539fd2bb7 (diff)
parent0e2a66156d69bb6d8d37a1c05f59abde42d62ebc (diff)
downloadRoughlyEnoughItems-92a438eef6f217d7b2d3ee21c6efb68ac2498d0a.tar.gz
RoughlyEnoughItems-92a438eef6f217d7b2d3ee21c6efb68ac2498d0a.tar.bz2
RoughlyEnoughItems-92a438eef6f217d7b2d3ee21c6efb68ac2498d0a.zip
Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19
# Conflicts: # api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java # default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java # fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/AutoCraftingEvaluator.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java
Diffstat (limited to 'fabric/src')
-rw-r--r--fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java b/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java
index a9b808e0e..03a697957 100644
--- a/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java
+++ b/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.impl.client.gui.fabric;
import com.mojang.blaze3d.vertex.PoseStack;
import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
import me.shedaniel.rei.impl.ClientInternals;
+import me.shedaniel.rei.impl.client.gui.widget.QueuedTooltip;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;