external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,485 Commits 32 Branches 187 Tags
1a1057f56fbcbb0cac6c209dc699fc7ead39160c
Commit Graph

49485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bug Hunter
22918f7dea Merge branch 'stp' into 'master' 
Swords to Plowshares: Update script

See merge request core-developers/forge!4170
 2021-03-10 21:45:26 +00:00
tool4EvEr
b8155d07cb Update script 2021-03-10 22:45:11 +01:00
tool4EvEr
141901c4c1 Fix NPE 2021-03-10 20:00:17 +01:00
tool4EvEr
e08e214fc1 Deskop layout: remove obsolete elements 2021-03-10 19:30:47 +01:00
Anthony Calosa
e328165fbc Merge branch 'revert-49c4b52f' into 'master' 
Revert "Merge branch 'master' into 'master'"

See merge request core-developers/forge!4166
 2021-03-10 15:27:19 +00:00
Anthony Calosa
bd02ac4c0c Revert "Merge branch 'master' into 'master'" 
This reverts merge request !4165
 2021-03-10 15:20:26 +00:00
Anthony Calosa
49c4b52fb0 Merge branch 'master' into 'master' 
[Mobile] refresh on activate when deckmanager is on imageview

See merge request core-developers/forge!4165
 2021-03-10 14:46:47 +00:00
Anthony Calosa
33e5fa7115 refresh on activate when imageview 2021-03-10 22:44:54 +08:00
Anthony Calosa
df9f108e02 Merge branch 'master' into 'master' 
[Mobile] Fix deck selection and generated commander decks with images

See merge request core-developers/forge!4164
 2021-03-10 13:29:00 +00:00
Anthony Calosa
3fbc438e47 Merge remote-tracking branch 'core/master' 2021-03-10 21:28:20 +08:00
Anthony Calosa
7daf310959 [Mobile] Fix deck selection and generated commander decks with images 2021-03-10 21:26:48 +08:00
Anthony Calosa
8e33d4bd05 Merge branch 'master' into 'master' 
Update digital sets

See merge request core-developers/forge!4163
 2021-03-10 11:20:59 +00:00
Anthony Calosa
9c151d2d66 Merge remote-tracking branch 'core/master' 2021-03-10 19:18:35 +08:00
Anthony Calosa
2d51428123 Update digital sets 2021-03-10 19:17:50 +08:00
Michael Kamensky
a235c757f5 Merge branch 'master' into 'master' 
Added an AI hint to Dredge the Mire.

See merge request core-developers/forge!4162
 2021-03-10 06:52:36 +00:00
Michael Kamensky
4c9bbe1290 - Added an AI hint to Dredge the Mire. 2021-03-10 09:52:05 +03:00
Michael Kamensky
f68975ede2 Merge branch 'master' into 'master' 
ConquestUtil: skip promos (again) and other reprints when choosing the starting Planeswalker

See merge request core-developers/forge!4161
 2021-03-10 06:09:13 +00:00
Michael Kamensky
076e27851f - ConquestUtil: skip promos (again) and other reprints when choosing the starting Planeswalker 2021-03-10 09:08:32 +03:00
Anthony Calosa
3914fde25f Merge branch 'kevlahnota-master-patch-72134' into 'master' 
Update Mystery Booster Playtest Cards.txt

See merge request core-developers/forge!4160
 2021-03-10 04:36:30 +00:00
Anthony Calosa
334918f6d8 Update Mystery Booster Playtest Cards.txt 2021-03-10 04:36:20 +00:00
Anthony Calosa
5aadc7e4be Merge branch 'master' into 'master' 
Update Edition Types

Closes #1764

See merge request core-developers/forge!4159
 2021-03-10 04:23:58 +00:00
Anthony Calosa
ecb5f4d2c3 Update check 2021-03-10 12:23:09 +08:00
Anthony Calosa
8f62e32f37 Merge remote-tracking branch 'core/master' 2021-03-10 12:10:32 +08:00
Anthony Calosa
92a2bf68f7 Update Edition Types 2021-03-10 12:06:22 +08:00
Anthony Calosa
000a7c679c Merge branch 'master' into 'master' 
Update Deck ImageView

