mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
Fix conflicts
This commit is contained in:
1 parent
f4afb6f56c
commit
d032a34aaa
3 files changed
+3
-3
No files matched your search
@@ -136,7 +136,7 @@ public class DynBucketTest
|
||||
@SubscribeEvent
|
||||
public void registrRecipes(RegistryEvent.Register<IRecipe> event)
|
||||
{
|
||||
ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(TestFluid.instance, Fluid.BUCKET_VOLUME));
|
||||
ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(ModelFluidDebug.FLUID, Fluid.BUCKET_VOLUME));
|
||||
GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "diamond_to_fluid"), null, filledBucket, Ingredient.fromItem(Items.DIAMOND));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user