merge latest trunk

src/main/java/forge/ImageLoader.java

@@ -42,6 +42,11 @@ final class ImageLoader extends CacheLoader<String, BufferedImage> {
 
         BufferedImage ret = _findFile(key, path, filename);
         
+        // some S00/S2K cards are really part of 6ED/6E
+        if (null == ret && filename.startsWith("S2K") ) {
+            ret = _findFile(key, path, filename.replace("S2K", "6E"));
+        }
+
         // try without set prefix
         if (null == ret && filename.contains("/")) {
             ret = _findFile(key, path, filename.substring(filename.indexOf('/') + 1));
@@ -61,6 +66,7 @@ final class ImageLoader extends CacheLoader<String, BufferedImage> {
         } catch (IOException ex) {
             BugReporter.reportException(ex, "Could not read image file " + file.getAbsolutePath() + " ");
         }
+
         return image;
     }
     
@@ -75,6 +81,5 @@ final class ImageLoader extends CacheLoader<String, BufferedImage> {
         }
         
         return null;
-
     }
 }

src/main/java/forge/game/GameNew.java

@@ -83,7 +83,6 @@ public class GameNew {
      * their decks and other special starting conditions.
      */
     public static void newGame(final MatchController match, final Map<Player, PlayerStartConditions> playersConditions, final GameState game, final boolean canRandomFoil) {
-        match.getInput().clearInput();
 
         Card.resetUniqueNumber();
         // need this code here, otherwise observables fail

src/main/java/forge/game/MatchController.java

@@ -157,6 +157,9 @@ public class MatchController {
             final boolean canRandomFoil = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL) && gameType == GameType.Constructed;
             GameNew.newGame(this, startConditions, currentGame, canRandomFoil);
             
+            getInput().clearInput();
+            getInput().resetInput();
+            
             Thread thGame = new GameInputUpdatesThread(this, currentGame);
             thGame.setName("Game input updater");
             thGame.start();