forge

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

Go to file

Michael Kamensky fb23e5a663 Merge branch 'master' into 'master'

Planar Conquest: allow Chaos matches from custom user worlds.

See merge request core-developers/forge!538

2018-05-07 15:38:56 +00:00

.settings

Normalize line endings

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

forge-ai

Merge branch 'asFlash' into 'master'

2018-05-06 08:56:15 +00:00

forge-core

FCollection: extra get Function that checks for element in Collection

2018-05-04 23:39:31 +02:00

forge-game

Resolved merge conflict.

2018-05-07 06:57:13 +03:00

forge-gui

- Planar Conquest: allow Chaos matches from custom user worlds.

2018-05-07 18:37:34 +03:00

forge-gui-android

Proposal to fix Android warnings.

2018-04-28 17:28:16 +00:00

forge-gui-desktop

Revert "Merge branch 'temp_dev6' into 'master'"

2018-05-01 01:11:29 +00:00

forge-gui-ios

- Preparing Forge for Android publish 1.6.9.005 [hotfix].

2018-04-26 07:36:04 +03:00

forge-gui-mobile

Merge branch 'dev-mode' into 'master'

2018-04-30 00:17:43 +00:00

forge-gui-mobile-dev

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

2018-04-21 01:18:35 +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-04-21 01:18:35 +00:00