Skip to content

Commit

Permalink
Merge branch 'master' into UAH
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown117343 authored Dec 15, 2024
2 parents 0822705 + 69a5200 commit 1170845
Show file tree
Hide file tree
Showing 51 changed files with 38,215 additions and 2,140 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.

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
10 changes: 5 additions & 5 deletions book/Ghostfire Gaming; Grim Hollow Player's Guide.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
],
"dateAdded": 1620477826,
"dateLastModified": 1729630006,
"dateLastModified": 1733315669,
"optionalFeatureTypes": {
"AdvT": "Adventurer's Talents",
"LC:C": "Living Crucible: Compounds",
Expand Down Expand Up @@ -47,7 +47,7 @@
"BGT:P": "Background Talent; Pauper & Pit Fighter",
"BGT:S": "Background Talent; Seafarer"
},
"_dateLastModifiedHash": "a70bde7367",
"_dateLastModifiedHash": "eefc00b2bf",
"edition": "classic"
},
"book": [
Expand Down Expand Up @@ -12189,7 +12189,7 @@
],
"toolProficiencies": [
{
"setGaming": true
"anyGamingSet": 1
}
],
"languageProficiencies": [
Expand Down Expand Up @@ -12420,7 +12420,7 @@
],
"toolProficiencies": [
{
"setGaming": true
"anyGamingSet": 1
}
],
"languageProficiencies": [
Expand Down Expand Up @@ -12640,7 +12640,7 @@
],
"toolProficiencies": [
{
"setGaming": true
"anyGamingSet": 1
}
],
"languageProficiencies": [
Expand Down
6 changes: 3 additions & 3 deletions book/MCDM Productions; Arcadia Issue 2.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"edition": "classic",
"status": "ready",
"dateAdded": 1615457594,
"dateLastModified": 1732488243,
"_dateLastModifiedHash": "cf4d04c7cc"
"dateLastModified": 1733692673,
"_dateLastModifiedHash": "e68d056e6f"
},
"subclass": [
{
Expand Down Expand Up @@ -19694,7 +19694,7 @@
"width": 401,
"height": 534
},
"{@b Makenzie De Armas} is an award-winning game designer and writer. In addition to her work for ARCADIA, she has also served as the lead writer for {@i The Islands of Sina Una} and co-designer for MCDM's {@i Kingdoms & Warfare}. She now works full-time as an Associate Game Designer for D&D at Wizards of the Coast. You can usually find her rambling into the void on Twitter at @MakenzieLaneDA."
"{@b Makenzie De Armas} is an award-winning game designer and writer. In addition to her work for ARCADIA, she has also served as the lead writer for {@i The Islands of Sina Una} and co-designer for MCDM's {@loader Kingdoms & Warfare|book/MCDM Productions; Kingdoms & Warfare.json}. She now works full-time as an Associate Game Designer for D&D at Wizards of the Coast. You can usually find her rambling into the void on Twitter at @MakenzieLaneDA."
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions book/MCDM Productions; Arcadia Issue 3.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"edition": "classic",
"status": "ready",
"dateAdded": 1620088248,
"dateLastModified": 1732050890,
"_dateLastModifiedHash": "db2b00abcc"
"dateLastModified": 1733692673,
"_dateLastModifiedHash": "5c27980013"
},
"race": [
{
Expand Down Expand Up @@ -15322,7 +15322,7 @@
"width": 480,
"height": 376
},
"{@b Sam Mannell} is a writer and designer based in Tamaki Makaurau, Aotearoa, a distant place known to some as Auckland, New Zealand. When not running or playing games, Sam is writing, making coffee, drinking club mate, or eating Thai food. He aspires to publish books, and if many of them happen to be roleplaying games, so be it. You can find more of Sam's work in MCDM's upcoming {@book Kingdoms & Warfare|KaW}, and you can be made aware of his location and movements by keeping an eye on {@link crypticparlour.com}, or following him on Twitter {@link @crypticparlour|https://twitter.com/crypticparlour}."
"{@b Sam Mannell} is a writer and designer based in Tamaki Makaurau, Aotearoa, a distant place known to some as Auckland, New Zealand. When not running or playing games, Sam is writing, making coffee, drinking club mate, or eating Thai food. He aspires to publish books, and if many of them happen to be roleplaying games, so be it. You can find more of Sam's work in MCDM's upcoming {@loader Kingdoms & Warfare|book/MCDM Productions; Kingdoms & Warfare.json}, and you can be made aware of his location and movements by keeping an eye on {@link crypticparlour.com}, or following him on Twitter {@link @crypticparlour|https://twitter.com/crypticparlour}."
]
},
{
Expand Down
11 changes: 6 additions & 5 deletions book/MCDM Productions; Arcadia Issue 5.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
],
"version": "1.0",
"url": "https://shop.mcdmproductions.com/collections/arcadia/products/arcadia-complete-bundle-issues-1-30",
"color": "22503d"
"color": "22503d",
"dateReleased": "2021-06-23"
}
],
"dependencies": {
Expand All @@ -28,8 +29,8 @@
"edition": "classic",
"status": "ready",
"dateAdded": 1626427893,
"dateLastModified": 1732488047,
"_dateLastModifiedHash": "58fac1ca52"
"dateLastModified": 1733692673,
"_dateLastModifiedHash": "f0c6d8aebb"
},
"subclass": [
{
Expand Down Expand Up @@ -3173,7 +3174,7 @@
"type": "external",
"url": "https://raw.githubusercontent.com/TheGiddyLimit/homebrew-img/main/img/Ar5/cover.webp"
},
"published": "2021-06-01",
"published": "2021-06-23",
"author": "James Introcaso, Leon Barillaro, Carlos Cisco, Sam Mannell",
"contents": [
{
Expand Down Expand Up @@ -4447,7 +4448,7 @@
"height": 406
},
"{@b Sam Mannell} is a writer and designer based in Tamaki Makaurau, Aotearoa, a distant place known to some as Auckland, New Zealand. When not running or playing games, Sam is writing, making coffee, drinking club mate, or eating Thai food. He aspires to publish books, and if many of them happen to be roleplaying games, so be it.",
"You can find more of Sam's work in MCDM's {@i Kingdoms & Warfare}, and you can be made aware of his location and movements by keeping an eye on {@link crypticparlour.com|https://crypticparlour.com/} or following him on Twitter {@link @crypticparlour|https://twitter.com/crypticparlour}."
"You can find more of Sam's work in MCDM's {@loader Kingdoms & Warfare|book/MCDM Productions; Kingdoms & Warfare.json}, and you can be made aware of his location and movements by keeping an eye on {@link crypticparlour.com|https://crypticparlour.com/} or following him on Twitter {@link @crypticparlour|https://twitter.com/crypticparlour}."
]
}
]
Expand Down
Loading

0 comments on commit 1170845

Please sign in to comment.