Commits · 68ef8daccaf157a55f28cafbcd9c3b33f9912534 · macaronideath / fc-pregmod

Sep 06, 2020
- Merge branch 'new-Slave-2' into 'pregmod-master' · 68ef8dac
  Pregmodder authored 4 years ago
  
  Drop newSlaveIntro.tw, will need review See merge request pregmodfan/fc-pregmod!7655
  68ef8dac
- Merge branch 'pregmod-master' into 'pregmod-master' · 222a7a4e
  Pregmodder authored 4 years ago
  
  Try 3: omit path information from output file (without raw this time) See merge request pregmodfan/fc-pregmod!7664
  222a7a4e
- Try 3: omit path information from output file (without raw this time) · e8f4004b
  svornost authored 4 years ago
  
  e8f4004b
- Merge branch 'market-fix' into 'pregmod-master' · db867f14
  Pregmodder authored 4 years ago
  
  market fix Closes #2225 See merge request pregmodfan/fc-pregmod!7663
  db867f14
- market fix · 46571d43
  lowercasedonkey authored 4 years ago
  
  46571d43
- Merge branch 'revert-84e20e5a ' into 'pregmod-master' · a0c53a5f
  Pregmodder authored 4 years ago
  
  Revert "Merge branch 'pregmod-master' into 'pregmod-master'" See merge request pregmodfan/fc-pregmod!7662
  a0c53a5f
- Revert "Merge branch 'pregmod-master' into 'pregmod-master'" · 76da8df2
  Pregmodder authored 4 years ago
  
  This reverts merge request !7657
  76da8df2
- safety check for newSlave · 7b47b0ed
  lowercasedonkey authored 4 years ago
  
  7b47b0ed
- don't dupe newSlave if it's in called in newSlaveIntro · cd6fd581
  lowercasedonkey authored 4 years ago
  
  cd6fd581
- fix · 6cc3b026
  lowercasedonkey authored 4 years ago
  
  6cc3b026
- finish broard switch from newSlave tw · 9aa1f235
  lowercasedonkey authored 4 years ago
  
  9aa1f235
- remove include new slave · 7b2d919c
  lowercasedonkey authored 4 years ago
  
  7b2d919c
- Merge branch 'pregmod-dev' into 'pregmod-master' · b02fe1d2
  Pregmodder authored 4 years ago
  
  murderAttempt round 2 See merge request !7652
  b02fe1d2
Sep 05, 2020
- Merge branch 'market-fixes' into 'pregmod-master' · 4c7e0143
  Pregmodder authored 4 years ago
  
  Market fixes Closes #2224 See merge request pregmodfan/fc-pregmod!7661
  4c7e0143
- fix bulk · 00a4fa05
  lowercasedonkey authored 4 years ago
  
  00a4fa05
- passage link · 00a01277
  lowercasedonkey authored 4 years ago
  
  00a01277
- fixes + word variety · cd97e4c7
  Pregmodder authored 4 years ago
  
  cd97e4c7
- Merge branch 'SecExp-rebellionsFix' into 'pregmod-master' · 127bbda3
  Pregmodder authored 4 years ago
  
  rebellionsFix See merge request pregmodfan/fc-pregmod!7659
  127bbda3
- accept() · 3fd7ce43
  Pregmodder authored 4 years ago
  
  3fd7ce43
- fix · 5f2cc9a8
  Blank_Alt authored 4 years ago
  
  5f2cc9a8
- remove () · fabb9649
  Pregmodder authored 4 years ago
  
  fabb9649
- Better BG pronoun init · 829f4be6
  Pregmodder authored 4 years ago
  
  829f4be6
- Merge branch 'SecExp-Fix' into 'pregmod-master' · 0937c7ae
  Pregmodder authored 4 years ago
  
  SecExp-Fix Closes #2223 See merge request pregmodfan/fc-pregmod!7658
  0937c7ae
- minor fixes · a0e9ca7a
  Pregmodder authored 4 years ago
  
  a0e9ca7a
- Merge branch 'pregmod-master' into 'pregmod-master' · 84e20e5a
  Pregmodder authored 4 years ago
  
  Try 2: omit path information from output file Closes #2222 See merge request pregmodfan/fc-pregmod!7657
  84e20e5a
- Fix · 19d546ea
  Blank_Alt authored 4 years ago
  
  19d546ea
- Try 2: omit path information from output file · a90f809d
  svornost authored 4 years ago
  
  a90f809d
- move it again · 85c119a8
  Pregmodder authored 4 years ago
  
  85c119a8
- He · fc1b3545
  Pregmodder authored 4 years ago
  
  fc1b3545
- probably pointless tweaks · 239f90c3
  Pregmodder authored 4 years ago
  
  239f90c3
- Move BG setter · b0962845
  Pregmodder authored 4 years ago
  
  b0962845
- Merge branch 'SecExp-minorTweaking' into 'pregmod-master' · 1a7162a7
  Pregmodder authored 4 years ago
  
  SecExp-FixAndMinorTweaking Closes #2221 See merge request pregmodfan/fc-pregmod!7646
  1a7162a7
- SecExp-FixAndMinorTweaking · fbfc7ed6
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  fbfc7ed6
- Merge branch 'revert-701a9135 ' into 'pregmod-master' · 12e0fff0
  Pregmodder authored 4 years ago
  
  Revert "Merge branch 'pregmod-master' into 'pregmod-master'" See merge request pregmodfan/fc-pregmod!7656
  12e0fff0
- Revert "Merge branch 'pregmod-master' into 'pregmod-master'" · 1d2ba32e
  Pregmodder authored 4 years ago
  
  This reverts merge request !7653
  1d2ba32e
- wrong syntax · dd656cca
  Pregmodder authored 4 years ago
  
  dd656cca
- Condense controller · 6a6814c6
  Pregmodder authored 4 years ago
  
  6a6814c6
- Merge branch 'new-Slave' into 'pregmod-master' · c680918a
  Pregmodder authored 4 years ago
  
  refresh sidebar button See merge request pregmodfan/fc-pregmod!7654
  c680918a
- sidebar button · 2ba5f853
  lowercasedonkey authored 4 years ago
  
  2ba5f853
- newSlave · ffd1e55f
  Pregmodder authored 4 years ago
  
  ffd1e55f