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

Manufacturer entry updates and conformalization #1778

Closed
wants to merge 96 commits into from

Conversation

h0yer
Copy link

@h0yer h0yer commented Oct 3, 2017

Updated quite a lot of manufacturer entries.

I went through the core files (EngineConfigs, RealFuelsengines, etc. ), as well as a through a hand full of suggested mods, like:
RaiderNick, SSTU, OLDD, FASA, VSR, SXT, Tantares, RealScaleBoosters, NovaPunch, DECQ, BobCat, Bluedog, AIES.

h0yer added 14 commits October 1, 2017 20:25
McDonnell Douglas, North American Rockwell and NASA
All by OKB-1, no details found
Hughes mostly, no details
OKB-52 on the clod parts and Khrunichev on the pod parts.
JPL, APL, Ames Research Center and Lockheed Martin.
RN_US_Probes_*.cfg:
Explorer6, Piooneer, Vanguard
SSTU:
UA120, ShipCore
-SXT: Command, LEM, N1, Utility
-VSR: Command,
-BobCat: AresI, AresV, LRV, N1, Orion, Soyuz (can't find downloads for counterchecking)
RealScaleBoosters: Agena, AresI, Ariane, Atlas, Carrack, Delta, Engines, PSLV, Saturn, STS
RaiderNick: TKS
AIES: Command, SolarPanels
BlueDog: Agena, Apollo, Solids
Tantares: ATV, Cygnus, FobosGrunt, Gemini, LKBlockD, Progress, Salyut, Soyuz, TKS, Venera, Vostok, Tantares, Antares, Ariane5, Fregat, N1, Proton,  R7, LV
@h0yer h0yer changed the title Maufacturer entry updates and conformalization Manufacturer entry updates and conformalization Oct 3, 2017
@raidernick
Copy link
Contributor

@h0yer fix the conflicts and I will merge this.

@raidernick raidernick added invalid Conflicts - Untested Has conflicts that need resolving but hasn't been tested Hold For Release Hold for next release and removed invalid Hold For Release Hold for next release labels Mar 31, 2018
@raidernick raidernick changed the base branch from dev to master April 3, 2018 01:34
@raidernick
Copy link
Contributor

this is too old to be easily resolved, please resubmit if you still want to make the changes

@raidernick raidernick closed this Apr 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Conflicts - Untested Has conflicts that need resolving but hasn't been tested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants