Commits · 150288c97703121166ab511eeac17a3d26a68553 · macaronideath / fc-pregmod

May 31, 2019
- Merge branch 'remove-active-arcology' into 'pregmod-master' · 150288c9
  Pregmodder authored 5 years ago
  
  Remove the last two $activeArcology uses See merge request pregmodfan/fc-pregmod!4680
  150288c9
- Remove the last two $activeArcology uses · 14bdd30d
  ezsh authored 5 years ago
  
  14bdd30d
- Merge branch 'pregmod-dev' into 'pregmod-master' · 55e5ffe8
  Pregmodder authored 5 years ago
  
  remove $activeArcology See merge request pregmodfan/fc-pregmod!4679
  55e5ffe8
- remove $activeArcology · 1012825e
  Pregmodder authored 5 years ago
  
  1012825e
- Merge branch 'pregmod-dev' into 'pregmod-master' · 2ec28bd8
  Pregmodder authored 5 years ago
  
  $activeArcology removal work See merge request pregmodfan/fc-pregmod!4678
  2ec28bd8
- $activeArcology removal work · 868ef2be
  Pregmodder authored 5 years ago
  
  868ef2be
- Merge branch 'dev' into 'pregmod-master' · b257f09b
  Pregmodder authored 5 years ago
  
  Remove textinput.js and convert boobs.js to template lits See merge request pregmodfan/fc-pregmod!4677
  b257f09b
- fix newline · 10070b1d
  Skriv authored 5 years ago
  
  10070b1d
- delete obsolete textInput.js · 646d40f7
  Skriv authored 5 years ago
  
  646d40f7
- template lits · 67f271b8
  Skriv authored 5 years ago
  
  67f271b8
- Merge branch 'eslint-comment-fix' into 'pregmod-master' · 33d72f5f
  Pregmodder authored 5 years ago
  
  Eslint comment fixes See merge request pregmodfan/fc-pregmod!4675
  33d72f5f
- Merge branch 'pregmod-dev' into 'pregmod-master' · 102d179c
  Pregmodder authored 5 years ago
  
  better use of function See merge request pregmodfan/fc-pregmod!4676
  102d179c
- unneeded set · e598bb59
  Pregmodder authored 5 years ago
  
  e598bb59
- better use of function · 916a7de4
  Pregmodder authored 5 years ago
  
  916a7de4
- missing exception · 6ae71dab
  Skriv authored 5 years ago
  
  6ae71dab
- relate correct rule · 451b788b
  Skriv authored 5 years ago
  
  451b788b
- Merge branch 'neighbourFixes' into 'pregmod-master' · 30d96684
  Pregmodder authored 5 years ago
  
  neighborArchology fixes See merge request pregmodfan/fc-pregmod!4660
  30d96684
- neighborArchology fixes · e3cee455
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  e3cee455
- Merge branch 'compile.sh_tweaking' into 'pregmod-master' · 5a96c825
  Pregmodder authored 5 years ago
  
  compile.sh_tweaking See merge request pregmodfan/fc-pregmod!4673
  5a96c825
- compile.sh_tweaking · c3dd92c3
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  c3dd92c3
- Merge branch 'pregmod-dev' into 'pregmod-master' · dd6c9095
  Pregmodder authored 5 years ago
  
  Better safety Closes #789 See merge request pregmodfan/fc-pregmod!4674
  dd6c9095
- Better safety · 3d71f8b2
  Pregmodder authored 5 years ago
  
  3d71f8b2
- Merge branch 'fix-ra-options' into 'pregmod-master' · 68b7a944
  Pregmodder authored 5 years ago
  
  Fix value case in RA options and add forgotten bleaching See merge request pregmodfan/fc-pregmod!4672
  68b7a944
- Fix value case in RA options and add forgotten bleaching · bd23a1ca
  ezsh authored 5 years ago
  
  bd23a1ca
- Merge branch 'pregmod-dev' into 'pregmod-master' · 1ad871bd
  Pregmodder authored 5 years ago
  
  safety Closes #789 See merge request pregmodfan/fc-pregmod!4671
  1ad871bd
- safety · 94fcab3c
  Pregmodder authored 5 years ago
  
  94fcab3c
- Merge branch 'dcoded-dev' into 'pregmod-master' · 7c880e18
  Pregmodder authored 5 years ago
  
  Minor Text Fixes See merge request pregmodfan/fc-pregmod!4670
  7c880e18
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into dcoded-dev · 1487a2b7
  DCoded authored 5 years ago
  
  1487a2b7
- Minor ageAndHealth() text fixes · 4a8e1c00
  DCoded authored 5 years ago
  
  4a8e1c00
- Merge branch 'vas-nick' into 'pregmod-master' · df85c338
  Pregmodder authored 5 years ago
  
  fix typo in renickname See merge request pregmodfan/fc-pregmod!4669
  df85c338
- fix typo in renickname · 2cac0e2b
  vas authored 5 years ago and Pregmodder committed 5 years ago
  
  2cac0e2b
May 30, 2019
- Merge branch 'pregmod-dev' into 'pregmod-master' · 46df8bf5
  Pregmodder authored 5 years ago
  
  physIdeal law recruiter respect Closes #738 See merge request pregmodfan/fc-pregmod!4667
  46df8bf5
- physIdeal law recruiter respect · b6e80dbd
  Pregmodder authored 5 years ago
  
  b6e80dbd
- Merge branch 'sanity' into 'pregmod-master' · 79518598
  Pregmodder authored 5 years ago
  
  Sanity fixes See merge request pregmodfan/fc-pregmod!4666
  79518598
- fix · 07bb1427
  Arkerthan authored 5 years ago
  
  07bb1427
- Merge branch 'pregmod-master' into sanity · 4584b9f3
  Arkerthan authored 5 years ago
  
  4584b9f3
- sanity fixes · 576a040a
  Arkerthan authored 5 years ago
  
  576a040a
- Merge branch 'link-tooltips' into 'pregmod-master' · b7ce8737
  Pregmodder authored 5 years ago
  
  Teach link generation function to show tooltips See merge request pregmodfan/fc-pregmod!4665
  b7ce8737
- Teach link generation function to show tooltips · 70fa3567
  ezsh authored 5 years ago
  
  70fa3567
- Merge branch 'pregmod-dev' into 'pregmod-master' · ab106cd9
  Pregmodder authored 5 years ago
  
  fix Closes #787 See merge request pregmodfan/fc-pregmod!4664
  ab106cd9