external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,469 Commits 32 Branches 187 Tags
b7f15da799d1d9866c92f7f61013ee9e55e2c82b
Commit Graph

55469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamin W. Collins
cfbad651a7 override https requirement for 4thline-repo 
Maven blocks external HTTP repositories by default since version 3.8.1
(see https://maven.apache.org/docs/3.8.1/release-notes.html)

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2022-01-26 12:23:56 -07:00
Hans Mackowiak
3d6baa441b Merge branch 'neo_modified' into 'master' 
NEO: initial support for "modified" property

See merge request core-developers/forge!6001
 2022-01-26 16:47:28 +00:00
Tim Mocny
06e95e0293 NEO: initial support for "modified" property 2022-01-26 16:47:28 +00:00
Michael Kamensky
5e16d91e83 Merge branch 'rebalanced_27_jan_2022' into 'master' 
January 27, 2022 Arena Rebalanced Cards

See merge request core-developers/forge!6082
 2022-01-26 04:56:19 +00:00
paul_snoops
939ad1f02d remaining cards, editions and oracle fixes 2022-01-25 21:12:30 +00:00
paul_snoops
46f0fa646c amend names 2022-01-25 18:31:29 +00:00
paul_snoops
9cbff0d3f5 January 25, 2022 Arena Rebalanced Cards 2022-01-25 18:25:52 +00:00
Paul Hammerton
6f67674ee3 Merge branch 'br_25_jan_22' into 'master' 
January 25, 2022 Banned and Restricted

See merge request core-developers/forge!6081
 2022-01-25 17:22:21 +00:00
paul_snoops
6edba1c6f4 B&R - January 25, 2022 2022-01-25 17:19:20 +00:00
Paul Hammerton
913d0f64a2 Merge branch 'historic_fix' into 'master' 
Historic format: add missing legal sets

See merge request core-developers/forge!6080
 2022-01-25 11:41:41 +00:00
paul_snoops
d93d2c934f removed bans 2022-01-25 11:39:48 +00:00
paul_snoops
dc177114cb Historic format fix 2022-01-25 11:09:42 +00:00
Hans Mackowiak
f3d2f1ecfd Merge branch 'TRT-master-patch-29303' into 'master' 
Update forge-gui/res/cardsfolder/p/prowling_geistcatcher.txt

Closes #2070

See merge request core-developers/forge!6079
 2022-01-25 08:44:08 +00:00
Bug Hunter
61fc8eed5c Update forge-gui/res/cardsfolder/p/prowling_geistcatcher.txt 2022-01-25 08:30:31 +00:00
Hans Mackowiak
b28737e2e7 fix curse_of_verbosity 2022-01-25 07:10:40 +01:00
Michael Kamensky
a0a0c89c19 Merge branch 'crash' into 'master' 
Fix crash when all choices invalid

See merge request core-developers/forge!6078
 2022-01-24 11:28:00 +00:00
TRT
ba0d6b3da4 Fix crash when all choices invalid 2022-01-24 11:31:22 +01:00
Bug Hunter
38d706c883 Merge branch 'goadedFix' into 'master' 
Goad: fixed using PlayerCollection

See merge request core-developers/forge!6077
 2022-01-24 08:54:54 +00:00
Hans Mackowiak
d8ab18e673 Goad: fixed using PlayerCollection 2022-01-24 06:52:19 +01:00
Michael Kamensky
47a2f4b81e Merge branch 'master' into 'master' 
Ghitu Lavarunner AI hint

See merge request core-developers/forge!6076
 2022-01-24 05:38:09 +00:00
Michael Kamensky
2940f34a9c - Ghitu Lavarunner AI hint 2022-01-24 08:36:52 +03:00
Michael Kamensky
635890a447 Merge branch 'mayflashsac' into 'master' 
Fix MayFlashSac

See merge request core-developers/forge!6075
 2022-01-23 20:20:42 +00:00
Bug Hunter
01e9a321a9 Fix MayFlashSac 2022-01-23 20:20:42 +00:00
Michael Kamensky
06e487b033 Merge branch 'goad' into 'master' 
Goad doesn't stack

See merge request core-developers/forge!6074
 2022-01-23 20:20:36 +00:00
Bug Hunter
2b7fb8c5be Goad doesn't stack 2022-01-23 20:20:35 +00:00
Michael Kamensky
6208336ac3 Merge branch 'walkerTokenTextChange' into 'master' 
Walker Token protected by Text Change

See merge request core-developers/forge!6073
 2022-01-23 20:20:07 +00:00
Hans Mackowiak
be383eb2c4 Walker Token protected by Text Change 2022-01-23 11:30:30 +01:00
Hans Mackowiak
f5430b7e26 Merge branch 'definedPlayerValid' into 'master' 
AbilityUtils.getDefinedPlayer use valid like with getDefinedCards

See merge request core-developers/forge!6067
 2022-01-23 10:19:56 +00:00
Hans Mackowiak
91fb66bd4b AbilityUtils.getDefinedPlayer use valid like with getDefinedCards 2022-01-23 10:19:56 +00:00
Hans Mackowiak
cec684a460 Merge branch 'LKIsba' into 'master' 
Update LKI before creature dies from SBA

See merge request core-developers/forge!6071
 2022-01-23 10:19:19 +00:00
Bug Hunter
61f4bdc5d3 Update LKI before creature dies from SBA 2022-01-23 10:19:17 +00:00
Anthony Calosa
36c2dc9872 Merge branch 'master' into 'master' 
[Mobile] Deck View on Player Tab

See merge request core-developers/forge!6072
 2022-01-23 08:02:58 +00:00
Anthony Calosa
501a623517 unused imports 2022-01-23 15:58:39 +08:00
Anthony Calosa
bea0a53cbf [Mobile] Deck View on Player Tab 
- Deck Viewer is available on Player Tab -> Avatar Image click/tap
 2022-01-23 15:48:39 +08:00
Michael Kamensky
d5d70b51a7 Merge branch 'sliver' into 'master' 
Fix Dementia Sliver

See merge request core-developers/forge!6069
 2022-01-23 04:58:25 +00:00
Bug Hunter
d89acc6141 Fix Dementia Sliver 2022-01-23 04:58:24 +00:00
Bug Hunter
36b42d3f4f Merge branch 'staticKeywordX' into 'master' 
use StaticAbility for some cases of Keyword X

See merge request core-developers/forge!6070
 2022-01-22 15:25:44 +00:00
Hans Mackowiak
0a2303a1dd use StaticAbility for some cases of Keyword X 2022-01-22 15:13:54 +01:00
Anthony Calosa
9a98797189 Merge branch 'kevlahnota-master-patch-25933' into 'master' 
Update AbilityUtils.java

See merge request core-developers/forge!6066
 2022-01-21 23:41:48 +00:00
Anthony Calosa
f19fb9c333 Update AbilityUtils.java 2022-01-21 23:40:59 +00:00
Anthony Calosa
373b12e9ca Update AbilityUtils.java 2022-01-21 23:37:35 +00:00
Michael Kamensky
1b6bcf4e29 Merge branch 'neo_hotfix' into 'master' 
NEO edition hotfix for shops

See merge request core-developers/forge!6062
 2022-01-21 14:16:45 +00:00
Michael Kamensky
238c2ec950 Merge branch 'churrufli-master-patch-46885' into 'master' 
Update net-decks-brawl.txt add current historic brawl metagame

See merge request core-developers/forge!6064
 2022-01-21 14:16:37 +00:00
Michael Kamensky
158a7b4b24 Merge branch 'token' into 'master' 
Cleaning up some token generation and a Curse cycle

Closes #1104

See merge request core-developers/forge!6041
 2022-01-21 14:16:34 +00:00
Paul Hammerton
27f48d1ded Merge branch 'pauper_bans' into 'master' 
Pauper Bans - 21 Jan 2022

See merge request core-developers/forge!6065
 2022-01-21 13:31:00 +00:00
Paul Hammerton
3be20306c0 Update Pauper.txt 2022-01-21 10:52:06 +00:00
Churrufli
b26805cb28 Update net-decks-brawl.txt add current historic brawl metagame 2022-01-20 21:20:03 +00:00
Churrufli
415f25f60b Add "Current Historic Brawl Metagame" in Net Decks Brawl Format 2022-01-20 22:14:00 +01:00
Northmoc
5dc0230d98 Curse of GoodStuff cycle with You then TriggeredAttackingPlayerIfOpponent 2022-01-20 12:27:47 -05:00
Northmoc
44eace6311 "=Opponent" -> "IfOpponent" 2022-01-20 12:26:43 -05:00