Skip to content

Commit

Permalink
Merge branch 'master' into selerim
Browse files Browse the repository at this point in the history
  • Loading branch information
DaveParkinglot authored Dec 11, 2024
2 parents 3c9da85 + 69a5200 commit 4bfdc6b
Show file tree
Hide file tree
Showing 89 changed files with 89,556 additions and 16,917 deletions.
2 changes: 1 addition & 1 deletion _generated/index-adventure-book-ids.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _generated/index-meta.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _generated/index-props.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _generated/index-sources.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _generated/index-timestamps.json

Large diffs are not rendered by default.

Binary file added _img/FleeMortals/token/Goxomoc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _img/FleeMortals/token/Swarm of Spiders.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _img/FleeMortals/token/Zenith Aastrika.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _img/JennysHomebrewStuff/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Some files in this directory correspond to a homebrew which has been overhauled.
- Arcadia Issue 2 Images
- Arcadia Issue 4 Images
- Arcadia Issue 5 Images
- Arcadia Issue 6 Images

### Root Files
- Coverpage.png
Expand Down
8 changes: 4 additions & 4 deletions background/D&D Wiki; Featured Quality Backgrounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
}
],
"dateAdded": 1633834544,
"dateLastModified": 1729630006,
"_dateLastModifiedHash": "297daefba9",
"dateLastModified": 1733315669,
"_dateLastModifiedHash": "53122f19b6",
"edition": "classic"
},
"background": [
Expand Down Expand Up @@ -1418,8 +1418,8 @@
],
"toolProficiencies": [
{
"land vehicle": true,
"farm implement": true
"vehicles (land)": true,
"farm implement|dndwiki-bestbackgrounds": true
}
],
"entries": [
Expand Down
Loading

0 comments on commit 4bfdc6b

Please sign in to comment.