external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved card prefrences to gui

Browse Source
This commit is contained in:
Maxmtg
2013-12-22 13:08:28 +00:00
parent 7d41ae1331
commit 5367811a33
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -28,7 +28,6 @@ forge-core/src/main/java/forge/card/CardCharacteristicName.java -text
forge-core/src/main/java/forge/card/CardDb.java -text
forge-core/src/main/java/forge/card/CardEdition.java -text
forge-core/src/main/java/forge/card/CardFace.java -text
forge-core/src/main/java/forge/card/CardPreferences.java -text
forge-core/src/main/java/forge/card/CardRarity.java -text
forge-core/src/main/java/forge/card/CardRules.java -text
forge-core/src/main/java/forge/card/CardRulesPredicates.java -text
@@ -15205,6 +15204,7 @@ forge-gui/src/main/java/forge/gui/CardContainer.java svneol=native#text/plain
forge-gui/src/main/java/forge/gui/CardDetailPanel.java svneol=native#text/plain
forge-gui/src/main/java/forge/gui/CardListViewer.java -text
forge-gui/src/main/java/forge/gui/CardPicturePanel.java svneol=native#text/plain
forge-gui/src/main/java/forge/gui/CardPreferences.java -text
forge-gui/src/main/java/forge/gui/DualListBox.java -text
forge-gui/src/main/java/forge/gui/FNetOverlay.java -text
forge-gui/src/main/java/forge/gui/ForgeAction.java svneol=native#text/plain

2
forge-gui/src/main/java/forge/Singletons.java
View File

@@ -17,8 +17,8 @@
*/
package forge;
import forge.card.CardPreferences;
import forge.control.FControl;
import forge.gui.CardPreferences;
import forge.gui.toolbox.FProgressBar;
import forge.gui.workshop.CardScriptInfo;
import forge.model.FModel;

2
forge-core/src/main/java/forge/card/CardPreferences.java → forge-gui/src/main/java/forge/gui/CardPreferences.java
View File

@@ -1,4 +1,4 @@
package forge.card;
package forge.gui;
import java.io.FileInputStream;
import java.io.FileNotFoundException;

2
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java
View File

@@ -23,7 +23,7 @@ import java.awt.event.MouseEvent;
import javax.swing.JTable;
import forge.card.CardPreferences;
import forge.gui.CardPreferences;
import forge.gui.toolbox.FSkin;
import forge.gui.toolbox.FSkin.SkinImage;
import forge.item.IPaperCard;