Sampo Niskanen 5412b8255b Merge branch 'integration' of github.com:kruland2607/openrocket ...

Conflicts:
	core/.classpath
	core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
	core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java

2012-12-11 08:38:59 +02:00

..

arch

moving to core/

2012-01-08 02:25:52 +00:00

communication

Change toLowerCase() to toLowerCase(Locale.ENGLISH)

2012-03-27 11:42:31 +00:00

database

Refactor motor serialization/loading code

2012-12-10 22:44:06 +02:00

file

Merge branch 'integration' of github.com:kruland2607/openrocket

2012-12-11 08:38:59 +02:00

gui

Added ruler graphic to printed output; improvements to layout and margins in printing; bug fix in PrintUnit; other

2012-05-28 04:28:26 +00:00

l10n

Make ClassBasedTranslator compatible with Guice

2012-10-15 07:33:24 +03:00

logging

moving to core/

2012-01-08 02:25:52 +00:00

models/gravity

moving to core/

2012-01-08 02:25:52 +00:00

motor

Fix correctness and threading issue in new Manufacturer lookup mechanism. It was incorrect because the Manufacturer objects should be registered under the searchNames. The threading correctness is only an issue in the Manufacturer.get(String) method when the name does not exist. This is handled by using external locking mechanism. Added a unit test which exposed the problem looking for the manufacturer "Contrail_Rockets".

2012-08-24 20:31:13 +00:00

optimization

Unit rounding fine-tuning

2012-09-28 19:42:11 +00:00

preset

Material localization support

2012-08-25 20:10:58 +00:00

rocketcomponent

Break up the area/cg test cases and add some documentation describing

2012-10-07 22:20:33 -05:00

simulation/customexpression

Big update to custom expression feature.

2012-08-05 23:59:54 +00:00

unit

Unit rounding fine-tuning

2012-09-28 19:42:11 +00:00

util

Remove invalid unit test

2012-09-16 12:39:45 +00:00

Estes_A8.rse

moving to core/

2012-01-08 02:25:52 +00:00

IntegrationTest.java

Merge branch 'integration' of github.com:kruland2607/openrocket

2012-12-11 08:38:59 +02:00

simplerocket.ork

moving to core/

2012-01-08 02:25:52 +00:00