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
|
5e77e3670a
|
Fix range because of GM scale 2
|
2024-08-09 06:03:06 +02:00 |
|
SiboVG
|
bf0e5eaeaf
|
Forgot assertsame import
|
2024-08-09 06:02:52 +02:00 |
|
SiboVG
|
d311ee6cc0
|
Use assertSame
|
2024-08-09 05:48:23 +02:00 |
|
SiboVG
|
b5d9343ff0
|
Add missing Test annotations
|
2024-08-09 05:47:07 +02:00 |
|
SiboVG
|
1c5bddf54b
|
Fix small numerical issues
|
2024-08-09 05:37:47 +02:00 |
|
SiboVG
|
aebb8b87d2
|
Use enhanced switch
|
2024-08-09 05:22:01 +02:00 |
|
SiboVG
|
4952320030
|
Use String.contains
|
2024-08-09 05:20:51 +02:00 |
|
SiboVG
|
fd3f2e167c
|
Use enhanced for-loops
|
2024-08-09 05:20:27 +02:00 |
|
SiboVG
|
595406ab68
|
Replace explicit type with <>
|
2024-08-09 05:15:51 +02:00 |
|
SiboVG
|
aef972699a
|
Performance improvements
|
2024-08-09 05:14:37 +02:00 |
|
SiboVG
|
9cde5c9766
|
Replace wildcard imports with single imports
|
2024-08-09 05:07:41 +02:00 |
|
SiboVG
|
8d8b6a93cf
|
Remove unnecessary imports from the same package
|
2024-08-09 04:37:27 +02:00 |
|
SiboVG
|
af7f26ab48
|
Remove unused imports
|
2024-08-09 04:36:51 +02:00 |
|
SiboVG
|
5aff7ff066
|
Fix database trans in unit tests
|
2024-08-09 01:22:26 +02:00 |
|
SiboVG
|
46a941968e
|
Add unit tests for material
|
2024-08-08 21:39:16 +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
|
d32faea6c6
|
Use jakarta.xml instead of javax.xml
|
2024-03-23 02:13:09 +01:00 |
|
SiboVG
|
5e315c55da
|
Some more gradle debugging...
|
2024-02-27 05:54:31 +01:00 |
|
SiboVG
|
538710c55b
|
Fix unit test bugs leftover from bump to JUnit 5
I had to rewrite the unit tests using regex and a Python script (because of the scale of the unit test). That code still contained errors...
|
2024-02-27 03:18:55 +01:00 |
|
SiboVG
|
46849e14e1
|
Fix Plugin dynamic injection
|
2024-02-27 02:54:27 +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
|
101530a5df
|
Remove unnecessary resources from core module
|
2024-02-22 23:00:10 +01:00 |
|
SiboVG
|
323b3d9ba6
|
Modularize codebase to JPMS
|
2024-02-22 19:49:55 +01:00 |
|
thzero
|
92859640fa
|
merge latest changes into gradle branch, updated required dependencies for new swing theme code
|
2023-12-23 16:02:01 -06:00 |
|
thzero
|
52d7e4d8ba
|
cleanup of test resource in the java folder instead of the resources folder
|
2023-05-10 07:57:46 -05:00 |
|
thzero
|
5b8f078201
|
cleanup
|
2023-05-08 19:40:35 -05:00 |
|
thzero
|
0da7515b3a
|
cleanup of any development markers
|
2023-05-07 08:12:40 -05:00 |
|
thzero
|
0bd3b1630e
|
merge sync issues
|
2023-05-06 11:29:20 -05:00 |
|
thzero
|
f22d5887df
|
sync with updates from unstable branch
|
2023-05-06 11:17:44 -05:00 |
|
thzero
|
9ac552fb84
|
updates for gradle
|
2023-04-18 21:48:26 -05:00 |
|