Merge remote-tracking branch 'upstream/unstable' into unstable

2 files changed, 12 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index fbeda8f014..4ea6166058 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -10,6 +10,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_Config;

+import gregtech.api.util.GT_Recipe;

 import net.minecraftforge.fluids.FluidStack;

 

 import static gregtech.api.enums.GT_Values.V;

@@ -68,6 +69,11 @@ public class GT_MetaTileEntity_Massfabricator
         return 0;

     }

 

+    @Override

+    public GT_Recipe.GT_Recipe_Map getRecipeList() {

+        return GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes;

+    }

+

     public boolean isFluidInputAllowed(FluidStack aFluid) {

         return aFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L));

     }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
index 6d11864f26..2e50df6e54 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
@@ -8,6 +8,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_OreDictUnificator;

+import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.items.behaviors.Behaviour_DataOrb;

 import net.minecraft.item.ItemStack;

@@ -74,6 +75,11 @@ public class GT_MetaTileEntity_Replicator
         return 0;

     }

 

+    @Override

+    public GT_Recipe.GT_Recipe_Map getRecipeList() {

+        return GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes;

+    }

+

     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

         return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (ItemList.Cell_Empty.isStackEqual(aStack));

     }