Skip to content

Commit

Permalink
Merge branch 'master' into pipe-switch
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master authored Jan 28, 2025
2 parents c40941f + 802b194 commit ea171ba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
15 changes: 0 additions & 15 deletions src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
Original file line number Diff line number Diff line change
Expand Up @@ -929,21 +929,6 @@ private static void blastSmelterRecipes() {
.duration(2 * MINUTES)
.addTo(alloyBlastSmelterRecipes);

// molten precious metals alloy
GTValues.RA.stdBuilder()
.itemInputs(
GTUtility.getIntegratedCircuit(6),
ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustRhodium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustPalladium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustPlatinum", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 1))
.fluidOutputs(FluidUtils.getFluidStack("molten.precious metals alloy", 864))
.eut(TierEU.RECIPE_UEV)
.duration(9 * MINUTES)
.addTo(alloyBlastSmelterRecipes);

// lossless phonon transfer medium
GTValues.RA.stdBuilder()
.itemInputs(
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kubatech/loaders/RecipeLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -305,15 +305,15 @@ private static void RegisterTeaLine() {
GTValues.RA.stdBuilder()
.itemInputs(BlackTea.get(1))
.itemOutputs(LemonTea.get(1))
.fluidInputs(FluidRegistry.getFluidStack("potion.lemonjuice", 1000))
.fluidInputs(FluidRegistry.getFluidStack("potion.lemonjuice", 10))
.eut(TierEU.RECIPE_LV)
.duration(5 * SECONDS)
.addTo(mixerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(BlackTea.get(1))
.itemOutputs(MilkTea.get(1))
.fluidInputs(FluidRegistry.getFluidStack("milk", 1000))
.fluidInputs(FluidRegistry.getFluidStack("milk", 100))
.eut(TierEU.RECIPE_LV)
.duration(5 * SECONDS)
.addTo(mixerRecipes);
Expand Down

0 comments on commit ea171ba

Please sign in to comment.