Skip to content

Merge Turret to Main quickly#76

Draft
GreatGreenStar wants to merge 15 commits intomainfrom
turret-to-main-fast
Draft

Merge Turret to Main quickly#76
GreatGreenStar wants to merge 15 commits intomainfrom
turret-to-main-fast

Conversation

@GreatGreenStar
Copy link
Contributor

@GreatGreenStar GreatGreenStar commented Feb 27, 2026

This is a version of main with turret merged. The goal being to get it merged quicker. The reason this is not done in turret directly is to retain turret to compare against, if needed. (Commit history could work, but I was instructed to do so this way by @woolstar.)

@GreatGreenStar GreatGreenStar marked this pull request as draft February 27, 2026 02:21
@GreatGreenStar GreatGreenStar self-assigned this Feb 27, 2026
@GreatGreenStar
Copy link
Contributor Author

GreatGreenStar commented Feb 27, 2026

This will almost certainly need revision, though to make it easier I've added todos and fixmes where unsure and possibly breaking changes have been made. This may not cover everything, but should assist in such.

Currently I've worked ONLY on getting turret to merge into this fork based off main, then getting this to build.

@GreatGreenStar GreatGreenStar marked this pull request as ready for review February 27, 2026 02:44
@GreatGreenStar GreatGreenStar marked this pull request as draft February 27, 2026 02:54
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.

3 participants