Update changelog.txt related to PR #1332

[nickthetinker]

Added line to changelog related to PR #1332

• gui/quickfort: fix build mode evluation rules to allow placement of various furniture and constructions on tiles with stair shapes or without orthagonal floor.

[myk002]

is there any reason this change is not part of #1332?

[nickthetinker]

I wasn’t aware that I could change 1332

…

On Mon, Nov 11, 2024 at 8:11 PM Myk ***@***.***> wrote: is there any reason this change is not part of #1332 <#1332>? — Reply to this email directly, view it on GitHub <#1336 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BMTADODGBTREJ4XBV4NVBYL2AFPWPAVCNFSM6AAAAABRS7EQAGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINRZGQ2DSMRYGM> . You are receiving this because you authored the thread.Message ID: ***@***.***>

[myk002]

I can merge this commit over to keep them together. Normally, you'd continue adding commits to a PR as it goes through the review process.

[nickthetinker]

Thanks. I'm still learning Github's ropes.

[myk002]

ooh, nevermind, you started a PR from your master branch. That will make things a bit difficult. No worries, though! I'll get it fixed up in a separate PR.

[myk002]

I merged your commits into a branch in #1337

In general, things go a bit smoother if you submit PRs from a non-master branch on your fork. We have some guidelines that might help documented here: https://docs.dfhack.org/en/stable/docs/dev/Contributing.html

[myk002]

ok, I merged everything as a group. Your master branch may need to get reconciled with upstream now (when you submit PRs from a non-master branch, you can just delete them afterwards, but it's important to keep your master branch clean and identical to upstream)

[nickthetinker]

Thanks! I will sync it next chance I have. Sorry about the trouble. It’s been a very long day, unrelated to this. Good night!

…

On Mon, Nov 11, 2024 at 8:33 PM Myk ***@***.***> wrote: ok, I merged everything as a group. Your master branch may need to get reconciled with upstream now (when you submit PRs from a non-master branch, you can just delete them afterwards, but it's important to keep your master branch clean and identical to upstream) — Reply to this email directly, view it on GitHub <#1336 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BMTADOCMWK7UW6VB3FBN3R32AFSGJAVCNFSM6AAAAABRS7EQAGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINRZGQ3DQNBTGM> . You are receiving this because you authored the thread.Message ID: ***@***.***>