Skip to content

Obo Merge#7

Merged
unknown117343 merged 5 commits intoobo24from
obo24foo
Dec 15, 2025
Merged

Obo Merge#7
unknown117343 merged 5 commits intoobo24from
obo24foo

Conversation

@unknown117343
Copy link
Owner

No description provided.

@unknown117343 unknown117343 changed the title Obo24foo Obo Merge Dec 15, 2025
@unknown117343 unknown117343 merged commit 182cdbd into obo24 Dec 15, 2025
1 check passed
unknown117343 pushed a commit that referenced this pull request Dec 18, 2025
* Upload Spells

This commit uploads the spells json file for the Tanks and Flanks source

* Fix name

* Changed Spell Name

Changed detect poison and acid to detect chemicals.

* Fix Acid Mitt

* Restructured

Moved creatures to another file and updated the file naming convention to match other files.

* Fixed meta

Gave each json field a unique value
Changed version number to reflect version number convention
Added dateAdded and dateLastModified.

* Updated sources

Updated sources in stat blocks and spells to match change to json in meta

* Find spell fix

fixed the source for the creatures and fixed the references to the creatures in the spells

* Move high level reaction spells down

Executioner is now more connected to reactions and for a lower level. reclaimed shrapnel is for a lower level

* Move spells

Moved to another file
Removed spell from source name

* Prepped Source Name

Removed creatures from source name to match collections file in preparation to move it over

* Added monsters to collection

Moved the monsters data over to the collection

* Fix creature references

fixed source for creature references

* Update spells

Nerf and lower level of misty step
Ban Find Greater Steed because Find Steed has it built in now.

* Shield, executioner, bane, reclaimed shrapnel

Shield now uses bonus stacking prevention logic
executioner has better wording
bane uses bonus stacking prevention logic
Reclaimed shrapnel works for death saves and countering

* feat experiments

* Feats WIP

* Replaced exhaustion with the vitality mechanic

* Feat update completion attempt 1

* Spell update

Removed dazed condition.
Added effects to the primary healing spells.
Made using your action an option on spells like web.

* Revert "Spell update"

This reverts commit a97f9df.

* Fix spell update

Fixed spell terminology
Fixed new healing spells

* Fix compelled duel

* Redesigned recent changes to healing spells

Isolated changes to healing spells to cure injury and mass cure injury.

* Wrong page name

Cure Injury and Mass Cure Injury had the wrong page name.

* Gave warlock the jump spell

* Spell nerf

This spell is utterly broken

* stabilize terminology change

Change the stabilize action to a specific usage of the help action.

* Updating to 2024 #1

Rewrote animate objects changes
Removed Acid splash changes
Removed aid changes
Added animated object creature as part of the rewritten animate objects spell

* Updating to 2024 #2

Made a series of changes to update to 2024 edition

* Updating to 2024 #3

The listed changes are innaccurate. For some reason github thinks each spell replaced the next spell and so on.

* Cause Fear and Compel Duel

Made cause fear consistent with the changes to compel duel

* Added Shroud of Knight

Fixed cause fear
added shroud of knight
fixed silent knight

* Update more spells

Update spells
added ability innovator feat

* Merge master into dev

* Update Galdeveer; Tanks and Flanks.json

* temporary

* frightened, poisoned and angered update

* Updating to 2024 #3

Left off before enlarge/reduce

* update to 2024 #4

* update to 2024 #4

* Update to 2024 #5

* Update to 2024 #6

* Update to 2024 #7 [FINAL]

* Update feats to 2024 edition

* Update Galdeveer; Tanks and Flanks.json

* Feat backtrack

* Quick feat backtrack

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Restoration and Find Familiar changes

* tweaks

* formatting

* Added edition

* Add the nerfed find familiar spell to ranger

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Set edition to 1

* Fighting Style Update

* Rewriting hand mechanics

* Adjustments to hand mechanics
unknown117343 pushed a commit that referenced this pull request Dec 18, 2025
* Upload Spells

This commit uploads the spells json file for the Tanks and Flanks source

* Fix name

* Changed Spell Name

Changed detect poison and acid to detect chemicals.

* Fix Acid Mitt

* Restructured

Moved creatures to another file and updated the file naming convention to match other files.

* Fixed meta

Gave each json field a unique value
Changed version number to reflect version number convention
Added dateAdded and dateLastModified.

* Updated sources

Updated sources in stat blocks and spells to match change to json in meta

* Find spell fix

fixed the source for the creatures and fixed the references to the creatures in the spells

* Move high level reaction spells down

Executioner is now more connected to reactions and for a lower level. reclaimed shrapnel is for a lower level

* Move spells

Moved to another file
Removed spell from source name

* Prepped Source Name

Removed creatures from source name to match collections file in preparation to move it over

* Added monsters to collection

Moved the monsters data over to the collection

* Fix creature references

fixed source for creature references

* Update spells

Nerf and lower level of misty step
Ban Find Greater Steed because Find Steed has it built in now.

* Shield, executioner, bane, reclaimed shrapnel

Shield now uses bonus stacking prevention logic
executioner has better wording
bane uses bonus stacking prevention logic
Reclaimed shrapnel works for death saves and countering

* feat experiments

* Feats WIP

* Replaced exhaustion with the vitality mechanic

* Feat update completion attempt 1

* Spell update

Removed dazed condition.
Added effects to the primary healing spells.
Made using your action an option on spells like web.

* Revert "Spell update"

This reverts commit a97f9df.

* Fix spell update

