mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-14 17:58:01 +00:00
Merge branch 'master' into 'master'
Fix imports. See merge request core-developers/forge!5703
This commit is contained in:
@@ -2,7 +2,6 @@ package forge.screens.deckeditor.controllers;
|
|||||||
|
|
||||||
import forge.deck.DeckProxy;
|
import forge.deck.DeckProxy;
|
||||||
import forge.gui.framework.ICDoc;
|
import forge.gui.framework.ICDoc;
|
||||||
import forge.itemmanager.ItemManagerConfig;
|
|
||||||
import forge.screens.deckeditor.views.VBrawlDecks;
|
import forge.screens.deckeditor.views.VBrawlDecks;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,12 +1,7 @@
|
|||||||
package forge.screens.deckeditor.controllers;
|
package forge.screens.deckeditor.controllers;
|
||||||
|
|
||||||
import forge.deck.DeckBase;
|
|
||||||
import forge.deck.DeckProxy;
|
import forge.deck.DeckProxy;
|
||||||
import forge.gui.framework.ICDoc;
|
import forge.gui.framework.ICDoc;
|
||||||
import forge.item.InventoryItem;
|
|
||||||
import forge.itemmanager.DeckManager;
|
|
||||||
import forge.itemmanager.ItemManagerConfig;
|
|
||||||
import forge.screens.deckeditor.CDeckEditorUI;
|
|
||||||
import forge.screens.deckeditor.views.VCommanderDecks;
|
import forge.screens.deckeditor.views.VCommanderDecks;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package forge.screens.deckeditor.controllers;
|
|||||||
|
|
||||||
import forge.deck.DeckProxy;
|
import forge.deck.DeckProxy;
|
||||||
import forge.gui.framework.ICDoc;
|
import forge.gui.framework.ICDoc;
|
||||||
import forge.itemmanager.ItemManagerConfig;
|
|
||||||
import forge.screens.deckeditor.views.VOathbreakerDecks;
|
import forge.screens.deckeditor.views.VOathbreakerDecks;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package forge.screens.deckeditor.controllers;
|
|||||||
|
|
||||||
import forge.deck.DeckProxy;
|
import forge.deck.DeckProxy;
|
||||||
import forge.gui.framework.ICDoc;
|
import forge.gui.framework.ICDoc;
|
||||||
import forge.itemmanager.ItemManagerConfig;
|
|
||||||
import forge.screens.deckeditor.views.VTinyLeadersDecks;
|
import forge.screens.deckeditor.views.VTinyLeadersDecks;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package forge.screens.deckeditor.views;
|
|||||||
|
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
|
|
||||||
import forge.deck.DeckProxy;
|
|
||||||
import forge.deck.io.DeckPreferences;
|
import forge.deck.io.DeckPreferences;
|
||||||
import forge.game.GameType;
|
import forge.game.GameType;
|
||||||
import forge.gui.framework.DragCell;
|
import forge.gui.framework.DragCell;
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package forge.screens.deckeditor.views;
|
|||||||
|
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
|
|
||||||
import forge.deck.DeckProxy;
|
|
||||||
import forge.deck.io.DeckPreferences;
|
import forge.deck.io.DeckPreferences;
|
||||||
import forge.game.GameType;
|
import forge.game.GameType;
|
||||||
import forge.gui.framework.DragCell;
|
import forge.gui.framework.DragCell;
|
||||||
|
|||||||
Reference in New Issue
Block a user