Update feature branch with master

[ianthpun]

---

For contributor use:

• [ ] Targeted PR against master branch
• [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work
• [ ] Code follows the standards mentioned here
• [ ] Updated relevant documentation
• [ ] Re-reviewed Files changed in the Github PR explorer
• [ ] Added appropriate labels

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 21.76991% with 442 lines in your changes missing coverage. Please review.

Project coverage is 33.91%. Comparing base (dbb5eec) to head (d0d1882).

Files	Patch %	Lines
internal/super/setup.go	0.00%	143 Missing :warning:
internal/super/scaffolds.go	0.00%	85 Missing :warning:
internal/prompt/select-options.go	0.00%	53 Missing :warning:
internal/super/generate.go	69.93%	33 Missing and 10 partials :warning:
internal/prompt/text-input.go	0.00%	31 Missing :warning:
internal/config/init.go	0.00%	21 Missing :warning:
internal/dependencymanager/dependencyinstaller.go	42.42%	12 Missing and 7 partials :warning:
internal/prompt/prompt.go	0.00%	13 Missing :warning:
internal/tools/flowser.go	0.00%	5 Missing :warning:
internal/command/command.go	0.00%	4 Missing :warning:
... and 16 more

Additional details and impacted files

```diff @@ Coverage Diff @@ ## feature/stable-cadence #1643 +/- ## ========================================================== - Coverage 34.40% 33.91% -0.50% ========================================================== Files 96 100 +4 Lines 5917 6222 +305 ========================================================== + Hits 2036 2110 +74 - Misses 3604 3828 +224 - Partials 277 284 +7 ``` | [Flag](https://app.codecov.io/gh/onflow/flow-cli/pull/1643/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=onflow) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/onflow/flow-cli/pull/1643/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=onflow) | `33.91% <21.76%> (-0.50%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=onflow#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[turbolent]

Thank you for keeping this updated!

I had a look at the conflict resolution (git log -1 -p -w --remerge-diff c053a6ac30c3de6d2265365d997085737f10e89e) and it looks good. Unfortunately, due to https://github.com/onflow/flow-core-contracts/issues/433, these two changes need to get reverted (i.e. counter-intuitively, the lower versions are the actual current versions):

-       github.com/onflow/flow-core-contracts/lib/go/templates v1.0.0
+       github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f

-       github.com/onflow/flow-core-contracts/lib/go/contracts v1.1.0 // indirect
+       github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f // indirect

The fixes (revert) for that, faebf02b45d5f4eea513931a080e3e3c8489b569 and 970ab037180534e99babc917f8a47ed1c4da56b6, look good!

[chasefleming]

@turbolent The versions I added were what are on the stable cadence branch currently? If I revert those changes, it breaks.

[turbolent]

@chasefleming Yep, all I meant to do above was confirm that your fixes are correct 👍