Anthony Calosa
93d8fd43f3
Merge remote-tracking branch 'core/master'
2021-03-24 14:34:38 +08:00
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
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
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
Lyu Zong-Hong
214a35ba5e
Add Raging River
2021-03-23 02:18:01 +09: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
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
tool4EvEr
db451886ad
Fix Blazing Torch ability
2021-03-20 21:16:13 +01: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
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
tool4EvEr
384f4892d5
Fix typo
2021-03-20 11:17:40 +01:00
Alumi
9c11c90f48
Fix Piracy mana restriction
2021-03-20 08:37:59 +00:00
Anthony Calosa
5cc2aaa07a
Merge branch 'customCards_Folder' into 'master'
...
Support loading Custom Cards & Editions from User Folder
See merge request core-developers/forge!4222
2021-03-20 07:28:26 +00:00
Michael Kamensky
29bf2970f3
Merge branch 'rollback_Phase_dev' into 'master'
...
[Mobile] add Experimental Rollback Phase
See merge request core-developers/forge!4195
2021-03-20 04:31:57 +00:00
Bug Hunter
be9de2cc09
Fix cards
2021-03-20 03:43:12 +00:00
tool4EvEr
0c1ca71f93
Fix Spell targets
2021-03-19 23:13:11 +01:00
Anthony Calosa
9ce1ce14d3
Merge remote-tracking branch 'core/master' into rollback_Phase_dev
2021-03-20 02:42:14 +08:00
Anthony Calosa
7fde89dcd7
allow devmode to find custom cards
2021-03-20 02:18:16 +08:00
Leandro Doctors
993fb3b518
refactor: rename 'assets' package to 'skin'
2021-03-19 14:27:10 -03:00
Anthony Calosa
a9135b6df4
Merge remote-tracking branch 'core/master' into customCards_Folder
2021-03-20 00:40:39 +08:00
Alumi
903b0130c7
Add Ertai's Meddling
2021-03-19 16:11:46 +00:00
Anthony Calosa
41b9bd3e06
Support loading Custom Cards & Editions from User Folder
2021-03-20 00:01:15 +08:00
CCTV-1
4bb7b2f5fc
update simplified chinese translation
2021-03-19 10:35:41 +08:00
Anthony Calosa
0501ac9735
update imports
2021-03-18 17:24:44 +08:00
Anthony Calosa
f71e31c3a8
Merge remote-tracking branch 'core/master' into rollback_Phase_dev
...
# Conflicts:
# forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
# forge-gui-mobile/src/forge/screens/match/MatchController.java
# forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
# forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
2021-03-18 17:19:08 +08:00
Lyu Zong-Hong
69c17586aa
Refactor AddPhase effect and add World at War
2021-03-18 13:26:15 +09:00
Anthony Calosa
1d874760f1
cleanup
2021-03-17 22:19:36 +00:00
Anthony Calosa
9c59ed75be
Update achievement-images.txt
...
- planeswalker achievements updated up to kaldheim
2021-03-17 22:18:49 +00:00
Hans Mackowiak
d0e0b11186
better alias for XStream IO
2021-03-17 19:20:56 +01:00
