Skip to content

Commit b838160

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/cheatGUI/babel/core-7.18.2
2 parents 59997df + ba30451 commit b838160

File tree

8 files changed

+65
-107
lines changed

8 files changed

+65
-107
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,22 @@
99

1010

1111

12-
# GitHub config was set up by gemsvido
13-
/.github/ @afkvido
12+
# GitHub config
13+
/.github/ @afkvido @donaldli2020 @Erisfiregamer1
1414

1515

16-
# PHEx was originally created by UnstableRus, now maintained by ProdigyPNP.
17-
/PHEx/ @UnstableRus @afkvido @donaldli2020 @Erisfiregamer1
16+
# PHEx
17+
/PHEx/ @afkvido @donaldli2020 @Erisfiregamer1
1818

1919

20-
# The Cheat GUI was originally created by MelnCat, now maintained by ProdigyPNP.
21-
/willsCheatMenu/ @MelnCat @afkvido @donaldli2020 @Erisfiregamer1
20+
# The cheat GUI
21+
/willsCheatMenu/ @afkvido @donaldli2020 @Erisfiregamer1
2222

2323

24-
# Oldguard was created by Natsumi
25-
/oldguard/ @PatheticMustan
2624

27-
28-
# Repository metadata & wiki is managed by ProdigyPNP
25+
# Repository metadata & wiki
2926
/meta/ @afkvido @donaldli2020 @Erisfiregamer1
3027

3128

32-
# Code snippets were made by --------- (IM STILL TRYNNA FIND WHO)
33-
# /.vscode/
34-
35-
36-
# Typings were made by --------- (IM STILL TRYNNA FIND WHO)
37-
# /typings/
38-
39-
40-
4129

4230
# ------- END CODEOWNERS -------

.github/workflows/codacy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
4141
- name: Run Codacy Analysis CLI
42-
uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
42+
uses: codacy/codacy-analysis-cli-action@f38648320929161d81646834fbee4d75f6502aea
4343
with:
4444
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
4545
# You can also omit the token and run the tools that support default configurations

PHEx/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

PHEx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"dependencies": {
3737
"dir-archiver": "^1.1.2",
3838
"simple-archiver": "^1.0.1",
39-
"typescript": "^4.6.4",
39+
"typescript": "^4.7.3",
4040
"zip-dir": "^2.0.0"
4141
}
4242
}

cheatGUI/package-lock.json

Lines changed: 38 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cheatGUI/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
"autoprefixer": "^10.2.5",
3434
"babel": "^6.23.0",
3535
"babel-loader": "^8.2.2",
36-
"css-loader": "^5.1.2",
36+
"css-loader": "^6.7.1",
3737
"postcss": "^8.2.10",
3838
"postcss-loader": "^5.2.0",
3939
"sass": "^1.32.8",
40-
"sass-loader": "^11.0.1",
40+
"sass-loader": "^13.0.0",
4141
"socket.io": "^4.1.3",
4242
"socket.io-client": "^4.1.3",
4343
"source-map-loader": "^2.0.1",

typings/package-lock.json

Lines changed: 7 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

typings/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
},
1515

1616
"dependencies": {
17-
"typescript": "^2.3.4"
17+
"typescript": "^4.7.3"
1818
},
1919
"devDependencies": {
20-
"typescript": "^2.3.4"
20+
"typescript": "^4.7.3"
2121
},
2222
"keywords": [],
2323
"repository": {

0 commit comments

Comments
 (0)