Merge remote-tracking branch 'origin/master'

This commit is contained in:
Oleg Agafonov 2019-01-13 01:39:30 +04:00
commit 2ece7a9bb2
1004 changed files with 1125 additions and 1128 deletions

View file

@ -253,7 +253,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
predicates.add(new ColorPredicate(ObjectColor.WHITE));
}
if (this.tbColorless.isSelected()) {
predicates.add(new ColorlessPredicate());
predicates.add(ColorlessPredicate.instance);
}
filter.add(Predicates.or(predicates));