26 Commits

Author SHA1 Message Date
JoePfeiffer
b64a3b3fa8 The simulation now uses mass data from the entire motor as a unit,
rather than separating out the propellant data.  This commit clarifies
the code by replacing instances of "propellant" with "motor" in
variable names and messages where appropriate.

It does not update the translations into other languages.
2020-09-09 17:10:29 -06:00
Alexander Allen
107d987973 Implemented CD Override 2017-09-20 21:45:26 -04:00
Kevin Ruland
4b4a7c74fc Merge remote-tracking branch 'upstream/master' into unstable
Conflicts:
	swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java
2016-04-02 16:49:15 -05:00
Wes Cravens
74d636bf33 Add concurrent mass info for both with and without motor configuration 2016-03-23 13:23:40 -05:00
Daniel_M_Williams
6f4cba68ae refactored RocketFigure to use RocketPanel.VIEW_TYPE enum instead of unchecked ints 2015-06-23 13:12:48 -04:00
kruland
0707d8b957 Updated French translations from Boris. 2013-11-17 20:18:20 -06:00
kruland2607
e8b38b7398 Updated es, fr & ru translations. 2013-04-29 09:56:21 -05:00
kruland2607
701b8966a2 Merge remote-tracking branch 'upstream/master' into kruland-integration
Conflicts:
	core/resources/l10n/messages_fr.properties
	core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
2013-04-16 14:28:42 -05:00
kruland2607
8f9dc93705 Merge in l10n changes. 2013-04-16 13:53:17 -05:00
kruland2607
3212beb27c Merge remote-tracking branch 'upstream/master' into kruland-integration
Conflicts:
	core/.classpath
2013-04-03 20:09:12 -05:00
Sampo Niskanen
525869c3e7 Refactoring or rocket configuration description 2013-03-22 18:12:58 +02:00
kruland2607
f7def169ef Updated translation files from Boris du Reau. 2013-02-14 13:17:48 -06:00
Sampo Niskanen
b3b2303f27 Enhance flight configuration UI 2013-01-27 22:36:21 +02:00
Boris du Reau
0a2ddd9d6e updated french translations 2012-09-12 20:47:56 +00:00
Sampo Niskanen
31ace7b312 Material localization support 2012-08-25 20:10:58 +00:00
Boris du Reau
65168a345f updated french translation 2012-08-22 05:42:44 +00:00
Boris du Reau
f3152ec411 updated French translations 2012-07-10 21:28:51 +00:00
Boris du Reau
16d4378f94 Updated translations 2012-07-03 21:21:46 +00:00
Boris du Reau
f76966d0ea updated French translation 2012-05-06 20:08:37 +00:00
Boris du Reau
263c10baad New translations 2012-04-20 06:39:25 +00:00
Boris du Reau
bf0e3d978a updated translations 2012-04-10 18:33:58 +00:00
Boris du Reau
09067de7cf Updated French and Spanish translation 2012-03-24 17:54:22 +00:00
Boris du Reau
61539df82d French and Spanish translations updates 2012-03-15 22:28:30 +00:00
Boris du Reau
faae38ec05 Translations updates 2012-03-14 23:23:28 +00:00
Boris du Reau
e9d743c166 Updated French translations 2012-01-12 22:35:58 +00:00
Kevin Ruland
a497e6bbdb Move l10n/ in to resources/. 2012-01-11 03:26:17 +00:00