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

v1.5.0 PR #1024

Merged
merged 33 commits into from
Aug 28, 2024
Merged

v1.5.0 PR #1024

merged 33 commits into from
Aug 28, 2024

Conversation

Poodmund
Copy link
Collaborator

No description provided.

Poodmund and others added 29 commits June 6, 2024 21:36
- Aerospike shroud mesh aliasing fix
- First push of RS MH Cheetah LV-T91 engine (Kavaeric)
- Inclusion of RS+ patch to add gimbal to Cheetah verniers
- Add VABOrganizer support
- Fix spurious png file (#1017)
Add Russian Language ReStockPlus
Merge Thud, Command Seat and Cargo parts.
@Poodmund Poodmund self-assigned this Aug 26, 2024
@@ -42,6 +42,8 @@ Localization
#LOC_Restock_variant-engine_boattail_size1p5_white = Boattail (1.875m, White)
#LOC_Restock_variant-engine_boattail_size1_grey-orange = Boattail (1.25m, Orange/Grey)
#LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
#LOC_Restock_variant-engine_tankbutt = Tankbutt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we truly have no key? I also thought we've typically used Boattail instead of tankbutt (e.g LN 44 above)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed for #autoLOC_8007112 being 'Tank Butt', changed other RS tankbutt keys to be Tank Butt rather than Tankbutt so mimic vanilla. Unfortunately we still need to add #LOC_Restock_variant-engine_tankbutt_white = Tank Butt (White).

@@ -64,6 +66,7 @@ Localization

#LOC_Restock_variant-engine_shroud_white = White Shroud
#LOC_Restock_variant-engine_shroud_grey-orange = Metallic Shroud
#LOC_Restock_variant-engine_shroud_grey-orange-alt = Orange/Grey Shroud
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as previous comment - what's being used for the other Orange/Grey shrouds now.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the other orange/grey shroud keys have sizes in them and this is for the Thud, so a size doesn't really make sense.

@@ -58,48 +57,3 @@
}
}
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this patch moved to another file?

Copy link
Collaborator Author

@Poodmund Poodmund Aug 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChrisAdderley
Copy link
Contributor

Approved

@Poodmund Poodmund merged commit 5bc34f5 into prod Aug 28, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants