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.

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

[CDDA PORT] Adding House 33 from CDDA TO BN #1783

Merged

Conversation

LilShiningMan
Copy link
Contributor

@LilShiningMan LilShiningMan commented Aug 11, 2022

Summary

SUMMARY: Content "[CDDA PORT] Adding House 33"

Purpose of change

Adding more content to BN by porting over house from CDDA.

Describe the solution

Added entries for house_33. This was originally from Fuji Structures Mod, updated and added to CDDA mainline by curstwist
Original CDDA commit.

Describe alternatives you've considered

Adding nothing

Testing

Added house entries to BN. It spawned in game and looks fine, no editing required.

Additional context

Linted files via web de-linter.

Co-authored-by: curstwist

@Fris0uman
Copy link
Contributor

If you can't use cherry pick at leat give credit to the oroginal author by adding them as co author. You can do that by editing the commit message with two empty line after the commit description followed by Co-authored-by: name <username@users.noreply.github.com>
See proper format below

[describe commit]


Co-authored-by: name <username@users.noreply.github.com>

If you can't do that either at the very least link to the original PR in the description of your PR. Cdda license is very permissive but you have to give proper attribution.

@LilShiningMan
Copy link
Contributor Author

LilShiningMan commented Aug 11, 2022

I can do that when I have to the time to look up the info. Likely tonight or tomorrow.

@chaosvolt
Copy link
Member

If you're using github desktop, you can also click this bit here to add co-authors to a commit:
image

Not sure if it's possible to add the formal co-authorship to a commit that's already been committed and pushed.

@LilShiningMan
Copy link
Contributor Author

I admit I'm not very handy with github so I did as suggested above and added the info to the description. Thanks for the heads up on the option to add co-authors from desktop, I'll do that next time

@Coolthulhu Coolthulhu self-assigned this Aug 14, 2022
@Coolthulhu Coolthulhu merged commit 3935254 into cataclysmbnteam:upload Aug 28, 2022
@Coolthulhu
Copy link
Member

I added the co-author in merge commit, just to be sure.

@LilShiningMan LilShiningMan deleted the Add-Houses-CDDA-Port] branch October 2, 2022 00:38
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.

4 participants