Commits · 4a4658a778ccb944525c4a0c927623e688229988 · macaronideath / fc-pregmod

May 28, 2019
- progress · 4a4658a7
  lowercasedonkey authored 5 years ago
  
  4a4658a7
- remove predefined brand labels · 708ccbfb
  lowercasedonkey authored 5 years ago
  
  708ccbfb
- progress, brandLocation removed · a28afe50
  lowercasedonkey authored 5 years ago
  
  a28afe50
- more · 98e9eff2
  lowercasedonkey authored 5 years ago
  
  98e9eff2
- simple add remove brand working · e6e08af8
  lowercasedonkey authored 5 years ago
  
  e6e08af8
- Merge branch 'pregmod-master' into MultiBrand · dedc4af2
  lowercasedonkey authored 5 years ago
  
  dedc4af2
- fixes · 57ac0005
  Pregmodder authored 5 years ago and lowercasedonkey committed 5 years ago
  
  tweak working fix fix temp fix
  57ac0005
- fixes · 10fc1e1a
  Pregmodder authored 5 years ago and lowercasedonkey committed 5 years ago
  
  tweak
  10fc1e1a
- Ensure 'markings' RA settting exists · 858677f0
  ezsh authored 5 years ago and lowercasedonkey committed 5 years ago
  
  Fixes #774.
  858677f0
- Handle RA rules that were spiled by BC earlier · 2ddf3dd6
  ezsh authored 5 years ago and lowercasedonkey committed 5 years ago
  
  2ddf3dd6
- Handle old default placeholder for RA rules · b5d7a14f
  ezsh authored 5 years ago and lowercasedonkey committed 5 years ago
  
  b5d7a14f
- Removed num() from storyCaption · fce81df0
  DCoded authored 5 years ago and lowercasedonkey committed 5 years ago
  
  fce81df0
- Removed num() from slaveSummaryWidgets · 901f5c90
  DCoded authored 5 years ago and lowercasedonkey committed 5 years ago
  
  901f5c90
- Missed a fee · fdd6f14a
  DCoded authored 5 years ago and lowercasedonkey committed 5 years ago
  
  fdd6f14a
- Minor bugfix · de8720fe
  DCoded authored 5 years ago and lowercasedonkey committed 5 years ago
  
  de8720fe
- Removed unused code · 60d975cb
  DCoded authored 5 years ago and lowercasedonkey committed 5 years ago
  
  60d975cb
- Added missing num()s · a79353c3
  DCoded authored 5 years ago and lowercasedonkey committed 5 years ago
  
  a79353c3
- Merge branch 'ra-conditions' into 'pregmod-master' · e2cc1264
  Pregmodder authored 5 years ago
  
  A couple more RA fixes See merge request pregmodfan/fc-pregmod!4645
  e2cc1264
- Do not apply growth drugs to slaves with strong indenture restrictions · c3a6f8f5
  ezsh authored 5 years ago
  
  c3a6f8f5
- Do not overwrite the first rule whene merging · cb822e06
  ezsh authored 5 years ago
  
  cb822e06
- Fix Rule Summary rendering · d4135de4
  ezsh authored 5 years ago
  
  Use a rule with default setters as a reference object, in order to avoid traveling inside NumberTrgets.
  d4135de4
- Merge branch 'ra-conditions' into 'pregmod-master' · 4651aff6
  Pregmodder authored 5 years ago
  
  Fix RA rules application See merge request pregmodfan/fc-pregmod!4644
  4651aff6
- Make mergeRules work with hierarchical objects · 3374efe7
  ezsh authored 5 years ago
  
  3374efe7
May 27, 2019
- Merge branch 'pregmod-dev' into 'pregmod-master' · ca649b6d
  Pregmodder authored 5 years ago
  
  fixes See merge request pregmodfan/fc-pregmod!4642
  ca649b6d
- fixes · d7686b63
  Pregmodder authored 5 years ago
  
  d7686b63
- Merge branch 'hotfixes' into 'pregmod-master' · 0e2bb412
  Pregmodder authored 5 years ago
  
  Added missing `num()`s See merge request pregmodfan/fc-pregmod!4611
  0e2bb412
- early work · 73bcec77
  lowercasedonkey authored 5 years ago
  
  73bcec77
- Bring back unbreakable space to rules summary table · 20724407
  ezsh authored 5 years ago
  
  20724407
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into hotfixes · 452eb891
  DCoded authored 5 years ago
  
  452eb891
- Removed num() from storyCaption · bfd9673e
  DCoded authored 5 years ago
  
  bfd9673e
- Removed num() from slaveSummaryWidgets · 54c9a643
  DCoded authored 5 years ago
  
  54c9a643
- Merge branch 'ra-conditions' into 'pregmod-master' · 06f42eda
  Pregmodder authored 5 years ago
  
  Fix some RA bugs Closes #774 See merge request pregmodfan/fc-pregmod!4640
  06f42eda
- Ensure 'markings' RA settting exists · 6b7c8319
  ezsh authored 5 years ago
  
  Fixes #774.
  6b7c8319
- Handle RA rules that were spiled by BC earlier · 6bbecb7d
  ezsh authored 5 years ago
  
  6bbecb7d
- Handle old default placeholder for RA rules · 90175221
  ezsh authored 5 years ago
  
  90175221
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into hotfixes · 6bc21277
  DCoded authored 5 years ago
  
  6bc21277
- Merge branch 'ra-conditions' into 'pregmod-master' · 2097aa4d
  Pregmodder authored 5 years ago
  
  Add a warning about RA changes See merge request pregmodfan/fc-pregmod!4636
  2097aa4d
- Add a warning about RA changes · aa168e73
  ezsh authored 5 years ago
  
  aa168e73
- Merge branch 'rules-summary-escape-sc-markup' into 'pregmod-master' · d8005779
  Pregmodder authored 5 years ago
  
  Escape target condition because SugarCube interprets '==' See merge request pregmodfan/fc-pregmod!4638
  d8005779
- Escape target condition because SugarCube interprets '==' · b42ed942
  ezsh authored 5 years ago
  
  b42ed942