Merge remote-tracking branch 'origin/master' into MC1.6

This commit is contained in:
DarkGuardsman 2013-07-08 05:44:44 -04:00
commit ce11ee36cc

View file

@ -215,7 +215,7 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
{
super.setFilter(filter);
/* Reset inv Helper's filters */
this.invExtractionHelper.setFilter(this.getFilter() != null ? ItemImprinter.getFilters(this.getFilter()) : null, this.isInverted());
this.invHelper().setFilter(this.getFilter() != null ? ItemImprinter.getFilters(this.getFilter()) : null, this.isInverted());
}
/** Is this manipulator set to output items */