Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
idinium96 committed Aug 16, 2021
2 parents ed51b08 + 5111a46 commit 548ca96
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .example/options.json
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,8 @@
"escrow": "",
"manual": "",
"failedToCounter": "",
"takingItemsWithZeroSellingPrice": ""
"takingItemsWithIntentBuy": "",
"givingItemsWithIntentSell": ""
},
"accepted": {
"automatic": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: ${{ matrix.node-version }}
- run: npm install
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tf2autobot",
"version": "4.3.1",
"version": "4.4.5",
"description": "Fully automated TF2 trading bot advertising on www.backpack.tf using prices from www.prices.tf, Originally made by Nicklason.",
"main": "dist/app.js",
"scripts": {
Expand Down

0 comments on commit 548ca96

Please sign in to comment.