Skip to content

Commit

Permalink
Merge pull request #438 from CWolfs/develop
Browse files Browse the repository at this point in the history
v1.2.0
  • Loading branch information
CWolfs authored Jun 11, 2021
2 parents b7e7a7f + f687098 commit 79bbe73
Show file tree
Hide file tree
Showing 342 changed files with 5,548 additions and 2,778 deletions.
4 changes: 2 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"label": "build",
"type": "process",
"command": "dotnet",
"args": ["build", "D:/Modding/Battletech/MissionControl/src/MissionControl.csproj"],
"args": ["build", "K:/Modding/Battletech/MissionControl/src/MissionControl.csproj"],
"problemMatcher": "$msCompile"
},
{
"label": "copy (assets)",
"type": "shell",
"command": "./copy-assets.sh"
"command": "copy-assets.sh"
}
]
}
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Richard Griffiths (CWolf)
- [@17783](https://github.com/17783) / Spectre (Added better friendly lance portraits)
- [@NickAragua](https://github.com/NickAragua) (Fixed contract dialogue)
- [@CargoVroom](https://github.com/CargoVroom) (Fixed contract dialogue, contract tags advice)
- [@Haree78](https://github.com/Haree78) (Fixed rare infinite loading issue)
- [@mcb5637](https://github.com/mcb5637) (Fixed story support get random position issue)

## Special Thanks

Expand All @@ -48,4 +50,7 @@ I wouldn't have completed such an ambitious mod without the support and help of
- GentlePayload
- gnivler
- TekGnosis
- Pode
- CatLady
- RJPhoenix
- ...and everyone in the modder channels at Mission Control, RT and BATTLETECHGAME discord who helped in lots of different ways!
2 changes: 1 addition & 1 deletion contractTypeBuilds/Blackout/common.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@
},
{
"Type": "ModifyLanceEvasionTicksByTag", // Reduce evasion to indicate a trap
"Amount": -3,
"Amount": -2,
"Tags": ["Player 1"]
}
]
Expand Down
2 changes: 1 addition & 1 deletion docs/00068109.dc74764e.js → docs/00068109.d3464dde.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 79bbe73

Please sign in to comment.