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
68,299 Commits 32 Branches 187 Tags
3ef0479d76b51f43b984f4949e5281e03e8290af
Commit Graph

68299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Klisz
4097ca0e27 Update the_aether_flues.txt 2024-01-13 18:31:40 -07:00
TabletopGeneral
b610036d79 Merge pull request #4515 from jjayers99/master 
Adventure - Arena quest tracking correction
 2024-01-13 19:27:10 -05:00
jjayers99
0ebfc2c52a Adventure - Arena quest tracking correction 2024-01-13 19:21:32 -05:00
Klisz
f2b1da8329 Update huatli_poet_of_unity_roar_of_the_fifth_people.txt (#4514) 2024-01-13 22:13:25 +00:00
Paul Hammerton
6144d87827 Alchemy Rebalancing for January 12, 2024 (#4513) 2024-01-13 17:13:04 +00:00
Michael Kuenzli
41319a4005 Add Ravnica Remastered draft (#4511) 
* Add Ravnica Remastered draft

* Add draft rankings for Ravnica Remastered

* Update rvr.rnk

* Update blocks.txt

---------

Co-authored-by: Paul Hammerton <18243520+paulsnoops@users.noreply.github.com>
 2024-01-13 11:45:44 -05:00
Simisays
05743679d8 Adventure: Tibalt, Skep and White Castle rework (#4508) 
* Squashed commit of the following:

commit abe8d9bc8ff01eec3da2347e66f8cdc5348a7327
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jan 11 20:26:19 2024 +0100

    update

commit 16f45e1b1c64b95f7a38d8bb2ca8c2809e260b79
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 22:00:20 2024 +0100

    update

commit dd2cf3c0a840920fa9477cd1f85c6047de633a15
Merge: ebe940f020 acb5151a82
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 21:04:33 2024 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit ebe940f0203de29c4466a3a0f676c409c254387f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 21:04:24 2024 +0100

    update

commit 338947f02b7f133b97d2c9eb993423094645e421
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jan 6 16:41:00 2024 +0100

    update

commit 6328694aaf4311de3160fbd70edd49c1a8a6c289
Merge: 1f0a498b0d 94e154fcb8
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:21:42 2024 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit 1f0a498b0d5bb11655def1a3b8142c9898cb993d
Merge: 45b65fa602 9a5fe05838
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:20:47 2024 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit 45b65fa602ed1c5c6a6d65dbc9be89ea8ac636df
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:20:37 2024 +0100

    update

commit f984e00dbc70ab428133337d10f5a1157ef6a333
Merge: acf99e95aa be2f9aa187
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Dec 29 20:47:36 2023 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit acf99e95aae979e9c718809277b455ec12766b33
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Dec 29 20:47:31 2023 +0100

    update

commit a72da3d39a0b837370ef82b07253db1016a24772
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Dec 26 21:19:55 2023 +0100

    update

commit 96d037511f35c6f9c0393b5091b49a030b0ce2f9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 18:07:21 2023 +0100

    cleanup

commit e1271ec1f80918ace004c01b1e1183364c162a21
Merge: 3710aaad6a de851fc749
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 11:38:23 2023 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit 3710aaad6a627138ff202b84335ffa4f06a48e4a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 11:37:59 2023 +0100

    Update tibalt.tmx

* update

* Update skep_outer.tmx

* Update enemies.json

* More fitting homarid sprite
 2024-01-13 12:57:55 +03:00
Chris H
76f608009b Update jaya_ballard_task_mage.txt (#4510) 2024-01-12 21:00:40 +00:00
Chris H
0f684791fe Update snapshots-android.yml 2024-01-11 18:36:56 -05:00
edg444
d228f4771e Minor patch (#4506) 
* Update artisan_of_kozilek.txt

CARDNAME -> this spell

* Update skarrgan_skybreaker.txt

CARDNAME -> it

* Update vulshok_replica.txt

CARDNAME -> it
 2024-01-11 12:53:16 -05:00
tool4ever
fd182d4059 Update in_the_presence_of_ages.txt 2024-01-11 08:05:40 +01:00
tool4ever
0cd23e372a Update banes_contingency.txt 2024-01-10 22:16:27 +00:00
tool4ever
144ceee32e Skip ChangesZoneAll inside Moved replacement (#4493) 
* Support passing CardZoneTable
 2024-01-10 10:41:28 +01:00
tool4ever
1c518aec1a Fix Genesis of the Daleks (#4498) 2024-01-10 10:13:22 +01:00
Northmoc
acb5151a82 Wave 3 of perpetual rework + Pump double P or T rework (#4423) 2024-01-09 09:31:02 +01:00
tool4ever
fc23a8d9e3 Improve TriggerHandler accuracy (#4484) 
* Fix NPE

* Improve TriggerHandler accuracy
 2024-01-08 20:13:35 +01:00
TabletopGeneral
81de9a6a85 Merge branch 'Card-Forge:master' into master 2024-01-08 06:57:03 -05:00
Simisays
dccfee646f WHO 5 cards with Villainous Choice (#4450) 
* update

* cleanup

* improvements

* update

* update

* Update genesis_of_the_daleks.txt

* Update midnight_crusader_shuttle.txt
 2024-01-08 09:13:36 +03:00
Simisays
aa27ea8888 alchemy draft (#4479) 2024-01-08 09:13:03 +03:00
tool4ever
1a3a5cbf8c Fix Fatal Lore (#4488) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2024-01-08 09:12:49 +03:00
TabletopGeneral
6db188406a Adventure - Quest fixes (#4490) 
Correction for empty dialog textboxes displaying on what should be silent quest triggers

Bugfixes within Library Of Varsil dungeon
 2024-01-07 23:10:54 -05:00
TabletopGeneral
c98bf85df0 Merge branch 'Card-Forge:master' into master 2024-01-07 22:57:01 -05:00
jjayers99
f9fd8a7475 Adventure - Quest fixes 
Correction for empty dialog textboxes displaying on what should be silent quest triggers

Bugfixes within Library Of Varsil dungeon
 2024-01-07 22:56:29 -05:00
Hans Mackowiak
c8def9b1ca GameSimulationTest: update some hasKeyword tests 2024-01-07 07:29:19 +01:00
jjayers99
3c25f3260d Adventure - dialog hotfix 2024-01-06 20:07:39 -05:00
TabletopGeneral
eea0c8d03a Adventure bugfixes (#4481) 
* Adventure - POIChanges & reputation fix

* Adventure quest updates

* Adventure - proofreading updates
 2024-01-06 10:34:17 -05:00
tool4ever
bf11917844 Update food_fight.txt 
Fix AI crash
 2024-01-06 15:47:32 +01:00
tool4ever
7ee79373ba Update lita_mechanical_engineer.txt 2024-01-05 11:35:48 +00:00
tool4ever
024006f3e7 Update marwyn_the_nurturer.txt 2024-01-05 11:45:17 +01:00
tool4ever
9ca64b2ad7 Update Card.java 
Fix NPE
 2024-01-04 22:48:26 +00:00
TabletopGeneral
390efeca57 Adventure hotfixes (#4477) 
Hotfix for quest "What's Yours Is Mine", players were not receiving credit for defeating pirate captain
Replacing missing deck file for apprentice red wizard
 2024-01-04 13:08:46 -05:00
tool4ever
1e135e8d3b Support for Midnight Crusader Shuttle (#4478) 2024-01-04 16:47:58 +01:00
tool4ever
2933922572 Update huatli_poet_of_unity_roar_of_the_fifth_people.txt 2024-01-04 07:49:28 +01:00
TabletopGeneral
94e154fcb8 Merge pull request #4476 from jjayers99/master 
Adventure Hotfixes
 2024-01-03 10:41:22 -05:00
TabletopGeneral
f23e12f595 Merge branch 'Card-Forge:master' into master 2024-01-03 10:33:52 -05:00
jjayers99
73b876efe6 Adventure - Quest hotfixes 2024-01-03 10:33:20 -05:00
friarsol
238977dac4 Disable lazy loading 2024-01-03 10:17:16 -05:00
friarsol
e273df2850 Update scraper 2024-01-03 07:41:03 -05:00
friarsol
7b7aa72575 Load rankings from directory structure 2024-01-03 07:41:03 -05:00
friarsol
618651167d Split rankings.txt into rankings/set.rnk files 2024-01-03 07:41:03 -05:00
Paul Hammerton
63100f6e7b Merge pull request #4467 from edg444/Riddlekeeper-Rarity-Patch 
Update Commander Anthology Vol. II.txt
 2024-01-03 08:06:56 +00:00
TabletopGeneral
d2a9c6ba54 Merge pull request #4473 from jjayers99/master 
Adventure - Enable "Continue" button for BO3 duels
 2024-01-02 21:02:02 -05:00
jjayers99
ebf2ed5a55 Removing unused import 2024-01-02 20:59:00 -05:00
jjayers99
46aab83d72 Merge branch 'master' of https://github.com/jjayers99/forge-updates into master-local 2024-01-02 20:51:49 -05:00
jjayers99
8948193bd6 Adventure - Enable "Continue" button for BO3 duels 2024-01-02 20:51:32 -05:00
TabletopGeneral
80ada76793 Merge branch 'Card-Forge:master' into master 2024-01-02 20:46:42 -05:00
jjayers99
b65e3a3a34 Adventure - Enable "Continue" button for BO3 duels 2024-01-02 20:43:09 -05:00
Jorilx
13cf081046 Adventure: check for decks in user plane directory too (#4401) 
* Adventure: check for decks in user plane directory too

* Adventure: simplified check for decks in user plane directory

* Removed unused import
 2024-01-02 20:10:15 +03:00
Jorilx
3cb7fac8f2 Adventure: add config setting 'allowedEditions' (#4431) 2024-01-02 17:20:45 +03:00
tool4ever
aa589134d8 Support for Genesis of the Daleks (#4462) 
* Support for Genesis of the Daleks

* Fix Rift Elemental

* Fix script

* Fix logic

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-01-02 17:20:35 +03:00