Commits · bef9926abf8b29649805d1d48816674f6ef2cbd2 · macaronideath / fc-pregmod

May 05, 2019
- fixes · bef9926a
  Pregmodder authored 5 years ago
  
  bef9926a
- Merge branch 'template-curly-spacing' into 'pregmod-master' · da1f1cfc
  Pregmodder authored 5 years ago
  
  Template literals See merge request pregmodfan/fc-pregmod!4452
  da1f1cfc
- Merge branch 'pregmod-master' into 'pregmod-master' · 55e8e742
  Pregmodder authored 5 years ago
  
  Fix #720 Closes #720 See merge request pregmodfan/fc-pregmod!4451
  55e8e742
- Merge branch 'master' into 'pregmod-master' · cde0b606
  cc54iw authored 5 years ago and Pregmodder committed 5 years ago
  
  Master See merge request cc54iw/fc-pregmod!1
  cde0b606
- rulesAssistantOptions · 98c943a2
  Skriv authored 5 years ago
  
  98c943a2
- slaveGenerationJS · 4032477e
  Skriv authored 5 years ago
  
  4032477e
- DefaultRules · b5cecd76
  Skriv authored 5 years ago
  
  b5cecd76
- utilJS · c61478d6
  Skriv authored 5 years ago
  
  c61478d6
- initial commit · 37ca2742
  Skriv authored 5 years ago
  
  37ca2742
- Merge branch 'SF_Fix' into 'pregmod-master' · 1f561503
  Pregmodder authored 5 years ago
  
  SF hotfix. Closes #719 See merge request pregmodfan/fc-pregmod!4450
  1f561503
- SF hotfix. · 41f89de7
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  41f89de7
- Merge branch 'pregmod-dev' into 'pregmod-master' · ac58ad5f
  Pregmodder authored 5 years ago
  
  Aphrodisiacs counter erectile dysfunction See merge request pregmodfan/fc-pregmod!4449
  ac58ad5f
- Aphrodisiacs counter erectile dysfunction · c02dce0b
  Pregmodder authored 5 years ago
  
  c02dce0b
- Merge branch 'when-madam-works-herself' into 'pregmod-master' · e4edc338
  Pregmodder authored 5 years ago
  
  Fix when madam works herself See merge request pregmodfan/fc-pregmod!4448
  e4edc338
- note for future · a654fed7
  lowercasedonkey authored 5 years ago
  
  a654fed7
- small text fix · 036b5239
  lowercasedonkey authored 5 years ago
  
  036b5239
- fix pronoun · 08b376c9
  lowercasedonkey authored 5 years ago
  
  08b376c9
- inform player of work oven with EWD off · cde586de
  lowercasedonkey authored 5 years ago
  
  cde586de
- Fix when madam works herself · e3b9e36c
  lowercasedonkey authored 5 years ago
  
  e3b9e36c
- Merge branch 'pregmod-dev' into 'pregmod-master' · 934ff313
  Pregmodder authored 5 years ago
  
  Added priapism agents and .chem clinic summary See merge request pregmodfan/fc-pregmod!4447
  934ff313
- tweak · 24082919
  Pregmodder authored 5 years ago
  
  24082919
- tweaks · 6a8a37ca
  Pregmodder authored 5 years ago
  
  6a8a37ca
- further tweaking · 16faacf8
  Pregmodder authored 5 years ago
  
  16faacf8
- tweak · b260bbb1
  Pregmodder authored 5 years ago
  
  b260bbb1
- Added priapism agents and .chem clinic summary · 40429a2a
  Pregmodder authored 5 years ago
  
  40429a2a
- Merge branch 'fix-story-caption-if-continue-hidden' into 'pregmod-master' · 5bceaa4e
  Pregmodder authored 5 years ago
  
  fix story caption if continue hidden Closes #718 See merge request pregmodfan/fc-pregmod!4445
  5bceaa4e
- fix story caption if continue hidden · 24ba8f99
  lowercasedonkey authored 5 years ago
  
  24ba8f99
May 04, 2019
- Merge branch 'dcoded-dev' into 'pregmod-master' · 99209cc1
  Pregmodder authored 5 years ago
  
  VectorArtJS linting See merge request pregmodfan/fc-pregmod!4435
  99209cc1
- Merge branch 'pregmod-dev' into 'pregmod-master' · 328e9d0a
  Pregmodder authored 5 years ago
  
  fixes Closes #715 See merge request pregmodfan/fc-pregmod!4443
  328e9d0a
- removed extra line · 71100beb
  Pregmodder authored 5 years ago
  
  71100beb
- fixes · 6a7a9e13
  Pregmodder authored 5 years ago
  
  6a7a9e13
- Merge branch 'fixes' into 'pregmod-master' · 5d799412
  Pregmodder authored 5 years ago
  
  generateMarketSlave fixes and cleanup See merge request pregmodfan/fc-pregmod!4416
  5d799412
- Comment formatting · 46e7252f
  DCoded authored 5 years ago
  
  46e7252f
- Master merge · ccc09c27
  DCoded authored 5 years ago
  
  ccc09c27
- Merge branch 'eslinter' into 'pregmod-master' · f436dc24
  Pregmodder authored 5 years ago
  
  Remove linebreak rule See merge request pregmodfan/fc-pregmod!4442
  f436dc24
- Merge branch 'StoryCaption_Tweaking-2.0' into 'pregmod-master' · 42d09324
  Pregmodder authored 5 years ago
  
  StoryCaption_Tweaking-2.0 0 See merge request pregmodfan/fc-pregmod!4433
  42d09324
- StoryCaption_Tweaking-2.0 0 · 30514a4b
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  30514a4b
- remove linebreak rule · 277fbbeb
  Skriv authored 5 years ago
  
  277fbbeb
- fix pronoun · f215da9c
  Skriv authored 5 years ago
  
  f215da9c
- More comment formatting · 074423c3
  DCoded authored 5 years ago
  
  074423c3