Merge remote-tracking branch 'origin/master' into 009-templateTypes

This commit is contained in:
Oliver Rümpelein 2020-12-28 16:57:22 +01:00
commit 78be1c2370
2 changed files with 4 additions and 4 deletions

4
package-lock.json generated
View file

@ -2678,8 +2678,8 @@
}
},
"foundry-pc-types": {
"version": "gitlab:foundry-projects/foundry-pc/foundry-pc-types#e9cca6fbbe811fb439a3d0cdba7433746530cd97",
"from": "gitlab:foundry-projects/foundry-pc/foundry-pc-types",
"version": "git+https://git.f3l.de/dungeonslayers/foundry-pc-types.git#a94b1270e74d5e139c7c5d361764d9b0bc505c6f",
"from": "git+https://git.f3l.de/dungeonslayers/foundry-pc-types.git#f3l-fixes",
"dev": true,
"requires": {
"@types/jquery": "^3.5.1",

View file

@ -9,7 +9,7 @@
"build:watch": "gulp watch",
"link": "gulp link",
"clean": "gulp clean && gulp link --clean",
"update": "npm install --save-dev gitlab:foundry-projects/foundry-pc/foundry-pc-types",
"update": "npm install --save-dev git+https://git.f3l.de/dungeonslayers/foundry-pc-types.git#f3l-fixes",
"lint": "eslint 'src/**/*.ts' --cache",
"lint:fix": "eslint 'src/**/*.ts' --cache --fix"
},
@ -23,7 +23,7 @@
"eslint": "^7.16.0",
"eslint-config-prettier": "^7.1.0",
"eslint-plugin-prettier": "^3.3.0",
"foundry-pc-types": "gitlab:foundry-projects/foundry-pc/foundry-pc-types",
"foundry-pc-types": "git+https://git.f3l.de/dungeonslayers/foundry-pc-types.git#f3l-fixes",
"fs-extra": "^9.0.1",
"gulp": "^4.0.2",
"gulp-git": "^2.10.1",