external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
CCTV-1
2020-03-08 16:11:00 +08:00
parent 85b2409a66 be52fb772e
commit e0c9d5e6e0
76 changed files with 4333 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui/res/languages/en-US.properties
View File

@@ -2126,6 +2126,7 @@ lblLoadingCurrentConquest=Loading current conquest...
lblSelectCommander=Select Commander
lblCantSelectDeckBecause=Can''t select {0} \nDeck {1}
#ConquestAEtherScreen.java
lblShardsAE=Shards: {0}
lblHaveNAEShards=Shards: {0} {1}
lblTapToPullFromAE=Tap to pull from the Aether\n{0}
lblSelectCaptionFilter=Select {0} Filter