Commits · 7c5176465f3b917e1c0bfc76913902d66a473bd6 · macaronideath / fc-pregmod

Apr 28, 2019
- Added temp files to gitignore · 7c517646
  brickode authored 5 years ago
  
  7c517646
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into nursery-dev · ddbc172f
  brickode authored 5 years ago
  
  ddbc172f
- Merge branch 'pregmod-dev' into 'pregmod-master' · 5bf076db
  Pregmodder authored 5 years ago
  
  rulesAssistantOptions cleaning See merge request pregmodfan/fc-pregmod!4377
  5bf076db
- rulesAssistantOptions cleaning · be05392f
  Pregmodder authored 5 years ago
  
  be05392f
Apr 27, 2019
- Merge branch 'incubator' into 'pregmod-master' · cca1c2ee
  Pregmodder authored 5 years ago
  
  Starting Eyebrows See merge request pregmodfan/fc-pregmod!4372
  cca1c2ee
- LastStuff · 3c015a4f
  klorpa authored 5 years ago
  
  3c015a4f
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into incubator · ad70f45c
  klorpa authored 5 years ago
  
  ad70f45c
- Tested · f25a01ef
  klorpa authored 5 years ago
  
  f25a01ef
- Merge branch 'generateMarketSlaves' into 'pregmod-master' · 3bcdd733
  Pregmodder authored 5 years ago
  
  Convert generate market slaves to javascript See merge request pregmodfan/fc-pregmod!4340
  3bcdd733
- Merge branch 'pregmod-dev' into 'pregmod-master' · b7f333be
  Pregmodder authored 5 years ago
  
  Fixed bodymod error See merge request pregmodfan/fc-pregmod!4374
  b7f333be
- fix · ec8031fe
  Pregmodder authored 5 years ago
  
  ec8031fe
- Fixed bodymod error · 58d078a1
  Pregmodder authored 5 years ago
  
  58d078a1
- Merge branch 'hotfix' into 'pregmod-master' · 1fe825c4
  Pregmodder authored 5 years ago
  
  Minor fix See merge request pregmodfan/fc-pregmod!4371
  1fe825c4
- Merge branch 'eslint' into 'pregmod-master' · eb2a405f
  Pregmodder authored 5 years ago
  
  More tweaks See merge request pregmodfan/fc-pregmod!4370
  eb2a405f
- Merge branch 'fix-NaN' into 'pregmod-master' · 5440c191
  Pregmodder authored 5 years ago
  
  =+ fix Closes #692 See merge request pregmodfan/fc-pregmod!4373
  5440c191
- =+ fix · 91fed595
  lowercasedonkey authored 5 years ago
  
  91fed595
- StartingBrows · a947574c
  klorpa authored 5 years ago
  
  a947574c
- fix · ec632033
  Skriv authored 5 years ago
  
  ec632033
- error to warn · 1a3f73d1
  Skriv authored 5 years ago
  
  1a3f73d1
- -nested terniaries, +no-trailing-spaces · 2b0b8872
  Skriv authored 5 years ago
  
  2b0b8872
- Merge branch 'pregmod-dev' into 'pregmod-master' · e21d4fc1
  Pregmodder authored 5 years ago
  
  Corrected bad clit removing code See merge request pregmodfan/fc-pregmod!4367
  e21d4fc1
- Corrected bad clit removing code · 013d55fa
  Pregmodder authored 5 years ago
  
  013d55fa
- master merge · eb89b423
  Skriv authored 5 years ago
  
  eb89b423
- missing comma · f4449247
  Skriv authored 5 years ago
  
  f4449247
- Merge branch 'hotfixes' into 'pregmod-master' · 0afe5aa7
  Pregmodder authored 5 years ago
  
  More linting See merge request pregmodfan/fc-pregmod!4360
  0afe5aa7
- Merge branch 'pregmod-dev' into 'pregmod-master' · b9e11318
  Pregmodder authored 5 years ago
  
  Partial revert to the optionsMacro See merge request pregmodfan/fc-pregmod!4366
  b9e11318
- Reverted a bit of the options macro code. · 33d6a849
  Pregmodder authored 5 years ago
  
  33d6a849
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev · ab09498a
  Pregmodder authored 5 years ago
  
  ab09498a
- Merge branch 'fixes' into 'pregmod-master' · 981faad1
  Pregmodder authored 5 years ago
  
  More fixes for the options macro See merge request pregmodfan/fc-pregmod!4364
  981faad1
- More fixes · 1414380d
  kopareigns authored 5 years ago
  
  1414380d
- Merge branch 'patch-3' into 'pregmod-master' · 489f553b
  Pregmodder authored 5 years ago
  
  Updated to better account for bodies, devotion, trust, etc. See merge request pregmodfan/fc-pregmod!4361
  489f553b
- Merge branch 'fixes' into 'pregmod-master' · cc921e50
  Pregmodder authored 5 years ago
  
  Fixes Closes #690 See merge request pregmodfan/fc-pregmod!4362
  cc921e50
- Fixes · aea65691
  kopareigns authored 5 years ago
  
  aea65691
- Updated to better account for bodies, devotion, trust, etc. · 9f4e728f
  Sonofrevvan authored 5 years ago
  
  9f4e728f
- More linting · a37cab72
  brickode authored 5 years ago
  
  a37cab72
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into nursery-dev · 49a46de3
  brickode authored 5 years ago
  
  49a46de3
Apr 26, 2019
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev · 2a57bbfc
  Pregmodder authored 5 years ago
  
  2a57bbfc
- stuff · c4a2673c
  Pregmodder authored 5 years ago
  
  c4a2673c
- Merge branch 'add-eslint-rules' into 'pregmod-master' · 0065e6f2
  Pregmodder authored 5 years ago
  
  Eslint rules See merge request pregmodfan/fc-pregmod!4358
  0065e6f2
- new default value · 10776482
  Skriv authored 5 years ago
  
  10776482