Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

74d2f639

Commit 74d2f639 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1017-31

See merge request !471

parents 9858ff04 ae3474a1

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/js/raSelectorJS.tw 66 additions, 2 deletions

src/js/raSelectorJS.tw
src/societies/aztec/slaveSacrifice.tw 7 additions, 1 deletion

src/societies/aztec/slaveSacrifice.tw
src/uncategorized/initRules.tw 118 additions, 3 deletions

src/uncategorized/initRules.tw
src/uncategorized/rulesAssistant.tw 164 additions, 365 deletions

src/uncategorized/rulesAssistant.tw
src/uncategorized/slaveInteract.tw 3 additions, 3 deletions

src/uncategorized/slaveInteract.tw
src/utility/assayWidgets.tw 27 additions, 6 deletions

src/utility/assayWidgets.tw
src/utility/raWidgets.tw 118 additions, 18 deletions

src/utility/raWidgets.tw

with 503 additions and 398 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment