Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation

forge-gui/res/conquest/planes/Zendikar/cards.txt

@@ -1,28 +1,45 @@
-Perilous Vault
-Archangel of Thune
-Soul of Zendikar
+Animist's Awakening
+Bag of Holding
 Boundless Realms
-Malakir Cullblade
-Nissa's Expedition
+Crash of Rhino Beetles 
+Creeping Trailblazer
+Crop Rotation
+Crystalline Crawler
 Dismiss into Dream
 Elemental Bond
 Elvish Archdruid
 Elvish Mystic
-Nahiri, the Lithomancer
 Felidar Umbra
 Indrik Umbra
+Infernal Reckoning
 Into the Wilds
 Joraga Invocation
+Malakir Cullblade
+Might of the Masses
 Mind Control
+Nahiri, the Lithomancer
+Nesting Dragon
+Nissa's Expedition
 Nissa's Pilgrimage
 Nissa's Revelation
 Nissa, Vastwood Seer
 Nissa, Worldwaker
 Ob Nixilis of the Black Oath
 Ob Nixilis, Unshackled
+Omnath, Locus of the Roil
+Perilous Vault
+Risen Reef
+Soul of Zendikar
 Sword of the Animist
+Turntimber Ranger
 Vastwood Hydra
+Vine Snare 
+Volcanic Rambler
+Wakeroot Elemental
 Wild Instincts
 Woodborn Behemoth
+Yarok's Fenlurker
+Yarok's Wavecrasher
+Yarok, the Desecrated
 Zendikar Incarnate
 Zendikar's Roil

forge-gui/src/main/java/forge/match/input/InputSelectTargets.java

@@ -144,7 +144,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
 
     @Override
     protected final boolean onCardSelected(final Card card, final List<Card> otherCardsToSelect, final ITriggerEvent triggerEvent) {
-        if (!tgt.isUniqueTargets() && targetDepth.containsKey(card)) {
+        if (tgt.isUniqueTargets() && targetDepth.containsKey(card)) {
             return false;
         }