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 #72703 #73688

Merged
merged 1 commit into from
May 21, 2024
Merged

Backport #72703 #73688

merged 1 commit into from
May 21, 2024

Conversation

Procyonae
Copy link
Contributor

Summary

Bugfixes "Fixes issue where loading a forge with coal does not work"

Purpose of change

Labelled for backport

Describe the solution

Backport #72703

Describe alternatives you've considered

Testing

Additional context

@Procyonae @katemonster33
@RenechCDDA @nornagon
Fixing reload_furniture to allow reloading with ammo other than the d…
7fc710f 
…efault

Co-Authored-By: Kate <24497894+katemonster33@users.noreply.github.com>
Co-Authored-By: RenechCDDA <84619419+renechcdda@users.noreply.github.com>
Co-Authored-By: Jeremy Rose <nornagon@nornagon.net>
@github-actions github-actions bot added <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. [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Player Faction Base / Camp All about the player faction base/camp/site json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels May 11, 2024
@osuphobia
Copy link
Contributor

I think this needs to be modified before backporting, #70359 changed relevant functions.

@I-am-Erk I-am-Erk merged commit 4410096 into CleverRaven:0.H-branch May 21, 2024
16 of 23 checks passed
@Procyonae
Copy link
Contributor Author

Shame Erk can't read >-<

@I-am-Erk
Copy link
Member

Yep. My apologies. I suggest switching to draft if your PR is passing all tests and shouldn't be merged, especially if it's something that's usually routine like a backport.

@Procyonae
Copy link
Contributor Author

Procyonae commented May 22, 2024 •
edited

It wasn't passing all tests it failed the basic build, the required stuff just only applies if you're targetting master (kevin merged one with a relevant fail too that I didn't even have time to see)

@I-am-Erk
Copy link
Member

Ah dang

@Procyonae Procyonae mentioned this pull request May 24, 2024
Merged
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 <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` 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. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Player Faction Base / Camp All about the player faction base/camp/site
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Procyonae @osuphobia @I-am-Erk