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 |
|
SiboVG
|
c963d8104c
|
Merge branch 'refs/heads/unstable' into material-groups
# Conflicts:
# core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java
# core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java
|
2024-08-09 18:30:18 +02:00 |
|
SiboVG
|
1c5bddf54b
|
Fix small numerical issues
|
2024-08-09 05:37:47 +02:00 |
|
SiboVG
|
595406ab68
|
Replace explicit type with <>
|
2024-08-09 05:15:51 +02:00 |
|
JoePfeiffer
|
0e437a8cb7
|
Split UniqueID functionality into new ModID class and java UUID
|
2024-07-26 06:46:32 -06:00 |
|
SiboVG
|
bb9e17d0b4
|
Refactor ORPreferences to ApplicationPreferences
|
2024-07-21 23:14:19 +02:00 |
|
SiboVG
|
c86c04bd42
|
Move ORPreferences to preferences package
|
2024-07-21 23:10:41 +02:00 |
|
SiboVG
|
464d42fb81
|
Rename Preferences to ORReferences
To not cause confusion with java.util.prefs
|
2024-07-21 22:00:48 +02:00 |
|
SiboVG
|
a590bdc299
|
Fix merge conflicts
|
2024-04-06 02:23:58 +02:00 |
|
SiboVG
|
5e315c55da
|
Some more gradle debugging...
|
2024-02-27 05:54:31 +01:00 |
|
SiboVG
|
e5d1643bac
|
Fix unit test
|
2024-02-27 02:52:47 +01:00 |
|
SiboVG
|
9a8bfc0c37
|
Bump unit testing from JUnit 4 to 5
|
2024-02-25 05:55:27 +01:00 |
|
SiboVG
|
f728357655
|
Some more cleaning up
|
2024-02-25 04:11:37 +01:00 |
|
SiboVG
|
323b3d9ba6
|
Modularize codebase to JPMS
|
2024-02-22 19:49:55 +01:00 |
|
thzero
|
0da7515b3a
|
cleanup of any development markers
|
2023-05-07 08:12:40 -05:00 |
|
thzero
|
9ac552fb84
|
updates for gradle
|
2023-04-18 21:48:26 -05:00 |
|