Skip to content

Commit

Permalink
Merge branch 'master' into d2ai-speedup-paths
Browse files Browse the repository at this point in the history
  • Loading branch information
delphiactual authored Nov 29, 2023
2 parents 0363784 + 2cda7f0 commit 9bbc1de
Show file tree
Hide file tree
Showing 16 changed files with 353 additions and 916 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/push-to-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,6 @@ jobs:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: yarn
cache-dependency-path: |
d2ai-module/yarn.lock
DIM/yarn.lock
- name: Update DIM with new info from D2AI
id: DIM
working-directory: DIM
Expand Down
2 changes: 1 addition & 1 deletion Destiny-2-Font-Symbols
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@
| season-tags.json | a mapping between season name (short) and season number |
| season-to-source.json | a mapping between sources and the season they were introduced in |
| seasonal-challenges.json | a mapping between seasonal challenges and the criteria to complete them |
| seasonal-armor-mods.json | a list of armor mods that might only be available in certain seasons (in addition to the reduced-cost versions in reduced-mod-cost-hashes) |
| seasons_backup.json | a 1:1 listing of every item hash and the season it was introduced |
| seasons.json | a listing of item hashes to season, this does not include items that the season can be deduced another way (e.g. displayVersionWatermarkIcons or sources with a season) |
| source-info.ts | a listing between tags and the sources associated with them |
| sources.json | a listing containing source hash to source description |
| specialty-modslot-metadata.ts | deprecated specialty modslot metadata |
| spider-mats.json | an array of item hashes containing materials Spider (now Rahool) used to posses for purchase |
| spider-purchaseables-to-mats.json | Vendor item hashes to actual item hashes for Spider (now Rahool) |
| stat-effects.ts | a most likely outdated listing between tiers and associated cooldowns |
| subclass-plug-category-hashes.json | an array of subclass plug category hashes |
| symbol-name-sources.ts | well-known and useful Destiny 2 font symbols together with a way to retrieve localized names from the definitions |
| trait-to-enhanced-trait.json | a mapping between normal trait and its enhanced variant |
| universal-ornament-plugsethashes.json | an array of hashes for univeral ornament PlugSets, because you need to check canInsert instead of enabled for availability |
| universal-ornament-aux-sets.json | a mapping from classType -> universal ornament sets for sets where where set grouping cannot be derived from collections |
| unreferenced-collections-items.json | a map of collections entries to additional items they should cover |
| voice-dim-valid-perks.json | a listing of all valid perk names for use in voiceDIM |
| watermark-to-event.json | a mapping between watermark icon and the event it belongs to (see EVENTS.md) |
Expand Down
Loading

0 comments on commit 9bbc1de

Please sign in to comment.