Commits · 87f5e6e9c1ce9f9bf08a864b20551ede6aae7b13 · macaronideath / fc-pregmod

Dec 12, 2018
- fixes · 87f5e6e9
  Pregmodder authored 6 years ago
  
  87f5e6e9
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master · 468ce1a7
  Pregmodder authored 6 years ago
  
  468ce1a7
- lactation fixes and lactation management rules for facility heads. · 8b9d0cac
  Pregmodder authored 6 years ago
  
  8b9d0cac
- Merge branch 'fixes' into 'pregmod-master' · 669e6ef8
  Pregmodder authored 6 years ago
  
  Fix See merge request pregmodfan/fc-pregmod!3117
  669e6ef8
- Datatype updates · 6632d094
  kopareigns authored 6 years ago
  
  6632d094
- Fix · 0f834045
  kopareigns authored 6 years ago
  
  0f834045
Dec 11, 2018
- Merge branch 'fixes' into 'pregmod-master' · 0c7a9b5d
  Pregmodder authored 6 years ago
  
  Updating JS files See merge request pregmodfan/fc-pregmod!3108
  0c7a9b5d
- Merge branch 'pregmod-master' into fixes · b6127d1d
  kopareigns authored 6 years ago
  
  # Conflicts: # src/js/DefaultRules.tw # src/js/assayJS.tw # src/js/itemAvailability.tw # src/js/walkPastJS.tw # src/js/wombJS.tw
  b6127d1d
- Merge branch 'pregmod-master' into 'pregmod-master' · 8a5fa700
  Pregmodder authored 6 years ago
  
  fixes Closes #373 and #374 See merge request pregmodfan/fc-pregmod!3115
  8a5fa700
- fixes · 369f1366
  Pregmodder authored 6 years ago
  
  369f1366
- Merge branch 'pregmod-dev' into 'pregmod-master' · 065ecfb9
  Pregmodder authored 6 years ago
  
  Supressors -> Suppressors See merge request pregmodfan/fc-pregmod!3106
  065ecfb9
- MissedOne · 61513752
  klorpa authored 6 years ago
  
  61513752
- Fixeing · 4b5d8315
  klorpa authored 6 years ago
  
  4b5d8315
- Merge branch 'fixes2' into 'pregmod-master' · 4707d995
  Pregmodder authored 6 years ago
  
  Small update See merge request pregmodfan/fc-pregmod!3114
  4707d995
- Small update · 6f2ea7a3
  kopareigns authored 6 years ago
  
  6f2ea7a3
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into pregmod-dev · 05114f6a
  klorpa authored 6 years ago
  
  05114f6a
- Merge branch 'pregmod-master' into 'pregmod-master' · 5c58346a
  Pregmodder authored 6 years ago
  
  removed BC unset See merge request pregmodfan/fc-pregmod!3113
  5c58346a
- unset! · 39e3b66e
  Pregmodder authored 6 years ago
  
  39e3b66e
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into pregmod-dev · 6abd0bb0
  klorpa authored 6 years ago
  
  6abd0bb0
- Merge branch 'pregmod-master' into 'pregmod-master' · 65ad13cd
  Pregmodder authored 6 years ago
  
  minor fix See merge request pregmodfan/fc-pregmod!3112
  65ad13cd
- minor fix · fa0da2e7
  Pregmodder authored 6 years ago
  
  fa0da2e7
- Fixed · a094a0d4
  klorpa authored 6 years ago
  
  a094a0d4
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into pregmod-dev · 4ceaa2e5
  klorpa authored 6 years ago
  
  4ceaa2e5
- Merge branch 'fixes2' into 'pregmod-master' · 9b36bfab
  Pregmodder authored 6 years ago
  
  Fix See merge request pregmodfan/fc-pregmod!3111
  9b36bfab
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into pregmod-dev · d09fec51
  klorpa authored 6 years ago
  
  d09fec51
- Fix · 85992341
  klorpa authored 6 years ago
  
  85992341
- Fix · 946d8422
  kopareigns authored 6 years ago
  
  946d8422
- Merge branch 'pregmod-master' into fixes3 · 981726a4
  kopareigns authored 6 years ago
  
  # Conflicts: # devNotes/twine JS.txt # src/js/pregJS.tw # src/js/utilJS.tw
  981726a4
- Merge branch 'pregmod-master' into 'pregmod-master' · b47ca56e
  Pregmodder authored 6 years ago
  
  fixed bad BC See merge request pregmodfan/fc-pregmod!3110
  b47ca56e
- fixed bad BC · b766e7f8
  Pregmodder authored 6 years ago
  
  b766e7f8
Dec 10, 2018
- Merge branch 'pregmod-master' into 'pregmod-master' · d76a58b4
  Pregmodder authored 6 years ago
  
  Pregmod v1.3.0 See merge request pregmodfan/fc-pregmod!3109
  d76a58b4
- fixed starting slave issues · 75015d2a
  Pregmodder authored 6 years ago
  
  75015d2a
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master · 62453b2c
  Pregmodder authored 6 years ago
  
  62453b2c
- lactation changes · c25442c7
  Pregmodder authored 6 years ago
  
  c25442c7
- Updating JS files · 71b93b18
  kopareigns authored 6 years ago
  
  71b93b18
- Misc · 3fb79f08
  klorpa authored 6 years ago
  
  3fb79f08
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into pregmod-dev · e44da4bd
  klorpa authored 6 years ago
  
  e44da4bd
- Merge branch 'pregmod-master' into 'pregmod-master' · e52c488c
  Pregmodder authored 6 years ago
  
  Duplicate Mouth Fix See merge request pregmodfan/fc-pregmod!3107
  e52c488c
- Merge remote-tracking branch 'MEGAMASTER/pregmod-master' into pregmod-master · d892256d
  deepmurk authored 6 years ago
  
  d892256d
- Duplicate Mouth Fix · a7d2d1d6
  deepmurk authored 6 years ago
  
  a7d2d1d6