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
41,274 Commits 31 Branches 187 Tags
43b51c4795c823828e7b9e6988ec277b22e74266
Commit Graph

30 Commits

Author SHA1 Message Date
Sol
6371e708b0 Merge branch 'master' into 'mulligans' 
# Conflicts:
#   forge-game/src/main/java/forge/game/GameAction.java
 2019-05-28 00:39:05 +00:00
Chris H
220e75a81b Extract mulligans from GameAction 
- Add a few different types of Mulliganing that should be expandable
- To finish the work, we need the AI to better handle London mulligans
- And have the UI make this option selectable
 2019-05-27 15:58:20 -04:00
Churrufli
191488089e Update en-US.properties 2019-05-23 13:23:33 +00:00
churrufli
70655c0f26 Moving hard-coded text to en-US.properties file 2019-05-09 00:03:38 +02:00
churrufli
d041a1d315 updating res files 2019-05-08 23:21:03 +02:00
churrufli
e9b266e1d2 updating res files 2019-05-08 23:21:03 +02:00
churrufli
ae4bb531f0 updating res files 2019-05-08 23:21:03 +02:00
churrufli
08ae29c502 updating res files 2019-05-08 23:21:03 +02:00
churrufli
efb3401eff Update language properties 2019-05-08 23:21:03 +02:00
churrufli
662d725aa4 updating res files 2019-05-08 23:21:03 +02:00
churrufli
707a897fbe updating res files 2019-05-08 23:21:03 +02:00
churrufli
77bb7f9f42 Update language properties 2019-05-08 23:21:03 +02:00
churrufli
b95022740b updating res files 2019-04-14 09:51:35 +02:00
churrufli
5dd8619663 updating res files 2019-04-11 08:29:41 +02:00
churrufli
3c1ccfef82 updating res files 2019-04-11 08:29:41 +02:00
churrufli
8d94663f4a Update language properties 2019-04-11 08:29:41 +02:00
Chris H
a050f7c26c TokenViewer Deck "editor" 2019-03-30 22:09:16 -04:00
Michael Kamensky
2937041c63 Merge branch 'card-and-image-audit-menu' into 'master' 
Card and image audit menu

See merge request core-developers/forge!1451
 2019-03-12 05:51:21 +00:00
Tim Scott
e67b55d3cf Add ability to audit cards and card image data. 
README version info fixup.
 2019-03-03 10:00:10 -06:00
churrufli
a546339ea2 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 19:58:25 +01:00
churrufli
405e07a78e Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-25 00:02:01 +01:00
churrufli
6ef9f4bc7b undo translation in AddBasicLandsDialog.java 2019-02-23 19:47:52 +01:00
churrufli
f7134f0a54 Translating hard-coded text to res en-US.properties 2019-02-22 16:53:57 +01:00
Churrufli
3631b8be75 Update en-US.properties 2019-02-22 06:46:32 +00:00
churrufli
25858f625b Translating hard-coded text to res en-US.properties 2019-02-22 00:30:48 +01:00
churrufli
8bf2bd6ddc Translating hard-coded text to res en-US.properties 2019-01-21 00:43:16 +01:00
churrufli
07c2065917 Translating hard-coded text to res en-US.properties 2019-01-18 08:20:02 +01:00
KrazyTheFox
6d5e56f6bf Normalize line endings 2017-12-28 23:40:29 -05:00
drdev
291263b63e Fix case of localized string 2014-08-09 04:22:11 +00:00
Krazy
c26de845e1 Added localization classes and the start of the localization process. 2014-08-08 01:05:03 +00:00