Merge upstream unstable changes #12

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

Open

mishaturnbull wants to merge 5,158 commits into UND-ARC:unstable from openrocket:unstable

The diff you're trying to view is too large. We only load the first 3000 changed files.

.github/FUNDING.yml

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		open_collective: openrocket

.github/ISSUE_TEMPLATE/bug-report.yml

-Original file line number
+Diff line change
@@ -0,0 +1,70 @@
+    name: Bug report
+    description: Help us make OpenRocket better
+    title: '[Bug] REPLACE WITH YOUR TITLE HERE'
+    labels: bug
+    body:
+    - type: markdown
+      attributes:
+        value: "Thanks for taking the time to fill out this bug report!"
+    - type: textarea
+      id: description
+      attributes:
+        label: Describe the bug
+        description: What happened? Also tell us what you've expect to happen.
+        placeholder: Describe your bug in detail.
+      validations:
+        required: true
+    - type: textarea
+      id: repro
+      attributes:
+        label: To Reproduce
+        description: "Steps to reproduce the behavior:"
+        value: |
+.
+.
+.
+          ...
+      validations:
+        required: true
+    - type: textarea
+      id: files
+      attributes:
+        label: Screenshots / .ork file
+        description: Provide screenshots for clarification and/or the .ork file that caused the issue.
+        value: |
+          #### Screenshot(s):
+          *(drag-and-drop the screenshot(s) here)*
+          #### .ork file:
+          *(drag-and-drop the file here as a .zip file)*
+      validations:
+        required: false
+    - type: input
+      id: version-openrocket
+      attributes:
+        label: OpenRocket version
+        description: In what version(s) of OpenRocket does this bug happen?
+        placeholder: 22.02, unstable...
+      validations:
+        required: true
+    - type: dropdown
+      id: platform
+      attributes:
+        label: What platform are you running on?
+        options:
+          - Windows
+          - macOS
+          - Linux
+      validations:
+        required: true
+    - type: textarea
+      id: context
+      attributes:
+        label: Additional context
+        description: Add any other context about the problem here.
+        placeholder:
+      validations:
+        required: false

.github/ISSUE_TEMPLATE/feature_request.md

-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    ---
+    name: Feature request
+    about: Suggest an idea for this project
+    title: '[Feature Request] REPLACE WITH YOUR TITLE HERE'
+    labels: Feature request
+    assignees: ''
+    ---
+    **Is your feature request related to a problem? Please describe.**
+    A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    **Describe the solution you'd like**
+    A clear and concise description of what you want to happen.
+    **Describe alternatives you've considered**
+    A clear and concise description of any alternative solutions or features you've considered.
+    **Additional context**
+    Add any other context or screenshots about the feature request here.

.github/OpenRocket_home_2D.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

.github/OpenRocket_home_3D.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

.github/OpenRocket_sim.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

.github/getting-started.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

.github/workflows/build.yml

-Original file line number
+Diff line change
@@ -0,0 +1,48 @@
+    name: Build
+    on:
+      push:
+        branches:
+          - unstable
+      pull_request:
+        branches:
+          - unstable
+    jobs:
+      gradle:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout repository and submodules
+            uses: actions/checkout@v5
+            with:
+              submodules: 'recursive'
+          - name: Setup JDK 17
+            uses: actions/setup-java@v5
+            with:
+              distribution: 'temurin'
+              java-version: '17'
+          - name: Setup Gradle
+            uses: gradle/actions/setup-gradle@v5
+          - name: Execute Gradle build
+            run: ./gradlew clean check build dist
+          # If wanting to serialize all the engines during build
+          #        run: ./gradlew clean serializeEnginesDist build dist
+          - name: Generate JaCoCo HTML
+            run: |
+              ./gradlew test jacocoTestReport || true
+          - name: Upload build reports
+            uses: actions/upload-artifact@v5
+            with:
+              name: build-reports
+              path: build/reports/
+          - name: Upload Coverage HTML
+            uses: actions/upload-artifact@v5
+            with:
+              name: coverage-html
+              path: '**/build/reports/jacoco/test/html/**'
+          - name: Upload Artifact
+            uses: actions/upload-artifact@v5
+            with:
+              name: openrocket_build_${{ github.run_number }}
+              path: ${{github.workspace}}/build/libs/OpenRocket*.jar

