forge

mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00

Files

Simisays b62b588060 Large Adventure update (Hydra ect) (#4136 )

* Squashed commit of the following:

commit ccba1cbded5ca546f333ad33c227a1617296e9b4
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Nov 2 23:30:45 2023 +0100

    update

commit d8727b9d053b38a5faa806c0c2494826958e9e26
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Nov 1 21:31:30 2023 +0100

    update

commit 84d2bd0a29770c189ee24f9d413fda9c450569d6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Oct 31 22:51:03 2023 +0100

    update

commit 22c4ff1bd3b25bf0340f79b7a2ad096e3ff02bb5
Merge: 278ebc005b b6de8a6d63
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Oct 31 11:40:20 2023 +0100

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

commit 278ebc005bd32f332a6bf0637b3d2e2886d50dee
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 29 19:35:42 2023 +0100

    update

commit a7d7a768fc47b8063c22462551a94a79fc9e4bee
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 29 10:44:01 2023 +0100

    update

commit e4fe3fb08f084daccf155d809f1838ddbb32cb54
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Oct 28 00:13:40 2023 +0200

    update

commit b9d2065d1545aa1c1b2145753144575f6b0b6888
Merge: 770082f750 920e811812
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Oct 27 15:28:09 2023 +0200

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

commit 770082f7502c7725610d10cb386bb6c9354730ba
Merge: 590945bcc5 3fed75e089
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 22:06:22 2023 +0200

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

commit 590945bcc5c0afca8012a11f31662f53be18652c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 21:23:27 2023 +0200

    update

commit ea9e1452de6d9b46dc74ef34526515581ea0d81c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 20:10:48 2023 +0200

    update

commit acfd54e8fccf19b490648e8f13530f1d5c487965
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 17:44:04 2023 +0200

    update

commit 665f86fb4d307620a142fcb1604dd43ddd97abfb
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 22 15:10:11 2023 +0200

    Squashed commit of the following:

    commit 916ffceecdf96ac505591aa070c3301f6fceaec8
    Merge: ce28f2b548 48a8aa5463
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 22 08:20:48 2023 +0200

        Merge branch 'vampirefort' of https://github.com/Simisays/forge into vampirefort

    commit ce28f2b548f4bb84db9a34d9149c358bda5ed96f
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 22 08:20:25 2023 +0200

        update

    commit 48a8aa54631b3cec5d65719d3a4a42d8ebed1d4d
    Merge: 0cc727a8f5 437d64dc08
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 21 22:36:16 2023 +0200

        Merge branch 'Card-Forge:master' into vampirefort

    commit 0cc727a8f52888efca1bb50426296cd2922839a4
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 15 12:02:57 2023 +0200

        update

    commit 38b5eddb61785210d086df99dea7497d9c06f61c
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 14 17:09:37 2023 +0200

        Update enemies.json

    commit bc12ef0c14fc4a838a54d7a10d091ba7e5ab5d5b
    Merge: 2a213a14cb 1fc11929a8
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 14 12:23:12 2023 +0200

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

    commit 2a213a14cb7d8f04e1b5dc1b9c040421edba8419
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 21:28:52 2023 +0200

        update

    commit 093db5a7bb7b81881595907f0047ac7f806aa8c5
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 19:59:51 2023 +0200

        updarz

    commit d5af52298b9d12a9c1dce60ffaf7513565a0c214
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 19:59:32 2023 +0200

        update

    commit b06de36dacfaba785aea4f260a4e21f6869b52be
    Merge: 8ffb3ad52f 0fc88cc46c
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Mon Sep 25 20:13:50 2023 +0200

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

    commit 8ffb3ad52f71282ae3f04f423249299c7e9ac608
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Sep 24 17:39:55 2023 +0200

        update

    commit 723292aa9f47b140d41ab0ede394923aeaba9d60
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Sep 23 19:32:58 2023 +0200

        update

    commit db882cc60275e07d6767597dc33fea8dc4c78bc6
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Sep 23 08:34:43 2023 +0200

        update

    commit b22ee9e876f95d54718ec62b5236eb78dd125ccb
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Fri Sep 22 15:25:06 2023 +0200

        update

commit 09b57894da4dd08723c71af1b6e0c1e9efe4ac9b
Merge: beefe201ee b9117873bc
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 22 09:58:10 2023 +0200

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

commit beefe201ee1720cfa254472fd74619408e53a98c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Oct 21 23:42:54 2023 +0200

    update

* update

* update

* update

* update

* update

* update

* grolnok cleanup

* move gold

* colission fix Fort 4 White