10 Commits

Author SHA1 Message Date
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
Sampo Niskanen
525869c3e7 Refactoring or rocket configuration description 2013-03-22 18:12:58 +02:00
Sampo Niskanen
b3b2303f27 Enhance flight configuration UI 2013-01-27 22:36:21 +02:00
Sampo Niskanen
31ace7b312 Material localization support 2012-08-25 20:10:58 +00:00
Boris du Reau
3a53e160e9 updated German translations 2012-07-29 17:58:59 +00:00
Boris du Reau
16d4378f94 Updated translations 2012-07-03 21:21:46 +00:00
Boris du Reau
bf0e3d978a updated translations 2012-04-10 18:33:58 +00:00
Kevin Ruland
a497e6bbdb Move l10n/ in to resources/. 2012-01-11 03:26:17 +00:00