diff --git a/Mage.Client/mage-rate-executable.jar b/Mage.Client/mage-rate-executable.jar
index 4e18c5e43ae..91c91d48383 100644
Binary files a/Mage.Client/mage-rate-executable.jar and b/Mage.Client/mage-rate-executable.jar differ
diff --git a/Mage.Client/plugins/mage-card-plugin.jar b/Mage.Client/plugins/mage-card-plugin.jar
index 814d0a67159..269545512b0 100644
Binary files a/Mage.Client/plugins/mage-card-plugin.jar and b/Mage.Client/plugins/mage-card-plugin.jar differ
diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index e8feb48e2f4..311467f50ff 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
org.mage
diff --git a/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
index 6e7e7113799..9dab7fa633c 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
@@ -77,15 +77,15 @@ public class AboutDialog extends MageDialog {
}
});
- jLabel1.setText("MAGE client, version 0.5.1");
+ jLabel1.setText("MAGE client, version 0.6");
lblVersion.setText("version");
jLabel2.setText("Courtesy: BetaSteward@googlemail.com");
- jLabel3.setText("Devs: BetaSteward, Nantuko84, Eugen.Rivniy");
+ jLabel3.setText("Devs: BetaSteward, Nantuko84, Eugen.Rivniy, maurer.it");
- jLabel4.setText("Thanks: KLo, Cosmo & Fritz");
+ //jLabel4.setText("Thanks: KLo, Cosmo & Fritz");
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml
index 6f7a950f337..e1831514daa 100644
--- a/Mage.Common/pom.xml
+++ b/Mage.Common/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Common
diff --git a/Mage.Plugins/Mage.Card.Plugin/pom.xml b/Mage.Plugins/Mage.Card.Plugin/pom.xml
index a603ed7fb0d..1a6db5162b8 100644
--- a/Mage.Plugins/Mage.Card.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Card.Plugin/pom.xml
@@ -7,7 +7,7 @@
org.mage
Mage-Plugins
- 0.5.1
+ 0.6
Mage-Card-Plugin
diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
index 05f31efa2bf..7595512e078 100644
--- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
@@ -7,7 +7,7 @@
org.mage
Mage-Plugins
- 0.5.1
+ 0.6
Mage-Counter-Plugin
diff --git a/Mage.Plugins/Mage.Rating.Plugin/executable/mage-rate-executable.jar b/Mage.Plugins/Mage.Rating.Plugin/executable/mage-rate-executable.jar
index 488abada3b8..93ed55eca84 100644
Binary files a/Mage.Plugins/Mage.Rating.Plugin/executable/mage-rate-executable.jar and b/Mage.Plugins/Mage.Rating.Plugin/executable/mage-rate-executable.jar differ
diff --git a/Mage.Plugins/Mage.Rating.Plugin/pom.xml b/Mage.Plugins/Mage.Rating.Plugin/pom.xml
index 14f8b9979d3..c1156bf2c11 100644
--- a/Mage.Plugins/Mage.Rating.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Rating.Plugin/pom.xml
@@ -6,7 +6,7 @@
org.mage
Mage-Plugins
- 0.5.1
+ 0.6
org.mage
@@ -25,7 +25,7 @@
org.mage
Mage-Sets
- 0.5.1
+ 0.6
com.googlecode.jspf
diff --git a/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java b/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java
index 846a784937b..8832e280b4b 100644
--- a/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java
+++ b/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java
@@ -15,6 +15,7 @@ import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import org.apache.log4j.Logger;
+import org.mage.plugins.rating.cards.CardsStorage;
import org.mage.plugins.rating.results.ResultHandler;
import org.mage.plugins.rating.ui.BigCard;
@@ -22,6 +23,7 @@ public class RateFrame extends JFrame {
private static Logger log = Logger.getLogger(RateFrame.class);
private BigCard bigCard;
+ private JLabel label;
public RateFrame() {
setTitle("Mage Rate Cards, version 0.1");
@@ -56,7 +58,8 @@ public class RateFrame extends JFrame {
bigCard.setBorder(BorderFactory.createLineBorder(Color.gray));
add(bigCard);
- JLabel label = new JLabel("The results are stored for every 10 compare.");
+ //JLabel label = new JLabel("The results are stored for every 10 compare.");
+ label = new JLabel("Loading cards...Please wait.");
label.setBounds(290, 270, 300, 30);
add(label);
@@ -78,6 +81,8 @@ public class RateFrame extends JFrame {
}
public void startRating() {
+ CardsStorage.getAllCards();
+ label.setText("The results are stored for every 10 compare.");
RateThread.getInstance().start(this, this.bigCard);
}
diff --git a/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateThread.java b/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateThread.java
index 504c2228dfe..a64868277c9 100644
--- a/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateThread.java
+++ b/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateThread.java
@@ -1,6 +1,6 @@
package org.mage.plugins.rating;
-import java.awt.Component;
+import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -25,6 +25,7 @@ public class RateThread extends Thread {
private static RateThread fInstance = new RateThread();
private CardPluginImpl impl = new CardPluginImpl();
public static CardDimensions dimensions = new CardDimensions(0.4);
+ public static Dimension cardDimension = new Dimension(dimensions.frameWidth, dimensions.frameHeight);
public static CardDimensions bigCardDimension = new CardDimensions(0.8);
private JFrame frame;
private MageCard mageCard1;
@@ -51,11 +52,11 @@ public class RateThread extends Thread {
Card card1 = getRandomUniqueNonLandCard(null);
Card card2 = getRandomUniqueNonLandCard(card1);
- mageCard1 = impl.getMageCard(new CardView(card1), dimensions, UUID.randomUUID(), new RateCallback(card1, card2, this, bigCard), false);
+ mageCard1 = impl.getMageCard(new CardView(card1), cardDimension, UUID.randomUUID(), new RateCallback(card1, card2, this, bigCard), false);
mageCard1.setCardBounds(bigCardDimension.frameWidth + 80, 10, dimensions.frameWidth, dimensions.frameHeight);
frame.add(mageCard1);
- mageCard2 = impl.getMageCard(new CardView(card2), dimensions, UUID.randomUUID(), new RateCallback(card2, card1, this, bigCard), false);
+ mageCard2 = impl.getMageCard(new CardView(card2), cardDimension, UUID.randomUUID(), new RateCallback(card2, card1, this, bigCard), false);
mageCard2.setCardBounds(bigCardDimension.frameWidth + 80 + dimensions.frameWidth + 30, 10, dimensions.frameWidth, dimensions.frameHeight);
frame.add(mageCard2);
diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
index a61a57ce290..95c4ead2d16 100644
--- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
@@ -6,7 +6,7 @@
org.mage
Mage-Plugins
- 0.5.1
+ 0.6
Mage-Theme-Plugin
diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml
index 44e37e2f9c6..1a087c83e47 100644
--- a/Mage.Plugins/pom.xml
+++ b/Mage.Plugins/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Plugins
diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
index 97e5df49dd4..9f24091a7ad 100644
--- a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Deck-Constructed
diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
index d87b4657983..5b51853cb44 100644
--- a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
+++ b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Deck-Limited
diff --git a/Mage.Server.Plugins/Mage.Draft.8PlayerBooster/pom.xml b/Mage.Server.Plugins/Mage.Draft.8PlayerBooster/pom.xml
index 14d00806cce..3a3d408d828 100644
--- a/Mage.Server.Plugins/Mage.Draft.8PlayerBooster/pom.xml
+++ b/Mage.Server.Plugins/Mage.Draft.8PlayerBooster/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Draft-8PlayerBooster
diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
index f05b152adbd..c5cfa73857c 100644
--- a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Game-FreeForAll
diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
index 71be696010a..5121b4abf72 100644
--- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Game-TwoPlayerDuel
diff --git a/Mage.Server.Plugins/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml
index 6f375225154..cfbea7e711e 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Player-AI
diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
index 90ba36b87c6..12c2767e2d4 100644
--- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Player-AIMinimax
diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml
index 79ceada5862..51c871d92b1 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Player-Human
diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml
index 7b390eaef26..a22f05a4609 100644
--- a/Mage.Server.Plugins/pom.xml
+++ b/Mage.Server.Plugins/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Server-Plugins
@@ -22,7 +22,7 @@
Mage.Player.AI
Mage.Player.AIMinimax
Mage.Player.Human
- Mage.Draft.8PlayerBooster
+ Mage.Draft.8PlayerBooster
\ No newline at end of file
diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml
index 813168de0d3..f4f59805560 100644
--- a/Mage.Server/pom.xml
+++ b/Mage.Server/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Server
diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml
index a90b49c357f..7b560c67cdc 100644
--- a/Mage.Sets/pom.xml
+++ b/Mage.Sets/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
org.mage
diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml
index f125160e51c..f3956fea0a7 100644
--- a/Mage.Tests/pom.xml
+++ b/Mage.Tests/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage-Tests
diff --git a/Mage/pom.xml b/Mage/pom.xml
index 5bcce4f7fb4..a5d453c34a8 100644
--- a/Mage/pom.xml
+++ b/Mage/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
Mage
diff --git a/pom.xml b/pom.xml
index e1ad4c3e515..6354f84bd3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 0.5.1
+ 0.6
pom
Mage Root
Mage Root POM
@@ -40,6 +40,6 @@
- 0.5.1
+ 0.6