Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts: # src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
commit
426001251f
123 changed files with 1469 additions and 1486 deletions
|
@ -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());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue