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 /runtime/src/main | |
| parent | 1aa8f3c5a2bc55135c3bef0e56c88bdd569dc00e (diff) | |
| download | RoughlyEnoughItems-0dd97db996b084fc8e0533e093e8116786308747.tar.gz RoughlyEnoughItems-0dd97db996b084fc8e0533e093e8116786308747.tar.bz2 RoughlyEnoughItems-0dd97db996b084fc8e0533e093e8116786308747.zip | |
Fix merge conflicts
Diffstat (limited to 'runtime/src/main')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java (renamed from runtime/src/main/java/me/shedaniel/rei/plugin/client/FilteredStacksVisibilityHandler.java) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/FilteredStacksVisibilityHandler.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java index 50bc8f277..d39672c68 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/FilteredStacksVisibilityHandler.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java @@ -21,13 +21,13 @@ * SOFTWARE. */ -package me.shedaniel.rei.plugin.client; +package me.shedaniel.rei.plugin.client.runtime; import com.google.common.base.Stopwatch; +import dev.architectury.event.EventResult; import it.unimi.dsi.fastutil.objects.Reference2BooleanMap; import it.unimi.dsi.fastutil.objects.Reference2BooleanMaps; import it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap; -import me.shedaniel.architectury.event.EventResult; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.client.config.ConfigObject; import me.shedaniel.rei.api.client.registry.display.DisplayCategory; |