Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/dev/attackeight/the_vault_jei/jei/TheVaultJEIPlugin.java
  • Loading branch information
Attack8 committed Jun 11, 2024
2 parents d5ef3bd + 192786d commit b59bdd5
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,18 @@ private List<JewelForgeRecipe> getJewelRecipes(){
return recipes;
}

private List<GearForgeRecipe> getGearRecipes(){
List<GearForgeRecipe> recipes = new ArrayList<>();
ModConfigs.GEAR_RECIPES.getConfigRecipes().forEach(b -> recipes.add(b.makeRecipe()));
return recipes;
}

private List<TrinketForgeRecipe> getTrinketRecipes(){
List<TrinketForgeRecipe> recipes = new ArrayList<>();
ModConfigs.TRINKET_RECIPES.getConfigRecipes().forEach(b -> recipes.add(b.makeRecipe()));
return recipes;
}

private List<GearForgeRecipe> getGearRecipes(){
List<GearForgeRecipe> recipes = new ArrayList<>();
ModConfigs.GEAR_RECIPES.getConfigRecipes().forEach(b -> recipes.add(b.makeRecipe()));
return recipes;
}

private List<InscriptionForgeRecipe> getInscriptionRecipes() {
List<InscriptionForgeRecipe> recipes = new ArrayList<>();
ModConfigs.INSCRIPTION_RECIPES.getConfigRecipes().forEach(b -> recipes.add(b.makeRecipe()));
Expand Down

0 comments on commit b59bdd5

Please sign in to comment.