forge

mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00

Go to file

maustin 21c41550f8 Merge remote-tracking branch 'Core/historicformats' into historicformatscopy

# Conflicts:
#	forge-gui/res/formats/Historic/Duelists' Convocation/pending verification/Block/Invasion Block Constructed, Apocalypse.txt

2018-05-12 22:33:28 +01:00

.settings

Normalize line endings

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

forge-ai

Merge branch 'ai-torgaar' into 'master'

2018-04-19 07:06:56 +00:00

forge-core

Merge branch 'master' into historicformats

2018-04-18 23:00:56 +01:00

forge-game

Reversed date ordering when checking deck formats so that when only one of each subtype is shown the earliest valid format is used

2018-04-20 06:46:26 +01:00

forge-gui

Merge remote-tracking branch 'Core/historicformats' into historicformatscopy

2018-05-12 22:33:28 +01:00

forge-gui-android

Updates the project for Java 8.

2018-04-16 18:26:15 -07:00

forge-gui-desktop

Merge branch 'master' into historicformats

2018-04-18 23:00:56 +01:00

forge-gui-ios

Updates the project for Java 8.

2018-04-16 18:26:15 -07:00

forge-gui-mobile

Merge branch 'brawlfixes' into historicformats

2018-04-19 18:21:36 +01:00

forge-gui-mobile-dev

Updates the project for Java 8.

2018-04-16 18:26:15 -07: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-03-20 01:14:26 +00:00