Skip to content

Commit

Permalink
Merge branch 'master' into breakerama
Browse files Browse the repository at this point in the history
  • Loading branch information
bhollis authored Sep 23, 2024
2 parents c1b9fee + 53320a9 commit 9b0c405
Show file tree
Hide file tree
Showing 37 changed files with 796 additions and 755 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/i18n-bot-download.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: pnpm install --frozen-lockfile --prefer-offline

- name: Download updated i18n files
uses: crowdin/github-action@v2.1.2
uses: crowdin/github-action@v2.2.0
with:
upload_sources: false
upload_translations: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/i18n-bot-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: dimJSON="$(jq -S . src/locale/en.json)" && echo "${dimJSON}" > src/locale/en.json

- name: Upload updated en.json to crowdin
uses: crowdin/github-action@v2.1.2
uses: crowdin/github-action@v2.2.0
with:
upload_sources: true
upload_translations: false
Expand Down
4 changes: 1 addition & 3 deletions config/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@
"DevVersion": "Are you running a development version of DIM? You must register your chrome extension with Bungie.net.",
"Difficulties": "Bungie.net is currently experiencing difficulties.",
"ErrorTitle": "Bungie.net Error",
"ItemUniquenessExplanation": "You tried to move the '{{name}}' {{type}} to your {{character}} but that destination already has that item and is only allowed one.",
"ItemUniquenessExplanation_female": "You tried to move the '{{name}}' {{type}} to your {{character}} but that destination already has that item and is only allowed one.",
"ItemUniquenessExplanation_male": "You tried to move the '{{name}}' {{type}} to your {{character}} but that destination already has that item and is only allowed one.",
"ItemUniquenessExplanation": "A character can only have one of '{{name}}' on it.",
"Maintenance": "Bungie.net servers are down for maintenance.",
"MissingInventory": "Bungie.net did not return your inventory, possibly because your privacy settings prevent it. Try logging out and logging back in.",
"DestinyCannotPerformActionAtThisLocation": "You cannot equip items or change mods while in an activity. Try heading to orbit or a social area. This is a limitation of the Bungie.net API, not DIM.",
Expand Down
5 changes: 5 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
* Add `breaker:intrinsic` search that highlights items that have an intrinsic breaker ability (i.e. not granted by the seasonal artifact).
* Breaker type granted by the seasonal artifact now has a green box around it, reminiscent of the artifact mod that grants it.

## 8.38.0 <span class="changelog-date">(2024-09-22)</span>

* Renamed `is:class` to `is:subclass`.
* Fixed D1 item category searches such as `is:primary` and `is:horn`. Now they're up to parity with the D2 categories.

## 8.37.0 <span class="changelog-date">(2024-09-15)</span>

## 8.36.1 <span class="changelog-date">(2024-09-12)</span>
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dim",
"version": "8.37.0",
"version": "8.38.0",
"description": "An item manager for Destiny.",
"main": "app/index.html",
"private": true,
Expand Down Expand Up @@ -75,7 +75,7 @@
"last 2 Opera versions"
],
"resolutions": {
"@types/react": "18.3.6",
"@types/react": "18.3.8",
"react-redux": "^9.1.0",
"redux": "^5.0.0",
"react-is": "^18.1.0"
Expand All @@ -90,7 +90,7 @@
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@babel/register": "^7.24.6",
"@eslint-react/eslint-plugin": "^1.14.1",
"@eslint-react/eslint-plugin": "^1.14.2",
"@eslint/compat": "^1.1.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@sigmacomputing/babel-plugin-lodash": "^3.3.5",
Expand All @@ -99,12 +99,12 @@
"@types/dom-screen-wake-lock": "^1.0.3",
"@types/generate-json-webpack-plugin": "^0.3.7",
"@types/jest": "^29.5.13",
"@types/lodash": "^4.17.7",
"@types/lodash": "^4.17.9",
"@types/lodash-webpack-plugin": "^0.11.9",
"@types/node": "22.0.2",
"@types/papaparse": "^5.3.14",
"@types/prop-types": "^15.7.12",
"@types/react": "18.3.6",
"@types/prop-types": "^15.7.13",
"@types/react": "18.3.8",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-dnd-multi-backend": "^6.0.6",
"@types/react-dom": "^18.3.0",
Expand All @@ -114,8 +114,8 @@
"@types/webpack": "^5.28.5",
"@types/webpack-env": "^1.18.5",
"@types/webpack-stats-plugin": "^0.3.5",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"autoprefixer": "^10.4.20",
"babel-jest": "^29.7.0",
"babel-loader": "^9.2.1",
Expand Down Expand Up @@ -163,17 +163,17 @@
"mini-css-extract-plugin": "^2.9.1",
"mini-svg-data-uri": "^1.4.4",
"mkcert": "^3.2.0",
"nodemon": "^3.1.4",
"nodemon": "^3.1.7",
"postcss": "^8.4.47",
"postcss-assets-webpack-plugin": "^4.1.2",
"postcss-loader": "^8.1.1",
"postcss-sort-media-queries": "^5.2.0",
"prettier": "^3.3.3",
"prettier-plugin-organize-imports": "^4.0.0",
"prettier-plugin-organize-imports": "^4.1.0",
"react-refresh": "^0.14.2",
"react-test-renderer": "^18.3.1",
"sass": "^1.78.0",
"sass-loader": "^16.0.1",
"sass": "^1.79.3",
"sass-loader": "^16.0.2",
"source-map-loader": "^5.0.0",
"style-loader": "^4.0.0",
"stylelint": "^16.9.0",
Expand All @@ -188,7 +188,7 @@
"ts-unused-exports": "^10.1.0",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "^5.6.2",
"typescript-eslint": "^8.6.0",
"typescript-eslint": "^8.7.0",
"webpack": "^5.94.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.1.0",
Expand All @@ -202,25 +202,25 @@
"@fortawesome/fontawesome-free": "^5.15.4",
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/react-fontawesome": "^0.2.2",
"@hello-pangea/dnd": "^16.6.0",
"@hello-pangea/dnd": "^17.0.0",
"@popperjs/core": "^2.11.8",
"@react-hook/resize-observer": "^2.0.2",
"@sentry/browser": "^8.30.0",
"@sentry/react": "^8.30.0",
"@sentry/types": "^8.30.0",
"@sentry/browser": "^8.31.0",
"@sentry/react": "^8.31.0",
"@sentry/types": "^8.31.0",
"@tanstack/react-virtual": "^3.10.8",
"@textcomplete/core": "^0.1.13",
"@textcomplete/textarea": "^0.1.13",
"@textcomplete/utils": "^0.1.13",
"bungie-api-ts": "^5.1.0",
"caniuse-lite": "^1.0.30001660",
"caniuse-lite": "^1.0.30001663",
"clsx": "^2.1.1",
"comlink": "^4.4.1",
"core-js": "^3.38.1",
"dnd-core": "^16.0.1",
"downshift": "^9.0.8",
"fast-equals": "^5.0.1",
"framer-motion": "^11.5.4",
"framer-motion": "^11.5.6",
"i18next": "^23.15.1",
"i18next-http-backend": "^2.6.1",
"immer": "^10.1.1",
Expand Down
Loading

0 comments on commit 9b0c405

Please sign in to comment.