forge

mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00

Go to file

maustin 02eb8f632f Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements

# Conflicts:
#	forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
#	forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java

2018-03-01 06:55:16 +00:00

.settings

Normalize line endings

2017-12-28 23:40:29 -05:00

forge-ai

Clear out release files in preparation for next release

2018-02-25 22:55:10 +00:00

forge-core

allow ALL cards to be (de)serialized

2018-02-28 20:03:53 -07:00

forge-game

Merge branch 'multiplayer' into 'master'

2018-03-01 03:12:26 +00:00

forge-gui

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

2018-03-01 06:55:16 +00:00

forge-gui-android

bump commons-lang3 version for Java 9 support

2018-02-28 17:44:30 -07:00

forge-gui-desktop

network play: enable Vanguard

2018-02-28 20:03:53 -07:00

forge-gui-ios

Clear out release files in preparation for next release

2018-02-25 22:55:10 +00:00

forge-gui-mobile

bump commons-lang3 version for Java 9 support

2018-02-28 17:44:30 -07:00

forge-gui-mobile-dev

Clear out release files in preparation for next release

2018-02-25 22:55:10 +00:00

.checkstyle

In Eclipse, turn on CheckStyle plugin checks for any file opened in the editor, even if it is already in synch with the repository.

2011-08-28 13:42:22 +00:00

.classpath

fix eclipse issues

2013-11-08 18:39:59 +00:00

.fbprefs

Normalize line endings

2017-12-28 23:40:29 -05:00

.gitattributes

Normalize line endings

2017-12-28 23:40:29 -05:00

.gitignore

Update CHANGES.txt for release 1.5.57.

2016-10-27 02:43:15 +00:00

.project

- Reverted accidental commit of project file.

2014-11-01 14:40:31 +00:00

AppIcon.png

Work towards getting Android app to run

2014-04-23 22:02:51 +00:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2018-02-25 22:49:44 +00:00