.gitignore

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,19 +13,12 @@
  
    /tmp

    /loganalysis

    # /android/

    /android/bin

    # /android-libraries/achartengine/

    /android-libraries/achartengine/gen

    /android-libraries/achartengine/bin

    /android-libraries/achartengine/lint.xml

    # /core/

    /core/loganalysis

    /core/build

    /core/tmp

    /core/misc

    /core/bin

    # /core/doc/techdoc/

    /core/doc/techdoc/*.aux

    @@ -39,45 +32,65 @@
  
    /core/resources-src/pix/splashscreen-sormus.xcf.gz

    /swing/build

    /swing/bin

    /swing/tmp

    /core/src/main/resources/datafiles/components

    /core/src/main/resources/ReleaseNotes.md

    # IntelliJ

    # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm

    # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

    # https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore

    # User-specific stuff:

    .idea/workspace.xml

    .idea/tasks.xml

    .idea/dictionaries

    .idea/vcs.xml

    .idea/jsLibraryMappings.xml

    **/.idea/workspace.xml

    **/.idea/tasks.xml

    **/.idea/dictionaries

    **/.idea/vcs.xml

    **/.idea/jsLibraryMappings.xml

    **/.idea/copilot

    **/.idea/shelf

    swing/OpenRocket Swing.iml

    core/OpenRocket Core.iml

    lib-test/OpenRocket Library Test.iml

    # Sensitive or high-churn files:

    .idea/dataSources.ids

    .idea/dataSources.xml

    .idea/dataSources.local.xml

    .idea/sqlDataSources.xml

    .idea/dynamic.xml

    .idea/uiDesigner.xml

    **/.idea/dataSources.ids

    **/.idea/dataSources.xml

    **/.idea/dataSources.local.xml

    **/.idea/sqlDataSources.xml

    **/.idea/dynamic.xml

    **/.idea/uiDesigner.xml

    **/.idea/workspace.xml

    # Gradle:

    .idea/gradle.xml

    .idea/libraries

    **/.idea/gradle.xml

    **/.idea/libraries

    # Mongo Explorer plugin:

    .idea/mongoSettings.xml

    **/.idea/mongoSettings.xml

    ## File-based project format:

    *.iws

    **/*.iws

    ## Plugin-specific files:

    # IntelliJ

    /out/

    **/out/

    **/build/

    **/.gradle**

    # IntelliJ run configurations (keep some default configs though)

    !/.idea/runConfigurations/SwingStartup.xml

    !/.idea/runConfigurations/openrocket_jar.xml

    !/.idea/runConfigurations/openrocket_test.xml

    /.idea/runConfigurations/

    # VSCode

    .vscode/

    # mpeltonen/sbt-idea plugin

    .idea_modules/

    **/.idea_modules/

    # JIRA plugin

    atlassian-ide-plugin.xml

    @@ -87,3 +100,17 @@ com_crashlytics_export_strings.xml
  
    crashlytics.properties

    crashlytics-build.properties

    fabric.properties

    openrocket.log

    **/hs_err_pid*.log

    *.snap

    # Sphinx documentation

    docs/build

    # AI tools

    **/copilot.*.xml

    **/AGENTS.md

    **/CLAUDE.md

    **/GEMINI.md

.gitmodules

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    [submodule "core/resources-src/datafiles/openrocket-database"]
+    	path = core/resources-src/datafiles/openrocket-database
+    	url = https://github.com/openrocket/openrocket-database.git

.idea/artifacts/openrocket_jar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream unstable changes #12

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Merge upstream unstable changes #12

Are you sure you want to change the base?

Uh oh!

Merge upstream unstable changes #12

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!