See merge request core-developers/forge!4158
 2021-03-10 01:36:28 +00:00
Anthony Calosa
e5142cba99 Update Deck ImageView 
- [Desktop] double right click / [Mobile] multiple tap - add deck to favorites
 2021-03-10 01:36:28 +00:00
Anthony Calosa
76714d840f update check 2021-03-10 09:33:40 +08:00
Anthony Calosa
0394b65f43 Update Deck ImageView 
- [Desktop] double right click / [Mobile] multiple tap - add deck to favorites
 2021-03-10 09:30:12 +08:00
Michael Kamensky
3864e56c23 Merge branch 'Williams-master-patch-33487' into 'master' 
Clash Pack "Promos"

See merge request core-developers/forge!4157
 2021-03-09 16:13:10 +00:00
Michael Kamensky
9632ad4162 Merge branch 'cleanup' into 'master' 
Cleanup TODO.txt artifact from codebase

See merge request core-developers/forge!4150
 2021-03-09 15:39:04 +00:00
John
e9da3b3bfe Update Magic_Origins_Clash_Pack.txt 2021-03-09 15:03:12 +00:00
John
bec4acba2e Upload New File 2021-03-09 15:02:53 +00:00
John
a80353b4f2 Update Fate_Reforged_Clash_Pack.txt 2021-03-09 15:02:27 +00:00
John
d70694a352 Upload New File 2021-03-09 15:02:04 +00:00
John
3444dd594d Add new file 2021-03-09 15:01:05 +00:00
Michael Kamensky
edefe5be62 Merge branch 'master' into 'master' 
Hazduhr fix

Closes #1765

See merge request core-developers/forge!4156
 2021-03-09 14:11:08 +00:00
Michael Kamensky
2872fb6932 Merge branch 'Williams-master-patch-48793' into 'master' 
Update Edition Files

See merge request core-developers/forge!4155
 2021-03-09 14:10:21 +00:00
Michael Kamensky
7c2b05838d Merge branch 'klaxnek-master-patch-32779' into 'master' 
Update es-ES.properties

See merge request core-developers/forge!4154
 2021-03-09 14:09:40 +00:00
Hythonia
c94d8f5b7d Update hazduhr_the_abbot.txt 2021-03-09 11:48:31 +00:00
John
664ca46e76 Update Resale Promos.txt 2021-03-09 10:39:00 +00:00
John
73b95a8b2c Update Secret Lair Drop Series.txt 2021-03-09 09:44:34 +00:00
klaxnek
17e13d1b47 Update es-ES.properties 2021-03-09 08:55:42 +00:00
Anthony Calosa
70e97911ff Merge branch 'kevlahnota-master-patch-07534' into 'master' 
Update skinsList.txt

See merge request core-developers/forge!4153
 2021-03-08 22:26:06 +00:00
Anthony Calosa
275ea61129 Update skinsList.txt 2021-03-08 22:25:25 +00:00
Michael Kamensky
e88b84e8fe Merge branch 'card-fixes' into 'master' 
Fix some bad replacements from the References change

See merge request core-developers/forge!4151
 2021-03-08 17:48:13 +00:00
Adam Pantel
8d14f9ff39 Fix some bad replacements from the References change 2021-03-08 11:38:52 -05:00
Bug Hunter
cdca4c08de information moved to wiki 2021-03-08 15:10:22 +00:00
Michael Kamensky
7fe38f8dfa Merge branch 'master' into 'master' 
Torrent of Lava and other fixes

See merge request core-developers/forge!4136
 2021-03-08 14:07:46 +00:00
Michael Kamensky
5ca2c06eae Merge branch 'Williams-master-patch-71612' into 'master' 
Update Guilds of Ravnica Promos.txt

See merge request core-developers/forge!4149
 2021-03-08 13:01:44 +00:00
John
fff8e4d065 Update Guilds of Ravnica Promos.txt 2021-03-08 10:53:31 +00:00