filament_id v4.0: re-converge post-merge drift (Qidi/Snapmaker/re3D)

The 2026-08 main merge brought upstream vendor updates in pre-v3 style;
assign_filament_ids.py --check reported 243 errors. Re-converged per plan
v4 SS1(A)/SS4:

- Qidi X5: 12 brand presets had copied BBL catalog ids (GFB99/GFG99/GFL99);
  re-minted to their product triples (PolyLite PLA converges onto OF5CgdDq).
- Snapmaker U1: fixed empty/lowercase/wrong filament_vendor on 5 bases
  (triple inputs, W3-style); re-minted 24 declarations, resurrecting no
  retired ids (11813638720/141703112701/1417031127011/OGFL99 all re-minted
  away; base2 duplicates converge onto their families' v3.2 ids).
- re3D: rPETG had copied GFG01 (BBL space); re-minted to OFmCOW2Y. The
  GreenGate3D bundle was removed upstream with its product relocated here;
  retired OFSTCno1 -> OFmCOW2Y so shipped references keep resolving.
- validator -f: resolved 34 AMS-match ambiguities using the v3 mechanisms:
  salt-1 ids on the 5 re3D root presets and Snapmaker PLA-CF @U1 0.4
  (duplicate presets of one product; deletion forbidden), own minted ids
  for the 4 cross-family riders (Polymaker General/Silk/Tough PLA Family,
  Snapmaker PLA Full Spectrum).
- Snapshot re-sanctioned (+92 ids incl. 44 new QD_4_* island ids and BBL
  addnorth GF_AN*); ledger +1 entry (OFSTCno1).

Gates: --check 0; orca_extra_profile_check 0/0; 116 script tests OK;
validator base + -f exit 0. Vendor versions bumped (Qidi, Snapmaker, re3D).
This commit is contained in:
SoftFever
2026-08-21 18:13:18 +08:00
parent 71563cc6c6
commit 58d1a3b093
52 changed files with 566 additions and 68 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "Qidi",
"version": "02.04.00.10",
"version": "02.04.00.11",
"force_update": "0",
"description": "Qidi configurations",
"machine_model_list": [

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFB99",
"filament_id": "OFhuaUQB",
"name": "Bambu ABS@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFG99",
"filament_id": "OFLYDngx",
"name": "Bambu PETG@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFL99",
"filament_id": "OF1dpPrW",
"name": "Bambu PLA@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFL99",
"filament_id": "OFEWYR89",
"name": "Generic PLA+@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFB99",
"filament_id": "OFwLBAGf",
"name": "HATCHBOX ABS@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFG99",
"filament_id": "OFIWMSGX",
"name": "HATCHBOX PETG@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFL99",
"filament_id": "OFeelsSM",
"name": "HATCHBOX PLA@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFB99",
"filament_id": "OFK8XHPn",
"name": "Overture ABS@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFL99",
"filament_id": "OFc3xdm9",
"name": "Overture PLA@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFB99",
"filament_id": "OFOvv91M",
"name": "PolyLite ABS@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFL99",
"filament_id": "OF5CgdDq",
"name": "PolyLite PLA@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFL99",
"filament_id": "OFfYHK5z",
"name": "Polymaker PLA-HT@X-Plus 5-Series",
"from": "system",
"instantiation": "false",

View File

@@ -1,6 +1,6 @@
{
"name": "Snapmaker",
"version": "02.04.00.09",
"version": "02.04.00.10",
"force_update": "0",
"description": "Snapmaker configurations",
"machine_model_list": [

View File

@@ -4,6 +4,7 @@
"inherits": "Polymaker PLA @U1 base",
"from": "system",
"setting_id": "thXfSaUkOAKJ50ey",
"filament_id": "OF44ERDr",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"

View File

@@ -3,7 +3,7 @@
"name": "Polymaker PLA @U1 base",
"inherits": "fdm_filament_pla",
"from": "system",
"filament_id": "OGFL99",
"filament_id": "OFelDBgv",
"instantiation": "false",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"
@@ -48,7 +48,7 @@
"nil"
],
"filament_vendor": [
"Generic"
"Polymaker"
],
"filament_scarf_seam_type": [
"none"

View File

@@ -4,6 +4,7 @@
"inherits": "Polymaker PLA @U1 base",
"from": "system",
"setting_id": "h8vIYpXbxFtHPV6e",
"filament_id": "OFH57ibH",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"

View File

@@ -4,6 +4,7 @@
"inherits": "Polymaker PLA @U1 base",
"from": "system",
"setting_id": "d6CC81Es2hp46bto",
"filament_id": "OFgdaBOt",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"

View File

@@ -3,7 +3,7 @@
"name": "Snapmaker PETG HF @U1 base2",
"inherits": "fdm_filament_petg",
"from": "system",
"filament_id": "GFG96",
"filament_id": "OFL9aRjN",
"instantiation": "false",
"cool_plate_temp": [
"0"
@@ -177,7 +177,7 @@
"nil"
],
"filament_vendor": [
"Generic"
"Snapmaker"
],
"filament_prime_volume": [
"45"

View File

@@ -3,6 +3,6 @@
"name": "Snapmaker PETG Translucent @U1 base",
"inherits": "fdm_filament_petg",
"from": "system",
"filament_id": "PETG_TRANSLUCENT_001",
"filament_id": "OFW8lqnb",
"instantiation": "false"
}

View File

@@ -2,8 +2,11 @@
"type": "filament",
"name": "Snapmaker PLA Basic @U1 base",
"from": "system",
"filament_id": "1417031127011",
"filament_id": "OFhmxnYw",
"instantiation": "false",
"filament_vendor": [
"Snapmaker"
],
"filament_end_gcode": [
""
],

View File

@@ -4,6 +4,7 @@
"inherits": "Snapmaker PLA Basic @U1 base",
"from": "system",
"setting_id": "iybaFWrXKOsmXgMJ",
"filament_id": "OFOPU1xv",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"

View File

@@ -3,7 +3,7 @@
"name": "Snapmaker PLA Glow @U1 base",
"inherits": "fdm_filament_pla",
"from": "system",
"filament_id": "SPGLOW001",
"filament_id": "OFfD87Gy",
"instantiation": "false",
"filament_end_gcode": [
""

View File

@@ -2,8 +2,11 @@
"type": "filament",
"name": "Snapmaker PLA Matte @U1 base2",
"from": "system",
"filament_id": "141703112701",
"filament_id": "OFF9cgY5",
"instantiation": "false",
"filament_vendor": [
"Snapmaker"
],
"filament_end_gcode": [
""
],

View File

@@ -4,7 +4,7 @@
"inherits": "Snapmaker PLA Basic @U1 base",
"from": "system",
"setting_id": "Q5xH6oGGlbXr14Pa",
"filament_id": "11813638720",
"filament_id": "OFWgFOjn",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.2 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "Snapmaker PLA Basic @U1 base",
"from": "system",
"setting_id": "2pieDQoz9PiDCnU1",
"filament_id": "11813638720",
"filament_id": "OFWgFOjn",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.6 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "Snapmaker PLA Basic @U1 base",
"from": "system",
"setting_id": "f3H0JFUnds0mkKCN",
"filament_id": "11813638720",
"filament_id": "OFWgFOjn",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.8 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "Snapmaker PLA Basic @U1 base",
"from": "system",
"setting_id": "9PkHSwtXFM0zPWth",
"filament_id": "11813638720",
"filament_id": "OFWgFOjn",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"

View File

@@ -2,7 +2,7 @@
"type": "filament",
"name": "Snapmaker PLA SnapSpeed @U1 base2",
"from": "system",
"filament_id": "141703112701",
"filament_id": "OFwhLMs4",
"instantiation": "false",
"activate_air_filtration": [
"0"
@@ -195,7 +195,7 @@
"100"
],
"filament_vendor": [
"snapmaker"
"Snapmaker"
],
"filament_wipe": [
"nil"

View File

@@ -3,7 +3,7 @@
"name": "Snapmaker PLA Translucent @U1 base",
"inherits": "fdm_filament_pla",
"from": "system",
"filament_id": "SPTR001",
"filament_id": "OFLTYJW0",
"instantiation": "false",
"filament_end_gcode": [
""

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_pla",
"from": "system",
"setting_id": "XvizDDHbds3bVrzi",
"filament_id": "GFL9922",
"filament_id": "OFdd8ZqJ",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_pla",
"from": "system",
"setting_id": "Kp77DCcitdmoyjqm",
"filament_id": "GFL9922",
"filament_id": "OFdd8ZqJ",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.6 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_pla",
"from": "system",
"setting_id": "nBYnNiqwLo6nAsqi",
"filament_id": "GFL9922",
"filament_id": "OFdd8ZqJ",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.8 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_pla",
"from": "system",
"setting_id": "2INwruC3ZVkBTdUT",
"filament_id": "GFL98111",
"filament_id": "OFf52D4e",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_pla",
"from": "system",
"setting_id": "CKfdL85SvbOLzMuP",
"filament_id": "GFL98111",
"filament_id": "OFhQf8ou",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.6 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_pla",
"from": "system",
"setting_id": "fhhnfJm4dN9FXpWQ",
"filament_id": "GFL98111",
"filament_id": "OFhQf8ou",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.8 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_tpu",
"from": "system",
"setting_id": "uQCplebxmpBpzsnk",
"filament_id": "GFU99",
"filament_id": "OFY7jxcS",
"instantiation": "true",
"filament_max_volumetric_speed": [
"3.2"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_tpu",
"from": "system",
"setting_id": "w4Hpl2qNPmgNvaeM",
"filament_id": "GFU99",
"filament_id": "OFY7jxcS",
"instantiation": "true",
"filament_max_volumetric_speed": [
"3.5"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_tpu",
"from": "system",
"setting_id": "T4MmgICRrSzvmCZ5",
"filament_id": "GFU99",
"filament_id": "OFY7jxcS",
"instantiation": "true",
"filament_max_volumetric_speed": [
"3.2"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_tpu",
"from": "system",
"setting_id": "Q2svXpkEqg0dCdq3",
"filament_id": "GFU99",
"filament_id": "OFXSvqOX",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.6 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_tpu",
"from": "system",
"setting_id": "RjsE08h3l37cAkAs",
"filament_id": "GFU99",
"filament_id": "OFXSvqOX",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.8 nozzle)"

View File

@@ -4,7 +4,7 @@
"inherits": "fdm_filament_tpu",
"from": "system",
"setting_id": "KwcwmV2UmZUgCBoz",
"filament_id": "GFU99",
"filament_id": "OFXSvqOX",
"instantiation": "true",
"compatible_printers": [
"Snapmaker U1 (0.4 nozzle)"

View File

@@ -1,7 +1,7 @@
{
"name": "re3D",
"url": "",
"version": "03.00.08",
"version": "03.00.09",
"force_update": "0",
"description": "re3D configurations",
"machine_model_list": [

View File

@@ -4,7 +4,7 @@
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pc",
"filament_id": "OFU3QXL7",
"filament_id": "OFwbsgWj",
"setting_id": "eSR00TZTotTvJs8l",
"filament_settings_id": [
"re3D PC"

View File

@@ -4,7 +4,7 @@
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"filament_id": "OF3F63OE",
"filament_id": "OFX0etlv",
"setting_id": "msXDK31R8KOvqNqK",
"filament_settings_id": [
"re3D PETG"

View File

@@ -4,7 +4,7 @@
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_id": "OFRyOsZj",
"filament_id": "OFDdEaoL",
"setting_id": "nPpDwvFg7WQr7K3t",
"filament_settings_id": [
"re3D PLA"

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFG01",
"filament_id": "OFmCOW2Y",
"setting_id": "WlELqPVnuL7DaTxs",
"name": "re3D rPETG @0.8 nozzle",
"from": "system",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFG01",
"filament_id": "OFmCOW2Y",
"setting_id": "sHzO2S3mmE6Iqs2O",
"name": "re3D rPETG @1.75 nozzle",
"from": "system",

View File

@@ -5,7 +5,7 @@
"renamed_from": "re3D Greengate rPETG",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"filament_id": "GFG01",
"filament_id": "OFD8loeT",
"setting_id": "6aESuJ2S2Kogd4Lq",
"filament_settings_id": [
"re3D rPETG"

View File

@@ -4,7 +4,7 @@
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pp",
"filament_id": "OFfHGM1D",
"filament_id": "OFm8rqoY",
"setting_id": "8PB62qm5Cd3SHLf4",
"filament_settings_id": [
"re3D rPP"

View File

@@ -2328,6 +2328,12 @@
],
"successor": "OFhQfUQY"
},
"OFSTCno1": {
"claims": [
"re3D/re3D Greengate rPETG"
],
"successor": "OFmCOW2Y"
},
"OGFA00": {
"claims": [
"OrcaFilamentLibrary/Bambu PLA Basic"