From b7cd67809483dd0589484adeb75d0f59778a50a7 Mon Sep 17 00:00:00 2001 From: Nils Schmidt Date: Sun, 10 Dec 2023 13:05:14 +0100 Subject: [PATCH] Fixed issue #1009. --- primitive_rules.txt | 2 +- .../composite/primitive/CompositePrimitive.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/primitive_rules.txt b/primitive_rules.txt index 1a8d732b6..85de36156 100644 --- a/primitive_rules.txt +++ b/primitive_rules.txt @@ -40,7 +40,7 @@ Peg Hole End; Title "peghole.dat"; Matches ".*Peg.*Hole.*End.*" Technic Bush; Title "bush.dat"; Matches ".*Technic.*Bush.*" Technic Beam Hole; Title "beamhol2.dat"; Matches ".*Technic.*Beam.*Hole.*" -Studs; Title "stud.dat"; Contains "Stud"; AND NOT Matches ".*Stud.*Group.*" +Studs; Title "stud.dat"; Contains "Stud"; AND NOT Matches ".*Stud.*Group.*"; AND NOT Contains "Tile" Stud Groups; Title "stug-2x2.dat"; Matches ".*Stud.*Group.*" Znap; Title "znap5.dat"; Matches ".*Znap.*" diff --git a/src/org/nschmidt/ldparteditor/composite/primitive/CompositePrimitive.java b/src/org/nschmidt/ldparteditor/composite/primitive/CompositePrimitive.java index 32d7ca570..d595a23f8 100644 --- a/src/org/nschmidt/ldparteditor/composite/primitive/CompositePrimitive.java +++ b/src/org/nschmidt/ldparteditor/composite/primitive/CompositePrimitive.java @@ -1233,13 +1233,12 @@ private File[] listFiles(String ldrawPath, File libFolder) { final String[] standardBricks = ( """ - 3001.dat,3002.dat, - 3005.dat, - 3024.dat, - 3070b.dat""").split(",");//$NON-NLS-1$ //$NON-NLS-2$ + 3001,3002,3003,3005,3004,3622,3010,3009,2356,2456, + 3024,3023b,3623,3710,78329,3666,3022,3021,3020,3795,11212,3031,3032,3958, + 3070b,3069b,63864,2431,6636,3068b,26603,87079,69729,6934,10202""").split(",");//$NON-NLS-1$ //$NON-NLS-2$ final File[] result = new File[standardBricks.length]; for (int i = 0; i < result.length; i++) { - result[i] = new File(ldrawPath + File.separator + partsFolder + File.separator + standardBricks[i].trim()); + result[i] = new File(ldrawPath + File.separator + partsFolder + File.separator + standardBricks[i].trim() + ".dat"); //$NON-NLS-1$ } return result;