mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.8.9
* development: Fixed Turbine Stats crash Fixed Turbine container crash Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash ja_JP.lang - translate generators and ores tooltip, fix some entries ja_JP.lang - translate general machinery and Blocks(without ores) tooltip. ja_JP.lang - little fix/change ja_JP.lang - fix/change some entries ja_JP.lang - translate tooltip and gui text ja_JP.lang - gui and tooltip translation progress ja_JP.lang - fix/change some translation(items and blocks) ja_JP.lang tweak some entries based on v9 Conflicts: src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/util/RecipeUtils.java
This commit is contained in:
commit
d5656b0264
15 files changed
+1129
-984
No files matched your search
@@ -42,7 +42,6 @@ import mekanism.common.block.states.BlockStateMachine.MachineType;
|
||||
import mekanism.common.integration.IComputerIntegration;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.recipe.RecipeHandler;
|
||||
import mekanism.common.recipe.RecipeHandler.Recipe;
|
||||
import mekanism.common.recipe.inputs.InfusionInput;
|
||||
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
|
||||
import mekanism.common.recipe.machines.BasicMachineRecipe;
|
||||
@@ -632,24 +631,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||
}
|
||||
else if(recipeType == RecipeType.INFUSING)
|
||||
{
|
||||
if(infuseStored.type != null)
|
||||
{
|
||||
if(RecipeHandler.getMetallurgicInfuserRecipe(new InfusionInput(infuseStored, itemstack)) != null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
for(Object obj : Recipe.METALLURGIC_INFUSER.get().keySet())
|
||||
{
|
||||
InfusionInput input = (InfusionInput)obj;
|
||||
|
||||
if(input.inputStack.isItemEqual(itemstack))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return InfuseRegistry.getObject(itemstack) != null && (infuseStored.type == null || infuseStored.type == InfuseRegistry.getObject(itemstack).type);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user