kruland-integration-stickers Conflicts: core/src/net/sf/openrocket/appearance/SimpleAppearanceBuilder.java core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java core/src/net/sf/openrocket/gui/figure3d/RealisticRenderStrategy.java core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java