Skip to content

Commit

Permalink
Merge branch 'v1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
JovannMC committed Jun 22, 2024
2 parents 86efa30 + ba82100 commit 994e1fd
Show file tree
Hide file tree
Showing 20 changed files with 2,546 additions and 2,189 deletions.
File renamed without changes.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ typings/
# Vite
.vite/

# Stores VSCode versions used for testing VSCode extensions
.vscode-test
.vscode

dist/

src/config.json
Expand Down
5 changes: 3 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"tabWidth": 4,
"useTabs": false
}
"useTabs": false,
"printWidth": 100
}
40 changes: 0 additions & 40 deletions .vscode/settings.json

This file was deleted.

1,547 changes: 1,067 additions & 480 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "slimetora",
"productName": "slimetora",
"version": "1.0.0",
"description": "A program that connects the HaritoraX Wireless trackers to the SlimeVR server",
"type": "module",
"version": "1.1.0",
"description": "A program that connects the HaritoraX full body trackers to the SlimeVR server",
"private": true,
"author": {
"name": "BracketProto",
Expand All @@ -24,31 +25,36 @@
"preload": "del-cli dist/ && tsc && npm run copy-files",
"copy-files": "copyfiles -u 1 \"src/**/*.js\" \"src/**/*.html\" \"src/**/*.css\" \"src/**/*.ico\" \"src/**/*.png\" \"src/**/*.svg\" \"src/**/*.fbx\" \"src/static/languages/**/*\" dist/",
"build-bulma": "npx sass --watch ./src/static/css/index.scss ./src/static/css/index.css",
"lint": "eslint **/*.js"
"lint": "eslint ./src/**/*.ts"
},
"keywords": [],
"license": "MIT",
"devDependencies": {
"@electron/packager": "^18.3.2",
"@electron/rebuild": "^3.6.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.12.5",
"@types/serialport": "^8.0.5",
"@types/three": "^0.164.0",
"bestzip": "^2.2.1",
"copyfiles": "^2.4.1",
"del-cli": "^5.1.0",
"electron": "29.1.6",
"electron-rebuild": "^3.2.9",
"electron": "^30.1.0",
"eslint": "^8.57.0",
"typescript": "^5.4.4"
"node-gyp-build": "4.8.0",
"typescript": "^5.4.5"
},
"dependencies": {
"@slimevr/firmware-protocol": "^0.5.1",
"@slimevr/common": "^0.1.2",
"@slimevr/firmware-protocol": "^0.6.3",
"@slimevr/tracker-emulation": "^0.2.2",
"bulma": "^1.0.0",
"haritorax-interpreter": "^1.8.3",
"haritorax-interpreter": "^2.0.0",
"i18next": "^23.11.1",
"loc-i18next": "^0.1.6",
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"quaternion": "^1.5.1",
"sass": "^1.72.0",
"three": "^0.164.1"
"three": "^0.165.0"
}
}
Loading

0 comments on commit 994e1fd

Please sign in to comment.