Skip to content
This repository has been archived by the owner on Sep 23, 2024. It is now read-only.

Commit

Permalink
Revert "Merge remote-tracking branch 'upstream/main' into spanish_tra…
Browse files Browse the repository at this point in the history 
…nslation"

This reverts commit 694a900, reversing
changes made to 4f53ce4.
  • Loading branch information
@tadeu2
tadeu2 committed Nov 1, 2023
1 parent 694a900 commit 5e9ac70
Show file tree
Hide file tree
Showing 52 changed files with 5,250 additions and 1,798 deletions.
6,059 changes: 5,079 additions & 980 deletions localization/i18n/es/OrcaSlicer_es.po
View file

Large diffs are not rendered by default.

100 changes: 0 additions & 100 deletions resources/profiles/Voron.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,10 @@
"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 @@ -66,26 +58,10 @@
"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 @@ -94,46 +70,22 @@
"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 @@ -166,10 +118,6 @@
"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 @@ -190,21 +138,9 @@
"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 @@ -298,18 +234,10 @@
"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 @@ -318,26 +246,14 @@
"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 @@ -346,26 +262,14 @@
"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 @@ -374,10 +278,6 @@
"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: 0 additions & 9 deletions resources/profiles/Voron/filament/Voron Generic ABS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,17 @@
],
"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: 17 additions & 26 deletions resources/profiles/Voron/filament/Voron Generic ASA.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,21 @@
"12"
],
"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",
"Voron 0.1 0.4 nozzle"
]
"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"
]
}
43 changes: 17 additions & 26 deletions resources/profiles/Voron/filament/Voron Generic PA-CF.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,21 @@
"8"
],
"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",
"Voron 0.1 0.4 nozzle"
]
"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"
]
}
43 changes: 17 additions & 26 deletions resources/profiles/Voron/filament/Voron Generic PA.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,21 @@
"12"
],
"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",
"Voron 0.1 0.4 nozzle"
]
"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"
]
}
Loading

0 comments on commit 5e9ac70

Please sign in to comment.