Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into spanish_translation
Browse files Browse the repository at this point in the history
  • Loading branch information
tadeu2 committed Nov 1, 2023
2 parents 4f53ce4 + 61e05f9 commit 694a900
Show file tree
Hide file tree
Showing 52 changed files with 1,798 additions and 5,250 deletions.
6,059 changes: 980 additions & 5,079 deletions localization/i18n/es/OrcaSlicer_es.po

Large diffs are not rendered by default.

100 changes: 100 additions & 0 deletions resources/profiles/Voron.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,18 @@
"name": "fdm_process_voron_common",
"sub_path": "process/fdm_process_voron_common.json"
},
{
"name": "fdm_process_voron_common_0_1_5",
"sub_path": "process/fdm_process_voron_common_0_1_5.json"
},
{
"name": "fdm_process_voron_common_0_2",
"sub_path": "process/fdm_process_voron_common_0_2.json"
},
{
"name": "fdm_process_voron_common_0_2_5",
"sub_path": "process/fdm_process_voron_common_0_2_5.json"
},
{
"name": "fdm_process_voron_common_0_6",
"sub_path": "process/fdm_process_voron_common_0_6.json"
Expand All @@ -58,10 +66,26 @@
"name": "fdm_process_voron_common_0_8",
"sub_path": "process/fdm_process_voron_common_0_8.json"
},
{
"name": "fdm_process_voron_common_1_0",
"sub_path": "process/fdm_process_voron_common_1_0.json"
},
{
"name": "0.05mm Fine 0.15 nozzle @Voron",
"sub_path": "process/0.05mm Fine 0.15 nozzle @Voron.json"
},
{
"name": "0.06mm Fine 0.2 nozzle @Voron",
"sub_path": "process/0.06mm Fine 0.2 nozzle @Voron.json"
},
{
"name": "0.06mm Fine 0.25 nozzle @Voron",
"sub_path": "process/0.06mm Fine 0.25 nozzle @Voron.json"
},
{
"name": "0.07mm Optimal 0.15 nozzle @Voron",
"sub_path": "process/0.07mm Optimal 0.15 nozzle @Voron.json"
},
{
"name": "0.08mm Extra Fine @Voron",
"sub_path": "process/0.08mm Extra Fine @Voron.json"
Expand All @@ -70,22 +94,46 @@
"name": "0.08mm Optimal 0.2 nozzle @Voron",
"sub_path": "process/0.08mm Optimal 0.2 nozzle @Voron.json"
},
{
"name": "0.08mm Optimal 0.25 nozzle @Voron",
"sub_path": "process/0.08mm Optimal 0.25 nozzle @Voron.json"
},
{
"name": "0.09mm Standard 0.15 nozzle @Voron",
"sub_path": "process/0.09mm Standard 0.15 nozzle @Voron.json"
},
{
"name": "0.10mm Standard 0.2 nozzle @Voron",
"sub_path": "process/0.10mm Standard 0.2 nozzle @Voron.json"
},
{
"name": "0.10mm Standard 0.25 nozzle @Voron",
"sub_path": "process/0.10mm Standard 0.25 nozzle @Voron.json"
},
{
"name": "0.12mm Fine @Voron",
"sub_path": "process/0.12mm Fine @Voron.json"
},
{
"name": "0.12mm Draft 0.15 nozzle @Voron",
"sub_path": "process/0.12mm Draft 0.15 nozzle @Voron.json"
},
{
"name": "0.12mm Draft 0.2 nozzle @Voron",
"sub_path": "process/0.12mm Draft 0.2 nozzle @Voron.json"
},
{
"name": "0.12mm Draft 0.25 nozzle @Voron",
"sub_path": "process/0.12mm Draft 0.25 nozzle @Voron.json"
},
{
"name": "0.14mm Extra Draft 0.2 nozzle @Voron",
"sub_path": "process/0.14mm Extra Draft 0.2 nozzle @Voron.json"
},
{
"name": "0.14mm Extra Draft 0.25 nozzle @Voron",
"sub_path": "process/0.14mm Extra Draft 0.25 nozzle @Voron.json"
},
{
"name": "0.15mm Optimal @Voron",
"sub_path": "process/0.15mm Optimal @Voron.json"
Expand Down Expand Up @@ -118,6 +166,10 @@
"name": "0.30mm Standard 0.6 nozzle @Voron",
"sub_path": "process/0.30mm Standard 0.6 nozzle @Voron.json"
},
{
"name": "0.30mm Fine 1.0 nozzle @Voron",
"sub_path": "process/0.30mm Fine 1.0 nozzle @Voron.json"
},
{
"name": "0.32mm Optimal 0.6 nozzle @Voron",
"sub_path": "process/0.32mm Optimal 0.6 nozzle @Voron.json"
Expand All @@ -138,9 +190,21 @@
"name": "0.48mm Draft 0.8 nozzle @Voron",
"sub_path": "process/0.48mm Draft 0.8 nozzle @Voron.json"
},
{
"name": "0.50mm Standard 1.0 nozzle @Voron",
"sub_path": "process/0.50mm Standard 1.0 nozzle @Voron.json"
},
{
"name": "0.56mm Extra Draft 0.8 nozzle @Voron",
"sub_path": "process/0.56mm Extra Draft 0.8 nozzle @Voron.json"
},
{
"name": "0.60mm Draft 1.0 nozzle @Voron",
"sub_path": "process/0.60mm Draft 1.0 nozzle @Voron.json"
},
{
"name": "0.80mm Extra Draft 1.0 nozzle @Voron",
"sub_path": "process/0.80mm Extra Draft 1.0 nozzle @Voron.json"
}
],
"filament_list": [
Expand Down Expand Up @@ -234,10 +298,18 @@
"name": "Voron 2.4 250 0.4 nozzle",
"sub_path": "machine/Voron 2.4 250 0.4 nozzle.json"
},
{
"name": "Voron 2.4 250 0.15 nozzle",
"sub_path": "machine/Voron 2.4 250 0.15 nozzle.json"
},
{
"name": "Voron 2.4 250 0.2 nozzle",
"sub_path": "machine/Voron 2.4 250 0.2 nozzle.json"
},
{
"name": "Voron 2.4 250 0.25 nozzle",
"sub_path": "machine/Voron 2.4 250 0.25 nozzle.json"
},
{
"name": "Voron 2.4 250 0.6 nozzle",
"sub_path": "machine/Voron 2.4 250 0.6 nozzle.json"
Expand All @@ -246,14 +318,26 @@
"name": "Voron 2.4 250 0.8 nozzle",
"sub_path": "machine/Voron 2.4 250 0.8 nozzle.json"
},
{
"name": "Voron 2.4 250 1.0 nozzle",
"sub_path": "machine/Voron 2.4 250 1.0 nozzle.json"
},
{
"name": "Voron 2.4 300 0.4 nozzle",
"sub_path": "machine/Voron 2.4 300 0.4 nozzle.json"
},
{
"name": "Voron 2.4 300 0.15 nozzle",
"sub_path": "machine/Voron 2.4 300 0.15 nozzle.json"
},
{
"name": "Voron 2.4 300 0.2 nozzle",
"sub_path": "machine/Voron 2.4 300 0.2 nozzle.json"
},
{
"name": "Voron 2.4 300 0.25 nozzle",
"sub_path": "machine/Voron 2.4 300 0.25 nozzle.json"
},
{
"name": "Voron 2.4 300 0.6 nozzle",
"sub_path": "machine/Voron 2.4 300 0.6 nozzle.json"
Expand All @@ -262,14 +346,26 @@
"name": "Voron 2.4 300 0.8 nozzle",
"sub_path": "machine/Voron 2.4 300 0.8 nozzle.json"
},
{
"name": "Voron 2.4 300 1.0 nozzle",
"sub_path": "machine/Voron 2.4 300 1.0 nozzle.json"
},
{
"name": "Voron 2.4 350 0.4 nozzle",
"sub_path": "machine/Voron 2.4 350 0.4 nozzle.json"
},
{
"name": "Voron 2.4 350 0.15 nozzle",
"sub_path": "machine/Voron 2.4 350 0.15 nozzle.json"
},
{
"name": "Voron 2.4 350 0.2 nozzle",
"sub_path": "machine/Voron 2.4 350 0.2 nozzle.json"
},
{
"name": "Voron 2.4 350 0.25 nozzle",
"sub_path": "machine/Voron 2.4 350 0.25 nozzle.json"
},
{
"name": "Voron 2.4 350 0.6 nozzle",
"sub_path": "machine/Voron 2.4 350 0.6 nozzle.json"
Expand All @@ -278,6 +374,10 @@
"name": "Voron 2.4 350 0.8 nozzle",
"sub_path": "machine/Voron 2.4 350 0.8 nozzle.json"
},
{
"name": "Voron 2.4 350 1.0 nozzle",
"sub_path": "machine/Voron 2.4 350 1.0 nozzle.json"
},
{
"name": "Voron Trident 250 0.4 nozzle",
"sub_path": "machine/Voron Trident 250 0.4 nozzle.json"
Expand Down
9 changes: 9 additions & 0 deletions resources/profiles/Voron/filament/Voron Generic ABS.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,26 @@
],
"compatible_printers": [
"Voron 2.4 250 0.4 nozzle",
"Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle",
"Voron 2.4 300 0.4 nozzle",
"Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle",
"Voron 2.4 350 0.4 nozzle",
"Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle",
"Voron Trident 250 0.4 nozzle",
"Voron Trident 300 0.4 nozzle",
"Voron Trident 350 0.4 nozzle",
Expand Down
43 changes: 26 additions & 17 deletions resources/profiles/Voron/filament/Voron Generic ASA.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,30 @@
"12"
],
"compatible_printers": [
"Voron 2.4 250 0.4 nozzle",
"Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle",
"Voron 2.4 300 0.4 nozzle",
"Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle",
"Voron 2.4 350 0.4 nozzle",
"Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle",
"Voron Trident 250 0.4 nozzle",
"Voron Trident 300 0.4 nozzle",
"Voron Trident 350 0.4 nozzle",
"Voron 0.1 0.4 nozzle"
]
"Voron 2.4 250 0.4 nozzle",
"Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle",
"Voron 2.4 300 0.4 nozzle",
"Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle",
"Voron 2.4 350 0.4 nozzle",
"Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle",
"Voron Trident 250 0.4 nozzle",
"Voron Trident 300 0.4 nozzle",
"Voron Trident 350 0.4 nozzle",
"Voron 0.1 0.4 nozzle"
]
}
43 changes: 26 additions & 17 deletions resources/profiles/Voron/filament/Voron Generic PA-CF.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,30 @@
"8"
],
"compatible_printers": [
"Voron 2.4 250 0.4 nozzle",
"Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle",
"Voron 2.4 300 0.4 nozzle",
"Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle",
"Voron 2.4 350 0.4 nozzle",
"Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle",
"Voron Trident 250 0.4 nozzle",
"Voron Trident 300 0.4 nozzle",
"Voron Trident 350 0.4 nozzle",
"Voron 0.1 0.4 nozzle"
]
"Voron 2.4 250 0.4 nozzle",
"Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle",
"Voron 2.4 300 0.4 nozzle",
"Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle",
"Voron 2.4 350 0.4 nozzle",
"Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle",
"Voron Trident 250 0.4 nozzle",
"Voron Trident 300 0.4 nozzle",
"Voron Trident 350 0.4 nozzle",
"Voron 0.1 0.4 nozzle"
]
}
43 changes: 26 additions & 17 deletions resources/profiles/Voron/filament/Voron Generic PA.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,30 @@
"12"
],
"compatible_printers": [
"Voron 2.4 250 0.4 nozzle",
"Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle",
"Voron 2.4 300 0.4 nozzle",
"Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle",
"Voron 2.4 350 0.4 nozzle",
"Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle",
"Voron Trident 250 0.4 nozzle",
"Voron Trident 300 0.4 nozzle",
"Voron Trident 350 0.4 nozzle",
"Voron 0.1 0.4 nozzle"
]
"Voron 2.4 250 0.4 nozzle",
"Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle",
"Voron 2.4 300 0.4 nozzle",
"Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle",
"Voron 2.4 350 0.4 nozzle",
"Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle",
"Voron Trident 250 0.4 nozzle",
"Voron Trident 300 0.4 nozzle",
"Voron Trident 350 0.4 nozzle",
"Voron 0.1 0.4 nozzle"
]
}
Loading

0 comments on commit 694a900

Please sign in to comment.