diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 02c00ced..7affb877 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -14,6 +14,8 @@ Changes Bugs - Fix outer corners on connected texture blocks not being metadata sensitive when they should be +- #1300 Farming Station won't take MFR Rubber trees + ------------------------------------------------------ Version 2.2.1 diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java index 985383d7..5894907b 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java @@ -1,14 +1,11 @@ package crazypants.enderio.machine.farm; import net.minecraft.block.Block; -import net.minecraft.block.BlockCrops; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.IPlantable; import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.Log; import crazypants.enderio.machine.farm.farmers.CustomSeedFarmer; import crazypants.enderio.machine.farm.farmers.FarmersCommune; import crazypants.enderio.machine.farm.farmers.MelonFarmer; @@ -154,10 +151,10 @@ public final class FarmersRegistry { private static void addMFR() { String mod = "MineFactoryReloaded"; - String blockName = "tile.mfr.rubberwood.sapling"; + String blockName = "rubberwood.sapling"; Block saplingBlock = GameRegistry.findBlock(mod, blockName); if(saplingBlock != null) { - FarmersCommune.joinCommune(new TreeFarmer(saplingBlock, GameRegistry.findBlock(mod, "tile.mfr.rubberwood.log"))); + FarmersCommune.joinCommune(new TreeFarmer(saplingBlock, GameRegistry.findBlock(mod, "rubberwood.log"))); } }