# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
modmuss50 2017-06-14 23:30:35 +01:00
commit 426001251f
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
123 changed files with 1469 additions and 1486 deletions

View file

@ -298,7 +298,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
RecipeCategoryUids.ROLLING_MACHINE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.SCRAP_BOX), RecipeCategoryUids.SCRAPBOX);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SEMIFLUID_GENERATOR),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR),
EFluidGenerator.SEMIFLUID.getRecipeID());
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.GAS_TURBINE),
EFluidGenerator.GAS.getRecipeID());