From 9920675f2897ed9fb0f86022627f582e596c7d6f Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 22 Nov 2021 21:49:33 +0800 Subject: Fix merge conflicts --- .../me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'forge/src/serverComponent') 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; -- cgit