Skip to content

Commit

Permalink
Merge remote-tracking branch 'FrostyFire1/fluid-heater-output' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master committed Feb 12, 2025
2 parents aeb1f6a + 7c7ea15 commit 3bfa1f4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/recipe/RecipeMaps.java
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ public final class RecipeMaps {
.progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
.build();
public static final RecipeMap<RecipeMapBackend> fluidHeaterRecipes = RecipeMapBuilder.of("gt.recipe.fluidheater")
.maxIO(1, 0, 1, 1)
.maxIO(1, 1, 1, 1)
.slotOverlays((index, isFluid, isOutput, isSpecial) -> {
if (!isFluid) {
return null;
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java
Original file line number Diff line number Diff line change
Expand Up @@ -4358,7 +4358,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
RecipeMaps.fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4374,7 +4374,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
RecipeMaps.fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4390,7 +4390,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
RecipeMaps.fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4406,7 +4406,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
RecipeMaps.fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4422,7 +4422,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
RecipeMaps.fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4438,7 +4438,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4454,7 +4454,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4470,7 +4470,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4486,7 +4486,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4502,7 +4502,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4518,7 +4518,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand All @@ -4534,7 +4534,7 @@ private void registerFluidHeater() {
MachineType.FLUID_HEATER.tooltipDescription(),
fluidHeaterRecipes,
1,
0,
1,
true,
SoundResource.NONE,
MTEBasicMachineWithRecipe.SpecialEffects.NONE,
Expand Down

0 comments on commit 3bfa1f4

Please sign in to comment.