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

Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator

Browse Source 
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
#	forge-gui-mobile/src/forge/deck/FDeckChooser.java
#	forge-gui/res/deckgendecks/Commander.dat
#	forge-gui/res/deckgendecks/Modern.dat
#	forge-gui/res/deckgendecks/Standard.dat
#	forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
#	forge-gui/src/main/java/forge/deck/DeckType.java
#	forge-gui/src/main/java/forge/deck/DeckgenUtil.java
#	forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
This commit is contained in:
maustin
2018-02-21 09:30:49 +00:00
parent 6cf2c3459c 8325893369
commit 05a30d0129
Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available