diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-11-20 20:51:17 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-11-20 20:51:17 +0800 |
| commit | 0dd97db996b084fc8e0533e093e8116786308747 (patch) | |
| tree | 4f3dd08096f648a1858a5fdb93b9e7ce1f2a7479 /api/src | |
| parent | 1aa8f3c5a2bc55135c3bef0e56c88bdd569dc00e (diff) | |
| download | RoughlyEnoughItems-0dd97db996b084fc8e0533e093e8116786308747.tar.gz RoughlyEnoughItems-0dd97db996b084fc8e0533e093e8116786308747.tar.bz2 RoughlyEnoughItems-0dd97db996b084fc8e0533e093e8116786308747.zip | |
Fix merge conflicts
Diffstat (limited to 'api/src')
| -rw-r--r-- | api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java index d44731cc9..5f459dac9 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java @@ -23,7 +23,7 @@ package me.shedaniel.rei.api.client.gui.widgets; -import me.shedaniel.architectury.utils.Env; +import dev.architectury.utils.Env; import dev.architectury.utils.EnvExecutor; import me.shedaniel.math.Point; import me.shedaniel.rei.api.client.REIRuntime; |