From cb0c0a9e8ca11edc348120ab30a9a685694bc506 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 31 Aug 2023 19:06:32 +0200 Subject: [PATCH] Add PLA, PETG & ABS materials --- core/resources/l10n/messages.properties | 3 +++ core/src/net/sf/openrocket/database/Databases.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 912ac9984..67be327d4 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1715,6 +1715,9 @@ material.styrofoam_blue_foam_xps = Styrofoam \"Blue foam\" (XPS) material.titanium = Titanium material.quantum_tubing = Quantum tubing material.blue_tube = Blue tube +material.pla = PLA - 100% infill +material.petg = PETG - 100% infill +material.abs = ABS - 100% infill !SURFACE_MATERIAL material.ripstop_nylon = Ripstop nylon material.mylar = Mylar diff --git a/core/src/net/sf/openrocket/database/Databases.java b/core/src/net/sf/openrocket/database/Databases.java index 339315795..6b5a0b4c3 100644 --- a/core/src/net/sf/openrocket/database/Databases.java +++ b/core/src/net/sf/openrocket/database/Databases.java @@ -69,6 +69,9 @@ public class Databases { BULK_MATERIAL.add(newMaterial(Material.Type.BULK, "Titanium", 4500)); BULK_MATERIAL.add(newMaterial(Material.Type.BULK, "Quantum tubing", 1050)); BULK_MATERIAL.add(newMaterial(Material.Type.BULK, "Blue tube", 1300)); + BULK_MATERIAL.add(newMaterial(Material.Type.BULK, "PLA - 100% infill", 1250)); + BULK_MATERIAL.add(newMaterial(Material.Type.BULK, "PETG - 100% infill", 1050)); + BULK_MATERIAL.add(newMaterial(Material.Type.BULK, "ABS - 100% infill", 1250)); SURFACE_MATERIAL.add(newMaterial(Material.Type.SURFACE, "Ripstop nylon", 0.067)); SURFACE_MATERIAL.add(newMaterial(Material.Type.SURFACE, "Mylar", 0.021));