Skip to content

Commit

Permalink
Merge branch 'staging' into feat/import-and-user-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
LudovicMalot authored Jul 20, 2024
2 parents 27a3396 + 348e12a commit eb8d8b2
Show file tree
Hide file tree
Showing 50 changed files with 1,898 additions and 2,228 deletions.
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
"socket.io": "^4.7.5",
"socket.io-client": "^4.7.5",
"svelte-i18next": "^2.2.2",
"svelte-legos": "^0.2.3",
"svelte-persisted-store": "^0.11.0",
"svelte-sonner": "^0.3.27",
"svelte-ux": "^0.73.3",
"sveltekit-superforms": "^2.16.0",
"tailwind-merge": "^2.4.0",
"tailwind-variants": "^0.2.1",
"tw-colors": "^3.3.1",
"vaul-svelte": "^0.3.2",
"zod": "^3.23.8"
},
"devDependencies": {
Expand All @@ -53,24 +55,24 @@
"autoprefixer": "^10.4.19",
"eslint": "^9.7.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-svelte": "^2.43.0",
"husky": "^9.1.0",
"husky": "^9.1.1",
"lint-staged": "^15.2.7",
"postcss": "^8.4.39",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.6",
"sass": "^1.77.8",
"svelte": "^4.2.18",
"svelte-check": "^3.8.4",
"svelte-eslint-parser": "^0.40.0",
"svelte-eslint-parser": "^0.41.0",
"svelte-headless-table": "^0.18.2",
"svelte-lucide": "^1.0.6",
"tailwindcss": "^3.4.4",
"tslib": "^2.6.3",
"typescript": "^5.5.3",
"typescript-eslint": "^7.16.0",
"vite": "^5.3.3",
"vite": "^5.3.4",
"vite-plugin-pwa": "^0.20.0"
},
"engines": {
Expand Down
208 changes: 97 additions & 111 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Binary file removed src/lib/assets/Icon_Gold_Star.png
Binary file not shown.
Binary file removed src/lib/assets/Icon_Purple_Star.png
Binary file not shown.
Binary file removed src/lib/assets/Icon_Weapon_Bow.png
Binary file not shown.
Binary file removed src/lib/assets/Icon_Weapon_Catalyst.png
Binary file not shown.
Binary file removed src/lib/assets/Icon_Weapon_Claymore.png
Binary file not shown.
Binary file removed src/lib/assets/Icon_Weapon_Polearm.png
Binary file not shown.
Binary file removed src/lib/assets/Icon_Weapon_Sword.png
Binary file not shown.
537 changes: 0 additions & 537 deletions src/lib/assets/icons/Element_Cryo.svg

This file was deleted.

382 changes: 0 additions & 382 deletions src/lib/assets/icons/Element_Geo.svg

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
162 changes: 162 additions & 0 deletions src/lib/assets/icons/elements/Element_Cryo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 66 additions & 0 deletions src/lib/assets/icons/elements/Element_Geo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit eb8d8b2

Please sign in to comment.