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

resources-src/datafiles/tours

Move database components from swing to core

2024-03-21 22:20:30 +00:00

src

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

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

build.gradle

Bump flatlaf

2024-07-18 20:56:26 +02: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