Commits · 089e0d16742cab5bbde325adcdfab3a7fca234fb · macaronideath / fc-pregmod

Jun 10, 2019
- Fix · 089e0d16
  kopareigns authored 5 years ago
  
  089e0d16
Jun 09, 2019
- Merge branch 'pregmod-dev' into 'pregmod-master' · 212bcb5e
  Pregmodder authored 5 years ago
  
  Temp fix and FS work See merge request pregmodfan/fc-pregmod!4791
  212bcb5e
- Temp fix and FS work · 3ca21554
  Pregmodder authored 5 years ago
  
  3ca21554
- Merge branch 'fixes' into 'pregmod-master' · 4a6fb92e
  Pregmodder authored 5 years ago
  
  Re-fix See merge request pregmodfan/fc-pregmod!4790
  4a6fb92e
- Re-fix · c6d413cf
  kopareigns authored 5 years ago
  
  c6d413cf
- Merge branch 'pregmod-dev' into 'pregmod-master' · 32381e1f
  Pregmodder authored 5 years ago
  
  partial revert See merge request pregmodfan/fc-pregmod!4789
  32381e1f
- partial revert · 0b4d0cb5
  Pregmodder authored 5 years ago
  
  0b4d0cb5
- Merge branch 'ra-options-editor-types' into 'pregmod-master' · 7d2a262d
  Pregmodder authored 5 years ago
  
  Fix return types for ListSelector See merge request pregmodfan/fc-pregmod!4788
  7d2a262d
- Fix return types for ListSelector · 1fabf49f
  ezsh authored 5 years ago
  
  1fabf49f
- Merge branch 'fixes' into 'pregmod-master' · 7c20c5fe
  Pregmodder authored 5 years ago
  
  Fix Closes #815 See merge request pregmodfan/fc-pregmod!4787
  7c20c5fe
- Fix · 2aad9db6
  kopareigns authored 5 years ago
  
  2aad9db6
- Merge branch 'pregmod-dev' into 'pregmod-master' · 206d1e70
  Pregmodder authored 5 years ago
  
  possible HG swap fix See merge request pregmodfan/fc-pregmod!4786
  206d1e70
- possible HG swap fix · 4277c946
  Pregmodder authored 5 years ago
  
  4277c946
- Merge branch 'fix-pronoun' into 'pregmod-master' · ec55a7b5
  Pregmodder authored 5 years ago
  
  fix pronoun See merge request pregmodfan/fc-pregmod!4785
  ec55a7b5
- fix pronoun · 4206398a
  lowercasedonkey authored 5 years ago
  
  4206398a
- comment · b673641b
  lowercasedonkey authored 5 years ago
  
  b673641b
- Merge branch 'daughters' into 'pregmod-master' · a6f7560a
  Pregmodder authored 5 years ago
  
  fix daughters again again See merge request pregmodfan/fc-pregmod!4784
  a6f7560a
- fix daughters again again · ad2da041
  lowercasedonkey authored 5 years ago
  
  ad2da041
- Merge branch 'agent-recall' into 'pregmod-master' · 0e932155
  Pregmodder authored 5 years ago
  
  Pass arcology id to agent recall passage Closes #825 See merge request pregmodfan/fc-pregmod!4783
  0e932155
- Pass arcology id to agent recall passage · d7c22ffc
  ezsh authored 5 years ago
  
  Fixes #825.
  d7c22ffc
- Merge branch 'next-button' into 'pregmod-master' · 9b55fadd
  Pregmodder authored 5 years ago
  
  fix daughters of liberty again See merge request pregmodfan/fc-pregmod!4782
  9b55fadd
- fix daughters of liberty again · 785c143e
  lowercasedonkey authored 5 years ago
  
  785c143e
- Merge branch 'storyCaptionFix' into 'pregmod-master' · 6fb1ee7a
  Pregmodder authored 5 years ago
  
  Story caption cleaning and fixes [Ready to merge]. See merge request pregmodfan/fc-pregmod!4780
  6fb1ee7a
- Story caption cleaning and fixes [Ready to merge]. · 688da4e8
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  688da4e8
- Merge branch 'misc-fixes' into 'pregmod-master' · 7fe1d86a
  Pregmodder authored 5 years ago
  
  Misc fixes Closes #826 and #821 See merge request pregmodfan/fc-pregmod!4781
  7fe1d86a
- Correct incorrect strings in rules · c0c4c08e
  ezsh authored 5 years ago
  
  Fixes #821, #826.
  c0c4c08e
- Merge branch 'storyCaptionFix' into 'pregmod-master' · 7c55233f
  Pregmodder authored 5 years ago
  
  storyCaptionFix See merge request pregmodfan/fc-pregmod!4779
  7c55233f
- storyCaptionFix · 24662c0f
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  24662c0f
- Merge branch 'fixes' into 'pregmod-master' · 2ab2a022
  Pregmodder authored 5 years ago
  
  Fix See merge request pregmodfan/fc-pregmod!4777
  2ab2a022
- Fix · 0f743ce2
  kopareigns authored 5 years ago
  
  0f743ce2
- Merge branch 'null-not-string' into 'pregmod-master' · b76297f4
  Pregmodder authored 5 years ago
  
  null not string See merge request pregmodfan/fc-pregmod!4776
  b76297f4
- null not string · 8f03d17e
  lowercasedonkey authored 5 years ago
  
  8f03d17e
- Merge branch 'pregmod-dev' into 'pregmod-master' · aceaee2c
  Pregmodder authored 5 years ago
  
  Traitor branching paths See merge request pregmodfan/fc-pregmod!4774
  aceaee2c
- fix · 8e904ea9
  Pregmodder authored 5 years ago
  
  8e904ea9
- the the · e896308b
  Pregmodder authored 5 years ago
  
  e896308b
- Merge branch 'works' into 'pregmod-master' · f5b934e5
  Pregmodder authored 5 years ago
  
  Spaces See merge request pregmodfan/fc-pregmod!4773
  f5b934e5
- Traitor branching paths · 2efbeab4
  Pregmodder authored 5 years ago
  
  2efbeab4
- SpacingAgain · 05ceb916
  klorpa authored 5 years ago
  
  05ceb916
- OtherSpaces · 15a97afa
  klorpa authored 5 years ago
  
  15a97afa
- Spaces · 4490808c
  klorpa authored 5 years ago
  
  4490808c