PhoenixPhantom/Spellbook
PhoenixPhantom/Spellbook
1
0
Fork 1
Code Issues 5 Pull requests 1 Projects Releases 5 Packages Wiki Activity Actions

WIP: Add SRD 5.2 magic items #8

Draft
PhoenixPhantom wants to merge 6 commits from Magic-Items_SRD5.2 into master
pull from: Magic-Items_SRD5.2
merge into: PhoenixPhantom:master
Conversation 0 Commits 6 Files changed 12 +2827 -398
PhoenixPhantom commented 2026-05-26 09:00:27 +02:00
Owner
Copy link
No description provided.
PhoenixPhantom force-pushed Magic-Items_SRD5.2 from a3103e1002 to ca25519554 2026-05-27 08:28:55 +02:00 Compare
PhoenixPhantom force-pushed Magic-Items_SRD5.2 from ca25519554 to 7c2600325e 2026-05-27 15:53:40 +02:00 Compare
PhoenixPhantom force-pushed Magic-Items_SRD5.2 from 7c2600325e to 4d93191ecf 2026-06-01 16:32:14 +02:00 Compare
PhoenixPhantom force-pushed Magic-Items_SRD5.2 from fe7c1e8766 to 876f0ff354 2026-06-01 21:57:24 +02:00 Compare
PhoenixPhantom force-pushed Magic-Items_SRD5.2 from 876f0ff354 to e6b9752f07 2026-06-03 13:18:34 +02:00 Compare
PhoenixPhantom force-pushed Magic-Items_SRD5.2 from e6b9752f07 to 97d66aa22f 2026-06-11 12:48:44 +02:00 Compare
PhoenixPhantom force-pushed Magic-Items_SRD5.2 from 97d66aa22f to 3294630805 2026-06-18 09:51:37 +02:00 Compare
This pull request has changes conflicting with the target branch.
  • composeApp/src/commonMain/kotlin/ch/phantomphoenix/spellbook/creatures/e2024/Animal.kt
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin Magic-Items_SRD5.2:Magic-Items_SRD5.2
git switch Magic-Items_SRD5.2

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff Magic-Items_SRD5.2
git switch Magic-Items_SRD5.2
git rebase master
git switch master
git merge --ff-only Magic-Items_SRD5.2
git switch Magic-Items_SRD5.2
git rebase master
git switch master
git merge --no-ff Magic-Items_SRD5.2
git switch master
git merge --squash Magic-Items_SRD5.2
git switch master
git merge --ff-only Magic-Items_SRD5.2
git switch master
git merge Magic-Items_SRD5.2
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Compat
Breaking
 Breaking change that won't be backward compatible

  
Kind/Bug
Something is not working

  
Kind/Documentation
Documentation changes

  
Kind/Enhancement
Improve existing functionality

  
Kind/Feature
New functionality

  
Kind/Security
This is security issue

  
Kind/Testing
Issue or pull request related to testing

  
Priority
Critical
 The priority is critical

  
Priority
High
 The priority is high

  
Priority
Low
 The priority is low

  
Priority
Medium
 The priority is medium

  
Reviewed
Confirmed
 Issue has been confirmed

  
Reviewed
Duplicate
 This issue or pull request already exists

  
Reviewed
Invalid
 Invalid issue

  
Reviewed
Won't Fix
 This issue won't be fixed

  
Status
Abandoned
 Somebody has started to work on this but abandoned work

  
Status
Blocked
 Something is blocking this issue or pull request

  
Status
Need More Info
 Feedback is required to reproduce issue or to continue work

  
Subject
Content
 Concerns the information included by default

  
Subject
Processing
 Concerns the internal processing of data

  
Subject
UI
 Concerns the User Interface

No labels
Compat
Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Subject
Content
Subject
Processing
Subject
UI
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
PhoenixPhantom/Spellbook!8
No description provided.