External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2016-02-27 09:28:01 +01:00
commit 56294eac50
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Client/src/main/assembly/distribution.xml
View file

@ -4,6 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<includeBaseDirectory>false</includeBaseDirectory>
<id>mage-client</id>
<formats>
<format>zip</format>
</formats>

2
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -169,8 +169,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
if (deck != null) {
this.cardSelector.loadSideboard(new ArrayList<>(deck.getSideboard()), this.bigCard);
}
// TODO: take from preferences
this.cardSelector.switchToGrid();
this.btnExit.setVisible(false);
this.btnImport.setVisible(false);