Commits · 1cad0ecbc214a7e7152f5ad337728951d22776c2 · Forge Core Developers / Forge

19 Sep, 2019 15 commits
- Merge branch 'patch' into 'master' · 1cad0ecb
  swordshine authored Sep 19, 2019
```
More ELD cards

See merge request !2143
```
  1cad0ecb
- More forgescribed cards · 42aa6f0e
  swordshine authored Sep 19, 2019
  
  42aa6f0e
- Merge branch 'hotfixDieharmoniconTrigger' into 'master' · 99c88991
  swordshine authored Sep 19, 2019
```
TriggerHandler: fix Dieharmonicon with new TriggerKeys

See merge request !2144
```
  99c88991
- TriggerHandler: fix Dieharmonicon with new TriggerKeys · a90b6033
  Hans Mackowiak authored Sep 19, 2019
  
  a90b6033
- More ELD cards · 191ffa67
  swordshine authored Sep 19, 2019
  
  191ffa67
- Merge branch 'patch' into 'master' · efc84974
  swordshine authored Sep 19, 2019
```
More ELD cards

See merge request !2137
```
  efc84974
- More forgescribed cards · ee533535
  swordshine authored Sep 19, 2019
  
  ee533535
- Merge branch 'master' into 'master' · 6d732013
  swordshine authored Sep 19, 2019
```
translation Forge.java and update forge-android supported simplified chinese character

See merge request !2141
```
  6d732013
- Merge branch 'patch-4' into 'master' · 6f333589
  swordshine authored Sep 19, 2019
```
Fix setloadingaMatch prematurely

See merge request !2140
```
  6f333589
- translation Forge.java · 1b9bce51
  CCTV-1 authored Sep 19, 2019
  
  1b9bce51
- Merge remote-tracking branch 'upstream/master' · dd55b731
  CCTV-1 authored Sep 19, 2019
  
  dd55b731
- Fix setloadingaMatch prematurely, if the startgame is null there must be an... · 91abbcd3
  Anthony Calosa authored Sep 19, 2019
```
Fix setloadingaMatch prematurely, if the startgame is null there must be an error/showdialog happened.
```
  91abbcd3
- Add some forgescribed cards · 3573a27b
  swordshine authored Sep 19, 2019
  
  3573a27b
- Merge branch 'fix_deckgen_restriction_bug' into 'master' · 78cee77b
  swordshine authored Sep 19, 2019
```
fix restricted cards not being restricted to one.

See merge request !2138
```
  78cee77b
- fix restricted cards not being restricted to one. · 9ab35769
  Ryan Wiedemann authored Sep 18, 2019
  
  9ab35769
18 Sep, 2019 11 commits
- Merge remote-tracking branch 'upstream/master' · e46fbb4d
  CCTV-1 authored Sep 18, 2019
  
  e46fbb4d
- Add Once and Future · 0fe6b3b5
  swordshine authored Sep 18, 2019
  
  0fe6b3b5
- Update a reference · c6a31221
  swordshine authored Sep 18, 2019
  
  c6a31221
- Merge branch 'patch' into 'master' · a2da91eb
  swordshine authored Sep 18, 2019
```
More ELD cards

See merge request !2135
```
  a2da91eb
- Merge branch 'push_down_toStringMap_part_1' into 'master' · 4fe15595
  swordshine authored Sep 18, 2019
```
Push down toStringMap part 1

See merge request !2127
```
  4fe15595
- Update Once Upon a Time · f89cc76a
  swordshine authored Sep 18, 2019
  
  f89cc76a
- Merge branch 'deutschupdate01' into 'master' · 158b1d0f
  swordshine authored Sep 18, 2019
```
Updated german translation

See merge request core-developers/forge!2136
```
  158b1d0f
- Updated german translation · 9d6aa6b7
  Peter authored Sep 18, 2019
```
Contributed by twosat at https://www.slightlymagic.net/forum/viewtopic.php?f=26&t=23215#p230047
```
  9d6aa6b7
- Add Clackbridge Troll · 97ebdff8
  swordshine authored Sep 18, 2019
  
  97ebdff8
- Add Dance of the Manse · 87fffa0d
  swordshine authored Sep 18, 2019
  
  87fffa0d
- Add Once Upon a Time · cf9a72fc
  swordshine authored Sep 18, 2019
  
  cf9a72fc
17 Sep, 2019 6 commits
- Update Hollow One · 2d9d53a1
  swordshine authored Sep 17, 2019
  
  2d9d53a1
- Merge branch 'patch' into 'master' · 9921f214
  swordshine authored Sep 17, 2019
```
More ELD cards

See merge request !2131
```
  9921f214
- Add Cauldron's Gift · d56568b4
  swordshine authored Sep 17, 2019
  
  d56568b4
- Add three cards · 5d161810
  swordshine authored Sep 17, 2019
  
  5d161810
- Update trigger description · b462f0db
  swordshine authored Sep 17, 2019
  
  b462f0db
- Merge remote-tracking branch 'upstream/master' · 3768074f
  CCTV-1 authored Sep 17, 2019
  
  3768074f
16 Sep, 2019 8 commits
- Merge branch 'master' into 'master' · 147cf600
  Michael Kamensky authored Sep 16, 2019
```
Fix FLAG_KEEP_SCREEN_ON

See merge request !2132
```
  147cf600
- Fix Cinder Cloud and Noxious Gearhulk Interaction with Cards with CDA · 72079ad6
  Anthony Calosa authored Sep 16, 2019
```
(Noxious Gearhulk -> Malignus, as reported on forums)
```
  72079ad6
- Merge remote-tracking branch 'upstream/master' · 48ee2057
  CCTV-1 authored Sep 16, 2019
  
  48ee2057
- Add Robber of the Rich · e98cb004
  swordshine authored Sep 16, 2019
  
  e98cb004
- Merge branch 'patch' into 'master' · e529765c
  swordshine authored Sep 16, 2019
```
More ELD cards

See merge request !2129
```
  e529765c
- Merge branch 'master' into 'master' · 5ded6fcf
  swordshine authored Sep 16, 2019
```
Fix two cards

See merge request !2130
```
  5ded6fcf
- Fix Cinder Cloud and Noxious Gearhulk Interaction with Cards with CDA · 4b031c69
  Anthony Calosa authored Sep 16, 2019
```
(Noxious Gearhulk -> Malignus, as reported on forums)
```
  4b031c69
- Update a script · c8cb56c4
  swordshine authored Sep 16, 2019
  
  c8cb56c4