Commits · 0c204d08b95130a4e1589c2b3283fcd060ff8c57 · macaronideath / fc-pregmod

Jan 13, 2018
- Merge branch 'text-fix' into 'pregmod-master' · 0c204d08
  Pregmodder authored 7 years ago
  
  Fixed bad sentence See merge request pregmodfan/fc-pregmod!1314
  0c204d08
- Fixed bad grammar · 49282710
  kopareigns authored 7 years ago
  
  49282710
Jan 12, 2018
- Merge branch 'pregmod-master' into 'pregmod-master' · c8275c34
  Pregmodder authored 7 years ago
  
  Pregmod v1021-270 See merge request pregmodfan/fc-pregmod!1313
  c8275c34
- fix and tweaks · 9fd95eb2
  Pregmodder authored 7 years ago
  
  9fd95eb2
- Merge branch 'pregmod-master' into 'pregmod-master' · eaf8df54
  Pregmodder authored 7 years ago
  
  Pregmod v1021-269 See merge request pregmodfan/fc-pregmod!1312
  eaf8df54
- Allows servants to qualify for events. · a1c1a69d
  Pregmodder authored 7 years ago
  
  a1c1a69d
- Merge branch 'pregmod-master' into 'pregmod-master' · 8040406f
  Pregmodder authored 7 years ago
  
  Pregmod v1021-268 See merge request pregmodfan/fc-pregmod!1311
  8040406f
- fix · 3d3cae61
  Pregmodder authored 7 years ago
  
  3d3cae61
- Merge branch 'pregmod-master' into 'pregmod-master' · c2269495
  Pregmodder authored 7 years ago
  
  Pregmod v1021-267 See merge request pregmodfan/fc-pregmod!1310
  c2269495
- fix · 5c756e59
  Pregmodder authored 7 years ago
  
  5c756e59
- Merge branch 'pregmod-master' into 'pregmod-master' · 7cc6595e
  Pregmodder authored 7 years ago
  
  Pregmod v1021-266 See merge request pregmodfan/fc-pregmod!1307
  7cc6595e
- eventSelection JS and various little fixes. Also manually merges !1308 · cf3ec18b
  Pregmodder authored 7 years ago
  
  cf3ec18b
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master · 786cf920
  Pregmodder authored 7 years ago
  
  786cf920
- Merge branch 'pregmod-master' into 'pregmod-master' · acce20b6
  Pregmodder authored 7 years ago
  
  Fixed losses bug (hopefully) See merge request pregmodfan/fc-pregmod!1309
  acce20b6
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master · 874821f7
  hexall90 authored 7 years ago
  
  updating fork
  874821f7
- fixing losses bug? · 54233b30
  hexall90 authored 7 years ago
  
  54233b30
- WIP JS · 2de2fdfb
  Pregmodder authored 7 years ago
  
  2de2fdfb
Jan 11, 2018
- Merge branch 'pregmod-master' into 'pregmod-master' · a8407f07
  Pregmodder authored 7 years ago
  
  Pregmod v1021-265 See merge request pregmodfan/fc-pregmod!1306
  a8407f07
- fixes · 98d1db7e
  Pregmodder authored 7 years ago
  
  98d1db7e
- Merge branch 'BugFixes' into 'pregmod-master' · b5434cc3
  Pregmodder authored 7 years ago
  
  Convert sugarcube for loops to JS. See merge request pregmodfan/fc-pregmod!1304
  b5434cc3
Jan 12, 2018
- Revert. · a5a11a56
  j authored 7 years ago
  
  a5a11a56
- Removing unecessary. · c1f26b72
  j authored 7 years ago
  
  c1f26b72
- Fix the second part. · 205dd66d
  j authored 7 years ago
  
  205dd66d
- Convert sugarcube for loops to JS. · a01e61c7
  j authored 7 years ago
  
  a01e61c7
Jan 11, 2018
- Merge branch 'pregmod-master' into 'pregmod-master' · 30f22839
  Pregmodder authored 7 years ago
  
  Pregmod v1021-264 See merge request pregmodfan/fc-pregmod!1305
  30f22839
- Experimental fix · 223ae1bf
  Pregmodder authored 7 years ago
  
  223ae1bf
- Merge branch 'pregmod-master' into 'pregmod-master' · b30c895c
  Pregmodder authored 7 years ago
  
  Pregmod v1021-263 See merge request pregmodfan/fc-pregmod!1303
  b30c895c
- fixes · 1fca23f9
  Pregmodder authored 7 years ago
  
  1fca23f9
- Merge branch 'BugFixes' into 'pregmod-master' · e1f164a3
  Pregmodder authored 7 years ago
  
  Unit loss checks and abort pregmancy sanity. See merge request pregmodfan/fc-pregmod!1297
  e1f164a3
Jan 12, 2018
- Revert damit. · 44a83bfd
  j authored 7 years ago
  
  44a83bfd
- Reverting. · 073d3805
  j authored 7 years ago
  
  073d3805
Jan 11, 2018
- bug fixes and disable goto as it appears broken. · d9c408cc
  j authored 7 years ago
  
  d9c408cc
- minor fix. · eadfb526
  j authored 7 years ago
  
  eadfb526
- Minor logical changes. · c18a282b
  j authored 7 years ago
  
  c18a282b
- Unit loss checks and abort pregmancy sanity. · e5307431
  j authored 7 years ago
  
  e5307431
- Merge branch 'pregmod-master' into 'pregmod-master' · e58f4027
  Pregmodder authored 7 years ago
  
  Pregmod v1021-262 See merge request pregmodfan/fc-pregmod!1302
  e58f4027
- fix · b7d20d88
  Pregmodder authored 7 years ago
  
  b7d20d88
- Merge branch 'PolicyDisplayRework' into 'pregmod-master' · c9d9245b
  Pregmodder authored 7 years ago
  
  Policy display rework See merge request pregmodfan/fc-pregmod!1299
  c9d9245b
- Revert. · cb348aca
  j authored 7 years ago
  
  cb348aca
- More rework. · ecc8d2ae
  j authored 7 years ago
  
  ecc8d2ae