Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport #71428, #71432 and #71449 #73900

Merged
merged 3 commits into from
May 19, 2024
Merged

Backport #71428, #71432 and #71449 #73900

merged 3 commits into from
May 19, 2024

Conversation

Procyonae
Copy link
Contributor

Summary

None

Purpose of change

All labelled for backport

Describe the solution

Backport #71428, #71432 and #71449

Describe alternatives you've considered

Testing

Additional context

Fris0uman and others added 3 commits May 18, 2024 10:58
@Fris0uman @Procyonae
Merge pull request CleverRaven#71428 from Fris0uman/prof_retcon
171e0b9 
Revert stuff that should not have been added
@kevingranade @Procyonae
Merge pull request CleverRaven#71432 from CleverRaven/revert-70469-Mi…
1baed7e 
…sses-Christmas

Revert "Missed Christmas"
@Fris0uman @Procyonae
Merge pull request CleverRaven#71449 from Fris0uman/spawn_edda
5398026 
Add the Poetic Edda to the "new-age pulp book" item group
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Food / Vitamins Comestibles and drinks Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Items: Armor / Clothing Armor and clothing <Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Info / User Interface Game - player communication, menus, etc. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels May 18, 2024
@dseguin dseguin merged commit 1d6de85 into CleverRaven:0.H-branch May 19, 2024
18 of 23 checks passed
@Procyonae Procyonae deleted the Backport71428And71432And71449 branch December 1, 2024 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style <Enhancement / Feature> New features, or enhancements on existing Info / User Interface Game - player communication, menus, etc. Items: Armor / Clothing Armor and clothing Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Procyonae @dseguin @Fris0uman @kevingranade