external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
516510c98f15e5fce8434349379b465b04a40546
forge/forge-ai
History
Ryan Wiedemann 308c75e60e Merge branch 'master' into 'push_down_toStringMap_part_3' 
# Conflicts:
#   forge-ai/src/main/java/forge/ai/AiController.java
#   forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
#   forge-game/src/main/java/forge/game/card/CardFactory.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDrawCards.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceSurveil.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java
2019-09-23 14:18:52 +00:00
..
src
Merge branch 'master' into 'push_down_toStringMap_part_3'
2019-09-23 14:18:52 +00:00
pom.xml
[maven-release-plugin] prepare for next development iteration
2019-09-04 01:51:10 +00:00