JoePfeiffer 49bf1126c7 Merge branch 'unstable' into fix-base-drag-take-2 ...

Resolve merge conflicts

2023-03-23 20:26:27 -06:00

..

.settings

[upgrade] Updated Eclipse buildfiles to use Java 1.8

2018-06-17 15:34:55 -04:00

config

Fixed unittest failure in LogLevelTest. Added config dir with logback

2013-06-03 17:55:32 -07:00

doc

Fix various typos

2022-10-15 14:32:21 -04:00

lib

Create custom CSV escape method

2023-03-06 20:09:14 +01:00

lib-extra

Added build target which translates rocksim component directories in resources-src into ORC format in resources.

2012-04-26 21:12:35 +00:00

reference

Move the gogl source from core to swing.

2013-11-05 10:03:30 -06:00

resources

Merge branch 'unstable' into issue-875

2023-03-20 12:41:12 +01:00

resources-src

Add some high-res logo images

2023-02-06 04:36:51 +00:00

scripts

moving to core/

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

src

Merge branch 'unstable' into fix-base-drag-take-2

2023-03-23 20:26:27 -06:00

src-extra

[code_cleanup-1] Clean up using IntelliJ's 'Silent Code Cleanup'

2021-09-10 00:36:29 +02:00

test/net/sf/openrocket

Merge branch 'unstable' into fix-base-drag-take-2

2023-03-23 20:26:27 -06:00

test-writing

[fixes #877] Fix deprecated 'position upwind'

2021-09-05 04:47:09 +02:00

web

Fix various typos

2022-10-15 14:32:21 -04:00

.classpath

Create custom CSV escape method

2023-03-06 20:09:14 +01:00

.gitignore

Added .gitignore which should have been part of the merge from master.

2013-04-04 10:41:25 -05:00

.project

Changed eclipse project name to OpenRocket Core.

2013-09-27 20:59:35 -05:00

build.xml

Add update thrust curves & database ant task

2023-01-26 19:44:28 +01:00

OpenRocket Core.iml

Create custom CSV escape method

2023-03-06 20:09:14 +01:00

releasing.txt

Added more details to releasing.txt

2013-10-06 10:01:58 -05:00

run.sh

Fix run.sh

2012-08-04 08:46:33 +00:00