SiboVG a38230a05e Merge branch 'refs/heads/unstable' into material-groups ...

# Conflicts:
#	core/src/main/java/info/openrocket/core/database/Databases.java
#	core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java
#	core/src/main/java/info/openrocket/core/material/Material.java
#	swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java
#	swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java
#	swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java
#	swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java
#	swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java
#	swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java

2024-08-09 20:46:55 +02:00

..

gradle/wrapper

updates for gradle

2023-04-18 21:48:26 -05:00

libs

THE JAVA SCRIPTING ERROR IS FINALLY GONE!!!

2024-02-28 23:30:52 +01:00

resources-src

In Cdm example don't actually save Cdm to FlightDataBranch until after simulation step.

2024-07-09 15:16:52 -06:00

scripts

moving to core/

2012-01-08 02:23:06 +00:00

src

Merge branch 'refs/heads/unstable' into material-groups

2024-08-09 20:46:55 +02:00

src-extra/altimeter

Change directories to conform to gradle directory layout

2024-07-05 16:12:13 -06:00

build.gradle

include LICENSE and README.md files with parts database

2024-05-10 05:51:07 -06:00

gradle.properties

updates for gradle

2023-04-18 21:48:26 -05:00

gradlew

updates for gradle

2023-04-18 21:48:26 -05:00

gradlew.bat

updates for gradle

2023-04-18 21:48:26 -05:00