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
Hans Mackowiak
9dca989b76
fixes QuestIO and GauntletIO
2021-03-17 18:27:56 +01:00
Leandro Doctors
aecd600367
fixup! add forge.quest.data.QuestData to fix old quests
2021-03-17 14:00:37 -03:00
Hans Mackowiak
412e77bdde
add forge.quest.data.QuestData to fix old quests
2021-03-17 17:23:10 +01:00
Leandro Doctors
0978162bf5
Organize imports
2021-03-17 11:52:50 -03:00
Leandro Doctors
f3fd57c014
fixup! Merge branch 'reorganize-forge-gui' into 'master'
2021-03-17 11:50:26 -03:00
Leandro Doctors
fe76d8b934
refactor: group gui-related packages
...
This is just a first step...
Probably there are many other classes that should be either completely
added here, or decomposed and partially added here.
2021-03-17 11:18:16 -03:00
Leandro Doctors
92110c1931
refactor: group game modes-related packages
2021-03-17 11:10:41 -03:00
Leandro Doctors
df64f5574d
refactor: group local instance-related packages
...
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
2021-03-17 11:10:41 -03:00
Alumi
b6b1ae852d
Refactor skip phase/step using replacement effect. Also add Fasting.
2021-03-17 05:43:32 +00:00
Anthony Calosa
a807f11d27
Update achievement-images.txt
2021-03-16 17:20:19 +00:00
Anthony Calosa
0b7dd163b5
Update Drake Stone.txt
2021-03-16 12:22:38 +00:00
Andreas Bendel
f6a3dd38bb
Update de-DE.properties
...
translated lblExcludePromosFromRewardPool
2021-03-15 20:38:39 +00:00
Hans Mackowiak
0dfe28a861
CardTraitBase: matchesValid as instance method, better use for isValid
...
Conflicts:
forge-gui/res/cardsfolder/d/day_of_the_dragons.txt
forge-gui/res/cardsfolder/d/deputy_of_detention.txt
forge-gui/res/cardsfolder/i/induced_amnesia.txt
forge-gui/res/cardsfolder/l/living_lore.txt
forge-gui/res/cardsfolder/p/phyrexian_devourer.txt
forge-gui/res/cardsfolder/p/prototype_portal.txt
forge-gui/res/cardsfolder/s/search_the_city.txt
forge-gui/res/cardsfolder/s/skyclave_apparition.txt
forge-gui/res/cardsfolder/s/soul_foundry.txt
forge-gui/res/cardsfolder/s/strata_scythe.txt
forge-gui/res/cardsfolder/s/sutured_ghoul.txt
2021-03-15 18:22:24 +00:00
Hans Mackowiak
34a813baeb
ChangeZoneEffect: add UntilHostLeavesPlay to use GameCommand instead of StaticTrigger
2021-03-15 15:36:55 +00:00
Hans Mackowiak
350fed6d77
Remove RememberMap, use EnteredSinceYourLastTurn instead
2021-03-15 13:39:34 +01:00
Michael Kamensky
a9a6e2b4d2
Merge branch 'quest-pool-nonpromo' into 'master'
...
Exclude promos from Quest Mode starting pool and random reward pool
See merge request core-developers/forge!4196
2021-03-15 03:37:26 +00:00
Michael Kamensky
203447e2b4
Merge branch 'master' into 'master'
...
SVar:UntapMe
See merge request core-developers/forge!4198
2021-03-14 10:57:11 +00:00
Hythonia
404e0bc453
Steel Overseer too
2021-03-14 11:56:15 +01:00
Hythonia
4688779358
UntapAi modifications
2021-03-14 11:50:40 +01:00
Michael Kamensky
4a85fdc87d
Merge branch 'master' into 'master'
...
Ikoria land fix
See merge request core-developers/forge!4197
2021-03-14 08:37:02 +00:00
Hythonia
174ecd4de6
Update Ikoria Lair of Behemoths.txt
2021-03-14 07:24:35 +00:00
Michael Kamensky
147a85e0e5
- Clarification and announcement.
2021-03-14 09:55:18 +03:00
