Skip to content

Commit

Permalink
Merge pull request #862 from Muttley/develop
Browse files Browse the repository at this point in the history
Update release branch
  • Loading branch information
Muttley authored Aug 26, 2024
2 parents c8c0646 + d9700f4 commit 1da9a36
Show file tree
Hide file tree
Showing 1,539 changed files with 12,280 additions and 4,038 deletions.
8 changes: 8 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# v3.1.0

## Enhancements
* [#853] CSS Styling for Journals
* [#856] Beauty pass over Quickstart journals

---

# v3.0.0

## Enhancements
Expand Down
9 changes: 6 additions & 3 deletions data/packs/conditions.db/blind__xE08WjX14HjHwSJC.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/creatures/eyes/humanoid-single-blind.webp",
"img": "icons/creatures/eyes/humanoid-single-blind.webp",
"name": "Blind",
"origin": "Item.Grd46xo0lgHLtfVe",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
9 changes: 6 additions & 3 deletions data/packs/conditions.db/charmed__g02s1plvTDRI6Ido.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/life/heart-shadow-red.webp",
"img": "icons/magic/life/heart-shadow-red.webp",
"name": "Charmed",
"origin": "Item.fDUPAItc64pmW5zM",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/control/fear-fright-white.webp",
"img": "icons/magic/control/fear-fright-white.webp",
"name": "Condition: Afraid",
"origin": "Item.6Hd5Dzf2TnXL9Gxs",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/control/sleep-bubble-purple.webp",
"img": "icons/magic/control/sleep-bubble-purple.webp",
"name": "Condition: Asleep",
"origin": "Item.FoXNI5CfBkJOvJ9c",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/control/hypnosis-mesmerism-pendulum.webp",
"img": "icons/magic/control/hypnosis-mesmerism-pendulum.webp",
"name": "Condition: Beguiled",
"origin": "Item.4OcLCPW1pxzTua7d",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/creatures/invertebrates/centipede-brown.webp",
"img": "icons/creatures/invertebrates/centipede-brown.webp",
"name": "Condition: Bug Brain",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/control/energy-stream-link-spiral-white.webp",
"img": "icons/magic/control/energy-stream-link-spiral-white.webp",
"name": "Condition: Compelled",
"origin": "Item.7DNtQwX31lpChHZH",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/unholy/strike-body-explode-disintegrate.webp",
"img": "icons/magic/unholy/strike-body-explode-disintegrate.webp",
"name": "Condition: Cursed",
"origin": "Item.T7PD6qqfanwAMEzo",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/death/skull-poison-green.webp",
"img": "icons/magic/death/skull-poison-green.webp",
"name": "Condition: Disease (1)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/death/skull-poison-green.webp",
"img": "icons/magic/death/skull-poison-green.webp",
"name": "Condition: Disease (2)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/death/skull-poison-green.webp",
"img": "icons/magic/death/skull-poison-green.webp",
"name": "Condition: Disease (3)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/death/skull-poison-green.webp",
"img": "icons/magic/death/skull-poison-green.webp",
"name": "Condition: Disease (4)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/unholy/strike-body-life-soul-green.webp",
"img": "icons/magic/unholy/strike-body-life-soul-green.webp",
"name": "Condition: Drained (1)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/unholy/strike-body-life-soul-green.webp",
"img": "icons/magic/unholy/strike-body-life-soul-green.webp",
"name": "Condition: Drained (2)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/unholy/strike-body-life-soul-green.webp",
"img": "icons/magic/unholy/strike-body-life-soul-green.webp",
"name": "Condition: Drained (3)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/unholy/strike-body-life-soul-green.webp",
"img": "icons/magic/unholy/strike-body-life-soul-green.webp",
"name": "Condition: Drained (4)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/unholy/strike-body-life-soul-green.webp",
"img": "icons/magic/unholy/strike-body-life-soul-green.webp",
"name": "Condition: Drained (5)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/unholy/strike-body-life-soul-green.webp",
"img": "icons/magic/unholy/strike-body-life-soul-green.webp",
"name": "Condition: Drained (6)",
"origin": null,
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/commodities/bones/bone-broken-grey.webp",
"img": "icons/commodities/bones/bone-broken-grey.webp",
"name": "Condition: Fragile",
"origin": "Item.pcBuNszkAjGRJ0XX",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/creatures/abilities/mouth-teeth-human.webp",
"img": "icons/creatures/abilities/mouth-teeth-human.webp",
"name": "Condition: Gibbering",
"origin": "Item.iU2qaminUz77BQ0L",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"startTurn": null,
"turns": null
},
"icon": "icons/magic/light/explosion-star-glow-silhouette.webp",
"img": "icons/magic/light/explosion-star-glow-silhouette.webp",
"name": "Condition: Invisible",
"origin": "Item.SMXbMbXcj5hLvTjY",
"statuses": [
],
"tint": null,
"transfer": true
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Loading

0 comments on commit 1da9a36

Please sign in to comment.