Anthony Calosa
f67b46255a
Fix ProtocolMethod
2021-03-24 14:34:23 +08:00
Michael Kamensky
9d44b11e95
Merge branch 'insubordination' into 'master'
...
Insubordination: Fix trigger
See merge request core-developers/forge!4252
2021-03-24 03:42:28 +00:00
Anthony Calosa
32b24b7884
Merge branch 'master' into 'master'
...
Fix duplicate dependencies
See merge request core-developers/forge!4253
2021-03-24 02:30:30 +00:00
Anthony Calosa
c3dd154ef5
Fix duplicate dependencies
...
-xstream greater than 1.4.9 needs higher android.jar (would remove support for devices lower than Android 8 unless we use the java 7 variant), latest guava and maybe other higher libs needs desugaring for android to work.
2021-03-24 10:22:43 +08:00
tool4EvEr
2b24539e0e
Fix trigger
2021-03-23 21:53:02 +01:00
Hans Mackowiak
9ca66c213d
Merge branch 'cleanup' into 'master'
...
Code cleanup
See merge request core-developers/forge!4248
2021-03-23 17:17:37 +00:00
Michael Kamensky
bbb561314a
Merge branch 'master' into 'master'
...
Added 3 Kaldheim puzzles.
See merge request core-developers/forge!4250
2021-03-23 06:37:06 +00:00
Michael Kamensky
16b56fffbe
- Added 3 Kaldheim puzzles.
2021-03-23 09:36:21 +03:00
Michael Kamensky
9961604ca5
Merge branch 'master' into 'master'
...
Kasmina, Enigma Sage
See merge request core-developers/forge!4246
2021-03-23 03:59:39 +00:00
Anthony Calosa
6a0345f6d4
Merge branch 'twosat-master-patch-44168' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!4247
2021-03-23 03:46:26 +00:00
Anthony Calosa
23fd43a965
Merge branch 'kevlahnota-master-patch-98872' into 'master'
...
Update M15_Prerelease_Challenge.txt
See merge request core-developers/forge!4249
2021-03-23 03:45:49 +00:00
Anthony Calosa
9b1521ee64
Update M15_Prerelease_Challenge.txt
2021-03-23 03:45:09 +00:00
tool4EvEr
dda5af5d4d
Code cleanup
2021-03-22 21:54:09 +01:00
Andreas Bendel
c90cd7f525
Update de-DE.properties
...
five new strings :)
2021-03-22 20:36:04 +00:00
Michael Kamensky
89dfdff05b
Merge branch 'raging_river' into 'master'
...
Add Raging River
See merge request core-developers/forge!4244
2021-03-22 19:05:32 +00:00
Michael Kamensky
e74eab8d50
Merge branch 'DifferentCardNames' into 'master'
...
Fix DifferentCardNames counting
See merge request core-developers/forge!4245
2021-03-22 19:04:32 +00:00
Michael Kamensky
d7a3357bbf
Merge branch 'fix_fantasy_block_npe' into 'master'
...
Fix NPE for Fantasy Block Draft when there is only one meta-set.
See merge request core-developers/forge!4242
2021-03-22 19:03:58 +00:00
Hythonia
e29fca980d
Kasmina, Enigma Sage
2021-03-22 19:23:09 +01:00
tool4EvEr
4c57436e9f
Update rulings
2021-03-22 19:01:49 +01:00
tool4EvEr
a08dd6efc8
Fix DifferentCardNames counting
2021-03-22 18:39:23 +01:00
Lyu Zong-Hong
214a35ba5e
Add Raging River
2021-03-23 02:18:01 +09:00
Hans Mackowiak
274093735c
Merge branch 'cardtargets' into 'master'
...
getCardsfromTargets: Add sanity check
See merge request core-developers/forge!4232
2021-03-22 14:45:37 +00:00
Bug Hunter
e6c60f389f
getCardsfromTargets: Add sanity check
2021-03-22 14:45:37 +00:00
Anthony Calosa
0e398f7251
Merge branch 'master' into 'master'
...
[Mobile] Preferred Art Options
See merge request core-developers/forge!4243
2021-03-22 14:08:05 +00:00
Anthony Calosa
e4a0ce9165
[Mobile] Preferred Art Options
2021-03-22 21:46:39 +08:00
Lyu Zong-Hong
76d0a9b41e
Fix NPE for FantasyBlock when there is only one meta-set.
2021-03-22 18:46:05 +09:00
Michael Kamensky
17352940ab
Merge branch 'Williams-master-patch-78185' into 'master'
...
Fix TSR
See merge request core-developers/forge!4241
2021-03-21 19:37:00 +00:00
Michael Kamensky
f48ca4dab2
Merge branch 'add_backdraft' into 'master'
...
Add Back
See merge request core-developers/forge!4240
2021-03-21 19:36:56 +00:00
John
c4f26be630
Update blocks.txt
2021-03-21 17:41:58 +00:00
John
f41b664600
Update blocks.txt
2021-03-21 17:38:31 +00:00
Lyu Zong-Hong
af6e091b02
Add Backdraft
2021-03-21 18:39:33 +09:00
Hans Mackowiak
1742c30450
fix bestow and ExiledWith when adding to Stack
2021-03-21 09:07:36 +01:00
Michael Kamensky
4687ad7f38
Merge branch 'torch' into 'master'
...
Fix Blazing Torch ability
See merge request core-developers/forge!4237
2021-03-21 05:16:45 +00:00
Michael Kamensky
53b2088b33
Merge branch 'card-fixes' into 'master'
...
Two Topsy Turvies cancel out
See merge request core-developers/forge!4235
2021-03-21 05:16:39 +00:00
Michael Kamensky
fe9284ce10
Merge branch 'kevlahnota-master-patch-31290' into 'master'
...
Fix card granted ability transforming to original state
Closes #1777
See merge request core-developers/forge!4233
2021-03-21 05:11:14 +00:00
Anthony Calosa
4bf557ca91
Update forge-game/src/main/java/forge/game/card/Card.java
2021-03-20 23:43:41 +00:00
Anthony Calosa
3f37a51eeb
Merge branch 'custom-crash' into 'master'
...
Prevent crash in custom card loading
See merge request core-developers/forge!4236
2021-03-20 23:20:47 +00:00
tool4EvEr
db451886ad
Fix Blazing Torch ability
2021-03-20 21:16:13 +01:00
Adam Pantel
6715c53b73
Prevent crash in custom card loading
2021-03-20 15:37:07 -04:00
Adam Pantel
05547bfda6
Two Topsy Turvies cancel out
2021-03-20 15:30:17 -04:00
Leandro Doctors
8643503082
Merge branch 'twosat-master-patch-15103' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!4234
2021-03-20 18:24:46 +00:00
Andreas Bendel
20d95e7b55
Update de-DE.properties
...
lblRollbackPhase translated
2021-03-20 18:05:28 +00:00
Leandro Doctors
5d8bbf8687
Merge branch 'rename-assets-to-skin' into 'master'
...
refactor: rename 'assets' package to 'skin'
See merge request core-developers/forge!4223
2021-03-20 17:58:15 +00:00
Anthony Calosa
aa8ed1ed8d
Update forge-game/src/main/java/forge/game/card/Card.java
2021-03-20 16:25:53 +00:00
Anthony Calosa
76cfe3da35
Update forge-game/src/main/java/forge/game/card/Card.java
2021-03-20 16:03:22 +00:00
Anthony Calosa
5f8a3a9c36
Fix modal card backside playing ability transforming to original state
...
close #1777
2021-03-20 13:32:01 +00:00
Anthony Calosa
1dc21055f7
Merge branch 'master' into 'master'
...
[Mobile] refactor loading overlay on deck editor/chooser
See merge request core-developers/forge!4231
2021-03-20 11:13:12 +00:00
Anthony Calosa
e75ec5e8a4
Merge remote-tracking branch 'core/master'
2021-03-20 19:12:29 +08:00
Hans Mackowiak
730bf1befa
Merge branch 'fixtargets2' into 'master'
...
Fix Spell targets
See merge request core-developers/forge!4226
2021-03-20 11:10:45 +00:00
Anthony Calosa
39b356bcac
[Mobile] refactor loading overlay on deck editor/chooser
...
- only show the overlay if it needs initializing/refreshing on the catalog/collection page
2021-03-20 19:07:35 +08:00
