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

Develop #5

Merged
merged 684 commits into from
Jun 22, 2021
Merged

Develop #5

merged 684 commits into from
Jun 22, 2021

Conversation

shimwell
Copy link
Member

@shimwell shimwell commented Jun 21, 2021

Proposed changes

Bringing all the latest improvements into the main branch

Types of changes

What types of changes does your code introduce to the Paramak?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Code refactoring
  • Documentation Update (if none of the other choices apply)
  • New tests

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • Pep8 applied
  • Unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

shimwell and others added 30 commits April 6, 2021 22:44
…kaea/paramak into adding_colour_to_jupyter_cadquery_show
…kaea/paramak into adding_colour_to_jupyter_cadquery_show
shimwell and others added 28 commits May 16, 2021 23:36
…/paramak into adding_gap_between_divertor_and_tf
@shimwell shimwell merged commit 817f373 into main Jun 22, 2021
@shimwell
Copy link
Member Author

I've still got some tidying up to do but this is getting closer to being ready @billingsley-john

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.

1 participant