Skip to content

Commit

Permalink
Merge branch 'master' into Ar6
Browse files Browse the repository at this point in the history
revilowaldow authored Dec 6, 2024
2 parents aabb484 + 54584fe commit 4ec767b
Showing 83 changed files with 45,627 additions and 12,643 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.
4 changes: 2 additions & 2 deletions background/D&D Wiki; Featured Quality Backgrounds.json
Original file line number Diff line number Diff line change
@@ -1418,8 +1418,8 @@
],
"toolProficiencies": [
{
"land vehicle": true,
"farm implement": true
"vehicles (land)": true,
"farm implement|dndwiki-bestbackgrounds": true
}
],
"entries": [
194 changes: 97 additions & 97 deletions book/Ghostfire Gaming; Grim Hollow Campaign Guide.json
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@
"BGT:S": "Background Talent; Seafarer"
},
"dateAdded": 1618022160,
"dateLastModified": 1730324372,
"_dateLastModifiedHash": "f74710c8a3",
"dateLastModified": 1733169901,
"_dateLastModifiedHash": "4fcaee300b",
"edition": "classic"
},
"spell": [
@@ -7122,11 +7122,11 @@
"history": true,
"choose": {
"from": [
"Arcana",
"Investigation",
"Medicine",
"Nature",
"Religion"
"arcana",
"investigation",
"medicine",
"nature",
"religion"
],
"count": 1
}
@@ -7340,11 +7340,11 @@
"investigation": true,
"choose": {
"from": [
"Arcana",
"arcana",
"history",
"Medicine",
"Nature",
"Religion"
"medicine",
"nature",
"religion"
],
"count": 1
}
@@ -7557,11 +7557,11 @@
"medicine": true,
"choose": {
"from": [
"Arcana",
"arcana",
"history",
"Investigation",
"Nature",
"Religion"
"investigation",
"nature",
"religion"
],
"count": 1
}
@@ -7785,11 +7785,11 @@
"deception": true,
"choose": {
"from": [
"History",
"Insight",
"Performance",
"Persuasion",
"Religion"
"history",
"insight",
"performance",
"persuasion",
"religion"
],
"count": 1
}
@@ -7990,11 +7990,11 @@
"insight": true,
"choose": {
"from": [
"History",
"history",
"deception",
"Performance",
"Persuasion",
"Religion"
"performance",
"persuasion",
"religion"
],
"count": 1
}
@@ -8197,11 +8197,11 @@
"persuasion": true,
"choose": {
"from": [
"History",
"history",
"deception",
"Insight",
"Performance",
"Religion"
"insight",
"performance",
"religion"
],
"count": 1
}
@@ -8401,11 +8401,11 @@
"intimidation": true,
"choose": {
"from": [
"History",
"Insight",
"Medicine",
"Persuasion",
"Religion"
"history",
"insight",
"medicine",
"persuasion",
"religion"
],
"count": 1
}
@@ -8620,11 +8620,11 @@
"persuasion": true,
"choose": {
"from": [
"History",
"Insight",
"Medicine",
"history",
"insight",
"medicine",
"intimidation",
"Religion"
"religion"
],
"count": 1
}
@@ -8835,9 +8835,9 @@
"religion": true,
"choose": {
"from": [
"History",
"Insight",
"Medicine",
"history",
"insight",
"medicine",
"intimidation",
"persuasion"
],
@@ -9065,9 +9065,9 @@
"insight": true,
"choose": {
"from": [
"Animal Handling",
"Athletics",
"Nature",
"animal handling",
"athletics",
"nature",
"perception"
],
"count": 1
@@ -9292,9 +9292,9 @@
"performance": true,
"choose": {
"from": [
"Animal Handling",
"Athletics",
"Nature",
"animal handling",
"athletics",
"nature",
"insight",
"perception"
],
@@ -9529,9 +9529,9 @@
"investigation": true,
"choose": {
"from": [
"Animal Handling",
"Athletics",
"Nature",
"animal handling",
"athletics",
"nature",
"insight",
"perception"
],
@@ -9762,11 +9762,11 @@
"deception": true,
"choose": {
"from": [
"Acrobatics",
"Athletics",
"acrobatics",
"athletics",
"intimidation",
"Sleight of Hand",
"Stealth"
"sleight of hand",
"stealth"
],
"count": 1
}
@@ -9982,11 +9982,11 @@
"intimidation": true,
"choose": {
"from": [
"Acrobatics",
"Athletics",
"acrobatics",
"athletics",
"deception",
"Sleight of Hand",
"Stealth"
"sleight of hand",
"stealth"
],
"count": 1
}
@@ -10200,12 +10200,12 @@
"perception": true,
"choose": {
"from": [
"Acrobatics",
"Athletics",
"acrobatics",
"athletics",
"deception",
"intimidation",
"Sleight of Hand",
"Stealth"
"sleight of hand",
"stealth"
],
"count": 1
}
@@ -10414,9 +10414,9 @@
"intimidation": true,
"choose": {
"from": [
"Animal Handling",
"Athletics",
"Insight",
"animal handling",
"athletics",
"insight",
"perception",
"survival"
],
@@ -10620,9 +10620,9 @@
"perception": true,
"choose": {
"from": [
"Animal Handling",
"Athletics",
"Insight",
"animal handling",
"athletics",
"insight",
"intimidation",
"survival"
],
@@ -10825,9 +10825,9 @@
"athletics": true,
"choose": {
"from": [
"Animal Handling",
"animal handling",
"perception",
"Insight",
"insight",
"intimidation",
"survival"
],
@@ -11037,12 +11037,12 @@
"survival": true,
"choose": {
"from": [
"Animal Handling",
"Athletics",
"Medicine",
"Nature",
"animal handling",
"athletics",
"medicine",
"nature",
"perception",
"Stealth"
"stealth"
],
"count": 1
}
@@ -11269,12 +11269,12 @@
"nature": true,
"choose": {
"from": [
"Animal Handling",
"Athletics",
"Medicine",
"animal handling",
"athletics",
"medicine",
"survival",
"perception",
"Stealth"
"stealth"
],
"count": 1
}
@@ -11496,12 +11496,12 @@
"survival": true,
"choose": {
"from": [
"Animal Handling",
"Athletics",
"Medicine",
"Nature",
"animal handling",
"athletics",
"medicine",
"nature",
"perception",
"Stealth"
"stealth"
],
"count": 1
}
@@ -11713,10 +11713,10 @@
"perception": true,
"choose": {
"from": [
"Athletics",
"Persuasion",
"Sleight of Hand",
"Survival"
"athletics",
"persuasion",
"sleight of hand",
"survival"
],
"count": 1
}
@@ -11952,11 +11952,11 @@
"investigation": true,
"choose": {
"from": [
"Athletics",
"Persuasion",
"Perception",
"Sleight of Hand",
"Survival"
"athletics",
"persuasion",
"perception",
"sleight of hand",
"survival"
],
"count": 1
}
@@ -12192,13 +12192,13 @@
],
"skillProficiencies": [
{
"Survival": true,
"survival": true,
"choose": {
"from": [
"Athletics",
"Persuasion",
"Perception",
"Sleight of Hand"
"athletics",
"persuasion",
"perception",
"sleight of hand"
],
"count": 1
}
Loading

0 comments on commit 4ec767b

Please sign in to comment.