Commits · 488a0cec8af35d9fe1ae615834f2a8b3415163d7 · pregmodfan / fc-pregmod

Oct 24, 2020
- add factors · 488a0cec
  svornost authored 4 years ago
  
  488a0cec
- Fix unboosted militia recruitment · e54c7722
  svornost authored 4 years ago
  
  e54c7722
- Merge branch 'issue-2466' into 'pregmod-master' · 9e170af8
  Pregmodder authored 4 years ago
  
  Make App.Arcology.Cell.Decorative constructor callable without arguments Closes #2466 See merge request !8167
  9e170af8
- Make App.Arcology.Cell.Decorative constructor callable without arguments · ae9d0aa1
  ezsh authored 4 years ago
  
  Fixes #2466.
  ae9d0aa1
- Merge branch 'balance-demand' into 'pregmod-master' · a06c7ffc
  Pregmodder authored 4 years ago
  
  Balance impact of localEcon on demand calculation See merge request !8166
  a06c7ffc
- Balance impact of localEcon on demand calculation · 2f2a9344
  i107760 authored 4 years ago
  
  2f2a9344
- Merge branch 'balance' into 'pregmod-master' · 5f696fb8
  Pregmodder authored 4 years ago
  
  Small emigration balance change See merge request !8165
  5f696fb8
- Making emigration when citizens > demand a little slower · cb879043
  i107760 authored 4 years ago
  
  cb879043
- Merge branch 'recuriter' into 'pregmod-master' · 71fb159c
  Pregmodder authored 4 years ago
  
  fix typo See merge request !8164
  71fb159c
- Merge branch 'secExp' into 'pregmod-master' · b2dc5efa
  Pregmodder authored 4 years ago
  
  misc SexExp See merge request !8163
  b2dc5efa
- fix typo · 674b0482
  i107760 authored 4 years ago
  
  674b0482
- misc · 5fde14cf
  Skriv authored 4 years ago
  
  5fde14cf
- Merge branch 'pregmod-master' into 'pregmod-master' · b6fc8664
  Pregmodder authored 4 years ago
  
  remove empty append See merge request !8162
  b6fc8664
- remove empty append · dee35ebd
  svornost authored 4 years ago
  
  dee35ebd
- Merge branch 'secExp-tradeReport-rep-fix' into 'pregmod-master' · 07812cd7
  Pregmodder authored 4 years ago
  
  Sec exp trade report rep fix See merge request !8161
  07812cd7
- Sec exp trade report rep fix · 72e8503d
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  72e8503d
- Merge branch 'pregmod-master' into 'pregmod-master' · 96c55f47
  Pregmodder authored 4 years ago
  
  More arcmgmt fixes See merge request !8160
  96c55f47
- Fix stray span text in weatherFreeze · b307333a
  svornost authored 4 years ago
  
  b307333a
- Fix slave total miscalculation from SecExp · 5ab7eb8a
  svornost authored 4 years ago
  
  5ab7eb8a
- Merge branch 'fix-personalAssiantFS' into 'pregmod-master' · b1b99ff7
  Pregmodder authored 4 years ago
  
  fix-personalAssiantFS See merge request !8159
  b1b99ff7
Oct 23, 2020
- fix · 28985356
  Blank_Alt authored 4 years ago
  
  28985356
- Merge branch 'bugfix' into 'pregmod-master' · 6036cadd
  Pregmodder authored 4 years ago
  
  fix bug See merge request !8158
  6036cadd
- Merge branch 'fix-si' into 'pregmod-master' · 19bb4ae0
  Pregmodder authored 4 years ago
  
  Fix si See merge request !8157
  19bb4ae0
- fix bug · 04f0bc8c
  i107760 authored 4 years ago
  
  04f0bc8c
- fix dupe span · d7d1ab28
  lowercasedonkey authored 4 years ago
  
  d7d1ab28
- fix si scenes refresh · 7f207fbd
  lowercasedonkey authored 4 years ago
  
  7f207fbd
- Merge branch 'autoRunSecExpBC' into 'pregmod-master' · 47b3290e
  Pregmodder authored 4 years ago
  
  autoRunSecExpBC See merge request !8156
  47b3290e
- autoRunSecExpBC · 17075539
  Blank_Alt authored 4 years ago
  
  17075539
- Merge branch 'pregmod-master' into 'pregmod-master' · 9d3b725b
  Pregmodder authored 4 years ago
  
  Move tradeReport to JS and reconnect it to arcmgmt See merge request !8155
  9d3b725b
- Move tradeReport to JS and reconnect it. · cdd65eb6
  svornost authored 4 years ago
  
  cdd65eb6
- Merge branch 'crimeCap' into 'pregmod-master' · 55771f00
  Pregmodder authored 4 years ago
  
  crimeCap fix See merge request !8154
  55771f00
- crimeCap fix · d009b4ef
  i107760 authored 4 years ago
  
  d009b4ef
- Merge branch 'pregmod-master' into 'pregmod-master' · ffa871f9
  Pregmodder authored 4 years ago
  
  Arcology management fixes and cleanup, part 4 See merge request !8153
  ffa871f9
- Merge branch 'pregmod-master' of gitgud.io:pregmodfan/fc-pregmod into pregmod-master · 34f8a833
  svornost authored 4 years ago
  
  34f8a833
- Arcology management fixes and cleanup, part 4 · b0a49129
  svornost authored 4 years ago
  
  b0a49129
- Merge branch 'arc-2' into 'pregmod-master' · f9d65959
  Pregmodder authored 4 years ago
  
  Arcmgmt fixes See merge request !8152
  f9d65959
- prosperity fix · 64c712e1
  lowercasedonkey authored 4 years ago
  
  64c712e1
- double rents fix · 9ed06778
  lowercasedonkey authored 4 years ago
  
  9ed06778
- Merge branch 'incubator-AS-fix' into 'pregmod-master' · c2d88d1f
  Pregmodder authored 4 years ago
  
  incubator as fix Closes #2461 See merge request !8151
  c2d88d1f
- incubator as fix · e14e4fd6
  lowercasedonkey authored 4 years ago
  
  e14e4fd6