-
Notifications
You must be signed in to change notification settings - Fork 7
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
плюшки ватрушки! #136
The head ref may contain hidden characters: "\u041F\u043B\u044E\u0448\u043A\u0438-\u0432\u0430\u0442\u0440\u0443\u0448\u043A\u0438!"
плюшки ватрушки! #136
Conversation
@AtomicFox556 This appears to be a copy of CleverRaven#68458 (authored by @NetSysFire) and CleverRaven#69156 (authored by @detahramet, @TheShadowFerret, and @Termineitor244) without attribution. |
@RenechCDDA You are absolutely right, we are just manually transferring the changes from dda, since atomic fox has been refusing to make a pull request directly from dda since August, since there is an unpleasant update there as far as I remember |
"just manually transferring the changes" does not justify giving no attribution whatsoever. You are still bound by the upstream license, which requires attribution. |
Noted, thanks.
What would you consider sufficient attribution, just to avoid further misunderstandings? |
The original author(s) and emails need to be listed in the commit message. Ideally you accomplish that by cherry-picking the original commits. The lazy, but still acceptable, way is to add Since this PR hasn't been merged yet, I strongly recommend that you redo it by cherry picking and adding your modifications in a separate commit. For #130 the easiest way would be to start with an interactive rebase, then amend every commit with the correct authorship, and finally force-push to the repo. There are many guides on stackoverflow for that. |
NetSysFire <[email protected]>
Co-authored-by: NetSysFire <[email protected]>
Co-authored-by: lispcoc <[email protected]>
Co-authored-by: Andrew Krieger <[email protected]>
Co-authored-by: Andrew Krieger <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MNG-cataclysm <[email protected]> Co-authored-by: Empyrean-Heaven <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details. Click to expand
This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to |
Добавляю различные "плюшки-ватрушки"
Краткое содержание:
Добавление места "последнего боя"
Добавление условия "категория оружия в руках"
Обновление айди-шника для компилирование сборки windows msvc
Разнообразие концовок-мира для НПС
Слабые точки триффидов и описание при разделке
Слабые точки грибов и описание при разделке
Слабые точки слизи
Портировал из:
CleverRaven#68458
CleverRaven#68044
CleverRaven#69592
CleverRaven#69758
CleverRaven#69764
CleverRaven#69700
CleverRaven#69583