Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Arachnid authored Dec 16, 2024
2 parents 6c1b0c2 + 3b73ad8 commit 4930f34
Show file tree
Hide file tree
Showing 388 changed files with 5,688 additions and 629 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,10 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
add_compile_options(-gz=zstd)
endif()

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=template-id-cdtor" )
endif()

endif()

if (SLIC3R_ASAN)
Expand Down
Binary file removed SoftFever_doc/sponsor_logos/Phrozen_Logo圓_.png
Binary file not shown.
Binary file modified SoftFever_doc/sponsor_logos/QIDI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion linux.d/debian
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3 || echo '')

REQUIRED_DEV_PACKAGES=(
autoconf
Expand Down
1 change: 1 addition & 0 deletions linux.d/fedora
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ REQUIRED_DEV_PACKAGES=(
gstreamermm-devel
gtk3-devel
libmspack-devel
libquadmath-devel
libsecret-devel
libtool
m4
Expand Down
32 changes: 20 additions & 12 deletions localization/i18n/OrcaSlicer.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-27 23:05+0800\n"
"POT-Creation-Date: 2024-12-01 08:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -4116,7 +4116,7 @@ msgstr ""
msgid "Size:"
msgstr ""

#, possible-c-format, possible-boost-format
#, possible-boost-format
msgid ""
"Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
"separate the conflicted objects farther (%s <-> %s)."
Expand Down Expand Up @@ -7102,8 +7102,8 @@ msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
"by right-click the empty position of build plate and choose \"Add Primitive"
"\"->\"Timelapse Wipe Tower\"."
"by right-click the empty position of build plate and choose \"Add "
"Primitive\"->\"Timelapse Wipe Tower\"."
msgstr ""

msgid "Line width"
Expand Down Expand Up @@ -10441,10 +10441,10 @@ msgstr ""

msgid ""
"Fan speed will be ramped up linearly from zero at layer "
"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
"\". \"full_fan_speed_layer\" will be ignored if lower than "
"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
"\"close_fan_the_first_x_layers\" to maximum at layer "
"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
msgstr ""

msgid "layer"
Expand Down Expand Up @@ -11365,6 +11365,14 @@ msgstr ""
msgid "Force a retraction when changes layer"
msgstr ""

msgid "Retract on top layer"
msgstr ""

msgid ""
"Force a retraction on top layer. Disabling could prevent clog on very slow "
"patterns with small movements, like Hilbert curve"
msgstr ""

msgid "Retraction Length"
msgstr ""

Expand Down Expand Up @@ -12275,8 +12283,8 @@ msgstr ""

msgid ""
"Enable this option for automated chamber temperature control. This option "
"activates the emitting of an M191 command before the \"machine_start_gcode"
"\"\n"
"activates the emitting of an M191 command before the "
"\"machine_start_gcode\"\n"
" which sets the chamber temperature and waits until it is reached. In "
"addition, it emits an M141 command at the end of the print to turn off the "
"chamber heater, if present. \n"
Expand Down Expand Up @@ -13953,8 +13961,8 @@ msgid ""
msgstr ""

msgid ""
"We would rename the presets as \"Vendor Type Serial @printer you selected"
"\". \n"
"We would rename the presets as \"Vendor Type Serial @printer you "
"selected\". \n"
"To add preset for more printers, Please go to printer selection"
msgstr ""

Expand Down
38 changes: 23 additions & 15 deletions localization/i18n/ca/OrcaSlicer_ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-27 23:05+0800\n"
"POT-Creation-Date: 2024-12-01 08:07+0100\n"
"PO-Revision-Date: 2024-07-07 18:43+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4427,7 +4427,7 @@ msgstr "Volum:"
msgid "Size:"
msgstr "Mida:"

#, c-format, boost-format
#, boost-format
msgid ""
"Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
"separate the conflicted objects farther (%s <-> %s)."
Expand Down Expand Up @@ -7740,8 +7740,8 @@ msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
"by right-click the empty position of build plate and choose \"Add Primitive"
"\"->\"Timelapse Wipe Tower\"."
"by right-click the empty position of build plate and choose \"Add "
"Primitive\"->\"Timelapse Wipe Tower\"."
msgstr ""
"Quan graveu timelapse sense capçal d'impressió, es recomana afegir una "
"\"Torre de Purga Timelapse\" \n"
Expand Down Expand Up @@ -11658,15 +11658,15 @@ msgstr "Velocitat màxima del ventilador a la capa"

msgid ""
"Fan speed will be ramped up linearly from zero at layer "
"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
"\". \"full_fan_speed_layer\" will be ignored if lower than "
"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
"\"close_fan_the_first_x_layers\" to maximum at layer "
"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
msgstr ""
"La velocitat del ventilador augmentarà linealment de zero a la capa "
"\"close_fan_the_first_x_layers\" al màxim a la capa \"full_fan_speed_layer"
"\". S'ignorarà \"full_fan_speed_layer\" si és inferior a "
"\"close_fan_the_first_x_layers\", en aquest cas el ventilador funcionarà a "
"\"close_fan_the_first_x_layers\" al màxim a la capa "
"\"full_fan_speed_layer\". S'ignorarà \"full_fan_speed_layer\" si és inferior "
"a \"close_fan_the_first_x_layers\", en aquest cas el ventilador funcionarà a "
"la velocitat màxima permesa a la capa \"close_fan_the_first_x_layers\" + 1."

msgid "layer"
Expand Down Expand Up @@ -12822,6 +12822,14 @@ msgstr "Retracció quan canvia de capa"
msgid "Force a retraction when changes layer"
msgstr "Forçar una retracció quan canvia de capa"

msgid "Retract on top layer"
msgstr ""

msgid ""
"Force a retraction on top layer. Disabling could prevent clog on very slow "
"patterns with small movements, like Hilbert curve"
msgstr ""

msgid "Retraction Length"
msgstr "Longitud de Retracció"

Expand Down Expand Up @@ -13947,8 +13955,8 @@ msgstr "Activar el control de temperatura"

msgid ""
"Enable this option for automated chamber temperature control. This option "
"activates the emitting of an M191 command before the \"machine_start_gcode"
"\"\n"
"activates the emitting of an M191 command before the "
"\"machine_start_gcode\"\n"
" which sets the chamber temperature and waits until it is reached. In "
"addition, it emits an M141 command at the end of the print to turn off the "
"chamber heater, if present. \n"
Expand Down Expand Up @@ -15984,8 +15992,8 @@ msgstr ""
"Vols reescriure'l?"

msgid ""
"We would rename the presets as \"Vendor Type Serial @printer you selected"
"\". \n"
"We would rename the presets as \"Vendor Type Serial @printer you "
"selected\". \n"
"To add preset for more printers, Please go to printer selection"
msgstr ""
"Canviaríem el nom dels perfils seleccionats com a \"Proveïdor Tipus "
Expand Down
12 changes: 10 additions & 2 deletions localization/i18n/cs/OrcaSlicer_cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-27 23:05+0800\n"
"POT-Creation-Date: 2024-12-01 08:07+0100\n"
"PO-Revision-Date: 2024-11-03 20:59+0100\n"
"Last-Translator: René Mošner <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -4342,7 +4342,7 @@ msgstr "Objem:"
msgid "Size:"
msgstr "Velikost:"

#, c-format, boost-format
#, boost-format
msgid ""
"Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
"separate the conflicted objects farther (%s <-> %s)."
Expand Down Expand Up @@ -12284,6 +12284,14 @@ msgstr "Retrakce při změně vrstvy"
msgid "Force a retraction when changes layer"
msgstr "Vynutit retrakci při změně vrstvy"

msgid "Retract on top layer"
msgstr ""

msgid ""
"Force a retraction on top layer. Disabling could prevent clog on very slow "
"patterns with small movements, like Hilbert curve"
msgstr ""

msgid "Retraction Length"
msgstr "Vzdálenost retrakce"

Expand Down
67 changes: 43 additions & 24 deletions localization/i18n/de/OrcaSlicer_de.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Orca Slicer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-27 23:05+0800\n"
"POT-Creation-Date: 2024-12-01 08:07+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Heiko Liebscher <hliebschergmail.com>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -4470,7 +4470,7 @@ msgstr "Volumen:"
msgid "Size:"
msgstr "Größe:"

#, c-format, boost-format
#, boost-format
msgid ""
"Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
"separate the conflicted objects farther (%s <-> %s)."
Expand Down Expand Up @@ -5981,7 +5981,7 @@ msgid "Edit current plate name"
msgstr "Bearbeite den Namen der aktuellen Platte"

msgid "Move plate to the front"
msgstr ""
msgstr "Bewege die Platte nach vorne"

msgid "Customize current plate"
msgstr "Aktuelle Platte anpassen"
Expand Down Expand Up @@ -7417,8 +7417,8 @@ msgstr ""
msgid ""
"Timelapse is not supported because Print sequence is set to \"By object\"."
msgstr ""
"Zeitraffer wird nicht unterstützt, da die Druckreihenfolge auf \"Nach Objekt"
"\" eingestellt ist."
"Zeitraffer wird nicht unterstützt, da die Druckreihenfolge auf \"Nach "
"Objekt\" eingestellt ist."

msgid "Errors"
msgstr "Fehler"
Expand Down Expand Up @@ -7812,13 +7812,13 @@ msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
"by right-click the empty position of build plate and choose \"Add Primitive"
"\"->\"Timelapse Wipe Tower\"."
"by right-click the empty position of build plate and choose \"Add "
"Primitive\"->\"Timelapse Wipe Tower\"."
msgstr ""
"Wenn Sie einen Zeitraffer ohne Werkzeugkopf aufnehmen, wird empfohlen, einen "
"\"Timelapse Wischturm\" hinzuzufügen, indem Sie mit der rechten Maustaste "
"auf die leere Position der Bauplatte klicken und \"Primitiv hinzufügen\"->"
"\"Timelapse Wischturm\" wählen."
"auf die leere Position der Bauplatte klicken und \"Primitiv hinzufügen\"-"
">\"Timelapse Wischturm\" wählen."

msgid "Line width"
msgstr "Breite der Linie"
Expand Down Expand Up @@ -10404,6 +10404,14 @@ msgid ""
"When Detect overhang wall is not enabled, this option is ignored and "
"reversal happens on every even layers regardless."
msgstr ""
"Die Anzahl der Millimeter, die der Überhang betragen muss, damit die "
"Umkehrung als nützlich angesehen wird. Kann ein Prozentsatz der "
"Umfangsbreite sein.\n"
"Der Wert 0 aktiviert die Umkehrung auf jeder geraden Schicht unabhängig "
"davon.\n"
"Wenn die Erkennung der Überhangswand nicht aktiviert ist, wird diese Option "
"ignoriert und die Umkehrung erfolgt auf jeder geraden Schicht unabhängig "
"davon."

msgid "Classic mode"
msgstr "Klassicher Modus"
Expand Down Expand Up @@ -11981,7 +11989,7 @@ msgid ""
"increased in a linear fashion over the specified number of layers."
msgstr ""
"Die ersten paar Schichten werden langsamer als normal gedruckt. Die "
"Geschwindigkeitwird allmählich linear über die angegebene Anzahl von "
"Geschwindigkeit wird allmählich linear über die angegebene Anzahl von "
"Schichten erhöht."

msgid "Initial layer nozzle temperature"
Expand All @@ -11997,13 +12005,13 @@ msgstr "Volle Lüfterdrehzahl ab Schicht"

msgid ""
"Fan speed will be ramped up linearly from zero at layer "
"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
"\". \"full_fan_speed_layer\" will be ignored if lower than "
"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
"\"close_fan_the_first_x_layers\" to maximum at layer "
"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
msgstr ""
"Die Lüftergeschwindigkeit wird linear von Null bei der Schicht"
"\"close_fan_the_first_x_layers\" auf das Maximum bei der Schicht "
"Die Lüftergeschwindigkeit wird linear von Null bei der "
"Schicht\"close_fan_the_first_x_layers\" auf das Maximum bei der Schicht "
"\"full_fan_speed_layer\" erhöht. \"full_fan_speed_layer\" wird ignoriert, "
"wenn es niedriger ist als \"close_fan_the_first_x_layers\",in diesem Fall "
"läuft der Lüfter bei Schicht \"close_fan_the_first_x_layers\"+ 1 mit maximal "
Expand Down Expand Up @@ -13174,6 +13182,17 @@ msgstr "Zurückziehen beim Schichtwechsel"
msgid "Force a retraction when changes layer"
msgstr "Erzwingen eines Rückzugs beim Schichtwechsel"

msgid "Retract on top layer"
msgstr "Rückzug auf der obersten Schicht"

msgid ""
"Force a retraction on top layer. Disabling could prevent clog on very slow "
"patterns with small movements, like Hilbert curve"
msgstr ""
"Forciert einen Rückzug auf der obersten Schicht. Das Deaktivieren könnte "
"eine Verstopfung bei sehr langsamen Mustern mit kleinen Bewegungen wie der "
"Hilbert-Kurve verhindern."

msgid "Retraction Length"
msgstr "Rückzugslänge"

Expand Down Expand Up @@ -14334,8 +14353,8 @@ msgstr "aktiviere Temperaturkontrolle"

msgid ""
"Enable this option for automated chamber temperature control. This option "
"activates the emitting of an M191 command before the \"machine_start_gcode"
"\"\n"
"activates the emitting of an M191 command before the "
"\"machine_start_gcode\"\n"
" which sets the chamber temperature and waits until it is reached. In "
"addition, it emits an M141 command at the end of the print to turn off the "
"chamber heater, if present. \n"
Expand Down Expand Up @@ -16418,8 +16437,8 @@ msgstr ""
"Möchten Sie es überschreiben?"

msgid ""
"We would rename the presets as \"Vendor Type Serial @printer you selected"
"\". \n"
"We would rename the presets as \"Vendor Type Serial @printer you "
"selected\". \n"
"To add preset for more printers, Please go to printer selection"
msgstr ""
"Wir würden die Voreinstellungen als \"Hersteller Typ Seriennummer @Drucker, "
Expand Down Expand Up @@ -18475,8 +18494,8 @@ msgstr ""
#~ "Choose an AMS slot then press \"Load\" or \"Unload\" button to "
#~ "automatically load or unload filiament."
#~ msgstr ""
#~ "Wählen Sie einen AMS-Slot und drücken Sie dann \"Laden\" oder \"Entladen"
#~ "\", um automatisch Filament zu laden oder zu entladen."
#~ "Wählen Sie einen AMS-Slot und drücken Sie dann \"Laden\" oder "
#~ "\"Entladen\", um automatisch Filament zu laden oder zu entladen."

#~ msgid "MC"
#~ msgstr "MC"
Expand Down Expand Up @@ -18792,8 +18811,8 @@ msgstr ""
#~ msgstr "Keine dünnen Schichten (EXPERIMENTELL)"

#~ msgid ""
#~ "We would rename the presets as \"Vendor Type Serial @printer you selected"
#~ "\". \n"
#~ "We would rename the presets as \"Vendor Type Serial @printer you "
#~ "selected\". \n"
#~ "To add preset for more prinetrs, Please go to printer selection"
#~ msgstr ""
#~ "Wir würden die Voreinstellungen als \"Hersteller Typ Seriennummer "
Expand Down
Loading

0 comments on commit 4930f34

Please sign in to comment.