Fixed spell terminology
Fixed new healing spells

* Fix compelled duel

* Redesigned recent changes to healing spells

Isolated changes to healing spells to cure injury and mass cure injury.

* Wrong page name

Cure Injury and Mass Cure Injury had the wrong page name.

* Gave warlock the jump spell

* Spell nerf

This spell is utterly broken

* stabilize terminology change

Change the stabilize action to a specific usage of the help action.

* Updating to 2024 #1

Rewrote animate objects changes
Removed Acid splash changes
Removed aid changes
Added animated object creature as part of the rewritten animate objects spell

* Updating to 2024 #2

Made a series of changes to update to 2024 edition

* Updating to 2024 #3

The listed changes are innaccurate. For some reason github thinks each spell replaced the next spell and so on.

* Cause Fear and Compel Duel

Made cause fear consistent with the changes to compel duel

* Added Shroud of Knight

Fixed cause fear
added shroud of knight
fixed silent knight

* Update more spells

Update spells
added ability innovator feat

* Merge master into dev

* Update Galdeveer; Tanks and Flanks.json

* temporary

* frightened, poisoned and angered update

* Updating to 2024 #3

Left off before enlarge/reduce

* update to 2024 #4

* update to 2024 #4

* Update to 2024 #5

* Update to 2024 #6

* Update to 2024 #7 [FINAL]

* Update feats to 2024 edition

* Update Galdeveer; Tanks and Flanks.json

* Feat backtrack

* Quick feat backtrack

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Restoration and Find Familiar changes

* tweaks

* formatting

* Added edition

* Add the nerfed find familiar spell to ranger

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Set edition to 1

* Fighting Style Update

* Rewriting hand mechanics

* Adjustments to hand mechanics

* Added bashing

* Simple Fighting

* More fighting styles
unknown117343 pushed a commit that referenced this pull request Jan 5, 2026
* Upload Spells

This commit uploads the spells json file for the Tanks and Flanks source

* Fix name

* Changed Spell Name

Changed detect poison and acid to detect chemicals.

* Fix Acid Mitt

* Restructured

Moved creatures to another file and updated the file naming convention to match other files.

* Fixed meta

Gave each json field a unique value
Changed version number to reflect version number convention
Added dateAdded and dateLastModified.

* Updated sources

Updated sources in stat blocks and spells to match change to json in meta

* Find spell fix

fixed the source for the creatures and fixed the references to the creatures in the spells

* Move high level reaction spells down

Executioner is now more connected to reactions and for a lower level. reclaimed shrapnel is for a lower level

* Move spells

Moved to another file
Removed spell from source name

* Prepped Source Name

Removed creatures from source name to match collections file in preparation to move it over

* Added monsters to collection

Moved the monsters data over to the collection

* Fix creature references

fixed source for creature references

* Update spells

Nerf and lower level of misty step
Ban Find Greater Steed because Find Steed has it built in now.

* Shield, executioner, bane, reclaimed shrapnel

Shield now uses bonus stacking prevention logic
executioner has better wording
bane uses bonus stacking prevention logic
Reclaimed shrapnel works for death saves and countering

* feat experiments

* Feats WIP

* Replaced exhaustion with the vitality mechanic

* Feat update completion attempt 1

* Spell update

Removed dazed condition.
Added effects to the primary healing spells.
Made using your action an option on spells like web.

* Revert "Spell update"

This reverts commit a97f9df.

* Fix spell update

Fixed spell terminology
Fixed new healing spells

* Fix compelled duel

* Redesigned recent changes to healing spells

Isolated changes to healing spells to cure injury and mass cure injury.

* Wrong page name

Cure Injury and Mass Cure Injury had the wrong page name.

* Gave warlock the jump spell

* Spell nerf

This spell is utterly broken

* stabilize terminology change

Change the stabilize action to a specific usage of the help action.

* Updating to 2024 #1

Rewrote animate objects changes
Removed Acid splash changes
Removed aid changes
Added animated object creature as part of the rewritten animate objects spell

* Updating to 2024 #2

Made a series of changes to update to 2024 edition

* Updating to 2024 #3

The listed changes are innaccurate. For some reason github thinks each spell replaced the next spell and so on.

* Cause Fear and Compel Duel

Made cause fear consistent with the changes to compel duel

* Added Shroud of Knight

Fixed cause fear
added shroud of knight
fixed silent knight

* Update more spells

Update spells
added ability innovator feat

* Merge master into dev

* Update Galdeveer; Tanks and Flanks.json

* temporary

* frightened, poisoned and angered update

* Updating to 2024 #3

Left off before enlarge/reduce

* update to 2024 #4

* update to 2024 #4

* Update to 2024 #5

* Update to 2024 #6

* Update to 2024 #7 [FINAL]

* Update feats to 2024 edition

* Update Galdeveer; Tanks and Flanks.json

* Feat backtrack

* Quick feat backtrack

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Restoration and Find Familiar changes

* tweaks

* formatting

* Added edition

* Add the nerfed find familiar spell to ranger

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Set edition to 1

* Fighting Style Update

* Rewriting hand mechanics

* Adjustments to hand mechanics

* Added bashing

* Simple Fighting

* More fighting styles

* Balance Fighting Style

* Weapon Proficiency

Changed it for parity with other features

* Remove amputee and blind

* Remove old healing spells. Fix metabolize

* Familiar and Steed Spells

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* Update Galdeveer; Tanks and Flanks.json

* remove rewards

* Removed repeat info
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant