mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-16 13:32:44 +00:00
f7c1b290fd07c50f77443400552452d2e975e7e5
8
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 SoftFever
|
f7c1b290fd |
v3.2: vendor-bundle re-mint under the product-triple rule
Every remaining legacy filament_id outside the BBL/QD_* islands re-derives from its product triple (filament_vendor / filament_type / family name), completing the content-addressed id model of filament_id_plan_v3.md: - Relocation pre-step: 14 fdm_filament_* template forks (Cubicon x3, Prusa x6, RH3D x6 minus the pc fork already re-homed) stop declaring ids; the 16 presets that rode Prusa's forks now declare the id they already resolved (verified zero effective-id drift over all 5892 instantiated presets). - --drop-redundant-ids: 6 Custom/MyToolChanger generics drop copied GF ids and ride their OFL families. - --remint over all 62 non-island vendors: 2647 declarations re-derived; identical products converge cross-bundle (showcase: PolyLite PLA is now OF5CgdDq in OrcaFilamentLibrary, Qidi, OrcaArena and Snapmaker). - Prusament @XL completions surfaced by the relocation: filament_vendor ["Prusa Polymers"] on the 8 @XL declarers; Prusament PA-CF typed PA11-CF (the product is Prusament PA11CF) and PC-CF typed PC-CF (-CF family typed as base polymer); each family converges on one id. - Succession: 331 ids retired with mode-rule successors, 355 never-shipped v1 mints forgotten with chain splicing, 151 GF-shaped ids released to the island space with hints, 27 curated BBL-generic -> OFL-generic hints (GFL99 -> OFDSrzZ8 class). New --retire "OLD=NEW" maintenance mode records lineage for OGFC99/OGFG99/OGFN99 (the shipped ids of OFL's Generic PC/PETG/PA in released versions, whose claims migrated in v3.1 while Cubicon's inert fork declarations kept them alive). - Retiring the P-hex system ids removes the last system ids from check_ams_filament_valid's destructive P-gate. - AMS-ambiguity fixes surfaced by convergence (validator -f): 4 presets riding another family's id through inherits now declare their true family id (Elegoo Generic ASA-CF/PETG-CF, Snapmaker PolyLite Dual PLA / PolyLite J1 PLA); 9 Cubicon @base presets and Dremel Generic PLA, which duplicate their per-printer variants on the same printers, split onto the salt-1 iteration of their triple (sanctioned by the mint-conformance check; --remint now leaves salt-conformant declarations alone). Gates: assign_filament_ids --check 0; orca_extra_profile_check 0; 116 python unit tests; config-equivalence over all 5892 instantiated presets (byte-identical configs except the 14 sanctioned Prusament vendor/type corrections; setting_id and compatible_printers unchanged; per-family convergence and ledger conservation verified); profile validator base/-f/-r(BBL)/-r(Qidi) all green; libslic3r_tests 48610 assertions; Moonraker OFL generic map check; custom-preset fixture archives v1.9.0-v2.4.1. |
||
|
SoftFever
|
ee125975cf |
Snapmaker, FlyingBear, Sovol: family filament_ids
Phase 2 long-tail migrations (25 collision groups), zero effective-config change: Snapmaker (11 + the tree's one live library-cross group): three Benchy demo presets coexisting via compatible_prints gating (invisible to the -f check) get their own mints; the TPE/TPU-High-Flow lines riding shared bases get family mints across the plain/U1/Dual/J1 variants; 'Snapmaker PLA Matte @U1' minted; 'Snapmaker PET @Dual' unified onto its own family root id; 'Snapmaker PA-CF @U1' had its compatible_printers triple-duplicated (self-collision) - deduplicated. The PolyTerra J1/Dual PLA presets that re-exposed the library's PolyTerra PLA (alias rename) get family mints while 'PolyTerra PLA @0.2 nozzle' keeps the library id via inheritance. Fiberon families keep their authentic byte-copied Bambu catalog ids (sanctioned multi-vendor brand sharing, frozen in the snapshot). FlyingBear (8): every preset carries an own-key Bambu generic id; owners keep theirs, 15 impostor families (S1/Ghost7/Hyper lines) re-minted family-atomically - '@S1' and '@Ghost7' siblings move together (20 edits). Sovol (6): the GFL99 copy-paste epidemic. The five same-alias 'Generic * @Sovol SV08 MAX' tunings just DROP their wrong own-id lines so the library family ids flow through inheritance (alias-shadow-verified); Generic PLA Silk / SUNLU PETG adopt their library family ids as own keys (their inherits point at other families, so deletion would collide); the 21 dedicated Sovol/Polymaker families get fresh mints (23 edits). 'Sovol SV07 PLA' keeps GFL99 unambiguously (sole claimant on SV07), frozen in the snapshot. Verified: config-equivalence gate zero unexpected diffs; extra check exit 0; --check exit 0; validator -l 2 exit 0; extended -f -v Snapmaker/FlyingBear/ Sovol all exit 0. |
||
|
SoftFever
|
8cb2e4e01e |
profiles: deterministic setting_id from vendor/type/name (#14432)
* profiles: enforce globally-unique, per-vendor-namespaced setting_id Many non-Bambu vendors copied Bambu's generic setting_ids (GFSA04 alone appeared in 1557 files), so setting_id was not globally unique. This namespaces every vendor's ids and reserves Bambu/OrcaFilamentLibrary space. - Reserve "G*" (Bambu) and "O*" (OrcaFilamentLibrary) id spaces. - Assign each other vendor a 2-char prefix (first+last letter, collision resolved) and renumber every instantiated preset to <PREFIX><NNNN>. - Strip setting_id from base profiles (instantiation:false) per Bambu's convention; assign one to instantiated presets that lacked it. - Remove the pre-existing misspelled "settings_id" key (91 files). - filament_id is left untouched (it is a per-material id). - Add one-time migration script scripts/assign_vendor_setting_ids.py with a persisted registry resources/profiles/vendor_prefixes.json. Re-runs freeze existing ids; only new vendors/profiles get new ids. - Bump version in each changed vendor index file. - Extend scripts/orca_extra_profile_check.py with a CI guard: global uniqueness, in-namespace, no base setting_id, no gaps, no settings_id typo. 7425 profile files changed across 61 vendors; 0 cross-vendor collisions; validator clean; migration idempotent. BBL and OrcaFilamentLibrary id spaces untouched. * profiles: add setting_id authoring guide for new vendors / profiles * profiles: drop in-repo README; setting_id guide now lives in the wiki * profiles: derive setting_id deterministically from vendor/type/name * bump profile version |
||
|
Ian Bassi
|
16727644bb |
Reduce size by Json Fromatting (#13163)
Reduce the size of current and new JSONs by standardising them with 1 tab indentation instead of 4 spaces. This effectively reduces the size by almost 20 MB. | Current | New | |---|---| | 85.2 Mib | 67 Mib | Used [JQ](https://jqlang.org/) `--tab` to automatically format every current JSON. > [!NOTE] > Some profiles had the arrays on the same line, but those created by Orca were in the standard format (each object below the previous one). In some cases, this increases the number of tabs due to the new lines, but the increase is negligible, and this way both the base profiles and those created by Orca maintain the same style. |
||
|
SoftFever
|
4f50fdc94e | Fixed many profile issues and cleaned up some messes. (#10686) | ||
|
FlyingbearOfficial
|
c52b845c36 |
fix some params from processes and filaments (#7801)
* Update FlyingBear S1 0.4 nozzle.json * Update 0.16mm Optimal @FlyingBear Reborn3.json * Update 0.16mm Optimal @FlyingBear S1.json * Update fdm_process_common.json * Update fdm_klipper_common.json * Update fdm_machine_common.json * Update fdm_klipper_common.json * Update fdm_machine_common.json * Update fdm_process_common.json * Update fdm_process_common_S1.json fix some parameters * Update fdm_process_common.json * Update FlyingBear S1 0.4 nozzle.json * Update 0.08mm Extra Fine @FlyingBear S1.json * Update 0.12mm Fine @FlyingBear S1.json * Update 0.16mm Optimal @FlyingBear S1.json * Update 0.20mm Standard @FlyingBear S1.json * Update 0.24mm Draft @FlyingBear S1.json * Update 0.08mm Extra Fine @FlyingBear Reborn3.json * Update 0.12mm Fine @FlyingBear Reborn3.json * Update 0.16mm Optimal @FlyingBear Reborn3.json * Update 0.20mm Standard @FlyingBear Reborn3.json * Update 0.24mm Draft @FlyingBear Reborn3.json * Update FlyingBear S1 0.4 nozzle.json * Update fdm_process_common_S1.json * Update fdm_process_common.json * Update 0.08mm Extra Fine @FlyingBear S1.json * Update 0.12mm Fine @FlyingBear S1.json * Update 0.16mm Optimal @FlyingBear S1.json * Update 0.08mm Extra Fine @FlyingBear Reborn3.json * Update 0.12mm Fine @FlyingBear Reborn3.json * Update 0.16mm Optimal @FlyingBear Reborn3.json * Update FlyingBear S1 0.4 nozzle.json fix zhop type * Update fdm_machine_common.json fix zhop type * Update fdm_process_common_S1.json * Update fdm_process_common.json * Update FlyingBear Generic PLA.json * Update FlyingBear PLA @S1.json * Update Other PLA @S1.json * Update fdm_filament_pla @S1.json * Update fdm_filament_pla_Hyper @S1.json * Update fdm_filament_pla_other @S1.json * Update fdm_filament_pla_Hyper_other @S1.json * Update fdm_filament_pla.json * Update fdm_filament_pla_Hyper.json * Update fdm_process_common_S1.json * Update fdm_process_common.json * Update fdm_machine_common.json * Update fdm_klipper_common.json * Update 0.08mm Extra Fine @FlyingBear S1.json * Update 0.08mm Extra Fine @FlyingBear Reborn3.json * Update 0.08mm Extra Fine @FlyingBear S1.json * Update 0.08mm Extra Fine @FlyingBear Reborn3.json * Update 0.12mm Fine @FlyingBear Reborn3.json * Update 0.12mm Fine @FlyingBear S1.json * Update 0.16mm Optimal @FlyingBear S1.json * Update 0.16mm Optimal @FlyingBear Reborn3.json * Update fdm_filament_pla.json * Update fdm_filament_pla_Hyper.json * Update fdm_filament_abs.json * Update fdm_filament_pc.json * Update fdm_filament_pet.json * Update fdm_filament_pa.json * Update fdm_filament_tpu.json * Update fdm_filament_abs @S1.json * Update fdm_filament_abs_other @S1.json * Update fdm_filament_pa @S1.json * Update fdm_filament_pa_other @S1.json * Update fdm_filament_pc @S1.json * Update fdm_filament_pc_other @S1.json * Update fdm_filament_pet @S1.json * Update fdm_filament_pet_other @S1.json * Update fdm_filament_pla @S1.json * Update fdm_filament_pla_other @S1.json * Update fdm_filament_pla_Hyper @S1.json * Update fdm_filament_pla_Hyper_other @S1.json * Update fdm_filament_tpu @S1.json * Update fdm_filament_tpu_other @S1.json * Update fdm_filament_tpu.json * Update FlyingBear PETG @S1.json * Update Other PETG @S1.json * Update Other PETG @S1.json * Update FlyingBear PETG @S1.json * Update FlyingBear Generic PETG.json * Update fdm_filament_pet.json * Update fdm_filament_pet @S1.json * Update fdm_filament_pet_other @S1.json * Update FlyingBear Generic PLA.json * Update FlyingBear PLA @S1.json * Update Other PLA @S1.json |
||
|
FlyingbearOfficial
|
c9606a9458 |
fix some params about temps and processes something (#7459)
* Update FlyingBear S1 0.4 nozzle.json * Update 0.16mm Optimal @FlyingBear Reborn3.json * Update 0.16mm Optimal @FlyingBear S1.json * Update fdm_process_common.json * Update fdm_klipper_common.json * Update fdm_machine_common.json * Update fdm_klipper_common.json * Update fdm_machine_common.json * Update fdm_process_common.json * Update fdm_process_common_S1.json fix some parameters * Update fdm_process_common.json * Update FlyingBear S1 0.4 nozzle.json * Update 0.08mm Extra Fine @FlyingBear S1.json * Update 0.12mm Fine @FlyingBear S1.json * Update 0.16mm Optimal @FlyingBear S1.json * Update 0.20mm Standard @FlyingBear S1.json * Update 0.24mm Draft @FlyingBear S1.json * Update 0.08mm Extra Fine @FlyingBear Reborn3.json * Update 0.12mm Fine @FlyingBear Reborn3.json * Update 0.16mm Optimal @FlyingBear Reborn3.json * Update 0.20mm Standard @FlyingBear Reborn3.json * Update 0.24mm Draft @FlyingBear Reborn3.json * Update FlyingBear S1 0.4 nozzle.json * Update fdm_process_common_S1.json * Update fdm_process_common.json * Update 0.08mm Extra Fine @FlyingBear S1.json * Update 0.12mm Fine @FlyingBear S1.json * Update 0.16mm Optimal @FlyingBear S1.json * Update 0.08mm Extra Fine @FlyingBear Reborn3.json * Update 0.12mm Fine @FlyingBear Reborn3.json * Update 0.16mm Optimal @FlyingBear Reborn3.json * Update FlyingBear S1 0.4 nozzle.json fix zhop type * Update fdm_machine_common.json fix zhop type * Update fdm_process_common_S1.json * Update fdm_process_common.json * Update FlyingBear Generic PLA.json * Update FlyingBear PLA @S1.json * Update Other PLA @S1.json * Update fdm_filament_pla @S1.json * Update fdm_filament_pla_Hyper @S1.json * Update fdm_filament_pla_other @S1.json * Update fdm_filament_pla_Hyper_other @S1.json * Update fdm_filament_pla.json * Update fdm_filament_pla_Hyper.json * Update fdm_process_common_S1.json * Update fdm_process_common.json * Update fdm_machine_common.json * Update fdm_klipper_common.json |
||
|
FlyingbearOfficialandSoftFever
|
6e7117e0b1 |
Add a new model named S1 and fix some parameters of previous files (#4267)
* Update fdm_klipper_common.json * Update fdm_filament_abs.json * Update fdm_filament_pa.json * Update fdm_filament_abs.json * Update FlyingBear Generic ABS.json * Update fdm_klipper_common.json * Update FlyingBear Generic PA-CF.json * Update fdm_filament_pa.json * Update fdm_filament_pc.json * Update FlyingBear Generic PC.json * Update fdm_filament_pet.json * Update FlyingBear Generic PETG.json * Update FlyingBear Generic PLA.json * Update fdm_filament_pla.json * Update FlyingBear Generic TPU.json * Update fdm_filament_tpu.json * Update fdm_filament_common.json * Add a new filament named pla_Hyper * Update FlyingBear Reborn3 0.4 nozzle.json fix z_hop 0.4 * Update fdm_machine_common.json * Update 0.08mm Extra Fine @FlyingBear Reborn3.json * Update 0.12mm Fine @FlyingBear Reborn3.json * Update 0.20mm Standard @FlyingBear Reborn3.json * Update 0.24mm Draft @FlyingBear Reborn3.json * Update fdm_process_common.json * Add new a Model named S1 * Add a new model named S1 for machine * Add a new model named S1 for process * Rename lyingBear Reborn3-texture.png to FlyingBear Reborn3-texture.png.png fixed file's name * Rename FlyingBear Reborn3-texture.png.png to FlyingBear Reborn3-texture.png fixed file's name * Add a new model named S1 for img * Update FlyingBear.json add a new model named S1 * Add a new layer hieght * Update FlyingBear.json fixed mistakes --------- Co-authored-by: SoftFever <softfeverever@gmail.com> |