diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-11-22 21:49:33 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-01-16 03:05:40 +0800 |
| commit | 9920675f2897ed9fb0f86022627f582e596c7d6f (patch) | |
| tree | b7c339f542558030e5089d08fda300a30196c696 /forge/src/serverComponent | |
| parent | 8d948856481a1709d4989a715e080fcd6fa794e2 (diff) | |
| download | RoughlyEnoughItems-9920675f2897ed9fb0f86022627f582e596c7d6f.tar.gz RoughlyEnoughItems-9920675f2897ed9fb0f86022627f582e596c7d6f.tar.bz2 RoughlyEnoughItems-9920675f2897ed9fb0f86022627f582e596c7d6f.zip | |
Fix merge conflicts
Diffstat (limited to 'forge/src/serverComponent')
| -rw-r--r-- | forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java b/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java index 91becf2f8..d57a39fb9 100644 --- a/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java +++ b/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.forge; import me.shedaniel.rei.RoughlyEnoughItemsInitializer; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.DatagenModLoader; +import net.minecraftforge.data.loading.DatagenModLoader; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.loading.FMLEnvironment; |