Commits · 6b9bbb0f66e819b6c22dfc2cda22b410e1d0a802 · macaronideath / fc-pregmod

Mar 15, 2019
- Add bin/ check · 6b9bbb0f
  Blank authored 6 years ago and Pregmodder committed 6 years ago
  
  6b9bbb0f
- Merge branch 'pregmod-dev' into 'pregmod-master' · 617c00d2
  Pregmodder authored 6 years ago
  
  Superfluous Spaces Removal See merge request pregmodfan/fc-pregmod!3891
  617c00d2
- Merge branch 'pregmod-master' into 'pregmod-master' · da626557
  Pregmodder authored 6 years ago
  
  Add CSS to style the options and port across the rest of the introSummary See merge request pregmodfan/fc-pregmod!3890
  da626557
- EndSPace · b9f2b31d
  klorpa authored 6 years ago
  
  b9f2b31d
- Add CSS to style the options and port across the rest of the introSummary · 61d3fc2b
  Stuffed authored 6 years ago
  
  61d3fc2b
- Merge branch 'fixed--eyed' into 'pregmod-master' · 399486c5
  Pregmodder authored 6 years ago
  
  fixed -eyed Closes #570 See merge request pregmodfan/fc-pregmod!3889
  399486c5
- fixed -eyed · da725893
  lowercasedonkey authored 6 years ago
  
  da725893
- Merge branch 'small-clarification-in-jeslave' into 'pregmod-master' · 50ba0a55
  Pregmodder authored 6 years ago
  
  Small clarification in jeslave See merge request pregmodfan/fc-pregmod!3888
  50ba0a55
- small clarification in jeslave · e3de9d3e
  lowercasedonkey authored 6 years ago
  
  e3de9d3e
- Merge branch 'trickshot-sync' into 'pregmod-master' · b4f0a921
  Pregmodder authored 6 years ago
  
  Sync up trickshot slave with poker night See merge request pregmodfan/fc-pregmod!3887
  b4f0a921
- sync up trickshot · 02f3e8d6
  lowercasedonkey authored 6 years ago
  
  02f3e8d6
- Merge branch 'FixesAndTweaks' into 'pregmod-master' · 8a682b88
  Pregmodder authored 6 years ago
  
  (Ready to merge) FixesAndTweaks See merge request pregmodfan/fc-pregmod!3803
  8a682b88
- (Ready to merge) FixesAndTweaks · 01eb2847
  Blank authored 6 years ago and Pregmodder committed 6 years ago
  
  01eb2847
- Merge branch 'Display-corp-on-main-page' into 'pregmod-master' · 34bed7b0
  Pregmodder authored 6 years ago
  
  Display corp on main page, depretiate Manage Economy See merge request pregmodfan/fc-pregmod!3858
  34bed7b0
- Merge branch 'pregmod-dev' into 'pregmod-master' · bd72e9f8
  Pregmodder authored 6 years ago
  
  Mostly Spacing See merge request pregmodfan/fc-pregmod!3886
  bd72e9f8
- Fixy · 05ebb0c2
  klorpa authored 6 years ago
  
  05ebb0c2
- merge · 44281bb7
  lowercasedonkey authored 6 years ago
  
  44281bb7
- StuffNThings · b4399874
  klorpa authored 6 years ago
  
  b4399874
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into pregmod-dev · 3b9a100b
  klorpa authored 6 years ago
  
  3b9a100b
- Commit · f87a83f3
  klorpa authored 6 years ago
  
  f87a83f3
Mar 14, 2019
- Merge branch 'pregmod-master' into 'pregmod-master' · 00ebf1c6
  Pregmodder authored 6 years ago
  
  Finish converting the introSummary and make it pretty See merge request pregmodfan/fc-pregmod!3884
  00ebf1c6
- Add CSS to style the options and port across the rest of the introSummary · 449a62c1
  Stuffed authored 6 years ago
  
  449a62c1
- Add ability to add a comment to the options macro · 5fbecdb8
  Stuffed authored 6 years ago
  
  5fbecdb8
- PLS · aeab44b4
  klorpa authored 6 years ago
  
  aeab44b4
- JSON · dc018e61
  klorpa authored 6 years ago
  
  dc018e61
- Merge branch 'JSification' into 'pregmod-master' · 43a8c98b
  Pregmodder authored 6 years ago
  
  Preparatory organization See merge request pregmodfan/fc-pregmod!3883
  43a8c98b
- Merge branch 'hotfixes' into 'pregmod-master' · 1d13d80c
  Pregmodder authored 6 years ago
  
  Chastity fixes Closes #562 See merge request pregmodfan/fc-pregmod!3878
  1d13d80c
- slaveStatsChecker organization · 1787b150
  kopareigns authored 6 years ago
  
  1787b150
- Updated TODO · 9e9d8705
  brickode authored 6 years ago
  
  9e9d8705
- FS JS organizing · 45382ed0
  kopareigns authored 6 years ago
  
  45382ed0
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into hotfixes · e7975e6d
  brickode authored 6 years ago
  
  e7975e6d
- Fixed servants not respecting chastity rules · ae3849eb
  brickode authored 6 years ago
  
  ae3849eb
- Merge branch 'java-sanityCheck' into 'pregmod-master' · d7ab3e67
  Pregmodder authored 6 years ago
  
  Java Sanity Check fix See merge request pregmodfan/fc-pregmod!3882
  d7ab3e67
- Merge branch 'minor-fixes' into 'pregmod-master' · 95e6750a
  Pregmodder authored 6 years ago
  
  minor fixes See merge request pregmodfan/fc-pregmod!3877
  95e6750a
- Merge branch 'indentations' into 'pregmod-master' · e2ed1687
  Pregmodder authored 6 years ago
  
  only indentation fixes See merge request pregmodfan/fc-pregmod!3879
  e2ed1687
- Merge branch 'java-sanityCheck' into 'pregmod-master' · 942b2ec7
  Pregmodder authored 6 years ago
  
  Java sanity check finished See merge request pregmodfan/fc-pregmod!3880
  942b2ec7
- Merge branch 'pregmod-dev' into 'pregmod-master' · 830ce0f6
  Pregmodder authored 6 years ago
  
  Sell slave defiant slave content See merge request pregmodfan/fc-pregmod!3881
  830ce0f6
- fix · 7954d0bc
  Arkerthan authored 6 years ago
  
  7954d0bc
- Sell slave defiant slave content · 91c7754a
  Pregmodder authored 6 years ago
  
  91c7754a
- only tabs · c761668d
  Skriv authored 6 years ago
  
  c761668d