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.

Sign up for GitHub

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

Jump to bottom

Fix for the NEXT ion thruster #1664

Merged
merged 3 commits into from Apr 5, 2018
Merged

Fix for the NEXT ion thruster #1664

merged 3 commits into from Apr 5, 2018

Conversation

Max-Q
Copy link
Contributor

@Max-Q Max-Q commented Jun 3, 2017

Fixing the NEXT ion single and double thruster. Updated stats and working configuration.

Max-Q added 2 commits June 3, 2017 14:20
@Max-Q
Fix for the NEXT ion thruster
21640f2 
Fixing the NEXT ion single and double thrusters.
@Max-Q
Remove NASA 457M add HERMeS
d508a06 
Removed NASA 457M and added HERMeS Hall effect thruster.
Small fixes for NEXT thruster.
@raidernick raidernick changed the base branch from master to dev March 24, 2018 19:10
@raidernick
Copy link
Contributor

raidernick commented Mar 24, 2018 •
edited

Needs conflicts resolved

@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:35
@raidernick raidernick removed the Conflicts - Untested Has conflicts that need resolving but hasn't been tested label Apr 5, 2018
@raidernick raidernick merged commit 562be5d into KSP-RO:master Apr 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Max-Q @raidernick