forge

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

Go to file

Agetian d1fbe5c26d Merge remote-tracking branch 'upstream/FriendOrFoe' into FriendOrFoe

# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/regnas_sanction.txt

2018-06-04 07:37:06 +03:00

.settings

Normalize line endings

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

forge-ai

- Renamed two cards to match the current standard.

2018-06-04 07:35:47 +03:00

forge-core

PartnerWith: extended DeckFormat Predicate

2018-05-27 15:52:18 +02:00

forge-game

CountersPut: use Placer

2018-06-03 22:01:56 +02:00

forge-gui

Merge remote-tracking branch 'upstream/FriendOrFoe' into FriendOrFoe

2018-06-04 07:37:06 +03:00

forge-gui-android

- Preparing Forge for Android publish 1.6.10.001 [incremental].

2018-05-08 06:51:43 +03:00

forge-gui-desktop

Game: Counters Put effects need to have Putter as Source

2018-06-03 18:21:02 +02:00

forge-gui-ios

- Preparing Forge for Android publish 1.6.10.001 [incremental].

2018-05-08 06:51:43 +03:00

forge-gui-mobile

Oracle: update base code for their effects

2018-05-26 13:38:55 +02:00

forge-gui-mobile-dev

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

2018-05-08 00:48:11 +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-05-08 00:48:11 +00:00