Compare commits

...

229 Commits

Author SHA1 Message Date
SoftFever
36f4d585bf hotfix: fix PA calibration issues (#253)
* Fix PA dlg DPI issue

Signed-off-by: SoftFever <softfeverever@gmail.com>

* fix PA tower issue

Signed-off-by: SoftFever <softfeverever@gmail.com>

* fix locale issue for non English OS

Signed-off-by: SoftFever <softfeverever@gmail.com>

* bump to 1.4.4

Signed-off-by: SoftFever <softfeverever@gmail.com>

* update mac x64 ci/cd

Signed-off-by: SoftFever <softfeverever@gmail.com>

---------

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-29 00:17:25 +08:00
Heiko Liebscher
68def3cbb0 fix typo pressure adv and german languge (#252)
* fix typo pressure adv and german languge

* typo

* type advnce

* fix typo and msg id
2023-01-28 21:10:57 +08:00
SoftFever
41bd8f1c00 bump (#239)
Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-27 00:20:32 +08:00
SoftFever
5209719777 fix po file erros
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-27 00:11:21 +08:00
SoftFever
431ceb61dc rename calib dlg
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-26 23:36:07 +08:00
SoftFever
86f367b1f6 misc changes
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-26 23:11:21 +08:00
SoftFever
031a027717 Port seam fix for Arachne from PrusaSlicer
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-26 01:43:23 +08:00
SoftFever
854470cfba wipe on loops
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-26 01:29:44 +08:00
SoftFever
1f13b37f19 allow changing bbl machine limits
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-26 01:29:44 +08:00
SoftFever
0c2309e3a2 PA Calib dialog (#232)
* fix colors

Signed-off-by: SoftFever <softfeverever@gmail.com>

* calib dlg
WIP 1/2

Signed-off-by: SoftFever <softfeverever@gmail.com>

* cut tower based on range

Signed-off-by: SoftFever <softfeverever@gmail.com>

* mac menu change

Signed-off-by: SoftFever <softfeverever@gmail.com>

* minor fix

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

Signed-off-by: SoftFever <softfeverever@gmail.com>
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-26 01:28:47 +08:00
Heiko Liebscher
2cdece2b14 fix_mac build (#228) 2023-01-26 00:37:17 +08:00
Patrice Côté
2a757b1b95 Compatibility with klipper_estimator (#229)
Changed estimated time string in order to be fully compatible with klipper_estimator. Format is now the same as Slic3r, PrusaSlicer and SuperSlicer
2023-01-25 21:58:59 +08:00
Patrice Côté
bf782028ac Option for klipper only: Adjustment of "accel_to_decel" (#220)
* Klipper option: Adjustment of "accel_to_decel"

Add option to automatically adjust accel_to_decel to 50% of chosen acceleration.

* allow variable accel_to_decel percentage

allow variable accel_to_decel percentage for klipper firmware
2023-01-24 21:33:34 +08:00
SoftFever
cdd9c51949 Feature/fix timelapse crash (#224)
* Move use_firmware_retraction out of extruder tab

Signed-off-by: SoftFever <softfeverever@gmail.com>

* fix timelapse crash

Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-24 20:36:05 +08:00
Vladimir
ba72d1731b Force using of monotonic infill pattern for internal solid infill. (#218)
* Force using of monotonic infill pattern for internal solid infill to get rid of redundant gap fills.

* Fix an issue "Patterntype for Solid and top layer #134"
2023-01-24 13:07:52 +08:00
Patrice Côté
5692e02c54 Enable absolute/relative extrusion option on non BBL printers (#205)
Add the option to use non-relative extrusion in printer config screen. Some extruders do not play well with relative extrusion...

Remove reference to multi-extruder

Remove reference to multi-extruder

change g-code comment for M83 relative extrusion

changed comment for M83

Remove commented line of code

In this specific case, we delete the old line of code because it refers to a variable that was deleted from the rest of the code (RELATIVE_E_AXIS)
2023-01-24 13:02:52 +08:00
SoftFever
594c22cde0 fix wrong print size in case of multi plate
Signed-off-by: SoftFever <softfeverever@gmail.com>
#153
#37
2023-01-22 23:10:31 +08:00
SoftFever
3970b84d97 remove bed temp 0 error for non-bambu printers
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-22 23:04:25 +08:00
SoftFever
b7bdb65fd3 Add option to set jerk for infills
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-22 22:05:19 +08:00
Heiko Liebscher
5866d7b756 fix typo and dups after merge (#209) 2023-01-22 16:53:38 +08:00
SoftFever
15dc185681 update deps (#210)
Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-22 14:41:51 +08:00
SoftFever
1bde73b6b1 fix linux build
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-22 11:44:33 +08:00
SoftFever
05c8b57ade Inner brim only and Outer and inner brim
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-22 01:30:35 +08:00
SoftFever
5ea57c1406 Merge branch 'SoftFever' into feature/merge_upstream 2023-01-21 23:41:20 +08:00
SoftFever
4d85ef6657 increase max bed size to 2147
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-21 23:40:03 +08:00
Heiko Liebscher
7f8c2ab267 fix 256px icon to big (#198) 2023-01-21 11:20:41 +08:00
SoftFever
2492e5d39c merge upstream changes
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-21 00:37:10 +08:00
SoftFever
1bdedb1c47 Feature/fix more colors (#193)
* fix more colors

* fix more color on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* fix new windows issue on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
#137

* Support more PrusaSlicer variables

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* enhance compatibility: bed_shape and wipe_start_x

* fix more color

* build deps

* only build for PR

Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-18 23:06:39 +08:00
SoftFever
948dee01ec fix linux CICD 2023-01-16 22:30:11 +08:00
SoftFever
f9200cc7e4 Raised bed temperature limit to 300.
The actual temperature is subject to the firmware's limitations

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-16 21:13:13 +08:00
SoftFever
a6f0bd4d28 Allow 100% retract before wipe
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-16 20:59:10 +08:00
SoftFever
6f5af33c2d QoL: remember choice
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-16 20:58:42 +08:00
SoftFever
0ea985f926 move inwards before travel
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-16 00:58:01 +08:00
SoftFever
8350895513 role_based_wipe_speed and wipe_speed
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-15 21:05:35 +08:00
SoftFever
cdbd2fe042 fix calibration menu disappearing issue on Mac 2023-01-15 10:32:40 +08:00
SoftFever
023f8514c3 update tooltip 2023-01-14 19:43:35 +08:00
SoftFever
594819ef9c seam gap parameter 2023-01-14 19:39:00 +08:00
SoftFever
dd1efb3969 delete .DS_Store 2023-01-14 11:57:59 +08:00
SoftFever
6a86668ab2 fix linux CICD 2023-01-13 21:57:38 +08:00
salt.wei
b107990270 ENH: disable clipper2 in perimeter generator
Clipper2 doesn't solve wrong line issue for some
specific model and sometimes has performance issue.

Return to clipper1.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I906f8b81083ac8c03ecc9fe3e8d2ade20be95c04
2023-01-13 21:51:17 +08:00
Michael Birkler
61d851fc02 ADD Snapmaker A250 and A350 (#171) 2023-01-13 21:48:22 +08:00
Heiko Liebscher
ff1303778d Update de files (#168)
* new ids and typo

* build mo file

* new msgid
2023-01-12 22:56:43 +08:00
SoftFever
96c861f906 CICD (#167)
CICD
2023-01-12 22:55:50 +08:00
Patrice Côté
43f4288fdc Fix to RatRig profiles (#162)
Fix to RatRig profiles, especially V-Cast
2023-01-12 19:45:35 +08:00
Patrice Côté
540aa13e25 Add Post-processing (#159)
It is now possible to call external  post-process scripts
2023-01-12 19:42:31 +08:00
5axes
a3e5531e28 New French Translation Update (#158)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

Test to add Layer time ( missing in the original po file)

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

https://github.com/BastR/BambuStudio/blob/french-trad/bbl/i18n/fr/BambuStudio_fr.po

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one

* Update

Last Modification

* Update

Missing term in the German translation

* update

Changement

* update

TimeLaps

* Update 11/1/2023

Minor Change
Update  : Year / Month ( not translated in the previous translation)
2023-01-12 19:36:57 +08:00
5axes
fa403349e6 Update BambuStudio_fr.po (#150)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

Test to add Layer time ( missing in the original po file)

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

https://github.com/BastR/BambuStudio/blob/french-trad/bbl/i18n/fr/BambuStudio_fr.po

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one
2023-01-10 22:30:57 +08:00
Patrice Côté
c9f6421839 Remove limitations for bed_exclude_area (#151)
* Remove limitations for bed_exclude_area

Was limited to 256mm, not ractical to exlcude half of the bed (for instance on IDEX printers)

* Add RatRig V-Cast printer

Add RatRig V-Cast printer

Add RatRig V-Cast printer

Add RatRig V-Cast printer
2023-01-10 22:29:33 +08:00
Patrice Côté
54f8cb9591 Add RatRig V-Cast printer (#152)
Add RatRig V-Cast printer
2023-01-10 22:28:22 +08:00
Heiko Liebscher
985ce27d38 Fix german (#146)
* fix_ger add new msgid

* typo
2023-01-09 09:09:37 +08:00
SoftFever
67078dce32 Update appimage.yml 2023-01-08 21:07:25 +08:00
Heiko Liebscher
0ba8f23706 fix typo and color (#138)
* fix typo and color

* fix error
2023-01-08 20:59:33 +08:00
GP3D
f2b8051f2d Added latest Release note in readme (#132)
* Fixed deps "directory not found"

* Added Artillery Sidewinder X2

* typo

* forgotten rename

* Update README.md

* uploaded new printers pictures

* deleted old printers pictures

* Latest release note in readme

Co-authored-by: GiaPag <120025021+GiaPag@users.noreply.github.com>
2023-01-08 11:45:52 +08:00
SoftFever
970364cb4f bump version to 1.4.2
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-07 22:07:11 +08:00
SoftFever
15b49bf856 Fix a bug that after load a project, printer connection info is missing
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-07 22:06:30 +08:00
SoftFever
05cf936321 change Mac icon color
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-07 22:06:30 +08:00
SoftFever
1b7c3404f8 update Tronxy setting id
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-07 22:06:30 +08:00
SoftFever
0f04df2699 Support firmware retration and retract_restart_extra 2023-01-07 11:17:55 +08:00
SoftFever
13cd930bb4 fix sync_user_preset issue. Now it loads user presets properly 2023-01-07 00:22:22 +08:00
SoftFever
15f80453ab Ensure print speeds are consistent for all blocks in Flow Rate calibration process 2023-01-07 00:07:42 +08:00
Michael Birkler
32f8901fdb Tronxy profile revised (#123)
* Add Tronxy X5SA 400 Profile

* Update fdm_klipper_common.json

* Addjust Firmware Flavor to Marlin

* Tronxy profile revised
2023-01-06 23:04:11 +08:00
SoftFever
2ae6e90fd1 change icon color 2023-01-06 21:31:23 +08:00
SoftFever
81137112f1 bring back bed model fro RatRig 2023-01-06 21:31:23 +08:00
SoftFever
7440dcb955 fix bed model rendering issue for all 3rd party printers 2023-01-06 21:31:23 +08:00
Heiko Liebscher
964f2163cb fix_color_to_#009688 and hover btn (#125)
* fix_color_to_#009688 and hover btn

* fix_color_main_menu

* fix double ##

* tooltip_color

* fix bitmapcache.cpp
2023-01-06 21:22:20 +08:00
SoftFever
0d473ed447 update version to 1.4.2-dev 2023-01-05 22:37:13 +08:00
SoftFever
64281a8cc5 fix wrong css color
#116
2023-01-05 21:12:23 +08:00
SoftFever
53d3ab15e2 Cap max volumetric speed limit for PA line test
#94
2023-01-05 19:44:33 +08:00
SoftFever
d59519d253 Fix crash for Vase mode
#117
2023-01-05 19:44:33 +08:00
SoftFever
37fdb57222 Allow exporting g-code for BBL machines 2023-01-05 19:44:33 +08:00
SoftFever
86bfbb7fcc fix color in dark mode 2023-01-05 19:44:33 +08:00
SoftFever
60acc6b4e8 change print flow ratio to float.
Also fixed an issue that maximum volumetric speed is not respected
#93 #103
2023-01-05 19:44:33 +08:00
SoftFever
6d99cfbaa2 add safety check 2023-01-05 19:44:33 +08:00
SoftFever
515bd11477 Don't emit M106 P2 command if additional fan is not enabled.
#105
2023-01-05 19:44:32 +08:00
SoftFever
18153a6095 make sure to exit calib mode when a new model is added 2023-01-05 19:44:32 +08:00
GP3D
3b99d92515 Updated Readme whit latest project addictions (#113)
* Fixed deps "directory not found"

* Added Artillery Sidewinder X2

* typo

* forgotten rename

* Update README.md

* uploaded new printers pictures

* deleted old printers pictures

Co-authored-by: GiaPag <120025021+GiaPag@users.noreply.github.com>
2023-01-05 10:39:01 +08:00
Heiko Liebscher
07b7fc3768 fix german language again (#104)
* fix german language

* fix_german_calibration
2023-01-04 08:15:22 +08:00
SoftFever
9c1a7bbf8b change app color 2023-01-03 22:05:20 +08:00
SoftFever
7ac975475f Revert "Add Tronxy X5SA 400 Profile (#81)"
This reverts commit 022ed78904.
2023-01-03 16:40:54 +08:00
GP3D
7c6418e323 Artillery Sidewinder X2 (#84)
* Fixed deps "directory not found"

* Added Artillery Sidewinder X2

* typo

* forgotten rename

Co-authored-by: GiaPag <120025021+GiaPag@users.noreply.github.com>
2023-01-03 10:02:32 +08:00
Michael Birkler
022ed78904 Add Tronxy X5SA 400 Profile (#81)
* Add Tronxy X5SA 400 Profile

* Update fdm_klipper_common.json

* Addjust Firmware Flavor to Marlin
2023-01-03 10:00:12 +08:00
Heiko Liebscher
c0f7c6d5eb fix some german translation and the bug with the compare settings button if some words to long in the gui (#97) 2023-01-02 16:53:28 +08:00
fang64
af44269767 app image builder feature (#86)
* deps/wxWidgets: Disable EGL for wxGLCanvas

To work around <https://github.com/supermerill/SuperSlicer/issues/1093>.

* Fix USE_GLCANVAS_EGL=OFF for only Linux Builds

* Add -r flag to BuildLinux.sh to skip ram check

* Add support for AppImage build in containers.

* Add GitHub Action Workflow to Build AppImage

* Update AppImage-Builder to use upload-artifact v3

Co-authored-by: Zhaofeng Li <hello@zhaofeng.li>
2023-01-02 14:48:20 +08:00
SoftFever
4803c35b76 streamline mac build script
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-01 12:27:48 +08:00
SoftFever
2c4455fb03 bump version 2022-12-31 22:51:49 +08:00
SoftFever
aea6465863 update CN translation 2022-12-31 22:51:41 +08:00
SoftFever
5628f8c7fe don't cap volumetric speed for flowrate test 2022-12-31 22:51:27 +08:00
SoftFever
5ebb0daff0 reorder calibration menu items 2022-12-31 20:22:35 +08:00
SoftFever
cbbfc57f0f fix an issue that flow rate was not visible sometimes in object view 2022-12-31 20:22:18 +08:00
SoftFever
cbede8882c Support first_layer_bed_temperature and first_layer_temperature variable for better compatibility 2022-12-31 16:59:49 +08:00
SoftFever
260156648d Merge branch 'master-remote' into SoftFever
# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
2022-12-31 15:15:58 +08:00
SoftFever
359dfc49f7 fix wrong icon after dpi rescaling 2022-12-31 13:50:45 +08:00
SoftFever
913c4976a1 cn translation
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-31 01:26:10 +08:00
SoftFever
810442efe3 Use more informative project name for calibration 2022-12-30 22:09:59 +08:00
SoftFever
69a21f09c4 add Anker M5 printer 2022-12-30 18:11:57 +08:00
SoftFever
ca7000a659 set inner_wall_acceleration to 5000 for Bambu printers 2022-12-30 17:01:32 +08:00
SoftFever
45b40fd380 add Creality CR-10 Max
#46
2022-12-30 16:54:10 +08:00
SoftFever
8d482eddd3 fix profile syncing issue
#74
2022-12-30 15:45:15 +08:00
SoftFever
48032632a6 generate Xcode project instead
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-30 14:19:37 +08:00
SoftFever
10d470b3fc calibration menu for mac os
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-29 23:57:32 +08:00
SoftFever
e1a3b66b9f QOL change: use first model's name as output name if project name isn't set. 2022-12-29 23:13:44 +08:00
SoftFever
5eee758c9e QOL change: Don't add "_plate_0" in file name if there is only one plate in the current project 2022-12-29 23:12:48 +08:00
SoftFever
25e3944c53 QOLchange: Don't add Untitled string if project name is set 2022-12-29 23:11:24 +08:00
SoftFever
fb0719b450 update dev version 2022-12-29 22:17:44 +08:00
SoftFever
9379ea1546 add version check 2022-12-29 20:35:14 +08:00
erebus04
2266aa4d98 Added RatRig Printer Profiles (#71)
* ADD RatRig V-Core 500 Printer Profile

* ADD Other RatRig Printers

ADD V-Core 200/300/400
ADD V-Minion

* Add Printers to Filament

* Update Ratrig.json

* V-Minion correct PNG

* Correct Bed File for Printers

* Update fdm_process_ratrig_common.json

* Filament Settings Update/ Disable Z-Hop /Activate PA with Parameter

* Remove Bed Modell

The bed model was removed due to a known z bug
2022-12-29 20:13:03 +08:00
SoftFever
4623630829 fix scaling issue 2022-12-28 15:10:15 +08:00
SoftFever
3817cb7654 Attempt to fix a crash caused by small perimeters 2022-12-28 13:53:42 +08:00
SoftFever
329975518d re-write flow calibration 2022-12-28 02:14:22 +08:00
SoftFever
2944b6999a tune flowrate test 2022-12-28 00:06:42 +08:00
SoftFever
990d235415 pressure advance tower 2022-12-27 23:51:53 +08:00
SoftFever
647304f4a2 PA tuning tower 2022-12-27 00:57:39 +08:00
SoftFever
a5891fa097 move model 2022-12-27 00:57:13 +08:00
SoftFever
72f23ed5a8 flow calibration first version
Port from SuperSlicer
2022-12-27 00:57:12 +08:00
gerrit
ae8a64f4d5 ci: update build version to 01.04.01.52
Change-Id: I2df45013c155c03e6d64253b7bdf39afe1344e08
2022-12-26 05:31:54 -05:00
Arthur
bb48983e91 ENH: improve generate_contact_points tree support
1. Previously we used integer Point type to detect corner, which was wrong.
2. Delete duplicate points more aggressively to prevent too many points
   around curved overhangs.
3. Do not generate roof_1st_layers if there is no interface at all.

Change-Id: I1167ac04c533ec8f29dc9e656ba7072d1b54197f
(cherry picked from commit 1329347c4bf9c8207cf21e591a6ad113bb565673)
2022-12-26 05:31:54 -05:00
lane.wei
4385a8b33e FIX: fix the seq_print circle size not correct
Change-Id: Ie0674c2653e1db691447c150d9c669967960650e
2022-12-26 05:31:54 -05:00
tao wang
49f8d0df50 ENH:UpdateVersionDialog compatible web mode
Change-Id: I4a9294fc89005995be13cc3503d883324cb01ebf
2022-12-26 05:31:54 -05:00
gerrit
c663968089 ci: update build version to 01.04.01.51
Change-Id: Ia2c83ec777f803667f1f5398426ba19554e6dc7c
2022-12-26 05:31:54 -05:00
lane.wei
3871dfa03e ENH: update translation
Change-Id: Ibe4bbb671b08ae0e94506d629b711963a58907b5
2022-12-26 05:31:54 -05:00
lane.wei
35da8592ba FIX: fix the chinese text display issue for network plugin update
Change-Id: I50efd56f2b4a29237e76f5329c0423cfc2c7fff0
2022-12-26 05:31:54 -05:00
Arthur
f4519a45e9 FIX: tree hybrid may hang duing lightning infill
auto select grid infill for tree hybrid, and set default wall count to
1.

Change-Id: Icbecd540d06f353da2e63533f8f7cf7d7f20fbdb
(cherry picked from commit 246335cc195c88a4101dddd1eeda42d9ca16589f)
2022-12-26 05:31:54 -05:00
Arthur
e7e26b4b1a FIX: fix typos
Change-Id: Iba3727626d9102aa6c87d336ee1d49bbfbb7c479
(cherry picked from commit bf58651fffb94f9aeb4e85ff6c8a7b9feb3cab83)
2022-12-26 05:31:54 -05:00
qing.zhang
d287b88548 ENH: add metal PLA-CF & PAHT-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I698cca7e9a8f62d16361184f0ab8428dc177eacf
2022-12-26 05:31:54 -05:00
Arthur
58aaa94fc7 FIX: empty layers and dangling hybrid support
1. fix possible empty layers (caused by continues walls)
2. fix normal node may be absorbed in drop_nodes in "tree hybrid"
3. popup message to ask the user to select best parameters for tree strong
   and tree hybrid.
4. auto select lightning infill for tree hybrid.

Change-Id: I7d172887a9b0e4f268267684e83fc02dc7ec6a0c
(cherry picked from commit bc6d130e86c252d7fc1f84c4df7da95050dd5d51)
2022-12-26 05:31:54 -05:00
Stone Li
3f9c74c86e ENH: reorder the judgement when sending print job
Change-Id: I1a33bba1d33388a61d12c00a11e84c2ee5c00287
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-26 05:31:54 -05:00
gerrit
3c386f3739 ENH: update networking version
Change-Id: Ic670cf14c1171268ed0ade38145e8e39a16ad7ea
2022-12-26 05:31:54 -05:00
lane.wei
6899947da8 ENH: Update version to 1.4.1
Change-Id: Id21f3ffd8bdeab2cada64c74e87d606cb0ea7856
2022-12-26 05:31:54 -05:00
tao wang
8ccf3cbd7c FIX:fixed can not change filaments on objecttable
Change-Id: Ic4a301a71af1406f02075edaf9ef24a273c82105
2022-12-26 05:31:54 -05:00
lane.wei
697d945ca1 ENH: add the logic to prompt user to update network plugins
Change-Id: I73cce20e58783a365ad2665c8e095dcf2e9c02ea
2022-12-26 05:31:54 -05:00
lane.wei
8b5a49f378 ENH: disable wireframe currently for some macos has performance issue
Change-Id: I7646927352b0097e1a7b4fa97da4730976996b80
2022-12-26 05:31:54 -05:00
Stone Li
aff6fb934c ENH: sync po files with localazy
Change-Id: I1d4b821cb0b681bd0f8c87be942d71365372ddae
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-26 05:31:54 -05:00
Arthur
854eb0af95 ENH: change base pattern "None" to "Hollow"
1. change base pattern "None" to "Hollow", and add an icon image
2. fix a bug of not initializing m_highest_overhang_layer
3. fix a bug where normal(auto) with Tree* styles won't generate any
   supports.
4. add popup message when selecting support material for interface.
5. draw connected loops when wall count is larger than 1

Change-Id: I7ea211d2971b25c65724bb10d0f6cf6e0b68c6a1
(cherry picked from commit 4c1ae7f937239fc3e1397ec2cb3b290d886bb0f0)
2022-12-26 05:31:54 -05:00
qing.zhang
2690b5b558 ENH: add process preset for P1P's 0.4 nozzle
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I548fad31e66526689d285b200655342f4655ee5b
2022-12-26 05:31:54 -05:00
Arthur
3e7b5e7657 ENH: [Tree Support] smooth_nodes and draw ellipse works
1. smooth nodes' positions
2. draw ellipse along movement direction
3. fix a bug of radius not smooth
4. fix a bug of Tree Strong having too large radius
5. fix a bug in plan_layer_heights: when wipe tower is
   enabled, independent_support_layer_height is false, and all support
   layers should be exactly the same as the object.
   Jira: STUDIO-1785
6. move support style popup message to on_value_change, so only show the
   popup when the user changes support type or style.

Change-Id: Ibced7a28f436d96000ee35a7194b68bb5a20a32d
(cherry picked from commit 0d814b07e433533c8de1b7a04bf52b577de0778d)
2022-12-26 05:31:54 -05:00
tao.jin
629e68f4a0 ENH: add chinese translation
Change-Id: Ib0ced81990d5f34190775ae38861538bdbba71db
2022-12-26 05:31:54 -05:00
Arthur
7596b3fed9 ENH: improve auto arranging and by-object printing
1. In auto arranging bed temp can be higher than vitrify temp by no more than 15 degrees.
2. In by-object printing we use max radius for clearance
3. Add P1P max radius

Change-Id: If595f3e19fd74f6f36d2f394edbb835c413cc800
(cherry picked from commit 2af42420ad3770f0728adb583082600544519a58)
2022-12-26 05:31:54 -05:00
lane.wei
400ce3bcfd FIX: fix a shader loading failed issue on macos 11.x of m1 processor
Change-Id: I39a4d387a0c80743cd5b7a78547c416b387608fd
2022-12-26 05:31:54 -05:00
tao wang
030efb339a ENH: hide some functions which are not ready on U2 version
Change-Id: I6ff7f98d55d9734938b65aaa72727320dd3c5f6e
2022-12-26 05:31:54 -05:00
tao.jin
efb7106ecc FIX: version info and img in About Bambu Studio
Change-Id: I7c3ed0b13f09d6e97fdbb11b24cdeddc8439df88
2022-12-26 05:31:54 -05:00
Arthur
29dbc77e91 NEW: add new tree support style "Tree Slim"
1. Add a new style "Tree Slim". If enabled, tree
support branches are merged more aggressively, and the support volume
is minimized.
2. Enable support style, add back Snug for normal support.
3. Remove hybrid(auto) type and use "Tree Hybrid" style to represent it.
4. Fix a bug in plan_layer_heights that may generate empty layers when
   layer height is set to 0.3mm.
5. Fix a bug where no raft is generated if there is no overhang.
6. Fix the bug where no bottom interface or bottom gap is generated when
   tree slim is selected.
7. Use physical distance to calc radius

Change-Id: Iacd57018ae5496cdc9acd28551c44d1c88c53fe0
2022-12-26 05:31:54 -05:00
tao wang
51deb70f64 FIX:fixed the side menu popup cannot be selected on macos 13
Change-Id: Ic4e9182a1a7175b89f37114b3857e813f299989d
2022-12-26 05:31:54 -05:00
SoftFever
53f3b8b009 fix a tiny UI bug: wrong slice btn style 2022-12-26 15:45:18 +08:00
SoftFever
7e1a2840e5 Set flowrate per object 2022-12-25 23:29:48 +08:00
SoftFever
fb0b7f7b54 fix add calibration menu for Mac
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-25 22:47:15 +08:00
Zhaofeng Li
5e5dea82b6 HintsToPot: Fix compilation on MSVC 2022-12-25 15:31:32 +08:00
Zhaofeng Li
580d8d13b8 BuildLinuxImage.sh: Remove data dir creation
Fixed in c25c1ba4eb.
2022-12-25 14:32:28 +08:00
Zhaofeng Li
d6a7809d5c BuildLinuxImage.sh: Remove forced light theme 2022-12-25 14:32:27 +08:00
enricoturri1966
ef942d9d06 Updated deps-windows.cmake and Boost.cmake to be able to build dependencies using Visual Studio 2022
(cherry picked from commit 1376c9cffdb23351d35270ef5673ea98789dcaaf)
2022-12-25 14:30:56 +08:00
Zhaofeng Li
fd87560bd7 WebView: Only include the private header on Windows and macOS
The wrapper isn't used in the Linux code path. Some distributions'
wxWidgets packages don't ship the private headers.
2022-12-25 14:30:31 +08:00
Zhaofeng Li
6b0c17d9e9 CMakeLists.txt: Remove non-existent udev dir from installation
It doesn't exist in our tree.
2022-12-25 14:30:23 +08:00
Zhaofeng Li
8d7bb97eb9 GUI_ObjectTable: Fix casting of wxGridCellEditorEvtHandler
Fixes linking errors like:

/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(GUI_ObjectTable.cpp.o): in function `wxClassInfo::IsKindOf(wxClassInfo const*) const':
/nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:99: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
2022-12-25 14:30:12 +08:00
Zhaofeng Li
5e543837c1 WebView: Only include webview_edge.h when enabled 2022-12-25 14:30:04 +08:00
Zhaofeng Li
1f70fd70cd 3mf: Correctly include expat.h 2022-12-25 14:29:52 +08:00
Zhaofeng Li
c54e6b64bb GCodeProcessor: Add missing mutex include 2022-12-25 14:29:45 +08:00
Zhaofeng Li
7dbf39465c Add missing includes for boost::filesystem::load_string_file
Deprecated in Boost 1.79.0 and no longer included by
filesystem.hpp.
2022-12-25 14:29:34 +08:00
Zhaofeng Li
ab03a10621 Use fstream from boost::nowide
Fixes build on Boost 1.79.0.
2022-12-25 14:29:24 +08:00
tamasmeszaros
a30361ec69 Fix repeated calls to FindTBB in module mode.
fixes #6355
2022-12-25 14:28:58 +08:00
SoftFever
473b1805ed Merge branch 'feature/calib_pa' into SoftFever 2022-12-25 14:25:32 +08:00
SoftFever
a688719e72 Revert "Merge branch 'SoftFever' into feature/calib"
This reverts commit f5b28201fe, reversing
changes made to d9e9fb2206.

# Conflicts:
#	version.inc
2022-12-25 12:39:45 +08:00
SoftFever
de33c24b0a exit pa calib mode when new model is added. 2022-12-24 19:59:47 +08:00
SoftFever
47c744ceb0 export 3mf file with proper file name.
Issue #32
2022-12-24 13:36:04 +08:00
SoftFever
40c7baae83 Merge branch 'SoftFever' into feature/calib_pa 2022-12-24 12:48:13 +08:00
SoftFever
191a04be16 Add skirt height 2022-12-24 12:21:32 +08:00
SoftFever
693c044047 change workflow 2022-12-24 00:02:53 +08:00
SoftFever
d4780c3a97 apply z hop 2022-12-24 00:02:34 +08:00
SoftFever
a8cf77a2b0 small changes 2022-12-23 17:25:04 +08:00
SoftFever
a3bae2f9a5 draft version 2022-12-23 11:12:44 +08:00
SoftFever
1df89650e9 pa works 2022-12-22 22:41:45 +08:00
SoftFever
0bf74c97c3 disable PA when printing numbers 2022-12-22 22:38:24 +08:00
SoftFever
8c46a57036 wip 2022-12-22 16:09:03 +08:00
SoftFever
f5b28201fe Merge branch 'SoftFever' into feature/calib 2022-12-21 17:09:45 +08:00
SoftFever
d9e9fb2206 init 2022-12-21 17:05:27 +08:00
SoftFever
d733ab7e7b Merge branch 'master' into SoftFever
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
2022-12-21 16:54:14 +08:00
SoftFever
dc1fcf7ed6 fix typo 2022-12-20 23:21:54 +08:00
SoftFever
c84f01526a update readme with 1.4.0 release notes 2022-12-20 22:26:57 +08:00
SoftFever
41078e6555 refactor and improve layer time display 2022-12-20 22:24:42 +08:00
SoftFever
1eb54c49a6 revert changes for min_layer_height check, there was legacy config on user's machine that won't pass this check. (why?) 2022-12-20 11:41:11 +08:00
SoftFever
49982a4497 change version to 1.4.0 official
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-20 11:35:55 +08:00
SoftFever
57b4f3cf68 change default wall loop to 3
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-20 11:32:54 +08:00
SoftFever
92360f75ed remove redundant send button for 3rd printers
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-20 11:27:40 +08:00
SoftFever
daf5384b5a Add Layer Time/Layer time(Log).
Main logic is ported from SuperSlicer

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-19 23:58:24 +08:00
SoftFever
3d8eca022f temporary disable assert on Mac 2022-12-19 23:57:35 +08:00
chunmao.guo
78f6c429c1 FIX: [STUDIO-1800] enable_user_preset_folder before load preset
Change-Id: I3b877db994440359e56aa2fa13d13b1d9a98f978
2022-12-19 19:34:08 +08:00
chunmao.guo
e32792c305 FIX: [STUDIO-1800] enable_user_preset_folder before load preset
Change-Id: I3b877db994440359e56aa2fa13d13b1d9a98f978
2022-12-19 06:13:10 -05:00
Stone Li
55b6bc5563 ENH: do not show the functions if it is not supported
Change-Id: Iaee9c756f40fd26c376160e9cda305bee88d713b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-19 06:13:10 -05:00
gerrit
eaf7f87abb ci: update build version to 01.04.00.18
Change-Id: I62b60fc5581dc7a36c5cde20deb974e6ca298606
2022-12-19 06:13:10 -05:00
tao wang
c1ad24d660 FIX:fixed cant not set cover img of 3mf
Change-Id: I3beabd0ccd9fad1e5c48b8c92cc58aba9a4c4210
2022-12-19 06:13:10 -05:00
lane.wei
e03ac4957b ENH: curl: set backend to openssl for windows
Change-Id: I64c3b9f29ec7e986585e7e8361931599d5398125
2022-12-19 06:13:10 -05:00
Stone Li
c6152a70e9 FIX: add get_used_extruders interface
Change-Id: I03f0dca933c0aa9de893bc86b268ea727eeee9fb
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-19 06:13:10 -05:00
salt.wei
aae57b32e4 ENH: po change for translating
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I5bc92aad6647dc9cc2cf94e25bec2f4322940ad2
2022-12-19 06:13:10 -05:00
Zhaofeng Li
ca00918f85 BuildLinuxImage.sh: Remove data dir creation
Fixed in c25c1ba4eb.
2022-12-19 02:28:54 -05:00
Zhaofeng Li
f8a92b2b3f BuildLinuxImage.sh: Remove forced light theme 2022-12-19 02:28:54 -05:00
SoftFever
030063c8d5 Skip AMS filaments for 3rd party printers 2022-12-18 20:32:56 +08:00
SoftFever
71fb7a9f84 add G92 E0 for Prusa priters 2022-12-18 18:39:30 +08:00
SoftFever
8ef935e886 add G92 E0 for Prusa priters 2022-12-18 18:38:44 +08:00
SoftFever
7c11aeba96 add Prusa MINI+ 2022-12-18 16:12:32 +08:00
SoftFever
85f774a72d fix max layer height issue when open the app for the first time 2022-12-18 11:51:25 +08:00
SoftFever
0e64b47f9d expose bed_exclude_area feature to thirdparty printer 2022-12-18 10:30:41 +08:00
SoftFever
32364ee7ee fix a small ui issue 2022-12-18 10:30:15 +08:00
lane.wei
c25c1ba4eb ENH: linux: create data dir when not exists
Change-Id: Icaf5f3a74b52e3ada5db6a4354df6584bbf669cf
2022-12-17 03:21:09 -05:00
MusangKing
6096de0020 FIX: Solve cracked layers of tree support under adaptive slicing
fix bug of empty layers when meeting similar large layer height of tree support

TODO: hybrid(auto) still has dangling layers at the botttom.

Github#826

Change-Id: I6d5dfa9a610403e51ea82c1d86444f8645dc3210
(cherry picked from commit ea38988f0b5ba22c5b7c3b212d510f649dd23301)
2022-12-17 03:21:09 -05:00
MusangKing
18f794e4fa ENH: Optimize TreeSupport
New function plan_layer_heights added for pre-planning maximum layer heights

Previous adjust_layer_heights function has been commentted out.

Change-Id: I8ec5bb7b7e700ed7655d18a17d0b15de5f026592
(cherry picked from commit 55995c138e0375b8055f31768eea1392cd64168d)
2022-12-17 03:21:09 -05:00
tao wang
ee59ac76a9 FIX:fixed display wrong color of the color picker button
Change-Id: I09f955545f5e1adf28842f51394ae63ec1fe3576
2022-12-17 03:21:09 -05:00
salt.wei
1e5c746429 ENH: disable smooth timelapse in vase mode
Smooth timelaps has wipe tower and cause seam in vase
mode. Don't support

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I7aef1fc1ec2f5d57713fcc01e45ce99f385471c1
(cherry picked from commit 671203ada7c5d48a4eabad156d68d7cb1bb37b54)
2022-12-17 03:21:09 -05:00
zhimin.zeng
915e5a0e69 FIX: model copy problem
Change-Id: I1e32a5a89271a4bdc100599bb6a513e48c545313
(cherry picked from commit eb3755126a2df23045857e4081ba50a42ca5168c)
2022-12-17 03:21:09 -05:00
Arthur Tang
9ca84ba948 FIX: sync with master on TreeSupport.hpp
Change-Id: I5a7eab9fcf1d46ac4a3748c66eb163fb5cc289da
2022-12-17 03:21:09 -05:00
SoftFever
c08fc0c5dc Change layer height checking logic.
max min layer height should be compared against `Layer height limits` parameter instead of hardcoded value
2022-12-17 16:05:49 +08:00
SoftFever
bafd7356d6 update version to beta3 2022-12-17 11:57:31 +08:00
Zhaofeng Li
73679f6f2e TreeSupport: Fix UTF-8 errors
Let's just translate the comments into English while we are at it.
2022-12-16 22:51:07 -05:00
Zhaofeng Li
93bfa10d4e MediaPlayCtrl: Add missing string_file header 2022-12-16 22:51:07 -05:00
Zhaofeng Li
c6ac8193e3 HintsToPot: Fix compilation on MSVC 2022-12-16 22:51:07 -05:00
Zhaofeng Li
9cfe3c6016 Add more missing headers 2022-12-16 22:51:07 -05:00
tamasmeszaros
c87fda7f7a Fix Boost build not forwarding osx sdk flags to the compiler
(cherry picked from commit 8c6f67a1645c596189d6601c5ed758e70adfd172)
2022-12-16 22:51:07 -05:00
tamasmeszaros
d5a8db72ff Really fix boost build
(cherry picked from commit 8d25bf680165f5db0cfd398525199fad64e7642e)
2022-12-16 22:51:07 -05:00
tamasmeszaros
2f39bb0c2b Fix boost build
(cherry picked from commit d3cf765a24cf54d0e2bae790cefb8d77444998f4)
2022-12-16 22:51:07 -05:00
tamasmeszaros
6be5c9b3f8 Fix boost with clang on Linux and fix exclude rules for bad tests
(cherry picked from commit 62fb70d1cb9513f4e54481fac31a1c0771d2a30a)
2022-12-16 22:51:07 -05:00
tamasmeszaros
a5f9ab614a Update Boost to v1.78
(cherry picked from commit 776a125b9b5fb4af1d9c57b78063012ad6421f4b)
2022-12-16 22:51:07 -05:00
enricoturri1966
a89d896679 Updated deps-windows.cmake and Boost.cmake to be able to build dependencies using Visual Studio 2022
(cherry picked from commit 1376c9cffdb23351d35270ef5673ea98789dcaaf)
2022-12-16 22:51:07 -05:00
Zhaofeng Li
06a06714c1 WebView: Only include the private header on Windows and macOS
The wrapper isn't used in the Linux code path. Some distributions'
wxWidgets packages don't ship the private headers.
2022-12-16 22:51:07 -05:00
Zhaofeng Li
920241f0d4 CMakeLists.txt: Remove non-existent udev dir from installation
It doesn't exist in our tree.
2022-12-16 22:51:07 -05:00
Zhaofeng Li
a78bed0fd7 GUI_ObjectTable: Fix casting of wxGridCellEditorEvtHandler
Fixes linking errors like:

/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(GUI_ObjectTable.cpp.o): in function `wxClassInfo::IsKindOf(wxClassInfo const*) const':
/nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:99: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
2022-12-16 22:51:07 -05:00
Zhaofeng Li
daade424cb WebView: Only include webview_edge.h when enabled 2022-12-16 22:51:07 -05:00
Zhaofeng Li
0c83c2884b 3mf: Correctly include expat.h 2022-12-16 22:51:07 -05:00
Zhaofeng Li
9b1429144b GCodeProcessor: Add missing mutex include 2022-12-16 22:51:07 -05:00
Zhaofeng Li
99043bbb02 Add missing includes for boost::filesystem::load_string_file
Deprecated in Boost 1.79.0 and no longer included by
filesystem.hpp.
2022-12-16 22:51:07 -05:00
Zhaofeng Li
f4f871c906 Use fstream from boost::nowide
Fixes build on Boost 1.79.0.
2022-12-16 22:51:07 -05:00
tamasmeszaros
69edbdd01f Fix repeated calls to FindTBB in module mode.
fixes #6355
2022-12-16 22:51:07 -05:00
SoftFever
1938ab44ba fix an bug that wrong bed type was used for thirdparty printers 2022-12-17 11:11:55 +08:00
738 changed files with 63360 additions and 70788 deletions

44
.github/workflows/build_linux.yml vendored Normal file
View File

@@ -0,0 +1,44 @@
name: Build Linux
on: [pull_request]
jobs:
appimage-builder:
name: Linux AppImage Build
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 -y
- name: Install dependencies from BuildLinux.sh
shell: bash
run: sudo ./BuildLinux.sh -ur
- name: Fix permissions
shell: bash
run: sudo chown $USER -R ./
- name: build deps
id: cache_deps
uses: actions/cache@v3
env:
cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
with:
path: ${{ github.workspace }}/deps/build/destdir
key: build-${{ env.cache-name }}
- if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
name: build deps
working-directory: ${{ github.workspace }}
continue-on-error: true
run: ./BuildLinux.sh -dr
- name: Build Studio
shell: bash
run: ./BuildLinux.sh -isr
- uses: actions/upload-artifact@v3
with:
name: BambuStudio-SoftFever_Linux
path: './build/BambuStudio_ubu64.AppImage'

51
.github/workflows/build_mac_arm64.yml vendored Normal file
View File

@@ -0,0 +1,51 @@
name: Build Mac arm64
on: [pull_request]
jobs:
build_win64:
name: Build Mac arm64
runs-on: macos-12
steps:
- uses: actions/checkout@v3
- name: Install tools
run: |
brew install cmake git gettext zstd
- run: mkdir -p ${{ github.workspace }}/deps/build
# - run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep
# - name: build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_arm64
# with:
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep
# key: build-${{ env.cache-name }}
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
# name: build deps
# working-directory: ${{ github.workspace }}
# continue-on-error: true
# run: ./build_release_macos.sh -d -a arm64
- name: Download and extract deps
working-directory: ${{ github.workspace }}
run: |
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz
tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep
ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep
rm BambuStudio_dep_arm64_21-01-2023.tar.gz
- name: Build studio
working-directory: ${{ github.workspace }}
run: ./build_release_macos.sh -s -n -a arm64
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: BambuStudio-SoftFever_Mac
path: ${{ github.workspace }}/build/BambuStudio-SoftFever/BambuStudio-SoftFever*.zip

52
.github/workflows/build_mac_x64.yml vendored Normal file
View File

@@ -0,0 +1,52 @@
name: Build Mac x64
on: [pull_request]
jobs:
build_win64:
name: Build Mac x64
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Install tools
run: |
brew install cmake git gettext
- run: mkdir -p ${{ github.workspace }}/deps/build
- run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep
# - name: build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
# with:
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep
# key: build-${{ env.cache-name }}
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
# name: build deps
# working-directory: ${{ github.workspace }}
# continue-on-error: true
# run: ./build_release_macos.sh -d -a x86_64
- name: Download and extract deps
working-directory: ${{ github.workspace }}
run: |
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_x86_64_21-01-2023.tar.gz
tar -zxvf BambuStudio_dep_x86_64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep
ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep
rm BambuStudio_dep_x86_64_21-01-2023.tar.gz
- name: Build studio
working-directory: ${{ github.workspace }}
run: ./build_release_macos.sh -s -n -a x86_64
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: BambuStudio-SoftFever_Mac
path: ${{ github.workspace }}/build/BambuStudio-SoftFever/BambuStudio-SoftFever*.zip

58
.github/workflows/build_win.yml vendored Normal file
View File

@@ -0,0 +1,58 @@
name: Build Win64
on: [pull_request]
jobs:
build_win64:
name: Build Win64
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
- uses: ilammy/msvc-dev-cmd@v1
- name: Install perl
run: |
choco install strawberryperl
- run: mkdir ${{ github.workspace }}/deps/build
- run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep
- name: download deps
shell: powershell
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_21Jan2023.zip", "$env:temp\BambuStudio_dep_21Jan2023.zip")'
- name: extract deps
working-directory: ${{ github.workspace }}/deps/build
shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_21Jan2023.zip'
- run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep"
# - name: build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps
# with:
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep
# key: ${{ runner.os }}-build-${{ env.cache-name }}
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
# name: build deps
# working-directory: ${{ github.workspace }}
# continue-on-error: true
# run: .\build_release.bat deps
# - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force
- name: Build studio
working-directory: ${{ github.workspace }}
run: .\build_release.bat studio
- name: pack app
working-directory: ${{ github.workspace }}/build
shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" a -tzip BambuStudio-SoftFever_dev_build.zip ${{ github.workspace }}/build/BambuStudio-SoftFever'
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: BambuStudio-SoftFever_Win64
path: ${{ github.workspace }}/build/BambuStudio-SoftFever_dev_build.zip

View File

@@ -28,7 +28,7 @@ function check_available_memory_and_disk() {
}
unset name
while getopts ":dsiuhgb" opt; do
while getopts ":dsiuhgbr" opt; do
case ${opt} in
u )
UPDATE_LIB="1"
@@ -48,6 +48,9 @@ while getopts ":dsiuhgb" opt; do
g )
FOUND_GTK3=""
;;
r )
SKIP_RAM_CHECK="1"
;;
h ) echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
echo " -i: Generate appimage (optional)"
echo " -g: force gtk2 build"
@@ -55,6 +58,7 @@ while getopts ":dsiuhgb" opt; do
echo " -d: build deps (optional)"
echo " -s: build bambu-studio (optional)"
echo " -u: only update clock & dependency packets (optional and need sudo)"
echo " -r: skip free ram check (low ram compiling)"
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
echo " and then './BuildLinux.sh -dsi'"
exit 0
@@ -71,6 +75,7 @@ then
echo " -d: build deps (optional)"
echo " -s: build bambu-studio (optional)"
echo " -u: only update clock & dependency packets (optional and need sudo)"
echo " -r: skip free ram check (low ram compiling)"
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
echo " and then './BuildLinux.sh -dsi'"
exit 0
@@ -153,7 +158,10 @@ then
mkdir deps/build
fi
if ! [[ -n "$SKIP_RAM_CHECK" ]]
then
check_available_memory_and_disk
fi
if [[ -n "$BUILD_DEPS" ]]
then

View File

@@ -53,7 +53,7 @@ if (APPLE)
if (CMAKE_MACOSX_BUNDLE)
set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
endif()
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
endif ()
# Proposal for C++ unit tests and sandboxes
@@ -484,16 +484,7 @@ if (SLIC3R_STATIC AND NOT SLIC3R_STATIC_EXCLUDE_GLEW)
set(GLEW_VERBOSE ON)
endif()
find_package(GLEW)
if (NOT TARGET GLEW::GLEW)
message(STATUS "GLEW not found, using bundled version.")
add_library(glew STATIC ${LIBDIR}/glew/src/glew.c)
set(GLEW_FOUND TRUE)
set(GLEW_INCLUDE_DIRS ${LIBDIR}/glew/include/)
target_compile_definitions(glew PUBLIC GLEW_STATIC)
target_include_directories(glew PUBLIC ${GLEW_INCLUDE_DIRS})
add_library(GLEW::GLEW ALIAS glew)
endif ()
find_package(GLEW REQUIRED)
find_package(glfw3 REQUIRED)
@@ -704,7 +695,6 @@ elseif (SLIC3R_FHS)
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME BambuStudio.png
)
endforeach()
install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/udev/ DESTINATION lib/udev/rules.d)
elseif (CMAKE_MACOSX_BUNDLE)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/BambuStudio.app/Contents/resources")
else ()

View File

@@ -1,12 +1,67 @@
# Bambu Studio - SoftFever
A modified version of Bambu Studio with many handy features.
It's fully compatible with Bambulab X1/X1-C printers.
It also supports Voron and Prusa MK3S printers.
It's fully compatible with Bambulab X1/X1-C/P1P printers.
It also supports Anycubic, Anker, Creality, Prusa MK3S, RatRig and Voron printers.
You can download it here: https://github.com/SoftFever/BambuStudio-SoftFever/releases
## BambuStudio SoftFever change notes:
### [V1.4.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.2):
- Change the color theme :)
- Fixed a crash issue when selecting vase mode on some machines
- Port firmware retraction and Extra length on restart retraction feature from PrusaSlicer
- Fine-tune calibration features
1. Enforce max volumetric speed in PA line mode
2. Ensure print speeds are consistent across all blocks in the flow-rate calibration process. This is to help users calibrate those challenging filaments(such as TPU) by minimizing the influence of printing speed - thanks @psiberfunk for his input on this
- New printer models: thanks @erebus04 and @GP3D84
1. Tronxy X5SA 400
2. Artillery Sidewinder
- QoL:
1. Now allow exporting g-code for BBL printers
2. Fixed a bug that printer connection info was removed after loading a 3mf project
fixed an issue that user presets were not loaded when Auto sync user preset option was off in Preference.
3.Germany language translation - thanks @hliebscher
- Misc fixes:
1. Exit calibration mode when a new model is added to the scene(creating a new project after calibration is recommended)
2. Skip emitting M106 P2 command if the auxiliary fan is not enabled.
3. Fix an issue that previously there was a z-fighting issue when bed models are used for 3rd party printers
4. Fixed an issue that max volumetric speed was not correctly calculated if flow-rate was changed per object.
5. CICD for Linux build - thanks @fang64
Known issues:
The Calibration menu is missing on some Mac machines. Try restarting the App can usually fix it. See [#120](https://github.com/SoftFever/BambuStudio-SoftFever/issues/120)
### [V1.4.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.1):
- Added a feature for checking and displaying a notification for a new version
- Added RatRig printer profiles, thanks @erebus04 for working this
- Added support for the Creality CR-10 Max and Anker M5 printers.
- Fixed the issue with profile cloud syncing for third-party printers.
- set inner_wall_acceleration to 5000 for Bambu printers
- Added support for the first_layer_bed_temperature and first_layer_temperature variables for better compatibility."
- Fixed a crashing bug when adding text Mac Intel machine
- QoL improvements for naming logic:
1. The filename format is now supported when exporting 3mf files.
2. If the project is not defined, the model name will be used as the output name.
3. The "Untitled" string will no longer be added if the project name is set.
4. The "_plate_0" string has been removed from the file name if there is only one plate.
<details>
<summary> 👉 "Click here" for OLD Release Note</summary>
### [V1.4.0 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.0):
- Add Layer Time/Layer time(Log) display (NOTE: need more tweaking work for BBL printers as the layer time is skewed by the preparing time)
- Add `sandwich`(inner-outer-inner-infill) mode support for Arachne engine.
- Change default `wall loop` from 2 to 3
- Fix an issue that the last used printer was not remembered after application restart. (Thanks Bambulab engineers, for the quick response and fixing)
- Optimized layer height sanity check logic. It will check against `max_layer_height` in the printer settings now. (I can use CHT 1.8 nozzle to print 1.0 mm thick layers now ;) )
- Add Prusa MINI+ profile
- expose `bed_exclude_area` parameter to 3rd printers
- Fix some 3rd party printer related issues introduced in [BambuStudio v01.04.00.17](https://github.com/bambulab/BambuStudio/releases/tag/v01.04.00.17)
1. Can't send sliced files to printers
2. AMS filaments were added to non-Bambulab printers
3. Wrong bed setting was applied
### [V1.3.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.4):
1. Add a new printer order - sandwich mode:
This new order is similar to the outer-wall-first mode in achieving the best dimensional accuracy. This new approach however avoids printing outer walls right after a long travel, which may cause artifacts on the surface in many cases.
@@ -80,6 +135,7 @@ You might want to reduce speed for small perimeter parts to prevent failures lik
4. Support single wall mode on first layer
5. Support Chamber temperature. This setting can be use in machine start G-Gcode
6. Support thumbview for third-party printers
</details>
Demo video: https://youtu.be/vSNE9iGj2II
@@ -149,12 +205,14 @@ ARC movement are supported by default.
# Gallery
![image](./SoftFever_doc/accelerations.png)
![image](./SoftFever_doc/printers1.png)
![image](./SoftFever_doc/printers2.png)
![image](./SoftFever_doc/printers3.png)
![image](./SoftFever_doc/printers4.png)
![image](./SoftFever_doc/voron.png)
![image](./SoftFever_doc/BambuLab.png)
![image](./SoftFever_doc/Anker.png)
![image](./SoftFever_doc/Anycubic.png)
![image](./SoftFever_doc/Creality.png)
![image](./SoftFever_doc/Prusa.png)
![image](./SoftFever_doc/RatRig.png)
![image](./SoftFever_doc/Voron_1.png)
![image](./SoftFever_doc/Voron_2.png)
Image credits:

BIN
SoftFever_doc/Anker.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

BIN
SoftFever_doc/Anycubic.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

BIN
SoftFever_doc/BambuLab.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

BIN
SoftFever_doc/Creality.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

BIN
SoftFever_doc/Prusa.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

BIN
SoftFever_doc/RatRig.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

BIN
SoftFever_doc/Voron_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

BIN
SoftFever_doc/Voron_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -2,16 +2,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"POT-Creation-Date: 2023-01-19 13:01+0800\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Localazy (https://localazy.com)\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "Pintando Soportes"
@@ -1191,8 +1188,17 @@ msgstr "?"
msgid "Empty"
msgstr "Vacío"
msgid "Click the pencil icon to edit the filament."
msgstr "Haga clic en el icono del lápiz para editar el filamento."
msgid "AMS"
msgstr "AMS"
msgid "AMS not connected"
msgstr ""
msgid "Cali"
msgstr ""
msgid "Calibration of extrusion"
msgstr ""
msgid "Load Filament"
msgstr "Cargar"
@@ -1200,6 +1206,9 @@ msgstr "Cargar"
msgid "Unload Filament"
msgstr "Descargar"
msgid "Ext Spool"
msgstr ""
msgid "Tips"
msgstr "Consejos"
@@ -1392,6 +1401,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@@ -1414,6 +1426,9 @@ msgstr ""
msgid "Please log out and login to the printer again."
msgstr ""
msgid "Failed uploading print file. Please enter ip address again."
msgstr ""
msgid "Downloading"
msgstr ""
@@ -1493,6 +1508,12 @@ msgstr ""
msgid "AMS Materials Setting"
msgstr ""
msgid "Confirm"
msgstr "Confirmar"
msgid "Close"
msgstr "Cerrar"
msgid "Colour"
msgstr "Color"
@@ -1519,11 +1540,91 @@ msgstr "SN"
msgid "Setting AMS slot information while printing is not supported"
msgstr ""
msgid "Confirm"
msgstr "Confirmar"
msgid "Factors of dynamic flow cali"
msgstr ""
msgid "Close"
msgstr "Cerrar"
msgid "Factor K"
msgstr ""
msgid "Factor N"
msgstr ""
msgid "Please input a valid value (K in 0~0.5)"
msgstr ""
msgid "Please input a valid value (K in 0~0.5, N in 0.6~2.0)"
msgstr ""
msgid "Dynamic flow calibration"
msgstr ""
msgid ""
"The nozzle temp and max volumetric speed will affect the calibration "
"results. Please fill in the same values as the actual printing. They can be "
"auto-filled by selecting a filament preset."
msgstr ""
msgid "Nozzle Diameter"
msgstr ""
msgid "Bed Type"
msgstr ""
msgid "Nozzle temperature"
msgstr "Temperatura de la boquilla"
msgid "Bed Temperature"
msgstr ""
msgid "Max volumetric speed"
msgstr "Velocidad volumétrica máxima"
msgid "℃"
msgstr ""
msgid "Bed temperature"
msgstr "Temperatura de la base"
msgid "mm³"
msgstr "mm³"
msgid "Start calibration"
msgstr ""
msgid "Next"
msgstr ""
msgid ""
"Calibration completed. Please find the most uniform extrusion line on your "
"hot bed like the picture below, and fill the value on its left side into the "
"factor K input box."
msgstr ""
msgid "Save"
msgstr "Guardar"
msgid "Last Step"
msgstr ""
msgid "Example"
msgstr ""
#, c-format, boost-format
msgid "Calibrating... %d%%"
msgstr ""
msgid "Calibration completed"
msgstr ""
#, c-format, boost-format
msgid "%s does not support %s"
msgstr ""
msgid "Dynamic flow Calibration"
msgstr ""
msgid "Step"
msgstr ""
msgid "AMS Slots"
msgstr ""
@@ -1544,6 +1645,30 @@ msgstr ""
msgid "Print with the filament mounted on the back of chassis"
msgstr ""
msgid "Cabin humidity"
msgstr ""
msgid ""
"Green means that AMS humidity is normal, orange represent humidity is high, "
"red represent humidity is too high.(Hygrometer: lower the better, The bars: "
"higher the better)"
msgstr ""
msgid "Desiccant status"
msgstr ""
msgid ""
"A desiccant status lower than two bars indicates that desiccant may be "
"inactive. Please change the desiccant. (Higher is better)"
msgstr ""
msgid ""
"Note: When the lid is open or the desiccant pack is changed, it can take "
"hours or a night to absorb the moisture. Low temperatures also slow down the "
"process. During this time, the indicator may not represent the chamber "
"accurately."
msgstr ""
msgid ""
"Config which AMS slot should be used for a filament used in the print job"
msgstr ""
@@ -1557,6 +1682,18 @@ msgstr ""
msgid "Click to select AMS slot manually"
msgstr ""
msgid "Do not Enable AMS"
msgstr ""
msgid "Print using materials mounted on the back of the case"
msgstr ""
msgid "Print with filaments in ams"
msgstr ""
msgid "Print with filaments mounted on the back of the chassis"
msgstr ""
msgid "AMS Settings"
msgstr "Ajustes del AMS"
@@ -1896,12 +2033,9 @@ msgstr ""
"El valor se restablecerá a 0."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"El modo espiral sólo funciona cuando los bucles de pared son 1, \n"
"el soporte está desactivado, las capas superiores de la cáscara es 0 y la "
"densidad de relleno dispersa es 0\n"
msgid ""
"Change these settings automatically? \n"
@@ -1914,7 +2048,7 @@ msgstr ""
msgid ""
"Arachne engine only works when overhang slowing down is disabled.\n"
"This may cause decline in the quality of overhang surface when print fastly\n"
"This may cause decline in the quality of overhang surface when print fastly"
msgstr ""
msgid ""
@@ -1968,7 +2102,7 @@ msgstr "El patrón de relleno %1% no soporta el 100%% de densidad."
msgid ""
"Switch to rectilinear pattern?\n"
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
"No - reset density to default non 100% value automaticlly"
msgstr ""
msgid "Auto bed leveling"
@@ -2043,9 +2177,6 @@ msgstr "MC"
msgid "MainBoard"
msgstr "Placa Madre"
msgid "AMS"
msgstr "AMS"
msgid "TH"
msgstr "TH"
@@ -2564,12 +2695,12 @@ msgstr "Laminar placa"
msgid "Export G-code file"
msgstr ""
msgid "Send"
msgstr "Enviar"
msgid "Print plate"
msgstr ""
msgid "Send"
msgstr "Enviar"
msgid "Export plate sliced file"
msgstr ""
@@ -2892,7 +3023,7 @@ msgid ""
"It contains the following information:\n"
"1. The Process presets\n"
"2. The Filament presets\n"
"3. The Printer presets\n"
"3. The Printer presets"
msgstr ""
msgid "Synchronization"
@@ -2916,6 +3047,9 @@ msgstr ""
msgid "Initialize failed (Not accessible in LAN-only mode)!"
msgstr ""
msgid "Printer is busy downloading, Please wait for the downloading to finish."
msgstr ""
msgid "Initialize failed (Missing LAN ip of printer)!"
msgstr ""
@@ -2936,6 +3070,9 @@ msgstr ""
msgid "Stopped."
msgstr "Detenido."
msgid "LAN Connection Failed (Failed to start liveview)"
msgstr ""
msgid ""
"Virtual Camera Tools is required for this task!\n"
"Do you want to install them?"
@@ -3096,6 +3233,9 @@ msgstr "Detener"
msgid "0"
msgstr ""
msgid "Layers: N/A"
msgstr ""
msgid "Clean"
msgstr ""
@@ -3159,6 +3299,14 @@ msgstr "Descargando…"
msgid "Cloud Slicing..."
msgstr ""
#, c-format, boost-format
msgid "Layers: %s"
msgstr ""
#, c-format, boost-format
msgid "Layers: %d/%d"
msgstr ""
msgid "Please heat the nozzle to above 170 degree before loading filament."
msgstr ""
@@ -3168,6 +3316,12 @@ msgstr ""
msgid "Still load"
msgstr ""
msgid "AMS settings are not supported for external spool"
msgstr ""
msgid "Please select an AMS slot before calibration"
msgstr ""
msgid ""
"Cannot read filament info: the filament is loaded to the tool head,please "
"unload the filament and try again."
@@ -3257,6 +3411,12 @@ msgstr "La integración ha fallado."
msgid "Undo integration was successful."
msgstr "La operación de deshacer se ha realizado con éxito."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "La operación de deshacer ha fallado."
@@ -3546,10 +3706,8 @@ msgstr ""
#, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Found following keys "
"unrecognized:\n"
"unrecognized:"
msgstr ""
"La versión %s de 3mf es más reciente que la versión %s de %s, se han "
"encontrado las siguientes claves no reconocidas:\n"
msgid "You'd better upgrade your software.\n"
msgstr "Será mejor que actualices tu software.\n"
@@ -3560,7 +3718,7 @@ msgstr "Nueva versión 3mf"
#, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
"software."
msgstr ""
msgid "The 3mf is not compatible, load geometry data only!"
@@ -3761,9 +3919,6 @@ msgid "The current project has unsaved changes, save it before continue?"
msgstr ""
"El proyecto actual tiene cambios sin guardar, ¿guardarlos antes de continuar?"
msgid "Save"
msgstr "Guardar"
msgid "Number of copies:"
msgstr "Número de copias:"
@@ -3845,7 +4000,7 @@ msgid ""
msgstr ""
#, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgid "Plate %d: %s does not support filament %s (%s)."
msgstr ""
msgid "Switching the language requires application restart.\n"
@@ -4330,18 +4485,21 @@ msgstr ""
msgid "Cannot send the print job for empty plate"
msgstr ""
msgid "This printer does not support printing all plates"
msgstr ""
msgid "Errors"
msgstr ""
msgid ""
"Please check the following infomation and click Confirm to continue sending "
"print:\n"
"print:"
msgstr ""
msgid ""
"The printer type used to generate G-code is not the same type as the "
"currently selected physical printer. It is recommend to re-slice by "
"selecting the same printer type.\n"
"selecting the same printer type."
msgstr ""
#, c-format, boost-format
@@ -4439,11 +4597,35 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommend using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommend the following "
"settings: at least 2 interface layers, at least 0.1mm top z distance or "
"using support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommend the "
"following settings:\n"
"0 top z distance, 0 interface spacing, concentric pattern."
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\".\n"
"\"->\"Timelapse Wipe Tower\"."
msgstr ""
msgid "Line width"
@@ -5204,12 +5386,47 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "Nueva versión de Bambu Studio"
msgid "Don't remind me of this version again"
msgstr ""
msgid "LAN Connection Failed (Sending print file)"
msgstr ""
msgid ""
"Step 1, please confirm Bambu Studio and your printer are in the same LAN."
msgstr ""
msgid ""
"Step 2, if the IP and Access Code below are different from the actual values "
"on your printer, please correct them."
msgstr ""
msgid "IP"
msgstr ""
msgid "Access Code"
msgstr ""
msgid "Where to find your printer's IP and Access Code?"
msgstr ""
msgid "Error: IP or Access Code are not correct"
msgstr ""
msgid "Model:"
msgstr ""
@@ -5517,11 +5734,10 @@ msgstr "%1% está demasiado cerca de otros, y pueden producirse colisiones."
msgid "%1% is too tall, and collisions will be caused."
msgstr "%1% es demasiado alto, y se producirán colisiones."
msgid " is too close to others, there may be collisions when printing.\n"
msgid " is too close to others, there may be collisions when printing."
msgstr ""
msgid ""
" is too close to exclusion area, there may be collisions when printing.\n"
msgid " is too close to exclusion area, there may be collisions when printing."
msgstr ""
msgid "Prime Tower"
@@ -5626,7 +5842,7 @@ msgid "Layer height cannot exceed nozzle diameter"
msgstr "La altura de la capa no puede superar el diámetro de la boquilla"
#, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgid "Plate %d: %s does not support filament %s"
msgstr ""
msgid "Generating skirt & brim"
@@ -5778,9 +5994,6 @@ msgstr ""
msgid "°C"
msgstr "°C"
msgid "Bed temperature"
msgstr "Temperatura de la base"
msgid ""
"Bed temperature for layers except the initial one. Value 0 means the "
"filament does not support to print on the Engineering Plate"
@@ -6287,9 +6500,6 @@ msgid ""
"of nozzle's HRC."
msgstr ""
msgid "Max volumetric speed"
msgstr "Velocidad volumétrica máxima"
msgid ""
"This setting stands for how much volume of filament can be melted and "
"extruded per second. Printing speed is limited by max volumetric speed, in "
@@ -6302,9 +6512,6 @@ msgstr "mm³/s"
msgid "Minimal purge on wipe tower"
msgstr "Purga mínima en la torre de limpieza"
msgid "mm³"
msgstr "mm³"
msgid "Filament load time"
msgstr "Tiempo de carga de filamento"
@@ -7160,10 +7367,9 @@ msgstr "Habilitar la generación de soporte."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"normal(auto) y tree(auto) se utiliza para generar soporte automáticamente. "
"Si se selecciona normal o árbol, sólo se generan los soportes"
msgid "normal(auto)"
msgstr "normal(auto)"
@@ -7171,9 +7377,6 @@ msgstr "normal(auto)"
msgid "tree(auto)"
msgstr "árbol(auto)"
msgid "hybrid(auto)"
msgstr "híbrido(auto)"
msgid "normal(manual)"
msgstr ""
@@ -7220,9 +7423,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@@ -7278,6 +7484,9 @@ msgstr "Patrón lineal de apoyo"
msgid "Rectilinear grid"
msgstr "Rejilla rectilínea"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Patrón de interfaz"
@@ -7308,9 +7517,27 @@ msgstr "Velocidad de la asistencia"
msgid "Style"
msgstr "Estilo"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, slim style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Ajustado"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Altura de la capa de soporte independiente"
@@ -7366,21 +7593,14 @@ msgstr ""
msgid "Nozzle temperature for layers after the initial one"
msgstr "Temperatura de la boquilla después de la primera capa"
msgid "Nozzle temperature"
msgstr "Temperatura de la boquilla"
msgid "Bed temperature difference"
msgstr "Diferencia de temperatura de la cama"
msgid ""
"Do not recommand bed temperature of other layer to be lower than initial "
"Do not recommend bed temperature of other layer to be lower than initial "
"layer for more than this threshold. Too low bed temperature of other layer "
"may cause the model broken free from build plate"
msgstr ""
"No se recomienda que la temperatura de la cama de la otra capa sea inferior "
"a la de la capa inicial por más de este umbral. Una temperatura demasiado "
"baja de la otra capa puede hacer que el modelo se desprenda de la placa de "
"impresión."
msgid "Detect thin wall"
msgstr "Detectar la pared delgada"
@@ -7976,55 +8196,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Elija uno o varios archivos (3mf/step/stl/obj/amf):"
#~ msgid "Finish"
#~ msgstr "Finalizar"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importar 3MF/STL/STEP/OBJ/AMF"
#~ msgid "Part Cooling"
#~ msgstr "Refrigeración de Piezas"
#~ msgid "Aux Cooling"
#~ msgstr "Enfriamiento Auxiliar"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filamento para imprimir el soporte y el faldón. 0 significa que no hay "
#~ "filamento específico para el soporte y se utiliza el filamento actual"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filamento para imprimir la interfaz de soporte. 0 significa que no hay "
#~ "filamento específico para la interfaz de soporte y se utiliza el "
#~ "filamento actual"
#~ msgid "Repair"
#~ msgstr "Reparar"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Reparar las mallas del modelo si se trata de una malla no plegable"
#~ msgid "Monitoring Recording"
#~ msgstr "Monitoreo de grabación"
#~ msgid "Tree support with infill"
#~ msgstr "Soporte para árboles con relleno"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Este ajuste especifica si se añade relleno dentro de los grandes huecos "
#~ "del soporte del árbol"
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@@ -8055,6 +8226,12 @@ msgstr ""
#~ "Por favor, resuelva el problema moviéndolo totalmente dentro o fuera de "
#~ "la placa."
#~ msgid ""
#~ "Arachne engine only works when overhang slowing down is disabled.\n"
#~ "This may cause decline in the quality of overhang surface when print "
#~ "fastly\n"
#~ msgstr "\n"
#~ msgid "Auto arrange"
#~ msgstr "Auto posicionamiento"
@@ -8067,6 +8244,9 @@ msgstr ""
#~ "hay objetos seleccionados, sólo orienta los seleccionados.En caso "
#~ "contrario, orienta todos los objetos del proyecto."
#~ msgid "Aux Cooling"
#~ msgstr "Enfriamiento Auxiliar"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Evitar cruzar el muro en los desplazamientos"
@@ -8079,6 +8259,9 @@ msgstr ""
#~ "este filamento.\n"
#~ "Esto puede causar el bloqueo de la boquilla y el fracaso de la impresión"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Elija uno o varios archivos (3mf/step/stl/obj/amf):"
#~ msgid "Clear all"
#~ msgstr "Borrar todo"
@@ -8090,6 +8273,9 @@ msgstr ""
#~ "auto-organización para evitar la colisión cuando se imprime objeto por "
#~ "objeto"
#~ msgid "Click the pencil icon to edit the filament."
#~ msgstr "Haga clic en el icono del lápiz para editar el filamento."
#~ msgid "Color Print"
#~ msgstr "Impresión en color"
@@ -8123,6 +8309,16 @@ msgstr ""
#~ msgid "Display triangles of models"
#~ msgstr "Mostrar los triángulos de los modelos"
#~ msgid ""
#~ "Do not recommand bed temperature of other layer to be lower than initial "
#~ "layer for more than this threshold. Too low bed temperature of other "
#~ "layer may cause the model broken free from build plate"
#~ msgstr ""
#~ "No se recomienda que la temperatura de la cama de la otra capa sea "
#~ "inferior a la de la capa inicial por más de este umbral. Una temperatura "
#~ "demasiado baja de la otra capa puede hacer que el modelo se desprenda de "
#~ "la placa de impresión."
#~ msgid ""
#~ "Do you want to synchronize your personal data from Bambu Cloud? \n"
#~ "Contains the following information:\n"
@@ -8136,6 +8332,14 @@ msgstr ""
#~ "2. Preajustese de filamentos\n"
#~ "3. Preajustes de la impresora\n"
#~ msgid ""
#~ "Do you want to synchronize your personal data from Bambu Cloud? \n"
#~ "It contains the following information:\n"
#~ "1. The Process presets\n"
#~ "2. The Filament presets\n"
#~ "3. The Printer presets\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Don't retract when the travel is in infill area absolutely. That means "
#~ "the oozing can't been seen"
@@ -8189,9 +8393,27 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filamento N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filamento para imprimir el soporte y el faldón. 0 significa que no hay "
#~ "filamento específico para el soporte y se utiliza el filamento actual"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filamento para imprimir la interfaz de soporte. 0 significa que no hay "
#~ "filamento específico para la interfaz de soporte y se utiliza el "
#~ "filamento actual"
#~ msgid "Filaments Selection"
#~ msgstr "Selección de filamentos"
#~ msgid "Finish"
#~ msgstr "Finalizar"
#~ msgid "Finished"
#~ msgstr "Terminado"
@@ -8240,6 +8462,9 @@ msgstr ""
#~ "entrada de auto-organización para evitar la colisión cuando se imprime "
#~ "objeto por objeto."
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importar 3MF/STL/STEP/OBJ/AMF"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "En la calibración del flujo de extrusión"
@@ -8281,6 +8506,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Monitorizando"
#~ msgid "Monitoring Recording"
#~ msgstr "Monitoreo de grabación"
#~ msgid "Open"
#~ msgstr "Abrir"
@@ -8293,6 +8521,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Archivo de salida"
#~ msgid "Part Cooling"
#~ msgstr "Refrigeración de Piezas"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Pausa (error de temperatura de la cama caliente)"
@@ -8305,9 +8536,20 @@ msgstr ""
#~ msgid "Per object edit"
#~ msgstr "Por objeto editar"
#~ msgid "Plate %d: %s does not support filament %s\n"
#~ msgstr "\n"
#~ msgid "Plate %d: %s does not support filament %s.\n"
#~ msgstr "La placa %d: %s no admite el filamento %s.\n"
#~ msgid "Plate %d: %s does not support filament %s (%s).\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Please check the following infomation and click Confirm to continue "
#~ "sending print:\n"
#~ msgstr "\n"
#~ msgid "Please fill report first."
#~ msgstr "Por favor, rellene primero el informe."
@@ -8376,6 +8618,12 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Recarga de objetos"
#~ msgid "Repair"
#~ msgstr "Reparar"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Reparar las mallas del modelo si se trata de una malla no plegable"
#~ msgid "Report"
#~ msgstr "Informe"
@@ -8409,6 +8657,15 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Modo espiral"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "El modo espiral sólo funciona cuando los bucles de pared son 1, \n"
#~ "el soporte está desactivado, las capas superiores de la cáscara es 0 y la "
#~ "densidad de relleno dispersa es 0\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Enviado con éxito. Saltará automáticamente a la página del dispositivo en "
@@ -8424,6 +8681,12 @@ msgstr ""
#~ "personalizada, pero puede causar cambios de filamento adicionales si el "
#~ "soporte se especifica como un extrusor diferente con el objeto"
#~ msgid ""
#~ "Switch to rectilinear pattern?\n"
#~ "Yes - switch to rectilinear pattern automaticlly\n"
#~ "No - reset density to default non 100% value automaticlly\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Switch to zig-zag pattern?\n"
#~ "Yes - switch to zig-zag pattern automaticlly\n"
@@ -8437,6 +8700,18 @@ msgstr ""
#~ msgid "Swith cloud environment, Please login again!"
#~ msgstr "Cambiar el entorno de la nube, ¡Por favor, inicie sesión de nuevo!"
#~ msgid ""
#~ "The 3mf's version %s is newer than %s's version %s, Found following keys "
#~ "unrecognized:\n"
#~ msgstr ""
#~ "La versión %s de 3mf es más reciente que la versión %s de %s, se han "
#~ "encontrado las siguientes claves no reconocidas:\n"
#~ msgid ""
#~ "The 3mf's version %s is newer than %s's version %s, Suggest to upgrade "
#~ "your software.\n"
#~ msgstr "\n"
#~ msgid "The Config is not compatible and can not be loaded."
#~ msgstr "La configuración no es compatible y no se puede cargar."
@@ -8457,6 +8732,12 @@ msgstr ""
#~ "repararlo, sin embargo, es posible que desee comprobar los resultados o "
#~ "reparar el archivo de entrada y volver a intentarlo."
#~ msgid ""
#~ "The printer type used to generate G-code is not the same type as the "
#~ "currently selected physical printer. It is recommend to re-slice by "
#~ "selecting the same printer type.\n"
#~ msgstr "\n"
#~ msgid ""
#~ "This object will be used to purge the nozzle after a filament change to "
#~ "save filament and decrease the print time. Colours of the objects will be "
@@ -8466,6 +8747,13 @@ msgstr ""
#~ "filamento para ahorrar filamento y disminuir el tiempo de impresión. Los "
#~ "colores de los objetos se mezclarán como resultado"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Este ajuste especifica si se añade relleno dentro de los grandes huecos "
#~ "del soporte del árbol"
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@@ -8482,6 +8770,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Translación"
#~ msgid "Tree support with infill"
#~ msgstr "Soporte para árboles con relleno"
#~ msgid "Unable to create zip file"
#~ msgstr "No se puede crear un archivo zip"
@@ -8494,6 +8785,13 @@ msgstr ""
#~ msgid "Waiting"
#~ msgstr "Esperando"
#~ 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\".\n"
#~ msgstr "\n"
#~ msgid ""
#~ "You have changed some preset settings. \n"
#~ "Would you like to keep these changed settings after switching preset?"
@@ -8507,18 +8805,36 @@ msgstr ""
#~ msgid " Object:"
#~ msgstr "Objeto"
#~ msgid ""
#~ " is too close to exclusion area, there may be collisions when printing.\n"
#~ msgstr "\n"
#~ msgid ""
#~ " is too close to exclusion area, there will be collisions when printing.\n"
#~ msgstr ""
#~ " está demasiado cerca del área de exclusión, habrá colisiones al "
#~ "imprimir.\n"
#~ msgid " is too close to others, there may be collisions when printing.\n"
#~ msgstr "\n"
#~ msgid " is too close to others, there will be collisions when printing.\n"
#~ msgstr " está demasiado cerca de otros, habrá colisiones al imprimir.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "híbrido(auto)"
#~ msgid "normal"
#~ msgstr "normal"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "normal(auto) y tree(auto) se utiliza para generar soporte "
#~ "automáticamente. Si se selecciona normal o árbol, sólo se generan los "
#~ "soportes"
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr "el 3mf no es compatible, ¡cargue sólo los datos geométricos!"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -42,6 +42,7 @@ src/slic3r/GUI/Jobs/SendJob.cpp
src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
src/slic3r/GUI/AboutDialog.cpp
src/slic3r/GUI/AMSMaterialsSetting.cpp
src/slic3r/GUI/ExtrusionCalibration.cpp
src/slic3r/GUI/AMSMappingPopup.cpp
src/slic3r/GUI/AMSSetting.cpp
src/slic3r/GUI/BBLTopbar.cpp

View File

@@ -2,16 +2,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"POT-Creation-Date: 2023-01-19 13:01+0800\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Localazy (https://localazy.com)\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "Onderteuning (Support) tekenen"
@@ -1195,8 +1192,17 @@ msgstr " ?"
msgid "Empty"
msgstr "Leeg"
msgid "Click the pencil icon to edit the filament."
msgstr "Klik op het potlood icoon om het filament aan te passen."
msgid "AMS"
msgstr "AMS"
msgid "AMS not connected"
msgstr ""
msgid "Cali"
msgstr ""
msgid "Calibration of extrusion"
msgstr ""
msgid "Load Filament"
msgstr "Filament laden"
@@ -1204,6 +1210,9 @@ msgstr "Filament laden"
msgid "Unload Filament"
msgstr "Lossen"
msgid "Ext Spool"
msgstr ""
msgid "Tips"
msgstr "Tips"
@@ -1393,6 +1402,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@@ -1415,6 +1427,9 @@ msgstr ""
msgid "Please log out and login to the printer again."
msgstr ""
msgid "Failed uploading print file. Please enter ip address again."
msgstr ""
msgid "Downloading"
msgstr "Downloaden"
@@ -1495,6 +1510,12 @@ msgstr ""
msgid "AMS Materials Setting"
msgstr ""
msgid "Confirm"
msgstr "Bevestigen"
msgid "Close"
msgstr "Sluiten"
msgid "Colour"
msgstr "Kleur"
@@ -1521,11 +1542,91 @@ msgstr "SN"
msgid "Setting AMS slot information while printing is not supported"
msgstr ""
msgid "Confirm"
msgstr "Bevestigen"
msgid "Factors of dynamic flow cali"
msgstr ""
msgid "Close"
msgstr "Sluiten"
msgid "Factor K"
msgstr ""
msgid "Factor N"
msgstr ""
msgid "Please input a valid value (K in 0~0.5)"
msgstr ""
msgid "Please input a valid value (K in 0~0.5, N in 0.6~2.0)"
msgstr ""
msgid "Dynamic flow calibration"
msgstr ""
msgid ""
"The nozzle temp and max volumetric speed will affect the calibration "
"results. Please fill in the same values as the actual printing. They can be "
"auto-filled by selecting a filament preset."
msgstr ""
msgid "Nozzle Diameter"
msgstr ""
msgid "Bed Type"
msgstr ""
msgid "Nozzle temperature"
msgstr "Nozzle temperatuur"
msgid "Bed Temperature"
msgstr ""
msgid "Max volumetric speed"
msgstr "Maximale volumetrische snelheid"
msgid "℃"
msgstr ""
msgid "Bed temperature"
msgstr "Printbed temperatuur"
msgid "mm³"
msgstr "mm³"
msgid "Start calibration"
msgstr ""
msgid "Next"
msgstr ""
msgid ""
"Calibration completed. Please find the most uniform extrusion line on your "
"hot bed like the picture below, and fill the value on its left side into the "
"factor K input box."
msgstr ""
msgid "Save"
msgstr "Bewaar"
msgid "Last Step"
msgstr ""
msgid "Example"
msgstr ""
#, c-format, boost-format
msgid "Calibrating... %d%%"
msgstr ""
msgid "Calibration completed"
msgstr ""
#, c-format, boost-format
msgid "%s does not support %s"
msgstr ""
msgid "Dynamic flow Calibration"
msgstr ""
msgid "Step"
msgstr ""
msgid "AMS Slots"
msgstr ""
@@ -1546,6 +1647,30 @@ msgstr ""
msgid "Print with the filament mounted on the back of chassis"
msgstr ""
msgid "Cabin humidity"
msgstr ""
msgid ""
"Green means that AMS humidity is normal, orange represent humidity is high, "
"red represent humidity is too high.(Hygrometer: lower the better, The bars: "
"higher the better)"
msgstr ""
msgid "Desiccant status"
msgstr ""
msgid ""
"A desiccant status lower than two bars indicates that desiccant may be "
"inactive. Please change the desiccant. (Higher is better)"
msgstr ""
msgid ""
"Note: When the lid is open or the desiccant pack is changed, it can take "
"hours or a night to absorb the moisture. Low temperatures also slow down the "
"process. During this time, the indicator may not represent the chamber "
"accurately."
msgstr ""
msgid ""
"Config which AMS slot should be used for a filament used in the print job"
msgstr ""
@@ -1559,6 +1684,18 @@ msgstr ""
msgid "Click to select AMS slot manually"
msgstr ""
msgid "Do not Enable AMS"
msgstr ""
msgid "Print using materials mounted on the back of the case"
msgstr ""
msgid "Print with filaments in ams"
msgstr ""
msgid "Print with filaments mounted on the back of the chassis"
msgstr ""
msgid "AMS Settings"
msgstr "AMS Instellingen"
@@ -1898,12 +2035,9 @@ msgstr ""
"De waarde wordt teruggezet naar 0."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"Spiraal modus werkt alleen indien indien er 1 wall gekozen is, \n"
"support uitgeschakeld is, er 0 top layers gekozen zijn en de vulling "
"dichtheid 0 is\n"
msgid ""
"Change these settings automatically? \n"
@@ -1916,7 +2050,7 @@ msgstr ""
msgid ""
"Arachne engine only works when overhang slowing down is disabled.\n"
"This may cause decline in the quality of overhang surface when print fastly\n"
"This may cause decline in the quality of overhang surface when print fastly"
msgstr ""
msgid ""
@@ -1968,7 +2102,7 @@ msgstr "%1% het gekozen vulling patroon ondersteund geen 100%% dichtheid."
msgid ""
"Switch to rectilinear pattern?\n"
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
"No - reset density to default non 100% value automaticlly"
msgstr ""
msgid "Auto bed leveling"
@@ -2040,9 +2174,6 @@ msgstr "MC"
msgid "MainBoard"
msgstr "Moederbord"
msgid "AMS"
msgstr "AMS"
msgid "TH"
msgstr "th"
@@ -2561,12 +2692,12 @@ msgstr "Slice printbed"
msgid "Export G-code file"
msgstr ""
msgid "Send"
msgstr "Versturen"
msgid "Print plate"
msgstr ""
msgid "Send"
msgstr "Versturen"
msgid "Export plate sliced file"
msgstr ""
@@ -2889,13 +3020,8 @@ msgid ""
"It contains the following information:\n"
"1. The Process presets\n"
"2. The Filament presets\n"
"3. The Printer presets\n"
"3. The Printer presets"
msgstr ""
"Do you want to synchronize your personal data from Bambu Cloud? \n"
"It contains the following information:\n"
"1. The Process presets\n"
"2. The Filament presets\n"
"3. The Printer presets\n"
msgid "Synchronization"
msgstr "Synchronisatie"
@@ -2918,6 +3044,9 @@ msgstr ""
msgid "Initialize failed (Not accessible in LAN-only mode)!"
msgstr ""
msgid "Printer is busy downloading, Please wait for the downloading to finish."
msgstr ""
msgid "Initialize failed (Missing LAN ip of printer)!"
msgstr ""
@@ -2938,6 +3067,9 @@ msgstr ""
msgid "Stopped."
msgstr "Gestopt."
msgid "LAN Connection Failed (Failed to start liveview)"
msgstr ""
msgid ""
"Virtual Camera Tools is required for this task!\n"
"Do you want to install them?"
@@ -3098,6 +3230,9 @@ msgstr "Stop"
msgid "0"
msgstr ""
msgid "Layers: N/A"
msgstr ""
msgid "Clean"
msgstr ""
@@ -3161,6 +3296,14 @@ msgstr "Downloaden..."
msgid "Cloud Slicing..."
msgstr ""
#, c-format, boost-format
msgid "Layers: %s"
msgstr ""
#, c-format, boost-format
msgid "Layers: %d/%d"
msgstr ""
msgid "Please heat the nozzle to above 170 degree before loading filament."
msgstr ""
@@ -3170,6 +3313,12 @@ msgstr ""
msgid "Still load"
msgstr ""
msgid "AMS settings are not supported for external spool"
msgstr ""
msgid "Please select an AMS slot before calibration"
msgstr ""
msgid ""
"Cannot read filament info: the filament is loaded to the tool head,please "
"unload the filament and try again."
@@ -3259,6 +3408,12 @@ msgstr "Integratie is mislukt."
msgid "Undo integration was successful."
msgstr "Het ongedaan maken van de integratie is gelukt."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "Het ongedaan maken van de integratie is mislukt."
@@ -3554,10 +3709,8 @@ msgstr ""
#, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Found following keys "
"unrecognized:\n"
"unrecognized:"
msgstr ""
"De 3mf-versie %s is nieuwer dan %s-versie %s, Gevonden volgende sleutels "
"zijn niet herkend:\n"
msgid "You'd better upgrade your software.\n"
msgstr "U dient de software te upgraden.\n"
@@ -3565,10 +3718,10 @@ msgstr "U dient de software te upgraden.\n"
msgid "Newer 3mf version"
msgstr "Nieuwere versie 3mf"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
"software."
msgstr ""
msgid "The 3mf is not compatible, load geometry data only!"
@@ -3770,9 +3923,6 @@ msgstr ""
"Het huidige project heeft niet-opgeslagen wijzigingen. Wilt u eerst opslaan "
"voordat u verder gaat?"
msgid "Save"
msgstr "Bewaar"
msgid "Number of copies:"
msgstr "Aantal kopieën:"
@@ -3852,7 +4002,7 @@ msgid ""
msgstr ""
#, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgid "Plate %d: %s does not support filament %s (%s)."
msgstr ""
msgid "Switching the language requires application restart.\n"
@@ -4340,18 +4490,21 @@ msgstr ""
msgid "Cannot send the print job for empty plate"
msgstr ""
msgid "This printer does not support printing all plates"
msgstr ""
msgid "Errors"
msgstr ""
msgid ""
"Please check the following infomation and click Confirm to continue sending "
"print:\n"
"print:"
msgstr ""
msgid ""
"The printer type used to generate G-code is not the same type as the "
"currently selected physical printer. It is recommend to re-slice by "
"selecting the same printer type.\n"
"selecting the same printer type."
msgstr ""
#, c-format, boost-format
@@ -4447,11 +4600,35 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommend using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommend the following "
"settings: at least 2 interface layers, at least 0.1mm top z distance or "
"using support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommend the "
"following settings:\n"
"0 top z distance, 0 interface spacing, concentric pattern."
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\".\n"
"\"->\"Timelapse Wipe Tower\"."
msgstr ""
msgid "Line width"
@@ -5215,12 +5392,47 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "Nieuwe versie van Bambu Studio"
msgid "Don't remind me of this version again"
msgstr ""
msgid "LAN Connection Failed (Sending print file)"
msgstr ""
msgid ""
"Step 1, please confirm Bambu Studio and your printer are in the same LAN."
msgstr ""
msgid ""
"Step 2, if the IP and Access Code below are different from the actual values "
"on your printer, please correct them."
msgstr ""
msgid "IP"
msgstr ""
msgid "Access Code"
msgstr ""
msgid "Where to find your printer's IP and Access Code?"
msgstr ""
msgid "Error: IP or Access Code are not correct"
msgstr ""
msgid "Model:"
msgstr ""
@@ -5527,11 +5739,10 @@ msgstr "%1% staat te dicht bij anderen en er kunnen botsingen ontstaan."
msgid "%1% is too tall, and collisions will be caused."
msgstr "%1% is te hoog en er kunnen botsingen ontstaan."
msgid " is too close to others, there may be collisions when printing.\n"
msgid " is too close to others, there may be collisions when printing."
msgstr ""
msgid ""
" is too close to exclusion area, there may be collisions when printing.\n"
msgid " is too close to exclusion area, there may be collisions when printing."
msgstr ""
msgid "Prime Tower"
@@ -5636,7 +5847,7 @@ msgid "Layer height cannot exceed nozzle diameter"
msgstr "De laaghoogte kan niet groter zijn dan de diameter van de nozzle"
#, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgid "Plate %d: %s does not support filament %s"
msgstr ""
msgid "Generating skirt & brim"
@@ -5789,9 +6000,6 @@ msgstr ""
msgid "°C"
msgstr "°C"
msgid "Bed temperature"
msgstr "Printbed temperatuur"
msgid ""
"Bed temperature for layers except the initial one. Value 0 means the "
"filament does not support to print on the Engineering Plate"
@@ -6298,9 +6506,6 @@ msgid ""
"of nozzle's HRC."
msgstr ""
msgid "Max volumetric speed"
msgstr "Maximale volumetrische snelheid"
msgid ""
"This setting stands for how much volume of filament can be melted and "
"extruded per second. Printing speed is limited by max volumetric speed, in "
@@ -6313,9 +6518,6 @@ msgstr "mm³/s"
msgid "Minimal purge on wipe tower"
msgstr "Minimale filament reiniging op de wipe tower"
msgid "mm³"
msgstr "mm³"
msgid "Filament load time"
msgstr "Filament laadt tijd"
@@ -7180,11 +7382,9 @@ msgstr "Dit maakt het genereren van support mogelijk."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"normal (auto), hybride (auto) en tree (auto) worden gebruikt om automatisch "
"support te genereren. Als normaal of tree is geselecteerd, worden alleen "
"vereiste support gegenereerd."
msgid "normal(auto)"
msgstr "Normaal (automatisch)"
@@ -7192,9 +7392,6 @@ msgstr "Normaal (automatisch)"
msgid "tree(auto)"
msgstr "tree(auto)"
msgid "hybrid(auto)"
msgstr "Hybride (automatisch)"
msgid "normal(manual)"
msgstr ""
@@ -7242,9 +7439,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@@ -7300,6 +7500,9 @@ msgstr "Dit is het lijnpatroon voor support."
msgid "Rectilinear grid"
msgstr "Rechtlijnig raster"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Interfacepatroon"
@@ -7330,9 +7533,27 @@ msgstr "Dit is de snelheid voor het printen van support."
msgid "Style"
msgstr "Stijl"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, slim style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Nauwsluitend"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Onafhankelijke support laaghoogte"
@@ -7387,21 +7608,14 @@ msgstr "Deze instelling specificeert het aantal wanden rond de tree support."
msgid "Nozzle temperature for layers after the initial one"
msgstr "Nozzle temperatuur voor de lagen na de eerstse laag"
msgid "Nozzle temperature"
msgstr "Nozzle temperatuur"
msgid "Bed temperature difference"
msgstr "Printbed temperatuurverschil"
msgid ""
"Do not recommand bed temperature of other layer to be lower than initial "
"Do not recommend bed temperature of other layer to be lower than initial "
"layer for more than this threshold. Too low bed temperature of other layer "
"may cause the model broken free from build plate"
msgstr ""
"Een verschil in bedtemperatuur groter dan deze marge en lager dan de "
"bedtemperatuur van de eerste eerste laag, wordt niet geadviseerd. Een te "
"lage bedtemperatuur van de overige lagen kan ertoe leiden dat het model "
"loskomt van het printbed."
msgid "Detect thin wall"
msgstr "Detecteer dunne wanden"
@@ -7998,54 +8212,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Kies een of meer bestanden (3mf/step/stl/obj/amf):"
#~ msgid "Finish"
#~ msgstr "Klaar"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importeer 3MF/STL/STEP/OBJ/AMF"
#~ msgid "Part Cooling"
#~ msgstr "Koeling van de printkop"
#~ msgid "Aux Cooling"
#~ msgstr "Extra koeling"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament om randen (skirt) en support te printen. Indien u kiest voor 0 "
#~ "dan is er geen specifiek filament en wordt het huidige filament gebruikt"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament om support te printen. Indien u kiest voor 0 dan is er geen "
#~ "specifiek filament en wordt het huidige filament gebruikt"
#~ msgid "Repair"
#~ msgstr "Repareren"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Repareer de meshes van het model als ze niet-manifold zijn."
#~ msgid "Monitoring Recording"
#~ msgstr "Monitoring en opname"
#~ msgid "Tree support with infill"
#~ msgstr "Tree support met vulling"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Deze instelling geeft aan of er opvulling moet worden toegevoegd in grote "
#~ "holtes van de tree support."
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@@ -8076,6 +8242,12 @@ msgstr ""
#~ "Los dit probleem op door het object geheel binnen of buiten de printplaat "
#~ "te plaatsen."
#~ msgid ""
#~ "Arachne engine only works when overhang slowing down is disabled.\n"
#~ "This may cause decline in the quality of overhang surface when print "
#~ "fastly\n"
#~ msgstr "\n"
#~ msgid "Auto arrange"
#~ msgstr "Automatisch rangschikken"
@@ -8088,6 +8260,9 @@ msgstr ""
#~ "deze georiënteert. Anders worden alle objecten op de huidige project "
#~ "georiënteert."
#~ msgid "Aux Cooling"
#~ msgstr "Extra koeling"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Vermijd wanden tijdens het verplaatsen"
@@ -8100,6 +8275,9 @@ msgstr ""
#~ "filament. Hierdoor kan de nozzle verstopt raken en kan het printen "
#~ "mislukken"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Kies een of meer bestanden (3mf/step/stl/obj/amf):"
#~ msgid "Clear all"
#~ msgstr "Alles wissen"
@@ -8111,6 +8289,9 @@ msgstr ""
#~ "automatisch rangschikken om botsingen te voorkomen bij het afdrukken van "
#~ "object voor object"
#~ msgid "Click the pencil icon to edit the filament."
#~ msgstr "Klik op het potlood icoon om het filament aan te passen."
#~ msgid "Color Print"
#~ msgstr "Kleuren print"
@@ -8144,6 +8325,16 @@ msgstr ""
#~ msgid "Display triangles of models"
#~ msgstr "Toon de driehoeken van modellen"
#~ msgid ""
#~ "Do not recommand bed temperature of other layer to be lower than initial "
#~ "layer for more than this threshold. Too low bed temperature of other "
#~ "layer may cause the model broken free from build plate"
#~ msgstr ""
#~ "Een verschil in bedtemperatuur groter dan deze marge en lager dan de "
#~ "bedtemperatuur van de eerste eerste laag, wordt niet geadviseerd. Een te "
#~ "lage bedtemperatuur van de overige lagen kan ertoe leiden dat het model "
#~ "loskomt van het printbed."
#~ msgid ""
#~ "Do you want to synchronize your personal data from Bambu Cloud? \n"
#~ "Contains the following information:\n"
@@ -8157,6 +8348,14 @@ msgstr ""
#~ "2. Voorinstellingen voor filament\n"
#~ "3. Voorinstellingen voor printers\n"
#~ msgid ""
#~ "Do you want to synchronize your personal data from Bambu Cloud? \n"
#~ "It contains the following information:\n"
#~ "1. The Process presets\n"
#~ "2. The Filament presets\n"
#~ "3. The Printer presets\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Don't retract when the travel is in infill area absolutely. That means "
#~ "the oozing can't been seen"
@@ -8210,9 +8409,26 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filament N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament om randen (skirt) en support te printen. Indien u kiest voor 0 "
#~ "dan is er geen specifiek filament en wordt het huidige filament gebruikt"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament om support te printen. Indien u kiest voor 0 dan is er geen "
#~ "specifiek filament en wordt het huidige filament gebruikt"
#~ msgid "Filaments Selection"
#~ msgstr "Filaments selectie"
#~ msgid "Finish"
#~ msgstr "Klaar"
#~ msgid "Finished"
#~ msgstr "Voltooid"
@@ -8258,6 +8474,9 @@ msgstr ""
#~ "voor automatisch rangschikken om botsingen te voorkomen bij object voor "
#~ "object printen."
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importeer 3MF/STL/STEP/OBJ/AMF"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "Bij de kalibratie van de extrusieflow"
@@ -8299,6 +8518,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Monitoren"
#~ msgid "Monitoring Recording"
#~ msgstr "Monitoring en opname"
#~ msgid "Open"
#~ msgstr "Open"
@@ -8311,6 +8533,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Bestand weergeven"
#~ msgid "Part Cooling"
#~ msgstr "Koeling van de printkop"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Pauze (fout in temperatuur printbed)"
@@ -8323,9 +8548,20 @@ msgstr ""
#~ msgid "Per object edit"
#~ msgstr "Instellingen per object"
#~ msgid "Plate %d: %s does not support filament %s\n"
#~ msgstr "\n"
#~ msgid "Plate %d: %s does not support filament %s.\n"
#~ msgstr "Printbed %d: %s onderstand filament %s niet.\n"
#~ msgid "Plate %d: %s does not support filament %s (%s).\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Please check the following infomation and click Confirm to continue "
#~ "sending print:\n"
#~ msgstr "\n"
#~ msgid "Please fill report first."
#~ msgstr "Gelieve eerst het rapport in te vullen."
@@ -8391,6 +8627,12 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Onderdelen opnieuw laden"
#~ msgid "Repair"
#~ msgstr "Repareren"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Repareer de meshes van het model als ze niet-manifold zijn."
#~ msgid "Report"
#~ msgstr "Rapport"
@@ -8424,6 +8666,15 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Spiraal modus"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "Spiraal modus werkt alleen indien indien er 1 wall gekozen is, \n"
#~ "support uitgeschakeld is, er 0 top layers gekozen zijn en de vulling "
#~ "dichtheid 0 is\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Succesvol verzonden. Automatisch terug naar de apparaatpagina in %s s"
@@ -8438,6 +8689,12 @@ msgstr ""
#~ "filament wisselingen veroorzaken indien support is gespecificeerd als een "
#~ "andere extruder dan het object"
#~ msgid ""
#~ "Switch to rectilinear pattern?\n"
#~ "Yes - switch to rectilinear pattern automaticlly\n"
#~ "No - reset density to default non 100% value automaticlly\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Switch to zig-zag pattern?\n"
#~ "Yes - switch to zig-zag pattern automaticlly\n"
@@ -8450,6 +8707,18 @@ msgstr ""
#~ msgid "Swith cloud environment, Please login again!"
#~ msgstr "De cloud omgeving is aangepast. Log opnieuw in aub."
#~ msgid ""
#~ "The 3mf's version %s is newer than %s's version %s, Found following keys "
#~ "unrecognized:\n"
#~ msgstr ""
#~ "De 3mf-versie %s is nieuwer dan %s-versie %s, Gevonden volgende sleutels "
#~ "zijn niet herkend:\n"
#~ msgid ""
#~ "The 3mf's version %s is newer than %s's version %s, Suggest to upgrade "
#~ "your software.\n"
#~ msgstr "\n"
#~ msgid "The Config is not compatible and can not be loaded."
#~ msgstr "De configuratie is niet compatibel en kan niet geladen worden!"
@@ -8469,6 +8738,12 @@ msgstr ""
#~ "heeft geprobeerd om het te repareren, maar misschien wilt u de resultaten "
#~ "controleren of het invoerbestand repareren en het opnieuw proberen."
#~ msgid ""
#~ "The printer type used to generate G-code is not the same type as the "
#~ "currently selected physical printer. It is recommend to re-slice by "
#~ "selecting the same printer type.\n"
#~ msgstr "\n"
#~ msgid ""
#~ "This object will be used to purge the nozzle after a filament change to "
#~ "save filament and decrease the print time. Colours of the objects will be "
@@ -8478,6 +8753,13 @@ msgstr ""
#~ "om filament te besparen en de print tijd te verkorten. De kleuren van de "
#~ "objecten worden gemengd als resultaat"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Deze instelling geeft aan of er opvulling moet worden toegevoegd in grote "
#~ "holtes van de tree support."
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@@ -8494,6 +8776,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Vertaling"
#~ msgid "Tree support with infill"
#~ msgstr "Tree support met vulling"
#~ msgid "Unable to create zip file"
#~ msgstr "Kan het zip-bestand niet aanmaken"
@@ -8506,6 +8791,13 @@ msgstr ""
#~ msgid "Waiting"
#~ msgstr "Wachten"
#~ 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\".\n"
#~ msgstr "\n"
#~ msgid ""
#~ "You have changed some preset settings. \n"
#~ "Would you like to keep these changed settings after switching preset?"
@@ -8520,20 +8812,38 @@ msgstr ""
#~ msgid " Object:"
#~ msgstr "Object"
#~ msgid ""
#~ " is too close to exclusion area, there may be collisions when printing.\n"
#~ msgstr "\n"
#~ msgid ""
#~ " is too close to exclusion area, there will be collisions when printing.\n"
#~ msgstr ""
#~ " komt te dichtbij het uitgesloten gebied, er zullen botsingen optreden "
#~ "tijdens het printen.\n"
#~ msgid " is too close to others, there may be collisions when printing.\n"
#~ msgstr "\n"
#~ msgid " is too close to others, there will be collisions when printing.\n"
#~ msgstr ""
#~ " bevindt zich te dichtbij andere objecten, er zullen botsingen optreden "
#~ "tijdens het printen.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "Hybride (automatisch)"
#~ msgid "normal"
#~ msgstr "Normaal"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "normal (auto), hybride (auto) en tree (auto) worden gebruikt om "
#~ "automatisch support te genereren. Als normaal of tree is geselecteerd, "
#~ "worden alleen vereiste support gegenereerd."
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr ""
#~ "Het 3mf bestand is niet compatibel, enkel de geometrische data wordt "

View File

@@ -2,16 +2,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"POT-Creation-Date: 2023-01-19 13:01+0800\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Localazy (https://localazy.com)\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "Färgläggning av Support"
@@ -1178,8 +1175,17 @@ msgstr " ?"
msgid "Empty"
msgstr "Tom"
msgid "Click the pencil icon to edit the filament."
msgstr "Tryck på penn ikonen för att editera filament."
msgid "AMS"
msgstr "AMS"
msgid "AMS not connected"
msgstr ""
msgid "Cali"
msgstr ""
msgid "Calibration of extrusion"
msgstr ""
msgid "Load Filament"
msgstr "Ladda Filament"
@@ -1187,6 +1193,9 @@ msgstr "Ladda Filament"
msgid "Unload Filament"
msgstr "Mata ut"
msgid "Ext Spool"
msgstr ""
msgid "Tips"
msgstr "Tips"
@@ -1373,6 +1382,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@@ -1395,6 +1407,9 @@ msgstr ""
msgid "Please log out and login to the printer again."
msgstr ""
msgid "Failed uploading print file. Please enter ip address again."
msgstr ""
msgid "Downloading"
msgstr "Laddar ner"
@@ -1474,6 +1489,12 @@ msgstr ""
msgid "AMS Materials Setting"
msgstr ""
msgid "Confirm"
msgstr "Acceptera"
msgid "Close"
msgstr "Stäng"
msgid "Colour"
msgstr "Färg"
@@ -1500,11 +1521,91 @@ msgstr "SN"
msgid "Setting AMS slot information while printing is not supported"
msgstr ""
msgid "Confirm"
msgstr "Acceptera"
msgid "Factors of dynamic flow cali"
msgstr ""
msgid "Close"
msgstr "Stäng"
msgid "Factor K"
msgstr ""
msgid "Factor N"
msgstr ""
msgid "Please input a valid value (K in 0~0.5)"
msgstr ""
msgid "Please input a valid value (K in 0~0.5, N in 0.6~2.0)"
msgstr ""
msgid "Dynamic flow calibration"
msgstr ""
msgid ""
"The nozzle temp and max volumetric speed will affect the calibration "
"results. Please fill in the same values as the actual printing. They can be "
"auto-filled by selecting a filament preset."
msgstr ""
msgid "Nozzle Diameter"
msgstr ""
msgid "Bed Type"
msgstr ""
msgid "Nozzle temperature"
msgstr "Nozzel temperatur"
msgid "Bed Temperature"
msgstr ""
msgid "Max volumetric speed"
msgstr "Max volymetrisk hastighet"
msgid "℃"
msgstr ""
msgid "Bed temperature"
msgstr "Byggplattans temperatur"
msgid "mm³"
msgstr "mm³"
msgid "Start calibration"
msgstr ""
msgid "Next"
msgstr ""
msgid ""
"Calibration completed. Please find the most uniform extrusion line on your "
"hot bed like the picture below, and fill the value on its left side into the "
"factor K input box."
msgstr ""
msgid "Save"
msgstr "Spara"
msgid "Last Step"
msgstr ""
msgid "Example"
msgstr ""
#, c-format, boost-format
msgid "Calibrating... %d%%"
msgstr ""
msgid "Calibration completed"
msgstr ""
#, c-format, boost-format
msgid "%s does not support %s"
msgstr ""
msgid "Dynamic flow Calibration"
msgstr ""
msgid "Step"
msgstr ""
msgid "AMS Slots"
msgstr ""
@@ -1525,6 +1626,30 @@ msgstr ""
msgid "Print with the filament mounted on the back of chassis"
msgstr ""
msgid "Cabin humidity"
msgstr ""
msgid ""
"Green means that AMS humidity is normal, orange represent humidity is high, "
"red represent humidity is too high.(Hygrometer: lower the better, The bars: "
"higher the better)"
msgstr ""
msgid "Desiccant status"
msgstr ""
msgid ""
"A desiccant status lower than two bars indicates that desiccant may be "
"inactive. Please change the desiccant. (Higher is better)"
msgstr ""
msgid ""
"Note: When the lid is open or the desiccant pack is changed, it can take "
"hours or a night to absorb the moisture. Low temperatures also slow down the "
"process. During this time, the indicator may not represent the chamber "
"accurately."
msgstr ""
msgid ""
"Config which AMS slot should be used for a filament used in the print job"
msgstr ""
@@ -1538,6 +1663,18 @@ msgstr ""
msgid "Click to select AMS slot manually"
msgstr ""
msgid "Do not Enable AMS"
msgstr ""
msgid "Print using materials mounted on the back of the case"
msgstr ""
msgid "Print with filaments in ams"
msgstr ""
msgid "Print with filaments mounted on the back of the chassis"
msgstr ""
msgid "AMS Settings"
msgstr "AMS Inställningar"
@@ -1868,11 +2005,9 @@ msgstr ""
"Värdet kommer att återställas till 0."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"Spiral läge fungerar bara när vägg antalet är 1,\n"
"support är inaktiverad, top lager är 0 och låg ifyllnads densitet är 0\n"
msgid ""
"Change these settings automatically? \n"
@@ -1885,7 +2020,7 @@ msgstr ""
msgid ""
"Arachne engine only works when overhang slowing down is disabled.\n"
"This may cause decline in the quality of overhang surface when print fastly\n"
"This may cause decline in the quality of overhang surface when print fastly"
msgstr ""
msgid ""
@@ -1936,11 +2071,8 @@ msgstr "%1% ifyllnads mönster stöds ej 100%% densitet."
msgid ""
"Switch to rectilinear pattern?\n"
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
"No - reset density to default non 100% value automaticlly"
msgstr ""
"Switch to rectilinear pattern?\n"
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
msgid "Auto bed leveling"
msgstr "Auto justera byggplattan"
@@ -2011,9 +2143,6 @@ msgstr "MC"
msgid "MainBoard"
msgstr "Moderkort"
msgid "AMS"
msgstr "AMS"
msgid "TH"
msgstr "TH"
@@ -2532,12 +2661,12 @@ msgstr "Bered plattan"
msgid "Export G-code file"
msgstr ""
msgid "Send"
msgstr "Skicka"
msgid "Print plate"
msgstr ""
msgid "Send"
msgstr "Skicka"
msgid "Export plate sliced file"
msgstr ""
@@ -2860,7 +2989,7 @@ msgid ""
"It contains the following information:\n"
"1. The Process presets\n"
"2. The Filament presets\n"
"3. The Printer presets\n"
"3. The Printer presets"
msgstr ""
msgid "Synchronization"
@@ -2884,6 +3013,9 @@ msgstr ""
msgid "Initialize failed (Not accessible in LAN-only mode)!"
msgstr ""
msgid "Printer is busy downloading, Please wait for the downloading to finish."
msgstr ""
msgid "Initialize failed (Missing LAN ip of printer)!"
msgstr ""
@@ -2904,6 +3036,9 @@ msgstr ""
msgid "Stopped."
msgstr "Avbruten."
msgid "LAN Connection Failed (Failed to start liveview)"
msgstr ""
msgid ""
"Virtual Camera Tools is required for this task!\n"
"Do you want to install them?"
@@ -3064,6 +3199,9 @@ msgstr "Stopp"
msgid "0"
msgstr ""
msgid "Layers: N/A"
msgstr ""
msgid "Clean"
msgstr ""
@@ -3127,6 +3265,14 @@ msgstr "Laddar ner..."
msgid "Cloud Slicing..."
msgstr ""
#, c-format, boost-format
msgid "Layers: %s"
msgstr ""
#, c-format, boost-format
msgid "Layers: %d/%d"
msgstr ""
msgid "Please heat the nozzle to above 170 degree before loading filament."
msgstr ""
@@ -3136,6 +3282,12 @@ msgstr ""
msgid "Still load"
msgstr ""
msgid "AMS settings are not supported for external spool"
msgstr ""
msgid "Please select an AMS slot before calibration"
msgstr ""
msgid ""
"Cannot read filament info: the filament is loaded to the tool head,please "
"unload the filament and try again."
@@ -3225,6 +3377,12 @@ msgstr "Integrationen misslyckades."
msgid "Undo integration was successful."
msgstr "Återställande av integrationen lyckades."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "Återställande av integrationen misslyckades."
@@ -3510,10 +3668,8 @@ msgstr ""
#, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Found following keys "
"unrecognized:\n"
"unrecognized:"
msgstr ""
"3mf's version %s är nyare än %s's version %s, Följande nycklar känns inte "
"igen:\n"
msgid "You'd better upgrade your software.\n"
msgstr "Uppdatera mjukvaran.\n"
@@ -3521,10 +3677,10 @@ msgstr "Uppdatera mjukvaran.\n"
msgid "Newer 3mf version"
msgstr "Nyare 3mf version"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
"software."
msgstr ""
msgid "The 3mf is not compatible, load geometry data only!"
@@ -3719,9 +3875,6 @@ msgstr "Alla objekt kommer att raderas, fortsätta?"
msgid "The current project has unsaved changes, save it before continue?"
msgstr "Nuvarande projekt har ej sparade ändringar, spara innan du går vidare?"
msgid "Save"
msgstr "Spara"
msgid "Number of copies:"
msgstr "Antal kopior:"
@@ -3799,7 +3952,7 @@ msgid ""
msgstr ""
#, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgid "Plate %d: %s does not support filament %s (%s)."
msgstr ""
msgid "Switching the language requires application restart.\n"
@@ -4273,18 +4426,21 @@ msgstr ""
msgid "Cannot send the print job for empty plate"
msgstr ""
msgid "This printer does not support printing all plates"
msgstr ""
msgid "Errors"
msgstr ""
msgid ""
"Please check the following infomation and click Confirm to continue sending "
"print:\n"
"print:"
msgstr ""
msgid ""
"The printer type used to generate G-code is not the same type as the "
"currently selected physical printer. It is recommend to re-slice by "
"selecting the same printer type.\n"
"selecting the same printer type."
msgstr ""
#, c-format, boost-format
@@ -4378,11 +4534,35 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommend using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommend the following "
"settings: at least 2 interface layers, at least 0.1mm top z distance or "
"using support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommend the "
"following settings:\n"
"0 top z distance, 0 interface spacing, concentric pattern."
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\".\n"
"\"->\"Timelapse Wipe Tower\"."
msgstr ""
msgid "Line width"
@@ -5136,12 +5316,47 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "Ny version av Bambu Studio"
msgid "Don't remind me of this version again"
msgstr ""
msgid "LAN Connection Failed (Sending print file)"
msgstr ""
msgid ""
"Step 1, please confirm Bambu Studio and your printer are in the same LAN."
msgstr ""
msgid ""
"Step 2, if the IP and Access Code below are different from the actual values "
"on your printer, please correct them."
msgstr ""
msgid "IP"
msgstr ""
msgid "Access Code"
msgstr ""
msgid "Where to find your printer's IP and Access Code?"
msgstr ""
msgid "Error: IP or Access Code are not correct"
msgstr ""
msgid "Model:"
msgstr ""
@@ -5443,14 +5658,11 @@ msgstr "%1% är för nära andra och kan orsaka kollisioner."
msgid "%1% is too tall, and collisions will be caused."
msgstr "%1% är för hög, och kollisioner kommer att uppstå."
msgid " is too close to others, there may be collisions when printing.\n"
msgstr " is too close to others, there may be collisions when printing.\n"
msgid ""
" is too close to exclusion area, there may be collisions when printing.\n"
msgid " is too close to others, there may be collisions when printing."
msgstr ""
msgid " is too close to exclusion area, there may be collisions when printing."
msgstr ""
" is too close to exclusion area, there may be collisions when printing.\n"
"\n"
msgid "Prime Tower"
msgstr "Prime Torn"
@@ -5544,7 +5756,7 @@ msgid "Layer height cannot exceed nozzle diameter"
msgstr "Lagerhöjden kan inte överstiga nozzel diametern"
#, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgid "Plate %d: %s does not support filament %s"
msgstr ""
msgid "Generating skirt & brim"
@@ -5693,9 +5905,6 @@ msgstr ""
msgid "°C"
msgstr "° C"
msgid "Bed temperature"
msgstr "Byggplattans temperatur"
msgid ""
"Bed temperature for layers except the initial one. Value 0 means the "
"filament does not support to print on the Engineering Plate"
@@ -6187,9 +6396,6 @@ msgid ""
"of nozzle's HRC."
msgstr ""
msgid "Max volumetric speed"
msgstr "Max volymetrisk hastighet"
msgid ""
"This setting stands for how much volume of filament can be melted and "
"extruded per second. Printing speed is limited by max volumetric speed, in "
@@ -6202,9 +6408,6 @@ msgstr "mm³/s"
msgid "Minimal purge on wipe tower"
msgstr "Minimal purge på wipe torn"
msgid "mm³"
msgstr "mm³"
msgid "Filament load time"
msgstr "Inmatningstid för filament"
@@ -7048,11 +7251,9 @@ msgstr "Aktivera support generering."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"normal(auto), hybrid(auto) och tree(auto) används för att skapa support "
"automatiskt. Om normal eller tree är vald, kommer endast tvingande support "
"skapas"
msgid "normal(auto)"
msgstr "normal (auto)"
@@ -7060,9 +7261,6 @@ msgstr "normal (auto)"
msgid "tree(auto)"
msgstr "träd(auto)"
msgid "hybrid(auto)"
msgstr "hybrid(auto)"
msgid "normal(manual)"
msgstr ""
@@ -7110,9 +7308,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@@ -7166,6 +7367,9 @@ msgstr "Supportens linje mönster"
msgid "Rectilinear grid"
msgstr "Rät linjärt nät"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Gränssnitts mönster"
@@ -7196,9 +7400,27 @@ msgstr "Support hastighet"
msgid "Style"
msgstr "Stil"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, slim style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Tight"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Oberoende support lagerhöjd"
@@ -7250,20 +7472,14 @@ msgstr "Inställningen bestämmer antal väggar runt tree support"
msgid "Nozzle temperature for layers after the initial one"
msgstr "Nozzel temperatur efter första lager"
msgid "Nozzle temperature"
msgstr "Nozzel temperatur"
msgid "Bed temperature difference"
msgstr "Byggplattans temperatur skillnad"
msgid ""
"Do not recommand bed temperature of other layer to be lower than initial "
"Do not recommend bed temperature of other layer to be lower than initial "
"layer for more than this threshold. Too low bed temperature of other layer "
"may cause the model broken free from build plate"
msgstr ""
"Byggplattans temperatur rekommenderas inte att vara lägre än första lagrets "
"temperatur. För låg temperatur på byggplattan kan orsaka att objektet "
"släpper ifrån byggplattan"
msgid "Detect thin wall"
msgstr "Upptäck tunna väggar"
@@ -7853,54 +8069,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Välj en eller flera filer (3mf/step/stl/obj/amf):"
#~ msgid "Finish"
#~ msgstr "Slutför"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importera 3MF/STL/STEP/OBJ/AMF"
#~ msgid "Part Cooling"
#~ msgstr "Del Kylning"
#~ msgid "Aux Cooling"
#~ msgstr "Extra Kylning"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament för att skriva ut support och skirt med. 0 betyder inget "
#~ "speciellt filament för support och nuvarande filament används"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Support filament för utskrift. 0 betyder att inget specifikt filament för "
#~ "support gränssnitt och nuvarande filament används"
#~ msgid "Repair"
#~ msgstr "Reparera"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Reparera modellens mesh om den inte är mångfaldig"
#~ msgid "Monitoring Recording"
#~ msgstr "Övervaknings Inspelning"
#~ msgid "Tree support with infill"
#~ msgstr "Tree support med ifyllnad"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Inställningen bestämmer om det ska läggas till ifyllnad i stora hålrum av "
#~ "tree support"
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@@ -7927,6 +8095,12 @@ msgstr ""
#~ "Ett objekt är placerad över byggplattans begränsningar.\n"
#~ "Flytta objektet så det är helt inom eller utom byggplattans begränsningar."
#~ msgid ""
#~ "Arachne engine only works when overhang slowing down is disabled.\n"
#~ "This may cause decline in the quality of overhang surface when print "
#~ "fastly\n"
#~ msgstr "\n"
#~ msgid "Auto arrange"
#~ msgstr "Auto arrangera"
@@ -7938,6 +8112,9 @@ msgstr ""
#~ "Auto placera valda objekt eller alla objekt. Om det finns valda objekt så "
#~ "placeras endast dem. Alternativt så placeras alla objekt i projektet."
#~ msgid "Aux Cooling"
#~ msgstr "Extra Kylning"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Undvik väggar vid förflyttning"
@@ -7950,6 +8127,9 @@ msgstr ""
#~ "filament.\n"
#~ "Detta kan orsaka att nozzeln blockeras och utskriften misslyckas"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Välj en eller flera filer (3mf/step/stl/obj/amf):"
#~ msgid "Clear all"
#~ msgstr "Rensa allt"
@@ -7960,6 +8140,9 @@ msgstr ""
#~ "Fri radie område runt extrudern: Används som input för auto-placering för "
#~ "att undvika kollision när man skriver ut objekt för objekt"
#~ msgid "Click the pencil icon to edit the filament."
#~ msgstr "Tryck på penn ikonen för att editera filament."
#~ msgid "Color Print"
#~ msgstr "Färg Utskrift"
@@ -7993,6 +8176,15 @@ msgstr ""
#~ msgid "Display triangles of models"
#~ msgstr "Visa trianglar från modellerna"
#~ msgid ""
#~ "Do not recommand bed temperature of other layer to be lower than initial "
#~ "layer for more than this threshold. Too low bed temperature of other "
#~ "layer may cause the model broken free from build plate"
#~ msgstr ""
#~ "Byggplattans temperatur rekommenderas inte att vara lägre än första "
#~ "lagrets temperatur. För låg temperatur på byggplattan kan orsaka att "
#~ "objektet släpper ifrån byggplattan"
#~ msgid ""
#~ "Do you want to synchronize your personal data from Bambu Cloud? \n"
#~ "Contains the following information:\n"
@@ -8006,6 +8198,14 @@ msgstr ""
#~ "2. Filament förinställningar\n"
#~ "3. Skrivare förinställningar\n"
#~ msgid ""
#~ "Do you want to synchronize your personal data from Bambu Cloud? \n"
#~ "It contains the following information:\n"
#~ "1. The Process presets\n"
#~ "2. The Filament presets\n"
#~ "3. The Printer presets\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Don't retract when the travel is in infill area absolutely. That means "
#~ "the oozing can't been seen"
@@ -8059,9 +8259,26 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filament N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament för att skriva ut support och skirt med. 0 betyder inget "
#~ "speciellt filament för support och nuvarande filament används"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Support filament för utskrift. 0 betyder att inget specifikt filament för "
#~ "support gränssnitt och nuvarande filament används"
#~ msgid "Filaments Selection"
#~ msgstr "Filament Val"
#~ msgid "Finish"
#~ msgstr "Slutför"
#~ msgid "Finished"
#~ msgstr "Färdig"
@@ -8110,6 +8327,9 @@ msgstr ""
#~ "auto-placering för att undvika kollision när man skriver ut objekt för "
#~ "objekt"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importera 3MF/STL/STEP/OBJ/AMF"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "Vid kalibrering av extruderingsflödet"
@@ -8151,6 +8371,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Övervakar"
#~ msgid "Monitoring Recording"
#~ msgstr "Övervaknings Inspelning"
#~ msgid "Open"
#~ msgstr "Öppna"
@@ -8163,6 +8386,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Utdatafil"
#~ msgid "Part Cooling"
#~ msgstr "Del Kylning"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Paus (temperaturfel i byggplattan)"
@@ -8175,9 +8401,20 @@ msgstr ""
#~ msgid "Per object edit"
#~ msgstr "Redigera per objekt"
#~ msgid "Plate %d: %s does not support filament %s\n"
#~ msgstr "\n"
#~ msgid "Plate %d: %s does not support filament %s.\n"
#~ msgstr "Plattan %d: %s stöds ej av filament %s.\n"
#~ msgid "Plate %d: %s does not support filament %s (%s).\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Please check the following infomation and click Confirm to continue "
#~ "sending print:\n"
#~ msgstr "\n"
#~ msgid "Please fill report first."
#~ msgstr "Fyll i rapporten först."
@@ -8245,6 +8482,12 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Ladda om objekten"
#~ msgid "Repair"
#~ msgstr "Reparera"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Reparera modellens mesh om den inte är mångfaldig"
#~ msgid "Report"
#~ msgstr "Rapportera"
@@ -8278,6 +8521,14 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Spiral läge"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "Spiral läge fungerar bara när vägg antalet är 1,\n"
#~ "support är inaktiverad, top lager är 0 och låg ifyllnads densitet är 0\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Framgångsrikt skickat. Kommer automatiskt att hoppa till enhetssidan om "
@@ -8292,6 +8543,12 @@ msgstr ""
#~ "stöda custom support mellanrum, detta kan orsaka extra filament byten om "
#~ "support (materialet) är vald som en annan extruder än objektets"
#~ msgid ""
#~ "Switch to rectilinear pattern?\n"
#~ "Yes - switch to rectilinear pattern automaticlly\n"
#~ "No - reset density to default non 100% value automaticlly\n"
#~ msgstr "\n"
#~ msgid ""
#~ "Switch to zig-zag pattern?\n"
#~ "Yes - switch to zig-zag pattern automaticlly\n"
@@ -8304,6 +8561,18 @@ msgstr ""
#~ msgid "Swith cloud environment, Please login again!"
#~ msgstr "Byte av moln miljö, Logga in igen!"
#~ msgid ""
#~ "The 3mf's version %s is newer than %s's version %s, Found following keys "
#~ "unrecognized:\n"
#~ msgstr ""
#~ "3mf's version %s är nyare än %s's version %s, Följande nycklar känns inte "
#~ "igen:\n"
#~ msgid ""
#~ "The 3mf's version %s is newer than %s's version %s, Suggest to upgrade "
#~ "your software.\n"
#~ msgstr "\n"
#~ msgid "The Config is not compatible and can not be loaded."
#~ msgstr "Ej kompatibel konfiguration; kan inte laddas."
@@ -8322,6 +8591,12 @@ msgstr ""
#~ "Modellen har överlappande eller självkorsande aspekter.Reparation utförd, "
#~ "men kontrollera resultaten eller reparera indatafilen och försöka igen."
#~ msgid ""
#~ "The printer type used to generate G-code is not the same type as the "
#~ "currently selected physical printer. It is recommend to re-slice by "
#~ "selecting the same printer type.\n"
#~ msgstr "\n"
#~ msgid ""
#~ "This object will be used to purge the nozzle after a filament change to "
#~ "save filament and decrease the print time. Colours of the objects will be "
@@ -8331,6 +8606,13 @@ msgstr ""
#~ "byte för att spara filament och minska utskriftstiden. Objektens färger "
#~ "blandas som ett resultat"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Inställningen bestämmer om det ska läggas till ifyllnad i stora hålrum av "
#~ "tree support"
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@@ -8347,6 +8629,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Översättning"
#~ msgid "Tree support with infill"
#~ msgstr "Tree support med ifyllnad"
#~ msgid "Unable to create zip file"
#~ msgstr "Det gick inte att skapa zip-fil"
@@ -8359,6 +8644,13 @@ msgstr ""
#~ msgid "Waiting"
#~ msgstr "Väntar"
#~ 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\".\n"
#~ msgstr "\n"
#~ msgid ""
#~ "You have changed some preset settings. \n"
#~ "Would you like to keep these changed settings after switching preset?"
@@ -8372,16 +8664,34 @@ msgstr ""
#~ msgid " Object:"
#~ msgstr " Objekt:"
#~ msgid ""
#~ " is too close to exclusion area, there may be collisions when printing.\n"
#~ msgstr "\n"
#~ msgid ""
#~ " is too close to exclusion area, there will be collisions when printing.\n"
#~ msgstr " för tätt inpå den isolerade ytan, utskriften kolliderar.\n"
#~ msgid " is too close to others, there may be collisions when printing.\n"
#~ msgstr "\n"
#~ msgid " is too close to others, there will be collisions when printing.\n"
#~ msgstr " för tätt inpå andra, utskriften kolliderar.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "hybrid(auto)"
#~ msgid "normal"
#~ msgstr "normal"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "normal(auto), hybrid(auto) och tree(auto) används för att skapa support "
#~ "automatiskt. Om normal eller tree är vald, kommer endast tvingande "
#~ "support skapas"
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr "3mf ej kompatibel, laddar endast geometrin !"

View File

@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Slic3rPE\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: 2022-12-13 20:18+0800\n"
"POT-Creation-Date: 2023-01-19 13:01+0800\n"
"PO-Revision-Date: 2023-01-16 11:26+0800\n"
"Last-Translator: Jiang Yue <maze1024@gmail.com>\n"
"Language-Team: \n"
"Language: zh_CN\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 3.0.1\n"
"X-Generator: Poedit 3.2.2\n"
msgid "Supports Painting"
msgstr "支撑绘制"
@@ -708,7 +708,7 @@ msgid "Set filament for selected items"
msgstr "设置所选项的耗材丝"
msgid "Default"
msgstr "默认"
msgstr "缺省"
#, c-format, boost-format
msgid "Filament %d"
@@ -1159,8 +1159,17 @@ msgstr "?"
msgid "Empty"
msgstr "空"
msgid "Click the pencil icon to edit the filament."
msgstr "点击铅笔图标编辑耗材丝。"
msgid "AMS"
msgstr "AMS"
msgid "AMS not connected"
msgstr "AMS 未连接"
msgid "Cali"
msgstr "标定"
msgid "Calibration of extrusion"
msgstr "挤出标定"
msgid "Load Filament"
msgstr "进料"
@@ -1168,6 +1177,9 @@ msgstr "进料"
msgid "Unload Filament"
msgstr "退料"
msgid "Ext Spool"
msgstr "外挂料卷"
msgid "Tips"
msgstr "提示"
@@ -1364,6 +1376,9 @@ msgstr "需要插入SD卡后方可发送到打印机。"
msgid "Please log out and login to the printer again."
msgstr "请先退出登录然后再重新登录打印机。"
msgid "Failed uploading print file. Please enter ip address again."
msgstr "上传打印文件失败。请重新输入IP地址。"
msgid "Downloading"
msgstr "下载中"
@@ -1445,6 +1460,12 @@ msgstr ""
msgid "AMS Materials Setting"
msgstr "AMS 材料设置"
msgid "Confirm"
msgstr "确定"
msgid "Close"
msgstr "关闭"
msgid "Colour"
msgstr "颜色"
@@ -1469,11 +1490,92 @@ msgstr "序列号"
msgid "Setting AMS slot information while printing is not supported"
msgstr "不支持在打印时修改AMS槽位信息"
msgid "Confirm"
msgstr "确定"
msgid "Factors of dynamic flow cali"
msgstr "动态流量标定系数"
msgid "Close"
msgstr "关闭"
msgid "Factor K"
msgstr "系数K"
msgid "Factor N"
msgstr "系数N"
msgid "Please input a valid value (K in 0~0.5)"
msgstr "请输入有效的数值K的范围为0~0.5)"
msgid "Please input a valid value (K in 0~0.5, N in 0.6~2.0)"
msgstr "请输入有效的数值 (K的范围为0~0.5, N的范围为0.6~2.0"
msgid "Dynamic flow calibration"
msgstr "动态流量标定"
msgid ""
"The nozzle temp and max volumetric speed will affect the calibration "
"results. Please fill in the same values as the actual printing. They can be "
"auto-filled by selecting a filament preset."
msgstr ""
"喷嘴温度和最大体积速度会影响到标定结果,请填写与实际打印相同的数值。可通过选"
"择已有的材料预设来自动填写。"
msgid "Nozzle Diameter"
msgstr "喷嘴直径"
msgid "Nozzle temperature"
msgstr "喷嘴温度"
msgid "Bed Temperature"
msgstr "热床温度"
msgid "Max volumetric speed"
msgstr "最大体积速度"
msgid "℃"
msgstr ""
msgid "Bed temperature"
msgstr "床温"
msgid "mm³"
msgstr "mm³"
msgid "Start calibration"
msgstr "开始"
msgid "Next"
msgstr "下一步"
msgid ""
"Calibration completed. Please find the most uniform extrusion line on your "
"hot bed like the picture below, and fill the value on its left side into the "
"factor K input box."
msgstr ""
"标定完成。如下图中的示例,请在您的热床上找到最均匀的挤出线,并将其左侧的数值"
"填入系数K输入框。"
msgid "Save"
msgstr "保存"
msgid "Last Step"
msgstr "上一步"
msgid "Example"
msgstr "示例"
#, c-format, boost-format
msgid "Calibrating... %d%%"
msgstr "标定中... %d%%"
msgid "Calibration completed"
msgstr "标定已完成"
#, c-format, boost-format
msgid "%s does not support %s"
msgstr "%s 不支持 %s"
msgid "Dynamic flow Calibration"
msgstr "动态流量标定"
msgid "Step"
msgstr "步骤"
msgid "AMS Slots"
msgstr "AMS舱内材料"
@@ -1494,6 +1596,32 @@ msgstr "不启用AMS"
msgid "Print with the filament mounted on the back of chassis"
msgstr "使用机箱背后挂载的材料打印"
msgid "Cabin humidity"
msgstr "机舱湿度"
msgid ""
"Green means that AMS humidity is normal, orange represent humidity is high, "
"red represent humidity is too high.(Hygrometer: lower the better, The bars: "
"higher the better)"
msgstr "绿色表示 AMS 湿度正常,橙色和红色表示湿度过高(湿度条越低越好)"
msgid "Desiccant status"
msgstr "干燥机状态"
msgid ""
"A desiccant status lower than two bars indicates that desiccant may be "
"inactive. Please change the desiccant. (Higher is better)"
msgstr "干燥剂状态低于两格表示干燥剂可能不活跃。请更换干燥剂。(格数越高越好)"
msgid ""
"Note: When the lid is open or the desiccant pack is changed, it can take "
"hours or a night to absorb the moisture. Low temperatures also slow down the "
"process. During this time, the indicator may not represent the chamber "
"accurately."
msgstr ""
"注意: 打开盖子或更换干燥剂包时,可能需要数小时或一夜才能吸收水分。低温环境会"
"减慢这个过程。在此期间,指示器可能无法准确代表腔室。"
msgid ""
"Config which AMS slot should be used for a filament used in the print job"
msgstr "配置当前打印任务应使用哪个AMS槽位"
@@ -1507,6 +1635,18 @@ msgstr "当前料丝对应的AMS槽位"
msgid "Click to select AMS slot manually"
msgstr "点击以手动选择AMS槽位"
msgid "Do not Enable AMS"
msgstr "不启用AMS"
msgid "Print using materials mounted on the back of the case"
msgstr "使用机箱背后挂载的材料打印"
msgid "Print with filaments in ams"
msgstr "使用AMS里的材料打印"
msgid "Print with filaments mounted on the back of the chassis"
msgstr "使用机箱背后挂载的材料打印"
msgid "AMS Settings"
msgstr "AMS 设置"
@@ -1824,10 +1964,11 @@ msgstr ""
"这个数值将被重置为0。"
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"旋转模式只能在外墙层数为1关闭支撑顶层层数为0稀疏填充密度为0时有效。\n"
"旋转模式只能在外墙层数为1关闭支撑顶层层数为0稀疏填充密度为0,传统延时摄"
"影时有效"
msgid ""
"Change these settings automatically? \n"
@@ -1840,10 +1981,8 @@ msgstr ""
msgid ""
"Arachne engine only works when overhang slowing down is disabled.\n"
"This may cause decline in the quality of overhang surface when print fastly\n"
"This may cause decline in the quality of overhang surface when print fastly"
msgstr ""
"Arachne引擎只在关闭悬垂降速时起作用。\n"
"这可能会导致高速打印时悬垂表面质量的下降\n"
msgid ""
"Disable overhang slowing down automatically? \n"
@@ -1895,11 +2034,8 @@ msgstr "%1% 填充图案不支持 100%% 密度。"
msgid ""
"Switch to rectilinear pattern?\n"
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
"No - reset density to default non 100% value automaticlly"
msgstr ""
"切换到直线图案?\n"
"是 - 自动切换到直线图案\n"
"否 - 自动重置为非100%填充密度\n"
msgid "Auto bed leveling"
msgstr "自动热床调平"
@@ -1970,9 +2106,6 @@ msgstr ""
msgid "MainBoard"
msgstr "主板"
msgid "AMS"
msgstr "AMS"
msgid "TH"
msgstr ""
@@ -1983,10 +2116,10 @@ msgid "Unknown"
msgstr "未定义"
msgid "Fatal"
msgstr ""
msgstr "致命"
msgid "Serious"
msgstr ""
msgstr "严重"
msgid "Common"
msgstr ""
@@ -2479,7 +2612,7 @@ msgid "No"
msgstr "否"
msgid " will be closed before creating a new model. Do you want to continue?"
msgstr "会被关闭以创建新模型。是否继续?"
msgstr "会被关闭以创建新模型。是否继续?"
msgid "Slice"
msgstr "切片"
@@ -2493,12 +2626,12 @@ msgstr "切片单盘"
msgid "Export G-code file"
msgstr "导出G-code文件"
msgid "Send"
msgstr "发送"
msgid "Print plate"
msgstr "打印单盘"
msgid "Send"
msgstr "发送"
msgid "Export plate sliced file"
msgstr "导出单盘切片文件"
@@ -2724,6 +2857,39 @@ msgstr "在3D场景中显示对象名称"
msgid "Preferences"
msgstr "偏好设置"
msgid "Line method - DDE"
msgstr "划线方法 - 近程"
msgid "Line method - Bowden"
msgstr "划线方法 - 远程"
msgid "Tower method - DDE"
msgstr "打印塔方法 - 近程"
msgid "Tower method - Bowden"
msgstr "打印塔方法 - 远程"
msgid "Pressure/Linear Advance"
msgstr "压力提前"
msgid "Flow rate"
msgstr "流量"
msgid "Pass 1"
msgstr "粗调"
msgid "Pass 2"
msgstr "细调"
msgid "Tutorial"
msgstr "教程"
msgid "Layer Time"
msgstr "层时间"
msgid "Layer Time (log)"
msgstr "层时间(对数)"
msgid "View"
msgstr "视图"
@@ -2819,13 +2985,13 @@ msgid ""
"It contains the following information:\n"
"1. The Process presets\n"
"2. The Filament presets\n"
"3. The Printer presets\n"
"3. The Printer presets"
msgstr ""
"想从Bambu 云同步你的个人数据吗?\n"
"包含如下信息:\n"
"1. 工艺预设\n"
"2. 打印丝预设\n"
"3. 打印机预设\n"
"3. 打印机预设"
msgid "Synchronization"
msgstr "同步"
@@ -2848,6 +3014,9 @@ msgstr "初始化失败(不支持局域网模式的视频连接)"
msgid "Initialize failed (Not accessible in LAN-only mode)!"
msgstr "初始化失败(在局域网模式中不可访问)!"
msgid "Printer is busy downloading, Please wait for the downloading to finish."
msgstr "打印机正忙于下载,请等待下载完成。"
msgid "Initialize failed (Missing LAN ip of printer)!"
msgstr "初始化失败(未找到打印机的局域网地址)!"
@@ -2868,6 +3037,9 @@ msgstr "已停止 [%d]!"
msgid "Stopped."
msgstr "已经停止。"
msgid "LAN Connection Failed (Failed to start liveview)"
msgstr "LAN连接失败 (无法启动liveview)"
msgid ""
"Virtual Camera Tools is required for this task!\n"
"Do you want to install them?"
@@ -3031,6 +3203,9 @@ msgstr "停止"
msgid "0"
msgstr ""
msgid "Layers: N/A"
msgstr ""
msgid "Clean"
msgstr "清除"
@@ -3098,6 +3273,14 @@ msgstr "下载中..."
msgid "Cloud Slicing..."
msgstr "云切片中..."
#, c-format, boost-format
msgid "Layers: %s"
msgstr ""
#, c-format, boost-format
msgid "Layers: %d/%d"
msgstr ""
msgid "Please heat the nozzle to above 170 degree before loading filament."
msgstr "请在进料前把喷嘴升温到170℃"
@@ -3107,6 +3290,12 @@ msgstr "继续退料"
msgid "Still load"
msgstr "继续进料"
msgid "AMS settings are not supported for external spool"
msgstr "外挂料卷不支持AMS 设置"
msgid "Please select an AMS slot before calibration"
msgstr "请在标定前选择一个AMS槽位"
msgid ""
"Cannot read filament info: the filament is loaded to the tool head,please "
"unload the filament and try again."
@@ -3196,6 +3385,12 @@ msgstr "集成失败。"
msgid "Undo integration was successful."
msgstr "集成取消成功。"
msgid "New network plug-in available."
msgstr "新的网络插件可用。"
msgid "Details"
msgstr "详情"
msgid "Undo integration failed."
msgstr "集成取消失败。"
@@ -3480,8 +3675,8 @@ msgstr "该3mf文件来自旧版本的Bambu Lab将只加载几何数据。"
#, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Found following keys "
"unrecognized:\n"
msgstr "该3mf的版本%s比%s的版本%s新发现以下参数键值无法识别\n"
"unrecognized:"
msgstr ""
msgid "You'd better upgrade your software.\n"
msgstr "建议升级您的软件版本。\n"
@@ -3492,8 +3687,8 @@ msgstr "较新的3mf版本"
#, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
msgstr "该3mf文件的版本%s 比%s的版本%s更新建议升级您的软件。\n"
"software."
msgstr ""
msgid "The 3mf is not compatible, load geometry data only!"
msgstr "该3mf文件与软件不兼容将只加载几何数据。"
@@ -3596,7 +3791,7 @@ msgid "Invalid data"
msgstr "无效数据"
msgid "Slicing Canceled"
msgstr ""
msgstr "切片已取消"
#, c-format, boost-format
msgid "Slicing Plate %d"
@@ -3689,9 +3884,6 @@ msgstr "即将删除所有对象,是否继续?"
msgid "The current project has unsaved changes, save it before continue?"
msgstr "当前项目包含未保存的修改,是否先保存?"
msgid "Save"
msgstr "保存"
msgid "Number of copies:"
msgstr "克隆数量:"
@@ -3771,8 +3963,8 @@ msgstr ""
"模型。"
#, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgstr "盘%d%s不支持耗材丝%s (%s)。\n"
msgid "Plate %d: %s does not support filament %s (%s)."
msgstr "盘 %d: %s 不支持耗材丝 %s(%s)."
msgid "Switching the language requires application restart.\n"
msgstr "切换语言要求重启应用程序。\n"
@@ -4241,21 +4433,22 @@ msgstr "需要更新打印机固件后,才能将打印任务发送到打印机
msgid "Cannot send the print job for empty plate"
msgstr "无法为空盘发送打印任务"
msgid "This printer does not support printing all plates"
msgstr "此打印机类型不支持打印所有盘"
msgid "Errors"
msgstr "错误"
msgid ""
"Please check the following infomation and click Confirm to continue sending "
"print:\n"
msgstr "请检查以下信息,点击确认继续发送打印:\n"
"print:"
msgstr "请检查以下信息,点击确认继续发送打印:"
msgid ""
"The printer type used to generate G-code is not the same type as the "
"currently selected physical printer. It is recommend to re-slice by "
"selecting the same printer type.\n"
"selecting the same printer type."
msgstr ""
"用于生成G-code的打印机类型与当前选定的物理打印机类型不同建议选择相同的打印"
"机类型重新切片。\n"
#, c-format, boost-format
msgid "The %s filament is too soft to be used with the AMS"
@@ -4353,14 +4546,39 @@ msgid ""
msgstr ""
"平滑模式的延时摄影需要擦料塔,否则打印件上可能会有瑕疵。您想打开擦料塔吗?"
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommend using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
"自动调整这些设置?\n"
"是 - 自动调整这些设置\n"
"否 - 不用为我调整这些设置"
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommend the following "
"settings: at least 2 interface layers, at least 0.1mm top z distance or "
"using support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommend the "
"following settings:\n"
"0 top z distance, 0 interface spacing, concentric pattern."
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\".\n"
"\"->\"Timelapse Wipe Tower\"."
msgstr ""
"在录制无工具头延时摄影视频时,建议添加“延时摄影擦料塔”\n"
"右键单击构建板的空白位置,选择“添加标准模型”->“延时摄影擦料塔”。\n"
msgid "Line width"
msgstr "线宽"
@@ -4389,6 +4607,27 @@ msgstr "其他层速度"
msgid "Overhang speed"
msgstr "悬垂速度"
msgid "Seam gap"
msgstr "接缝留空"
msgid "Role base wipe speed"
msgstr "自动擦拭速度"
msgid "Wipe speed"
msgstr "擦拭速度"
msgid "Wipe on loops"
msgstr "闭环擦拭"
msgid "Use firmware retraction"
msgstr "使用固件回抽"
msgid "Use relative E distances"
msgstr "使用相对E距离"
msgid "Extra length on restart"
msgstr "额外回填长度"
msgid ""
"This is the speed for various overhang degrees. Overhang degrees are "
"expressed as a percentage of line width. 0 speed means no slowing down for "
@@ -5081,12 +5320,47 @@ msgstr "更新说明"
msgid "version %s update information :"
msgstr "版本 %s 更新信息"
msgid "Network plug-in update"
msgstr "网络插件升级"
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr "点击OK将在Bambu Studio下次启动之后自动升级网络插件"
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr "新的网络插件(%s) 可用,您是否需要安装它?"
msgid "New version of Bambu Studio"
msgstr "新版本的Bambu Studio"
msgid "Don't remind me of this version again"
msgstr "此版本不再提示"
msgid "LAN Connection Failed (Sending print file)"
msgstr "LAN连接失败 (发送打印文件)"
msgid ""
"Step 1, please confirm Bambu Studio and your printer are in the same LAN."
msgstr "步骤1, 请确认Bambu Studio和您的打印机在同一局域网中。"
msgid ""
"Step 2, if the IP and Access Code below are different from the actual values "
"on your printer, please correct them."
msgstr "步骤2, 如果下面的IP和访问码与打印机上的实际值不同请输入正确的值。"
msgid "IP"
msgstr ""
msgid "Access Code"
msgstr "访问码"
msgid "Where to find your printer's IP and Access Code?"
msgstr "在哪里可以找到打印机的IP和访问码?"
msgid "Error: IP or Access Code are not correct"
msgstr "错误IP或访问码不正确"
msgid "Model:"
msgstr "型号:"
@@ -5393,12 +5667,11 @@ msgstr "%1%离其它对象太近,可能会发生碰撞。"
msgid "%1% is too tall, and collisions will be caused."
msgstr "%1%太高,会发生碰撞。"
msgid " is too close to others, there may be collisions when printing.\n"
msgstr "到其他对象的距离太近了,可能在打印过程中发生碰撞。\n"
msgid " is too close to others, there may be collisions when printing."
msgstr "离其它对象太近,打印时可能会发生碰撞。"
msgid ""
" is too close to exclusion area, there may be collisions when printing.\n"
msgstr "到屏蔽区域的距离太近了,可能在打印过程中发生碰撞。\n"
msgid " is too close to exclusion area, there may be collisions when printing."
msgstr "离不可打印区域太近,打印时可能会发生碰撞。"
msgid "Prime Tower"
msgstr "擦拭塔"
@@ -5481,8 +5754,8 @@ msgid "Layer height cannot exceed nozzle diameter"
msgstr "层高不能超过喷嘴直径"
#, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgstr "盘%d: %s 不支持耗材丝 %s\n"
msgid "Plate %d: %s does not support filament %s"
msgstr "盘 %d: %s 不支持耗材丝 %s"
msgid "Generating skirt & brim"
msgstr "正在生成skirt和brim"
@@ -5539,7 +5812,7 @@ msgid "Printer preset names"
msgstr "打印机预设名"
msgid "Hostname, IP or URL"
msgstr ""
msgstr "主机名IP或者URL"
msgid ""
"Slic3r can upload G-code files to a printer host. This field should contain "
@@ -5628,9 +5901,6 @@ msgstr "非首层热床温度。0值表示这个耗材丝不支持低温打印
msgid "°C"
msgstr "°C"
msgid "Bed temperature"
msgstr "床温"
msgid ""
"Bed temperature for layers except the initial one. Value 0 means the "
"filament does not support to print on the Engineering Plate"
@@ -6121,9 +6391,6 @@ msgid ""
"of nozzle's HRC."
msgstr "打印此材料的所需的最小喷嘴硬度。零值表示不检查喷嘴硬度。"
msgid "Max volumetric speed"
msgstr "最大体积速度"
msgid ""
"This setting stands for how much volume of filament can be melted and "
"extruded per second. Printing speed is limited by max volumetric speed, in "
@@ -6138,9 +6405,6 @@ msgstr "mm³/s"
msgid "Minimal purge on wipe tower"
msgstr "擦拭塔上的最小清理量"
msgid "mm³"
msgstr "mm³"
msgid "Filament load time"
msgstr "加载耗材丝的时间"
@@ -6307,7 +6571,7 @@ msgstr "启用压力提前"
msgid "Pressure advance"
msgstr "压力提前"
msgid "Pressure advnce(Klipper) AKA Linear advance factor(Marlin)"
msgid "Pressure advance(Klipper) AKA Linear advance factor(Marlin)"
msgstr "压力提前(Klipper)或者线性提前(Marlin)"
msgid "Enable pressure advance, auto calibration result will be overwriten once enabled."
@@ -6865,6 +7129,18 @@ msgstr "随机"
msgid "Skirt distance"
msgstr "Skirt距离"
msgid "Skirt height"
msgstr "Skirt高度"
msgid "Post-processing Scripts"
msgstr "后处理脚本"
msgid "accel_to_decel"
msgstr "制动速度"
msgid "Enable accel_to_decel"
msgstr "启用制动速度"
msgid "Distance from skirt to brim or object"
msgstr "从skirt到模型或者brim的距离"
@@ -6975,10 +7251,11 @@ msgstr "开启支撑生成。"
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"普通(自动)和树状(自动)用于自动生成支撑体。如果选择普通或树状,仅会在支撑"
"强制面上生成支撑。"
"普通(自动)和树状(自动)用于自动生成支撑体。如果选择普通(手动)或树状(手"
"动),仅会在支撑强制面上生成支撑。"
msgid "normal(auto)"
msgstr "普通(自动)"
@@ -6986,9 +7263,6 @@ msgstr "普通(自动)"
msgid "tree(auto)"
msgstr "树状(自动)"
msgid "hybrid(auto)"
msgstr "混合(自动)"
msgid "normal(manual)"
msgstr "普通(手动)"
@@ -7033,10 +7307,14 @@ msgstr "底部Z距离"
msgid "The z gap between the bottom support interface and object"
msgstr "支撑生成于模型表面时支撑面底部和模型之间的z间隙"
msgid "Support base"
msgstr "支撑主体"
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
msgstr "打印支撑和筏层的耗材丝。“默认”代表不指定特定的耗材丝,并使用当前耗材"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
"打印支撑主体和筏层的耗材丝。\"缺省\"代表不指定特定的耗材丝,并使用当前耗材"
msgid "Line width of support"
msgstr "支撑的线宽"
@@ -7051,7 +7329,7 @@ msgstr "使用圈形走线覆盖顶部接触面。默认关闭。"
msgid ""
"Filament to print support interface. \"Default\" means no specific filament "
"for support interface and current filament is used"
msgstr "打印支撑接触面的耗材丝。“默认”代表不指定特定的耗材丝,并使用当前耗材"
msgstr "打印支撑接触面的耗材丝。\"缺省\"代表不指定特定的耗材丝,并使用当前耗材"
msgid "Top interface layers"
msgstr "顶部接触面层数"
@@ -7086,6 +7364,9 @@ msgstr "支撑走线图案"
msgid "Rectilinear grid"
msgstr "直线网格"
msgid "Hollow"
msgstr "空心"
msgid "Interface pattern"
msgstr "支撑面图案"
@@ -7115,9 +7396,27 @@ msgstr "支撑打印速度"
msgid "Style"
msgstr "样式"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, slim style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "紧贴"
msgid "Tree Slim"
msgstr "苗条树"
msgid "Tree Strong"
msgstr "粗壮树"
msgid "Tree Hybrid"
msgstr "混合树"
msgid "Independent support layer height"
msgstr "支撑独立层高"
@@ -7167,9 +7466,6 @@ msgstr "树状支撑外墙层数"
msgid "Nozzle temperature for layers after the initial one"
msgstr "除首层外的其它层的喷嘴温度"
msgid "Nozzle temperature"
msgstr "喷嘴温度"
msgid "Chamber temperature"
msgstr "机箱温度"
@@ -7177,12 +7473,10 @@ msgid "Bed temperature difference"
msgstr "热床温差"
msgid ""
"Do not recommand bed temperature of other layer to be lower than initial "
"Do not recommend bed temperature of other layer to be lower than initial "
"layer for more than this threshold. Too low bed temperature of other layer "
"may cause the model broken free from build plate"
msgstr ""
"不建议其它层热床温度比首层的热床温度低于这个值。太低的其它层热床温度可能导致"
"打印过程中模型从构建板脱落"
msgid "Detect thin wall"
msgstr "检查薄壁"
@@ -7841,6 +8135,169 @@ msgstr ""
"提高强度\n"
"你知道吗?你可以使用更多的墙层数和更高的疏散填充密度来提高模型的强度。"
#~ msgid ""
#~ "Step 1. please confirm Bambu Studio and your printer are in same LAN."
#~ msgstr "步骤1. 请确认Bambu Studio和您的打印机在同一局域网中。"
#~ msgid ""
#~ "Step 2. if the IP and Access Code below are different from the actual "
#~ "values on your printer,please correct them."
#~ msgstr "步骤2. 如果下面的IP和访问码与打印机上的实际值不同请更正它们。"
#~ msgid "Unable to connect printer"
#~ msgstr "无法连接打印机"
#~ msgid ""
#~ "Failed to connect to the printer through LAN. Please enter the correct "
#~ "printer IP address and access code."
#~ msgstr "无法通过局域网连接打印机请输入正确的IP地址和访问码。"
#~ msgid ""
#~ "Note : The location of IP and access code on the machine is as follows :"
#~ msgstr "提示: IP地址和访问码在机器上的位置如下:"
#~ msgid "NO AMS"
#~ msgstr "无AMS"
#~ msgid ""
#~ "Calibration completed. Please select the factors according to the left "
#~ "figure and fill them in the input boxes."
#~ msgstr "标定完成。请按照左图展示的方式选择流量补偿系数,并填写到输入框中。"
#~ msgid ""
#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the "
#~ "same LAN?"
#~ msgstr ""
#~ "无法检测到打印机%s 在局域网中的的IP地址。%s 和 Bambu Studio在同一个局域网"
#~ "内吗?"
#~ msgid "Click the pencil icon to edit the filament."
#~ msgstr "点击铅笔图标编辑耗材丝。"
#~ msgid ""
#~ "Arachne engine only works when overhang slowing down is disabled.\n"
#~ "This may cause decline in the quality of overhang surface when print "
#~ "fastly\n"
#~ msgstr ""
#~ "Arachne引擎只在关闭悬垂降速时起作用。\n"
#~ "这可能会导致高速打印时悬垂表面质量的下降\n"
#~ msgid ""
#~ "Switch to rectilinear pattern?\n"
#~ "Yes - switch to rectilinear pattern automaticlly\n"
#~ "No - reset density to default non 100% value automaticlly\n"
#~ msgstr ""
#~ "切换到直线图案?\n"
#~ "是 - 自动切换到直线图案\n"
#~ "否 - 自动重置为非100%填充密度\n"
#~ msgid ""
#~ "Do you want to synchronize your personal data from Bambu Cloud? \n"
#~ "It contains the following information:\n"
#~ "1. The Process presets\n"
#~ "2. The Filament presets\n"
#~ "3. The Printer presets\n"
#~ msgstr ""
#~ "想从Bambu 云同步你的个人数据吗?\n"
#~ "包含如下信息:\n"
#~ "1. 工艺预设\n"
#~ "2. 打印丝预设\n"
#~ "3. 打印机预设\n"
#~ msgid ""
#~ "The 3mf's version %s is newer than %s's version %s, Found following keys "
#~ "unrecognized:\n"
#~ msgstr "该3mf的版本%s比%s的版本%s新发现以下参数键值无法识别\n"
#~ msgid ""
#~ "The 3mf's version %s is newer than %s's version %s, Suggest to upgrade "
#~ "your software.\n"
#~ msgstr "该3mf文件的版本%s 比%s的版本%s更新建议升级您的软件。\n"
#~ msgid "Plate %d: %s does not support filament %s (%s).\n"
#~ msgstr "盘%d%s不支持耗材丝%s (%s)。\n"
#~ msgid ""
#~ "Please check the following infomation and click Confirm to continue "
#~ "sending print:\n"
#~ msgstr "请检查以下信息,点击确认后继续发送打印:\n"
#~ msgid ""
#~ "The printer type used to generate G-code is not the same type as the "
#~ "currently selected physical printer. It is recommend to re-slice by "
#~ "selecting the same printer type.\n"
#~ msgstr ""
#~ "用于生成G-code的打印机类型与当前选定的物理打印机类型不同建议选择相同的打"
#~ "印机类型重新切片。\n"
#~ msgid ""
#~ "We have added an experimental style \"Tree Slim\" that features smaller "
#~ "support volume but weaker strength.\n"
#~ "We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
#~ msgstr ""
#~ "我们加入一个新的实验性风格\\\"苗条树\\\",它使用更少的支撑体积,但强度可能"
#~ "较弱。\n"
#~ "\"因此我们推荐以下参数接触层数为0顶部Z距离为0墙层数为2。"
#~ msgid ""
#~ "When using support material for the support interface, We recommand the "
#~ "following settings:\n"
#~ "0 top distance, 0 interface spacing, concentric pattern."
#~ msgstr ""
#~ "当使用支撑材料作为支撑面,我们推荐以下设置:\n"
#~ "顶部Z距离为0 支撑面线距为0接触面图案为同。"
#~ 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\".\n"
#~ msgstr ""
#~ "在录制无工具头延时摄影视频时,建议添加“延时摄影擦料塔”\n"
#~ "右键单击构建板的空白位置,选择“添加标准模型”->“延时摄影擦料塔”。\n"
#~ msgid " is too close to others, there may be collisions when printing.\n"
#~ msgstr "到其他对象的距离太近了,可能在打印过程中发生碰撞。\n"
#~ msgid ""
#~ " is too close to exclusion area, there may be collisions when printing.\n"
#~ msgstr "到屏蔽区域的距离太近了,可能在打印过程中发生碰撞。\n"
#~ msgid "Plate %d: %s does not support filament %s\n"
#~ msgstr "盘%d: %s 不支持耗材丝 %s\n"
#~ msgid ""
#~ "Do not recommand bed temperature of other layer to be lower than initial "
#~ "layer for more than this threshold. Too low bed temperature of other "
#~ "layer may cause the model broken free from build plate"
#~ msgstr ""
#~ "不建议其它层热床温度比首层的热床温度低于这个值。太低的其它层热床温度可能导"
#~ "致打印过程中模型从构建板脱落"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "普通(自动)和树状(自动)用于自动生成支撑体。如果选择普通或树状,仅会在支"
#~ "撑强制面上生成支撑。"
#~ msgid "hybrid(auto)"
#~ msgstr "混合(自动)"
#~ msgid ""
#~ "Filament to print support and raft. \"Default\" means no specific "
#~ "filament for support and current filament is used"
#~ msgstr ""
#~ "打印支撑和筏层的耗材丝。\"缺省\"代表不指定特定的耗材丝,并使用当前耗材"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "旋转模式只能在外墙层数为1关闭支撑顶层层数为0稀疏填充密度为0时有"
#~ "效。\n"
#~ msgid ""
#~ "When sparse infill density is low, the internal solid infill or internal "
#~ "bridge may have no archor at the end of line. This cause falling and bad "
@@ -10528,12 +10985,6 @@ msgstr ""
#~ msgid "Retraction Length (Toolchange)"
#~ msgstr "回抽长度(更换工具头)"
#~ msgid "Extra length on restart"
#~ msgstr "启动时额外长度"
#~ msgid "Skirt height"
#~ msgstr "Skirt高度"
#~ msgid "How many layers of skirt. Usually only one layer"
#~ msgstr "skirt有多少层。通常只有一层"
@@ -10701,9 +11152,6 @@ msgstr ""
#~ msgid "choose a directory"
#~ msgstr "选择文件夹"
#~ msgid "Post-processing scripts"
#~ msgstr "后处理脚本"
#~ msgid "Print speed override"
#~ msgstr "覆盖打印速度"

View File

@@ -3,12 +3,21 @@ cd deps
mkdir build
cd build
set DEPS=%CD%/BambuStudio_dep
if "%1"=="studio" (
GOTO :studio
)
echo "building deps.."
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release
cmake --build . --config Release --target ALL_BUILD -- -m
if "%1"=="deps" exit /b 0
:studio
echo "building studio..."
cd %WP%
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake --build . --config Release --target ALL_BUILD -- -m
cmake --build . --target install --config Release

View File

@@ -1,20 +1,85 @@
#!/bin/sh
while getopts ":a:sdhn" opt; do
case ${opt} in
d )
export BUILD_TARGET="deps"
;;
a )
export ARCH="$OPTARG"
;;
s )
export BUILD_TARGET="studio"
;;
n )
export NIGHTLY_BUILD="1"
;;
h ) echo "Usage: ./build_release_macos.sh [-d]"
echo " -d: Build deps only"
echo " -a: Set ARCHITECTURE (arm64 or x86_64)"
echo " -s: Build studio only"
echo " -n: Nightly build"
exit 0
;;
esac
done
if [ -z "$ARCH" ]
then
export ARCH=$(uname -m)
fi
echo "Arch: $ARCH"
echo "BUILD_TARGET: $BUILD_TARGET"
brew --prefix libiconv
brew --prefix zstd
export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd $WD/deps
mkdir -p build
cd build
DEPS=$PWD/BambuStudio_dep
mkdir -p $DEPS
cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-$(uname -m)-cc" -DCMAKE_BUILD_TYPE=Release
make -j10
if [ "studio." != $BUILD_TARGET. ];
then
echo "building deps..."
echo "cmake ../ -DDESTDIR=$DEPS -DOPENSSL_ARCH=darwin64-${ARCH}-cc -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}"
cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-${ARCH}-cc" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}
cmake --build . --config Release --target all
fi
if [ "deps." == "$BUILD_TARGET". ];
then
exit 0
fi
cd $WD
mkdir -p build
cd build
cmake .. -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON
cmake --build . --config Release --target all -j10
cmake --build . --target install --config Release -j10
echo "building studio..."
cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH}
cmake --build . --config Release --target ALL_BUILD
mkdir -p BambuStudio-SoftFever
cd BambuStudio-SoftFever
cp -r bin/BambuStudio.app/Contents/MacOS BambuStudio.app/Contents
cp -r bin/BambuStudio.app/Contents/Info.plist BambuStudio.app/Contents/
rm -r ./BambuStudio-SoftFever.app
cp -pR ../src/Release/BambuStudio.app ./BambuStudio-SoftFever.app
resources_path=$(readlink ./BambuStudio-SoftFever.app/Contents/Resources)
rm ./BambuStudio-SoftFever.app/Contents/Resources
cp -R $resources_path ./BambuStudio-SoftFever.app/Contents/Resources
# delete .DS_Store file
find ./BambuStudio-SoftFever.app/ -name '.DS_Store' -delete
# extract version
export ver="_dev"
echo $PWD
if [ "1." != "$NIGHTLY_BUILD". ];
then
ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
ver="_V${ver//\"}"
fi
zip -FSr BambuStudio-SoftFever${ver}_Mac_${ARCH}.zip BambuStudio-SoftFever.app

View File

@@ -94,19 +94,20 @@ endif()
function(__glew_set_find_library_suffix shared_or_static)
if((UNIX AND NOT APPLE) AND "${shared_or_static}" MATCHES "SHARED")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" PARENT_SCOPE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
elseif((UNIX AND NOT APPLE) AND "${shared_or_static}" MATCHES "STATIC")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" PARENT_SCOPE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
elseif(APPLE AND "${shared_or_static}" MATCHES "SHARED")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so" PARENT_SCOPE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so")
elseif(APPLE AND "${shared_or_static}" MATCHES "STATIC")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" PARENT_SCOPE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
elseif(WIN32 AND "${shared_or_static}" MATCHES "SHARED")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" PARENT_SCOPE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
elseif(WIN32 AND "${shared_or_static}" MATCHES "STATIC")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib;.a;.dll.a" PARENT_SCOPE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib;.a;.dll.a")
endif()
set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES}" PARENT_SCOPE)
if(GLEW_VERBOSE)
message(STATUS "FindGLEW: CMAKE_FIND_LIBRARY_SUFFIXES for ${shared_or_static}: ${CMAKE_FIND_LIBRARY_SUFFIXES}")
endif()

View File

@@ -293,7 +293,7 @@ if(NOT TBB_FOUND)
# Create targets
##################################
if(NOT CMAKE_VERSION VERSION_LESS 3.0 AND TBB_FOUND)
if(NOT CMAKE_VERSION VERSION_LESS 3.0 AND TBB_FOUND AND NOT TARGET TBB::tbb)
add_library(TBB::tbb UNKNOWN IMPORTED)
set_target_properties(TBB::tbb PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "${TBB_DEFINITIONS}"

View File

@@ -6,23 +6,43 @@ else()
set(_build_static ON)
endif()
bambustudio_add_cmake_project(Blosc
#URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip
#URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
URL_HASH SHA256=dcb48bf43a672fa3de6a4b1de2c4c238709dad5893d1e097b8374ad84b1fc3b3
DEPENDS ${ZLIB_PKG}
# Patching upstream does not work this way with git version 2.28 installed on mac worker
# PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/blosc-mods.patch
CMAKE_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DBUILD_SHARED=${_build_shared}
-DBUILD_STATIC=${_build_static}
-DBUILD_TESTS=OFF
-DBUILD_BENCHMARKS=OFF
-DPREFER_EXTERNAL_ZLIB=ON
)
if(IS_CROSS_COMPILE AND APPLE)
bambustudio_add_cmake_project(Blosc
#URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip
#URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
URL_HASH SHA256=dcb48bf43a672fa3de6a4b1de2c4c238709dad5893d1e097b8374ad84b1fc3b3
DEPENDS ${ZLIB_PKG}
# Patching upstream does not work this way with git version 2.28 installed on mac worker
# PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/blosc-mods.patch
CMAKE_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DBUILD_SHARED=${_build_shared}
-DBUILD_STATIC=${_build_static}
-DBUILD_TESTS=OFF
-DBUILD_BENCHMARKS=OFF
-DPREFER_EXTERNAL_ZLIB=ON
-DDEACTIVATE_SSE2=ON
-DDEACTIVATE_AVX2=ON
)
else()
bambustudio_add_cmake_project(Blosc
#URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip
#URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
URL_HASH SHA256=dcb48bf43a672fa3de6a4b1de2c4c238709dad5893d1e097b8374ad84b1fc3b3
DEPENDS ${ZLIB_PKG}
# Patching upstream does not work this way with git version 2.28 installed on mac worker
# PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/blosc-mods.patch
CMAKE_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DBUILD_SHARED=${_build_shared}
-DBUILD_STATIC=${_build_static}
-DBUILD_TESTS=OFF
-DBUILD_BENCHMARKS=OFF
-DPREFER_EXTERNAL_ZLIB=ON
)
endif()
if (MSVC)
add_debug_dep(dep_Blosc)
endif ()

View File

@@ -67,16 +67,6 @@ include(ProcessorCount)
ProcessorCount(NPROC)
file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)
set(_boost_flags "")
if (UNIX)
set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
elseif(APPLE)
set(_boost_flags
"cflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
"cxxflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
"mflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
"mmflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET}")
endif()
set(_boost_variants "")
if(CMAKE_BUILD_TYPE)
@@ -100,8 +90,38 @@ if (NOT _boost_variants)
set(_boost_variants release)
endif()
if (IS_CROSS_COMPILE AND APPLE)
if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
message(STATUS "Compiling Boost for arm64.")
message(STATUS "Compiling Boost with toolset ${_boost_toolset}.")
message(STATUS "Compiling Boost with libs ${_libs}.")
message(STATUS "Compiling Boost with variant ${_boost_variants}.")
message(STATUS "Compiling Boost with _bootstrap_cmd ${_bootstrap_cmd}.")
message(STATUS "_boost_linkflags = ${_boost_linkflags}")
set(_arch_flags "-arch arm64")
set(_boost_linkflags "linkflags=${_arch_flags}")
message(STATUS "_cmake_args_osx_arch = '${_cmake_args_osx_arch}'")
elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
message(STATUS "Compiling Boost for x86_64.")
set(_arch_flags "-arch x86_64")
endif()
set(_boost_linkflags "linkflags=${_arch_flags}")
endif ()
set(_boost_flags "")
if(APPLE)
set(_boost_flags
"cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
"cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
"mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
"mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}")
elseif (UNIX)
set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
endif()
set(_build_cmd ${_build_cmd}
${_boost_flags}
${_boost_linkflags}
-j${NPROC}
${_libs}
--layout=versioned
@@ -117,9 +137,14 @@ set(_build_cmd ${_build_cmd}
set(_install_cmd ${_build_cmd} --prefix=${_prefix} install)
if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS)
message(STATUS "Standard boost build with bootstrap command '${_bootstrap_cmd}'")
message(STATUS "Standard boost build with patch command '${_patch_command}'")
message(STATUS "Standard boost build with build command '${_build_cmd}'")
message(STATUS "Standard boost build with install command '${_install_cmd}'")
ExternalProject_Add(
dep_Boost
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
CONFIGURE_COMMAND "${_bootstrap_cmd}"
@@ -129,7 +154,26 @@ ExternalProject_Add(
INSTALL_COMMAND "${_install_cmd}"
)
else()
ExternalProject_Add(
dep_Boost
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
CONFIGURE_COMMAND ./bootstrap.sh
--with-toolset=clang
--with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread
"--prefix=${DESTDIR}/usr/local"
# PATCH_COMMAND ${_patch_command}
BUILD_COMMAND "${_build_cmd}"
BUILD_IN_SOURCE ON
INSTALL_COMMAND "${_install_cmd}"
)
endif()
if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
message(STATUS "Patch the boost::polygon library with a custom one.")
# Patch the boost::polygon library with a custom one.
ExternalProject_Add(dep_boost_polygon
EXCLUDE_FROM_ALL ON
@@ -141,6 +185,7 @@ if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
DEPENDS dep_Boost
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
${_cmake_args_osx_arch}
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CMAKE_CURRENT_BINARY_DIR}/dep_boost_polygon-prefix/src/dep_boost_polygon/include/boost/polygon"
"${DESTDIR}/usr/local/include/boost/polygon"

43
deps/CMakeLists.txt vendored
View File

@@ -40,6 +40,25 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
endif()
set(IS_CROSS_COMPILE FALSE)
if (APPLE)
set(CMAKE_FIND_FRAMEWORK LAST)
set(CMAKE_FIND_APPBUNDLE LAST)
list(FIND CMAKE_OSX_ARCHITECTURES ${CMAKE_SYSTEM_PROCESSOR} _arch_idx)
message(STATUS "prusaslicer_add_cmake_project for Apple")
if (CMAKE_OSX_ARCHITECTURES AND _arch_idx LESS 0)
message(STATUS "prusaslicer_add_cmake_project for Apple crosscompiling")
set(IS_CROSS_COMPILE TRUE)
set(CMAKE_CXX_COMPILER_ID "Clang")
string(REPLACE ";" "$<SEMICOLON>" CMAKE_OSX_ARCHS "${CMAKE_OSX_ARCHITECTURES}")
set(_cmake_osx_arch -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHS})
set(_cmake_args_osx_arch CMAKE_ARGS -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHS})
message(STATUS "Detect Cross-compilation. Will build for target ${CMAKE_OSX_ARCHS}" )
endif ()
endif ()
# On developer machines, it can be enabled to speed up compilation and suppress warnings coming from IGL.
# FIXME:
# Enabling this option is not safe. IGL will compile itself with its own version of Eigen while
@@ -77,6 +96,7 @@ function(bambustudio_add_cmake_project projectname)
set(_build_j "/m")
endif ()
if (NOT IS_CROSS_COMPILE OR NOT APPLE)
ExternalProject_Add(
dep_${projectname}
EXCLUDE_FROM_ALL ON
@@ -92,6 +112,7 @@ function(bambustudio_add_cmake_project projectname)
-DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
-DBUILD_SHARED_LIBS:BOOL=OFF
${_cmake_osx_arch}
"${_configs_line}"
${DEP_CMAKE_OPTS}
${P_ARGS_CMAKE_ARGS}
@@ -99,6 +120,26 @@ function(bambustudio_add_cmake_project projectname)
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
)
else()
ExternalProject_Add(
dep_${projectname}
EXCLUDE_FROM_ALL ON
INSTALL_DIR ${DESTDIR}/usr/local
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/${projectname}
${_gen}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
-DBUILD_SHARED_LIBS:BOOL=OFF
${_cmake_osx_arch}
"${_configs_line}"
${DEP_CMAKE_OPTS}
${P_ARGS_CMAKE_ARGS}
${P_ARGS_UNPARSED_ARGUMENTS}
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
)
endif()
endfunction(bambustudio_add_cmake_project)
@@ -117,7 +158,7 @@ if (MSVC)
endif ()
elseif (APPLE)
message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
if (CMAKE_OSX_DEPLOYMENT_TARGET)
set(DEP_OSX_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}")
message("OS X Deployment Target: ${DEP_OSX_TARGET}")

View File

@@ -3,12 +3,17 @@ project(GLEW)
find_package(OpenGL REQUIRED)
add_library(glew src/glew.c)
target_include_directories(glew PRIVATE include/)
target_link_libraries(glew PUBLIC OpenGL::GL)
if(OpenGL_EGL_FOUND)
message(STATUS "building GLEW for EGL (hope that wxWidgets agrees, otherwise you won't have any output!)")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGLEW_EGL")
endif()
add_library(GLEW src/glew.c)
target_include_directories(GLEW PRIVATE include/)
target_link_libraries(GLEW PUBLIC OpenGL::GL)
if (NOT BUILD_SHARED_LIBS)
target_compile_definitions(glew PUBLIC GLEW_STATIC)
target_compile_definitions(GLEW PUBLIC GLEW_STATIC)
endif ()
include(GNUInstallDirs)
@@ -18,14 +23,12 @@ install(
${PROJECT_SOURCE_DIR}/include/GL/glew.h
${PROJECT_SOURCE_DIR}/include/GL/wglew.h
${PROJECT_SOURCE_DIR}/include/GL/glxew.h
${PROJECT_SOURCE_DIR}/include/GL/eglew.h
DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/GL
)
add_library(GLEW INTERFACE)
target_link_libraries(GLEW INTERFACE glew)
install(TARGETS glew GLEW
install(TARGETS GLEW GLEW
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

View File

@@ -1,53 +1,82 @@
THIS IS NOT THE COMPLETE GLEW DISTRIBUTION. ONLY FILES NEEDED FOR COMPILING GLEW INTO SLIC3R WERE PUT INTO THE SLIC3R SOURCE DISTRIBUTION.
A CMAKE CONFIG EXPORT IS ADDED TO ENABLE FIND PACKAGE TO FIND DEBUG BUILD ON MSVC
# GLEW - The OpenGL Extension Wrangler Library
The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. GLEW provides efficient run-time mechanisms for determining which OpenGL extensions are supported on the target platform. OpenGL core and extension functionality is exposed in a single header file. GLEW has been tested on a variety of operating systems, including Windows, Linux, Mac OS X, FreeBSD, Irix, and Solaris.
![](http://glew.sourceforge.net/glew.png)
http://glew.sourceforge.net/
https://github.com.cnpmjs.org/nigels-com/glew
https://github.com/nigels-com/glew
[![Build Status](https://travis-ci.org/nigels-com/glew.svg?branch=master)](https://travis-ci.org/nigels-com/glew)
[![Gitter](https://badges.gitter.im/nigels-com/glew.svg)](https://gitter.im/nigels-com/glew?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Download](https://img.shields.io/sourceforge/dm/glew.svg)](https://sourceforge.net/projects/glew/files/latest/download)
## Table of Contents
* [Downloads](#downloads)
* [Recent snapshots](#recent-snapshots)
* [Build](#build)
* [Linux and Mac](#linux-and-mac)
* [Using GNU Make](#using-gnu-make)
* [Install build tools](#install-build-tools)
* [Build](#build-1)
* [Linux EGL](#linux-egl)
* [Linux OSMesa](#linux-osmesa)
* [Linux mingw-w64](#linux-mingw-w64)
* [Using cmake](#using-cmake)
* [Install build tools](#install-build-tools-1)
* [Build](#build-2)
* [Windows](#windows)
* [Visual Studio](#visual-studio)
* [MSYS/Mingw](#msysmingw)
* [MSYS2/Mingw-w64](#msys2mingw-w64)
* [glewinfo](#glewinfo)
* [Code Generation](#code-generation)
* [Authors](#authors)
* [Contributions](#contributions)
* [Copyright and Licensing](#copyright-and-licensing)
## Downloads
Current release is [2.0.0](https://sourceforge.net/projects/glew/files/glew/2.0.0/).
Current release is [2.1.0](https://sourceforge.net/projects/glew/files/glew/2.1.0/).
[(Change Log)](http://glew.sourceforge.net/log.html)
Sources available as
[ZIP](https://sourceforge.net/projects/glew/files/glew/2.0.0/glew-2.0.0.zip/download) or
[TGZ](https://sourceforge.net/projects/glew/files/glew/2.0.0/glew-2.0.0.tgz/download).
Sources available as
[ZIP](https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.zip/download) or
[TGZ](https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.tgz/download).
Windows binaries for [32-bit and 64-bit](https://sourceforge.net/projects/glew/files/glew/2.0.0/glew-2.0.0-win32.zip/download).
Windows binaries for [32-bit and 64-bit](https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0-win32.zip/download).
### Recent snapshots
Snapshots may contain new features, bug-fixes or new OpenGL extensions ahead of tested, official releases.
[glew-20160708.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20160708.tgz/download)
*GLEW 2.0.0 RC: Core context, EGL support, no MX*
[glew-20200115.tgz](https://sourceforge.net/projects/glew/files/glew/snapshots/glew-20200115.tgz/download) *GLEW 2.2.0 RC3: fixes*
[glew-20160402.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20160402.tgz/download)
*GLEW 2.0.0 RC: Core context, EGL support, no MX*
[glew-20190928.tgz](https://sourceforge.net/projects/glew/files/glew/snapshots/glew-20190928.tgz/download) *GLEW 2.2.0 RC2: New extensions, bug fixes*
## Build
From a downloaded tarball or zip archive:
It is highly recommended to build from a tgz or zip release snapshot.
The code generation workflow is a complex brew of gnu make, perl and python, that works best on Linux or Mac.
The code generation is known to work on Windows using [MSYS2](https://www.msys2.org/).
For most end-users of GLEW the official releases are the best choice, with first class support.
### Linux and Mac
#### Using GNU Make
GNU make is the primary build system for GLEW, historically.
It includes targets for building the sources and headers, for maintenance purposes.
##### Install build tools
Debian/Ubuntu/Mint: `$ sudo apt-get install build-essential libxmu-dev libxi-dev libgl-dev libosmesa-dev git`
Debian/Ubuntu/Mint: `$ sudo apt-get install build-essential libxmu-dev libxi-dev libgl-dev`
RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel git`
RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel`
FreeBSD: `# pkg install xorg lang/gcc git cmake gmake bash python perl5`
##### Build
@@ -55,24 +84,46 @@ RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel
$ sudo make install
$ make clean
Targets: `all, glew.lib, glew.bin, clean, install, uninstall`
Targets: `all, glew.lib (sub-targets: glew.lib.shared, glew.lib.static), glew.bin, clean, install, uninstall`
Variables: `SYSTEM=linux-clang, GLEW_DEST=/usr/local, STRIP=`
_Note: you may need to call `make` in the **auto** folder first_
##### Linux EGL
$ sudo apt install libegl1-mesa-dev
$ make SYSTEM=linux-egl
##### Linux OSMesa
$ sudo apt install libosmesa-dev
$ make SYSTEM=linux-osmesa
##### Linux mingw-w64
$ sudo apt install mingw-w64
$ make SYSTEM=linux-mingw32
$ make SYSTEM=linux-mingw64
#### Using cmake
The cmake build is mostly contributer maintained.
Due to the multitude of use cases this is maintained on a _best effort_ basis.
Pull requests are welcome.
*CMake 2.8.12 or higher is required.*
##### Install build tools
Debian/Ubuntu/Mint: `$ sudo apt-get install build-essential libXmu-dev libXi-dev libgl-dev git cmake`
Debian/Ubuntu/Mint: `$ sudo apt-get install build-essential libxmu-dev libxi-dev libgl-dev cmake git`
RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel git cmake`
RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel cmake git`
##### Build
$ cd build
$ cmake ./cmake
$ cmake ./cmake
$ make -j4
| Target | Description |
@@ -96,9 +147,9 @@ RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel g
#### Visual Studio
Use the provided Visual Studio project file in build/vc12/
Use the provided Visual Studio project file in build/vc15/
Projects for vc6 and vc10 are also provided
Projects for vc6, vc10, vc12 and vc14 are also provided
#### MSYS/Mingw
@@ -118,7 +169,7 @@ Available from [Msys2](http://msys2.github.io/) and/or [Mingw-w64](http://mingw-
Requirements: bash, make, gcc
$ pacman -S gcc make mingw-w64-i686-gcc mingw-w64-x86_64-gcc
$ pacman -S gcc make mingw-w64-i686-gcc mingw-w64-x86_64-gcc
$ make
$ make install
$ make install.all
@@ -128,8 +179,8 @@ Alternative toolchain: `SYSTEM=msys, SYSTEM=msys-win32, SYSTEM=msys-win64`
## glewinfo
`glewinfo` is a command-line tool useful for inspecting the capabilities of an
OpenGL implementation and GLEW support for that. Please include the output of
`glewinfo` with bug reports, as appropriate.
OpenGL implementation and GLEW support for that. Please include `glewinfo.txt`
with bug reports, as appropriate.
---------------------------
GLEW Extension Info
@@ -149,12 +200,12 @@ OpenGL implementation and GLEW support for that. Please include the output of
glDrawRangeElements: OK
glTexImage3D: OK
glTexSubImage3D: OK
...
## Code Generation
A Unix or Mac environment is neded for building GLEW from scratch to
A Unix or Mac environment is needed for building GLEW from scratch to
include new extensions, or customize the code generation. The extension
data is regenerated from the top level source directory with:
@@ -165,32 +216,43 @@ download a pre-generated (unsupported) snapshot:
https://sourceforge.net/projects/glew/files/glew/snapshots/
Travis-built snapshots are also available:
https://glew.s3.amazonaws.com/index.html
## Authors
GLEW is currently maintained by [Nigel Stewart](https://github.com.cnpmjs.org/nigels-com)
GLEW is currently maintained by [Nigel Stewart](https://github.com/nigels-com)
with bug fixes, new OpenGL extension support and new releases.
GLEW was developed by [Milan Ikits](http://www.cs.utah.edu/~ikits/)
and [Marcelo Magallon](http://wwwvis.informatik.uni-stuttgart.de/~magallon/).
Aaron Lefohn, Joe Kniss, and Chris Wyman were the first users and also
assisted with the design and debugging process.
assisted with the design and debugging process.
The acronym GLEW originates from Aaron Lefohn.
Pasi K&auml;rkk&auml;inen identified and fixed several problems with
GLX and SDL. Nate Robins created the `wglinfo` utility, to
which modifications were made by Michael Wimmer.
which modifications were made by Michael Wimmer.
## Contributions
GLEW welcomes community contributions. Typically these are co-ordinated
via [Issues](https://github.com/nigels-com/glew/issues) or
[Pull Requests](https://github.com/nigels-com/glew/pulls) in the
GitHub web interface.
Be sure to mention platform and compiler toolchain details when filing
a bug report. The output of `glewinfo` can be quite useful for discussion
also.
Generally GLEW is usually released once a year, around the time of the Siggraph
computer graphics conference. If you're not using the current release
version of GLEW, be sure to check if the issue or bug is fixed there.
## Copyright and Licensing
GLEW is originally derived from the EXTGL project by Lev Povalahev.
The source code is licensed under the
[Modified BSD License](http://glew.sourceforge.net/glew.txt), the
The source code is licensed under the
[Modified BSD License](http://glew.sourceforge.net/glew.txt), the
[Mesa 3-D License](http://glew.sourceforge.net/mesa.txt) (MIT) and the
[Khronos License](http://glew.sourceforge.net/khronos.txt) (MIT).
The automatic code generation scripts are released under the
The automatic code generation scripts are released under the
[GNU GPL](http://glew.sourceforge.net/gpl.txt).

View File

@@ -1 +1 @@
1.13.0
2.2.0

3051
deps/GLEW/glew/include/GL/eglew.h vendored Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
/*
** The OpenGL Extension Wrangler Library
** Copyright (C) 2008-2015, Nigel Stewart <nigels[]users sourceforge net>
** Copyright (C) 2008-2019, Nigel Stewart <nigels[]users sourceforge net>
** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
** Copyright (C) 2002, Lev Povalahev
@@ -98,7 +98,12 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xmd.h>
#include <GL/glew.h>
#ifndef GLEW_INCLUDE
# include <GL/glew.h>
#else
# include GLEW_INCLUDE
#endif
#ifdef __cplusplus
extern "C" {
@@ -392,7 +397,7 @@ typedef Bool ( * PFNGLXMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (GLXContext ctx);
#ifndef GLX_ARB_context_flush_control
#define GLX_ARB_context_flush_control 1
#define GLX_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0x0000
#define GLX_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0
#define GLX_CONTEXT_RELEASE_BEHAVIOR_ARB 0x2097
#define GLX_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098
@@ -405,13 +410,13 @@ typedef Bool ( * PFNGLXMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (GLXContext ctx);
#ifndef GLX_ARB_create_context
#define GLX_ARB_create_context 1
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
#define GLX_CONTEXT_FLAGS_ARB 0x2094
typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display* dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list);
typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display* dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int* attrib_list);
#define glXCreateContextAttribsARB GLXEW_GET_FUN(__glewXCreateContextAttribsARB)
@@ -419,6 +424,17 @@ typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display* dpy, GLXFBCo
#endif /* GLX_ARB_create_context */
/* -------------------- GLX_ARB_create_context_no_error -------------------- */
#ifndef GLX_ARB_create_context_no_error
#define GLX_ARB_create_context_no_error 1
#define GLX_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3
#define GLXEW_ARB_create_context_no_error GLXEW_GET_VAR(__GLXEW_ARB_create_context_no_error)
#endif /* GLX_ARB_create_context_no_error */
/* --------------------- GLX_ARB_create_context_profile -------------------- */
#ifndef GLX_ARB_create_context_profile
@@ -600,6 +616,20 @@ typedef void ( * PFNGLXRELEASETEXIMAGEATIPROC) (Display *dpy, GLXPbuffer pbuf, i
#endif /* GLX_EXT_buffer_age */
/* ------------------------ GLX_EXT_context_priority ----------------------- */
#ifndef GLX_EXT_context_priority
#define GLX_EXT_context_priority 1
#define GLX_CONTEXT_PRIORITY_LEVEL_EXT 0x3100
#define GLX_CONTEXT_PRIORITY_HIGH_EXT 0x3101
#define GLX_CONTEXT_PRIORITY_MEDIUM_EXT 0x3102
#define GLX_CONTEXT_PRIORITY_LOW_EXT 0x3103
#define GLXEW_EXT_context_priority GLXEW_GET_VAR(__GLXEW_EXT_context_priority)
#endif /* GLX_EXT_context_priority */
/* ------------------- GLX_EXT_create_context_es2_profile ------------------ */
#ifndef GLX_EXT_create_context_es2_profile
@@ -658,11 +688,13 @@ typedef XID GLXContextID;
typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display* dpy, GLXContext context);
typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
typedef Display* ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display* dpy, GLXContextID contextID);
typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display* dpy, GLXContext context, int attribute,int *value);
typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display* dpy, GLXContext context, int attribute, int* value);
#define glXFreeContextEXT GLXEW_GET_FUN(__glewXFreeContextEXT)
#define glXGetContextIDEXT GLXEW_GET_FUN(__glewXGetContextIDEXT)
#define glXGetCurrentDisplayEXT GLXEW_GET_FUN(__glewXGetCurrentDisplayEXT)
#define glXImportContextEXT GLXEW_GET_FUN(__glewXImportContextEXT)
#define glXQueryContextInfoEXT GLXEW_GET_FUN(__glewXQueryContextInfoEXT)
@@ -670,6 +702,26 @@ typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display* dpy, GLXContext context
#endif /* GLX_EXT_import_context */
/* ---------------------------- GLX_EXT_libglvnd --------------------------- */
#ifndef GLX_EXT_libglvnd
#define GLX_EXT_libglvnd 1
#define GLX_VENDOR_NAMES_EXT 0x20F6
#define GLXEW_EXT_libglvnd GLXEW_GET_VAR(__GLXEW_EXT_libglvnd)
#endif /* GLX_EXT_libglvnd */
/* ----------------------- GLX_EXT_no_config_context ----------------------- */
#ifndef GLX_EXT_no_config_context
#define GLX_EXT_no_config_context 1
#define GLXEW_EXT_no_config_context GLXEW_GET_VAR(__GLXEW_EXT_no_config_context)
#endif /* GLX_EXT_no_config_context */
/* -------------------------- GLX_EXT_scene_marker ------------------------- */
#ifndef GLX_EXT_scene_marker
@@ -741,8 +793,10 @@ typedef void ( * PFNGLXSWAPINTERVALEXTPROC) (Display* dpy, GLXDrawable drawable,
#define GLX_TEXTURE_1D_EXT 0x20DB
#define GLX_TEXTURE_2D_EXT 0x20DC
#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD
#define GLX_FRONT_EXT 0x20DE
#define GLX_FRONT_LEFT_EXT 0x20DE
#define GLX_FRONT_RIGHT_EXT 0x20DF
#define GLX_BACK_EXT 0x20E0
#define GLX_BACK_LEFT_EXT 0x20E0
#define GLX_BACK_RIGHT_EXT 0x20E1
#define GLX_AUX0_EXT 0x20E2
@@ -756,8 +810,8 @@ typedef void ( * PFNGLXSWAPINTERVALEXTPROC) (Display* dpy, GLXDrawable drawable,
#define GLX_AUX8_EXT 0x20EA
#define GLX_AUX9_EXT 0x20EB
typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display* display, GLXDrawable drawable, int buffer, const int *attrib_list);
typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display* display, GLXDrawable drawable, int buffer);
typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display* dpy, GLXDrawable drawable, int buffer, const int* attrib_list);
typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display* dpy, GLXDrawable drawable, int buffer);
#define glXBindTexImageEXT GLXEW_GET_FUN(__glewXBindTexImageEXT)
#define glXReleaseTexImageEXT GLXEW_GET_FUN(__glewXReleaseTexImageEXT)
@@ -850,7 +904,7 @@ typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display* dpy, GLXDrawable drawabl
#ifndef GLX_MESA_pixmap_colormap
#define GLX_MESA_pixmap_colormap 1
typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display* dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display* dpy, XVisualInfo* visual, Pixmap pixmap, Colormap cmap);
#define glXCreateGLXPixmapMESA GLXEW_GET_FUN(__glewXCreateGLXPixmapMESA)
@@ -874,12 +928,11 @@ typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display* dpy, XVisualInfo
#define GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA 0x818B
#define GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA 0x818C
#define GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA 0x818D
#define GLX_RENDERER_ID_MESA 0x818E
typedef Bool ( * PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC) (int attribute, unsigned int* value);
typedef const char* ( * PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC) (int attribute);
typedef Bool ( * PFNGLXQUERYRENDERERINTEGERMESAPROC) (Display* dpy, int screen, int renderer, int attribute, unsigned int *value);
typedef const char* ( * PFNGLXQUERYRENDERERSTRINGMESAPROC) (Display *dpy, int screen, int renderer, int attribute);
typedef Bool ( * PFNGLXQUERYRENDERERINTEGERMESAPROC) (Display* dpy, int screen, int renderer, int attribute, unsigned int* value);
typedef const char* ( * PFNGLXQUERYRENDERERSTRINGMESAPROC) (Display* dpy, int screen, int renderer, int attribute);
#define glXQueryCurrentRendererIntegerMESA GLXEW_GET_FUN(__glewXQueryCurrentRendererIntegerMESA)
#define glXQueryCurrentRendererStringMESA GLXEW_GET_FUN(__glewXQueryCurrentRendererStringMESA)
@@ -895,7 +948,7 @@ typedef const char* ( * PFNGLXQUERYRENDERERSTRINGMESAPROC) (Display *dpy, int sc
#ifndef GLX_MESA_release_buffers
#define GLX_MESA_release_buffers 1
typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display* dpy, GLXDrawable d);
typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display* dpy, GLXDrawable drawable);
#define glXReleaseBuffersMESA GLXEW_GET_FUN(__glewXReleaseBuffersMESA)
@@ -986,6 +1039,21 @@ typedef Bool ( * PFNGLXDELAYBEFORESWAPNVPROC) (Display* dpy, GLXDrawable drawabl
#endif /* GLX_NV_float_buffer */
/* ------------------------ GLX_NV_multigpu_context ------------------------ */
#ifndef GLX_NV_multigpu_context
#define GLX_NV_multigpu_context 1
#define GLX_CONTEXT_MULTIGPU_ATTRIB_NV 0x20AA
#define GLX_CONTEXT_MULTIGPU_ATTRIB_SINGLE_NV 0x20AB
#define GLX_CONTEXT_MULTIGPU_ATTRIB_AFR_NV 0x20AC
#define GLX_CONTEXT_MULTIGPU_ATTRIB_MULTICAST_NV 0x20AD
#define GLX_CONTEXT_MULTIGPU_ATTRIB_MULTI_DISPLAY_MULTICAST_NV 0x20AE
#define GLXEW_NV_multigpu_context GLXEW_GET_VAR(__GLXEW_NV_multigpu_context)
#endif /* GLX_NV_multigpu_context */
/* ---------------------- GLX_NV_multisample_coverage ---------------------- */
#ifndef GLX_NV_multisample_coverage
@@ -1005,8 +1073,8 @@ typedef Bool ( * PFNGLXDELAYBEFORESWAPNVPROC) (Display* dpy, GLXDrawable drawabl
#define GLX_NUM_VIDEO_SLOTS_NV 0x20F0
typedef int ( * PFNGLXBINDVIDEODEVICENVPROC) (Display* dpy, unsigned int video_slot, unsigned int video_device, const int *attrib_list);
typedef unsigned int* ( * PFNGLXENUMERATEVIDEODEVICESNVPROC) (Display *dpy, int screen, int *nelements);
typedef int ( * PFNGLXBINDVIDEODEVICENVPROC) (Display* dpy, unsigned int video_slot, unsigned int video_device, const int* attrib_list);
typedef unsigned int* ( * PFNGLXENUMERATEVIDEODEVICESNVPROC) (Display* dpy, int screen, int* nelements);
#define glXBindVideoDeviceNV GLXEW_GET_FUN(__glewXBindVideoDeviceNV)
#define glXEnumerateVideoDevicesNV GLXEW_GET_FUN(__glewXEnumerateVideoDevicesNV)
@@ -1015,6 +1083,17 @@ typedef unsigned int* ( * PFNGLXENUMERATEVIDEODEVICESNVPROC) (Display *dpy, int
#endif /* GLX_NV_present_video */
/* ------------------ GLX_NV_robustness_video_memory_purge ----------------- */
#ifndef GLX_NV_robustness_video_memory_purge
#define GLX_NV_robustness_video_memory_purge 1
#define GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x20F7
#define GLXEW_NV_robustness_video_memory_purge GLXEW_GET_VAR(__GLXEW_NV_robustness_video_memory_purge)
#endif /* GLX_NV_robustness_video_memory_purge */
/* --------------------------- GLX_NV_swap_group --------------------------- */
#ifndef GLX_NV_swap_group
@@ -1022,9 +1101,9 @@ typedef unsigned int* ( * PFNGLXENUMERATEVIDEODEVICESNVPROC) (Display *dpy, int
typedef Bool ( * PFNGLXBINDSWAPBARRIERNVPROC) (Display* dpy, GLuint group, GLuint barrier);
typedef Bool ( * PFNGLXJOINSWAPGROUPNVPROC) (Display* dpy, GLXDrawable drawable, GLuint group);
typedef Bool ( * PFNGLXQUERYFRAMECOUNTNVPROC) (Display* dpy, int screen, GLuint *count);
typedef Bool ( * PFNGLXQUERYMAXSWAPGROUPSNVPROC) (Display* dpy, int screen, GLuint *maxGroups, GLuint *maxBarriers);
typedef Bool ( * PFNGLXQUERYSWAPGROUPNVPROC) (Display* dpy, GLXDrawable drawable, GLuint *group, GLuint *barrier);
typedef Bool ( * PFNGLXQUERYFRAMECOUNTNVPROC) (Display* dpy, int screen, GLuint* count);
typedef Bool ( * PFNGLXQUERYMAXSWAPGROUPSNVPROC) (Display* dpy, int screen, GLuint* maxGroups, GLuint* maxBarriers);
typedef Bool ( * PFNGLXQUERYSWAPGROUPNVPROC) (Display* dpy, GLXDrawable drawable, GLuint* group, GLuint* barrier);
typedef Bool ( * PFNGLXRESETFRAMECOUNTNVPROC) (Display* dpy, int screen);
#define glXBindSwapBarrierNV GLXEW_GET_FUN(__glewXBindSwapBarrierNV)
@@ -1065,9 +1144,9 @@ typedef void ( * PFNGLXFREEMEMORYNVPROC) (void *pointer);
typedef XID GLXVideoCaptureDeviceNV;
typedef int ( * PFNGLXBINDVIDEOCAPTUREDEVICENVPROC) (Display* dpy, unsigned int video_capture_slot, GLXVideoCaptureDeviceNV device);
typedef GLXVideoCaptureDeviceNV * ( * PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC) (Display* dpy, int screen, int *nelements);
typedef GLXVideoCaptureDeviceNV* ( * PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC) (Display* dpy, int screen, int* nelements);
typedef void ( * PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device);
typedef int ( * PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device, int attribute, int *value);
typedef int ( * PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device, int attribute, int* value);
typedef void ( * PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device);
#define glXBindVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXBindVideoCaptureDeviceNV)
@@ -1097,11 +1176,11 @@ typedef void ( * PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoC
#define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC
typedef int ( * PFNGLXBINDVIDEOIMAGENVPROC) (Display* dpy, GLXVideoDeviceNV VideoDevice, GLXPbuffer pbuf, int iVideoBuffer);
typedef int ( * PFNGLXGETVIDEODEVICENVPROC) (Display* dpy, int screen, int numVideoDevices, GLXVideoDeviceNV *pVideoDevice);
typedef int ( * PFNGLXGETVIDEOINFONVPROC) (Display* dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
typedef int ( * PFNGLXGETVIDEODEVICENVPROC) (Display* dpy, int screen, int numVideoDevices, GLXVideoDeviceNV* pVideoDevice);
typedef int ( * PFNGLXGETVIDEOINFONVPROC) (Display* dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long* pulCounterOutputPbuffer, unsigned long* pulCounterOutputVideo);
typedef int ( * PFNGLXRELEASEVIDEODEVICENVPROC) (Display* dpy, int screen, GLXVideoDeviceNV VideoDevice);
typedef int ( * PFNGLXRELEASEVIDEOIMAGENVPROC) (Display* dpy, GLXPbuffer pbuf);
typedef int ( * PFNGLXSENDPBUFFERTOVIDEONVPROC) (Display* dpy, GLXPbuffer pbuf, int iBufferType, unsigned long *pulCounterPbuffer, GLboolean bBlock);
typedef int ( * PFNGLXSENDPBUFFERTOVIDEONVPROC) (Display* dpy, GLXPbuffer pbuf, int iBufferType, unsigned long* pulCounterPbuffer, GLboolean bBlock);
#define glXBindVideoImageNV GLXEW_GET_FUN(__glewXBindVideoImageNV)
#define glXGetVideoDeviceNV GLXEW_GET_FUN(__glewXGetVideoDeviceNV)
@@ -1213,12 +1292,12 @@ typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display* dpy, GLXDrawable drawable, i
typedef XID GLXFBConfigIDSGIX;
typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
typedef GLXFBConfigSGIX* ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfig config, Pixmap pixmap);
typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display* dpy, GLXFBConfigSGIX config, int attribute, int *value);
typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display* dpy, XVisualInfo *vis);
typedef XVisualInfo* ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfig config);
typedef GLXFBConfigSGIX* ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display* dpy, int screen, int* attrib_list, int* nelements);
typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfigSGIX config, Pixmap pixmap);
typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display* dpy, GLXFBConfigSGIX config, int attribute, int* value);
typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display* dpy, XVisualInfo* vis);
typedef XVisualInfo* ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display* dpy, GLXFBConfigSGIX config);
#define glXChooseFBConfigSGIX GLXEW_GET_FUN(__glewXChooseFBConfigSGIX)
#define glXCreateContextWithConfigSGIX GLXEW_GET_FUN(__glewXCreateContextWithConfigSGIX)
@@ -1332,10 +1411,10 @@ typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Disp
typedef XID GLXPbufferSGIX;
typedef struct { int type; unsigned long serial; Bool send_event; Display *display; GLXDrawable drawable; int event_type; int draw_type; unsigned int mask; int x, y; int width, height; int count; } GLXBufferClobberEventSGIX;
typedef GLXPbuffer ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display* dpy, GLXFBConfig config, unsigned int width, unsigned int height, int *attrib_list);
typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbuffer pbuf);
typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long *mask);
typedef void ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display* dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int* attrib_list);
typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbufferSGIX pbuf);
typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long* mask);
typedef void ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int* value);
typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long mask);
#define glXCreateGLXPbufferSGIX GLXEW_GET_FUN(__glewXCreateGLXPbufferSGIX)
@@ -1353,8 +1432,8 @@ typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable,
#ifndef GLX_SGIX_swap_barrier
#define GLX_SGIX_swap_barrier 1
typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display* dpy, GLXDrawable drawable, int barrier);
typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display* dpy, int screen, int* max);
#define glXBindSwapBarrierSGIX GLXEW_GET_FUN(__glewXBindSwapBarrierSGIX)
#define glXQueryMaxSwapBarriersSGIX GLXEW_GET_FUN(__glewXQueryMaxSwapBarriersSGIX)
@@ -1368,7 +1447,7 @@ typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen,
#ifndef GLX_SGIX_swap_group
#define GLX_SGIX_swap_group 1
typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display* dpy, GLXDrawable drawable, GLXDrawable member);
#define glXJoinSwapGroupSGIX GLXEW_GET_FUN(__glewXJoinSwapGroupSGIX)
@@ -1387,8 +1466,8 @@ typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawabl
typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display* display, int screen, int channel, Window window);
typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int x, int y, int w, int h);
typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display* display, int screen, int channel, GLenum synctype);
typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display* display, int screen, int channel, int *x, int *y, int *w, int *h);
typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display* display, int screen, int channel, int* x, int* y, int* w, int* h);
typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int* dx, int* dy, int* dw, int* dh);
#define glXBindChannelToWindowSGIX GLXEW_GET_FUN(__glewXBindChannelToWindowSGIX)
#define glXChannelRectSGIX GLXEW_GET_FUN(__glewXChannelRectSGIX)
@@ -1472,7 +1551,7 @@ typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigne
#ifndef GLX_SUN_get_transparent_index
#define GLX_SUN_get_transparent_index 1
typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display* dpy, Window overlay, Window underlay, unsigned long *pTransparentIndex);
typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display* dpy, Window overlay, Window underlay, unsigned long* pTransparentIndex);
#define glXGetTransparentIndexSUN GLXEW_GET_FUN(__glewXGetTransparentIndexSUN)
@@ -1500,13 +1579,8 @@ typedef int ( * PFNGLXVIDEORESIZESUNPROC) (Display* display, GLXDrawable window,
/* ------------------------------------------------------------------------- */
#ifdef GLEW_MX
#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
#define GLXEW_VAR_EXPORT
#else
#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
#define GLXEW_VAR_EXPORT GLEW_VAR_EXPORT
#endif /* GLEW_MX */
GLXEW_FUN_EXPORT PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay;
@@ -1546,6 +1620,7 @@ GLXEW_FUN_EXPORT PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI;
GLXEW_FUN_EXPORT PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT;
GLXEW_FUN_EXPORT PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT;
GLXEW_FUN_EXPORT PFNGLXGETCURRENTDISPLAYEXTPROC __glewXGetCurrentDisplayEXT;
GLXEW_FUN_EXPORT PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT;
GLXEW_FUN_EXPORT PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT;
@@ -1658,12 +1733,6 @@ GLXEW_FUN_EXPORT PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN;
GLXEW_FUN_EXPORT PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN;
GLXEW_FUN_EXPORT PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN;
#if defined(GLEW_MX)
struct GLXEWContextStruct
{
#endif /* GLEW_MX */
GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_0;
GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_1;
GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_2;
@@ -1673,6 +1742,7 @@ GLXEW_VAR_EXPORT GLboolean __GLXEW_3DFX_multisample;
GLXEW_VAR_EXPORT GLboolean __GLXEW_AMD_gpu_association;
GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_context_flush_control;
GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context;
GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context_no_error;
GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context_profile;
GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context_robustness;
GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_fbconfig_float;
@@ -1685,11 +1755,14 @@ GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_vertex_buffer_object;
GLXEW_VAR_EXPORT GLboolean __GLXEW_ATI_pixel_format_float;
GLXEW_VAR_EXPORT GLboolean __GLXEW_ATI_render_texture;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_buffer_age;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_context_priority;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_create_context_es2_profile;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_create_context_es_profile;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_fbconfig_packed_float;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_framebuffer_sRGB;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_import_context;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_libglvnd;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_no_config_context;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_scene_marker;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_stereo_tree;
GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_swap_control;
@@ -1709,8 +1782,10 @@ GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_copy_buffer;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_copy_image;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_delay_before_swap;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_float_buffer;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_multigpu_context;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_multisample_coverage;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_present_video;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_robustness_video_memory_purge;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_swap_group;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_vertex_array_range;
GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_video_capture;
@@ -1734,34 +1809,18 @@ GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_swap_control;
GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_video_sync;
GLXEW_VAR_EXPORT GLboolean __GLXEW_SUN_get_transparent_index;
GLXEW_VAR_EXPORT GLboolean __GLXEW_SUN_video_resize;
#ifdef GLEW_MX
}; /* GLXEWContextStruct */
#endif /* GLEW_MX */
/* ------------------------------------------------------------------------ */
#ifdef GLEW_MX
typedef struct GLXEWContextStruct GLXEWContext;
GLEWAPI GLenum GLEWAPIENTRY glxewContextInit (GLXEWContext *ctx);
GLEWAPI GLboolean GLEWAPIENTRY glxewContextIsSupported (const GLXEWContext *ctx, const char *name);
#define glxewInit() glxewContextInit(glxewGetContext())
#define glxewIsSupported(x) glxewContextIsSupported(glxewGetContext(), x)
#define GLXEW_GET_VAR(x) (*(const GLboolean*)&(glxewGetContext()->x))
#define GLXEW_GET_FUN(x) x
#else /* GLEW_MX */
GLEWAPI GLenum GLEWAPIENTRY glxewInit ();
GLEWAPI GLboolean GLEWAPIENTRY glxewIsSupported (const char *name);
#ifndef GLXEW_GET_VAR
#define GLXEW_GET_VAR(x) (*(const GLboolean*)&x)
#define GLXEW_GET_FUN(x) x
#endif
#endif /* GLEW_MX */
#ifndef GLXEW_GET_FUN
#define GLXEW_GET_FUN(x) x
#endif
GLEWAPI GLboolean GLEWAPIENTRY glxewGetExtension (const char *name);

View File

@@ -1,6 +1,6 @@
/*
** The OpenGL Extension Wrangler Library
** Copyright (C) 2008-2015, Nigel Stewart <nigels[]users sourceforge net>
** Copyright (C) 2008-2019, Nigel Stewart <nigels[]users sourceforge net>
** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
** Copyright (C) 2002, Lev Povalahev
@@ -67,9 +67,6 @@
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN 1
# endif
# ifdef NOGDI
# undef NOGDI
# endif
#include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#endif
@@ -191,7 +188,7 @@ typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, in
#ifndef WGL_ARB_context_flush_control
#define WGL_ARB_context_flush_control 1
#define WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0x0000
#define WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0
#define WGL_CONTEXT_RELEASE_BEHAVIOR_ARB 0x2097
#define WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098
@@ -204,14 +201,13 @@ typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, in
#ifndef WGL_ARB_create_context
#define WGL_ARB_create_context 1
#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
#define WGL_CONTEXT_DEBUG_BIT_ARB 0x00000001
#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
#define WGL_CONTEXT_FLAGS_ARB 0x2094
#define ERROR_INVALID_VERSION_ARB 0x2095
#define ERROR_INVALID_PROFILE_ARB 0x2096
typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int* attribList);
@@ -221,6 +217,17 @@ typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShar
#endif /* WGL_ARB_create_context */
/* -------------------- WGL_ARB_create_context_no_error -------------------- */
#ifndef WGL_ARB_create_context_no_error
#define WGL_ARB_create_context_no_error 1
#define WGL_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3
#define WGLEW_ARB_create_context_no_error WGLEW_GET_VAR(__WGLEW_ARB_create_context_no_error)
#endif /* WGL_ARB_create_context_no_error */
/* --------------------- WGL_ARB_create_context_profile -------------------- */
#ifndef WGL_ARB_create_context_profile
@@ -228,6 +235,7 @@ typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShar
#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
#define ERROR_INVALID_PROFILE_ARB 0x2096
#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
#define WGLEW_ARB_create_context_profile WGLEW_GET_VAR(__WGLEW_ARB_create_context_profile)
@@ -280,7 +288,7 @@ typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
#define ERROR_INVALID_PIXEL_TYPE_ARB 0x2043
#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (VOID);
typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void);
typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
#define wglGetCurrentReadDCARB WGLEW_GET_FUN(__wglewGetCurrentReadDCARB)
@@ -389,9 +397,9 @@ typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC
#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, FLOAT *pfValues);
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, int *piValues);
typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int* piAttribIList, const FLOAT* pfAttribFList, UINT nMaxFormats, int* piFormats, UINT* nNumFormats);
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, FLOAT* pfValues);
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, int* piValues);
#define wglChoosePixelFormatARB WGLEW_GET_FUN(__wglewChoosePixelFormatARB)
#define wglGetPixelFormatAttribfvARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvARB)
@@ -509,6 +517,19 @@ typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, con
#endif /* WGL_ATI_render_texture_rectangle */
/* --------------------------- WGL_EXT_colorspace -------------------------- */
#ifndef WGL_EXT_colorspace
#define WGL_EXT_colorspace 1
#define WGL_COLORSPACE_SRGB_EXT 0x3089
#define WGL_COLORSPACE_LINEAR_EXT 0x308A
#define WGL_COLORSPACE_EXT 0x309D
#define WGLEW_EXT_colorspace WGLEW_GET_VAR(__WGLEW_EXT_colorspace)
#endif /* WGL_EXT_colorspace */
/* ------------------- WGL_EXT_create_context_es2_profile ------------------ */
#ifndef WGL_EXT_create_context_es2_profile
@@ -549,8 +570,8 @@ typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, con
typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
typedef void (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (GLushort* table, GLuint length);
typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort* table, GLuint length);
#define wglBindDisplayColorTableEXT WGLEW_GET_FUN(__wglewBindDisplayColorTableEXT)
#define wglCreateDisplayColorTableEXT WGLEW_GET_FUN(__wglewCreateDisplayColorTableEXT)
@@ -592,7 +613,7 @@ typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043
typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (VOID);
typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void);
typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
#define wglGetCurrentReadDCEXT WGLEW_GET_FUN(__wglewGetCurrentReadDCEXT)
@@ -698,9 +719,9 @@ typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC
#define WGL_TYPE_RGBA_EXT 0x202B
#define WGL_TYPE_COLORINDEX_EXT 0x202C
typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, FLOAT *pfValues);
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues);
typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int* piAttribIList, const FLOAT* pfAttribFList, UINT nMaxFormats, int* piFormats, UINT* nNumFormats);
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, FLOAT* pfValues);
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int* piValues);
#define wglChoosePixelFormatEXT WGLEW_GET_FUN(__wglewChoosePixelFormatEXT)
#define wglGetPixelFormatAttribfvEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvEXT)
@@ -773,9 +794,9 @@ typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAt
#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E
#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F
typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT* puRed, USHORT *puGreen, USHORT *puBlue);
typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT* puRed, USHORT* puGreen, USHORT* puBlue);
typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue);
typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT* puRed, const USHORT *puGreen, const USHORT *puBlue);
typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT* puRed, const USHORT* puGreen, const USHORT* puBlue);
typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue);
#define wglGetGammaTableI3D WGLEW_GET_FUN(__wglewGetGammaTableI3D)
@@ -813,7 +834,7 @@ typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT* uDela
typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT* uEdge);
typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT* uSource);
typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL* pFlag);
typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT* uMaxLineDelay, UINT *uMaxPixelDelay);
typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT* uMaxLineDelay, UINT* uMaxPixelDelay);
#define wglDisableGenlockI3D WGLEW_GET_FUN(__wglewDisableGenlockI3D)
#define wglEnableGenlockI3D WGLEW_GET_FUN(__wglewEnableGenlockI3D)
@@ -840,10 +861,10 @@ typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT*
#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002
typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, HANDLE* pEvent, LPVOID *pAddress, DWORD *pSize, UINT count);
typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE* pEvent, const LPVOID* pAddress, const DWORD* pSize, UINT count);
typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, LPVOID* pAddress, UINT count);
typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID* pAddress, UINT count);
#define wglAssociateImageBufferEventsI3D WGLEW_GET_FUN(__wglewAssociateImageBufferEventsI3D)
#define wglCreateImageBufferI3D WGLEW_GET_FUN(__wglewCreateImageBufferI3D)
@@ -859,8 +880,8 @@ typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, LPVOID*
#ifndef WGL_I3D_swap_frame_lock
#define WGL_I3D_swap_frame_lock 1
typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (VOID);
typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (VOID);
typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void);
typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void);
typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL* pFlag);
typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL* pFlag);
@@ -881,7 +902,7 @@ typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL* pFlag);
typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float* pUsage);
typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD* pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD* pFrameCount, DWORD* pMissedFrames, float* pLastMissedUsage);
#define wglBeginFrameTrackingI3D WGLEW_GET_FUN(__wglewBeginFrameTrackingI3D)
#define wglEndFrameTrackingI3D WGLEW_GET_FUN(__wglewEndFrameTrackingI3D)
@@ -897,9 +918,9 @@ typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD* pFrameCount, DWO
#ifndef WGL_NV_DX_interop
#define WGL_NV_DX_interop 1
#define WGL_ACCESS_READ_ONLY_NV 0x0000
#define WGL_ACCESS_READ_WRITE_NV 0x0001
#define WGL_ACCESS_WRITE_DISCARD_NV 0x0002
#define WGL_ACCESS_READ_ONLY_NV 0x00000000
#define WGL_ACCESS_READ_WRITE_NV 0x00000001
#define WGL_ACCESS_WRITE_DISCARD_NV 0x00000002
typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice);
typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects);
@@ -1010,6 +1031,21 @@ typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu);
#endif /* WGL_NV_gpu_affinity */
/* ------------------------ WGL_NV_multigpu_context ------------------------ */
#ifndef WGL_NV_multigpu_context
#define WGL_NV_multigpu_context 1
#define WGL_CONTEXT_MULTIGPU_ATTRIB_NV 0x20AA
#define WGL_CONTEXT_MULTIGPU_ATTRIB_SINGLE_NV 0x20AB
#define WGL_CONTEXT_MULTIGPU_ATTRIB_AFR_NV 0x20AC
#define WGL_CONTEXT_MULTIGPU_ATTRIB_MULTICAST_NV 0x20AD
#define WGL_CONTEXT_MULTIGPU_ATTRIB_MULTI_DISPLAY_MULTICAST_NV 0x20AE
#define WGLEW_NV_multigpu_context WGLEW_GET_VAR(__WGLEW_NV_multigpu_context)
#endif /* WGL_NV_multigpu_context */
/* ---------------------- WGL_NV_multisample_coverage ---------------------- */
#ifndef WGL_NV_multisample_coverage
@@ -1048,7 +1084,6 @@ typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int* pi
#ifndef WGL_NV_render_depth_texture
#define WGL_NV_render_depth_texture 1
#define WGL_NO_TEXTURE_ARB 0x2077
#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3
#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5
@@ -1080,8 +1115,8 @@ typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int* pi
typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier);
typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group);
typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint* count);
typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint* maxGroups, GLuint *maxBarriers);
typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint* group, GLuint *barrier);
typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint* maxGroups, GLuint* maxBarriers);
typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint* group, GLuint* barrier);
typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC);
#define wglBindSwapBarrierNV WGLEW_GET_FUN(__wglewBindSwapBarrierNV)
@@ -1100,8 +1135,8 @@ typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC);
#ifndef WGL_NV_vertex_array_range
#define WGL_NV_vertex_array_range 1
typedef void * (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void* pointer);
#define wglAllocateMemoryNV WGLEW_GET_FUN(__wglewAllocateMemoryNV)
#define wglFreeMemoryNV WGLEW_GET_FUN(__wglewFreeMemoryNV)
@@ -1159,7 +1194,7 @@ DECLARE_HANDLE(HPVIDEODEV);
typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV* hVideoDevice);
typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long* pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long* pulCounterOutputPbuffer, unsigned long* pulCounterOutputVideo);
typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice);
typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer);
typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long* pulCounterPbuffer, BOOL bBlock);
@@ -1180,12 +1215,12 @@ typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, in
#ifndef WGL_OML_sync_control
#define WGL_OML_sync_control 1
typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32* numerator, INT32 *denominator);
typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64* ust, INT64 *msc, INT64 *sbc);
typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32* numerator, INT32* denominator);
typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64* ust, INT64* msc, INT64* sbc);
typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64* ust, INT64 *msc, INT64 *sbc);
typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64* ust, INT64 *msc, INT64 *sbc);
typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64* ust, INT64* msc, INT64* sbc);
typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64* ust, INT64* msc, INT64* sbc);
#define wglGetMscRateOML WGLEW_GET_FUN(__wglewGetMscRateOML)
#define wglGetSyncValuesOML WGLEW_GET_FUN(__wglewGetSyncValuesOML)
@@ -1200,18 +1235,8 @@ typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT6
/* ------------------------------------------------------------------------- */
#ifdef GLEW_MX
#define WGLEW_FUN_EXPORT
#define WGLEW_VAR_EXPORT
#else
#define WGLEW_FUN_EXPORT GLEW_FUN_EXPORT
#define WGLEW_VAR_EXPORT GLEW_VAR_EXPORT
#endif /* GLEW_MX */
#ifdef GLEW_MX
struct WGLEWContextStruct
{
#endif /* GLEW_MX */
WGLEW_FUN_EXPORT PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL;
@@ -1368,6 +1393,7 @@ WGLEW_VAR_EXPORT GLboolean __WGLEW_AMD_gpu_association;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_buffer_region;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_context_flush_control;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_no_error;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_profile;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_robustness;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_extensions_string;
@@ -1382,6 +1408,7 @@ WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_robustness_application_isolation;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_robustness_share_group_isolation;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_pixel_format_float;
WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_render_texture_rectangle;
WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_colorspace;
WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es2_profile;
WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es_profile;
WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_depth_float;
@@ -1407,6 +1434,7 @@ WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_copy_image;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_delay_before_swap;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_float_buffer;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_gpu_affinity;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_multigpu_context;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_multisample_coverage;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_present_video;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_depth_texture;
@@ -1416,34 +1444,18 @@ WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_vertex_array_range;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_capture;
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_output;
WGLEW_VAR_EXPORT GLboolean __WGLEW_OML_sync_control;
#ifdef GLEW_MX
}; /* WGLEWContextStruct */
#endif /* GLEW_MX */
/* ------------------------------------------------------------------------- */
#ifdef GLEW_MX
typedef struct WGLEWContextStruct WGLEWContext;
GLEWAPI GLenum GLEWAPIENTRY wglewContextInit (WGLEWContext *ctx);
GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext *ctx, const char *name);
#define wglewInit() wglewContextInit(wglewGetContext())
#define wglewIsSupported(x) wglewContextIsSupported(wglewGetContext(), x)
#define WGLEW_GET_VAR(x) (*(const GLboolean*)&(wglewGetContext()->x))
#define WGLEW_GET_FUN(x) wglewGetContext()->x
#else /* GLEW_MX */
GLEWAPI GLenum GLEWAPIENTRY wglewInit ();
GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name);
#ifndef WGLEW_GET_VAR
#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x)
#define WGLEW_GET_FUN(x) x
#endif
#endif /* GLEW_MX */
#ifndef WGLEW_GET_FUN
#define WGLEW_GET_FUN(x) x
#endif
GLEWAPI GLboolean GLEWAPIENTRY wglewGetExtension (const char *name);

17371
deps/GLEW/glew/src/glew.c vendored

File diff suppressed because it is too large Load Diff

22
deps/GMP/GMP.cmake vendored
View File

@@ -22,10 +22,24 @@ else ()
if (APPLE)
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
set(_gmp_build_tgt aarch64)
set(_gmp_build_arch aarch64)
else ()
set(_gmp_build_arch ${CMAKE_SYSTEM_PROCESSOR})
endif()
if (IS_CROSS_COMPILE)
if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
set(_gmp_host_arch aarch64)
set(_gmp_host_arch_flags "-arch arm64")
elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
set(_gmp_host_arch x86_64)
set(_gmp_host_arch_flags "-arch x86_64")
endif()
set(_gmp_ccflags "${_gmp_ccflags} ${_gmp_host_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}")
set(_gmp_build_tgt --build=${_gmp_build_arch}-apple-darwin --host=${_gmp_host_arch}-apple-darwin)
else ()
set(_gmp_ccflags "${_gmp_ccflags} -mmacosx-version-min=${DEP_OSX_TARGET}")
set(_gmp_build_tgt "--build=${_gmp_build_arch}-apple-darwin")
endif()
set(_gmp_ccflags "${_gmp_ccflags} -mmacosx-version-min=${DEP_OSX_TARGET}")
set(_gmp_build_tgt "--build=${_gmp_build_tgt}-apple-darwin")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
set(_gmp_ccflags "${_gmp_ccflags} -march=armv7-a") # Works on RPi-4
@@ -51,4 +65,4 @@ else ()
BUILD_COMMAND make -j
INSTALL_COMMAND make install
)
endif ()
endif ()

View File

@@ -1,3 +1,34 @@
# Check if we're building for arm on x86_64 and just for OpenEXR, build fat
# binaries. We need this because it compiles some code to generate other
# source and we need to be able to run the executables. When we link the
# library, the x86_64 part will be ignored.
if (APPLE AND IS_CROSS_COMPILE)
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND ${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
set(_openexr_arch arm64^^x86_64)
set(_openxr_list_sep LIST_SEPARATOR ^^)
set(_cmake_openexr_arch -DCMAKE_OSX_ARCHITECTURES:STRING=${_openexr_arch})
else()
set(_openexr_arch ${CMAKE_OSX_ARCHITECTURES})
set(_cmake_openexr_arch -DCMAKE_OSX_ARCHITECTURES:STRING=${_openexr_arch})
endif()
ExternalProject_Add(dep_OpenEXR
EXCLUDE_FROM_ALL ON
URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
INSTALL_DIR ${DESTDIR}/usr/local
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/OpenEXR
${_openxr_list_sep}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
-DBUILD_SHARED_LIBS:BOOL=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DBUILD_TESTING=OFF
-DPYILMBASE_ENABLE:BOOL=OFF
-DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
-DOPENEXR_BUILD_UTILS:BOOL=OFF
${_cmake_openexr_arch}
)
else()
bambustudio_add_cmake_project(OpenEXR
# GIT_REPOSITORY https://github.com/openexr/openexr.git
URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
@@ -11,6 +42,7 @@ bambustudio_add_cmake_project(OpenEXR
-DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
-DOPENEXR_BUILD_UTILS:BOOL=OFF
)
endif()
if (MSVC)
add_debug_dep(dep_OpenEXR)

53
deps/PNG/PNG.cmake vendored
View File

@@ -5,26 +5,43 @@ else ()
set(_disable_neon_extension "")
endif ()
if(APPLE AND IS_CROSS_COMPILE)
# TODO: check if it doesn't create problem when compiling from arm to x86_64
bambustudio_add_cmake_project(PNG
GIT_REPOSITORY https://github.com/glennrp/libpng.git
GIT_TAG v1.6.35
DEPENDS ${ZLIB_PKG}
PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/macos-arm64.patch
CMAKE_ARGS
-DPNG_SHARED=OFF
-DPNG_STATIC=ON
-DPNG_PREFIX=prusaslicer_
-DPNG_TESTS=OFF
-DDISABLE_DEPENDENCY_TRACKING=OFF
${_disable_neon_extension}
)
else ()
set(_patch_step "")
if (APPLE)
set(_patch_step PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch)
endif ()
bambustudio_add_cmake_project(PNG
# GIT_REPOSITORY https://github.com/glennrp/libpng.git
# GIT_TAG v1.6.35
URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.35.zip
URL_HASH SHA256=3d22d46c566b1761a0e15ea397589b3a5f36ac09b7c785382e6470156c04247f
DEPENDS ${ZLIB_PKG}
"${_patch_step}"
CMAKE_ARGS
-DPNG_SHARED=OFF
-DPNG_STATIC=ON
-DPNG_PREFIX=prusaslicer_
-DPNG_TESTS=OFF
-DDISABLE_DEPENDENCY_TRACKING=OFF
${_disable_neon_extension}
if (APPLE)
set(_patch_step PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch)
endif ()
bambustudio_add_cmake_project(PNG
# GIT_REPOSITORY https://github.com/glennrp/libpng.git
# GIT_TAG v1.6.35
URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.35.zip
URL_HASH SHA256=3d22d46c566b1761a0e15ea397589b3a5f36ac09b7c785382e6470156c04247f
DEPENDS ${ZLIB_PKG}
"${_patch_step}"
CMAKE_ARGS
-DPNG_SHARED=OFF
-DPNG_STATIC=ON
-DPNG_PREFIX=prusaslicer_
-DPNG_TESTS=OFF
-DDISABLE_DEPENDENCY_TRACKING=OFF
${_disable_neon_extension}
)
endif()
if (MSVC)
add_debug_dep(dep_PNG)

90
deps/PNG/macos-arm64.patch vendored Normal file
View File

@@ -0,0 +1,90 @@
Based on https://github.com/vespakoen/libpng to work around until
https://github.com/glennrp/libpng/pull/354 is resolved.
also added patch from PS2.4 (PNG.pach) in pngrutil.c
---
CMakeLists.txt | 28 ++++++++++++++++++++--------
pngrutil.c | 7 -------
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4db9bb87d..9099d1edf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,10 +82,22 @@ option(PNG_HARDWARE_OPTIMIZATIONS "Enable Hardware Optimizations" ON)
set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names")
set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings")
+# CMake currently sets CMAKE_SYSTEM_PROCESSOR to one of x86_64 or arm64 on macOS,
+# based upon the OS architecture, not the target architecture. As such, we need
+# to check CMAKE_OSX_ARCHITECTURES to identify which hardware-specific flags to
+# enable. Note that this will fail if you attempt to build a universal binary in
+# a single cmake invokation.
+if (APPLE AND CMAKE_OSX_ARCHITECTURES)
+ set(TARGET_ARCH ${CMAKE_OSX_ARCHITECTURES})
+else()
+ set(TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
+
if(PNG_HARDWARE_OPTIMIZATIONS)
# set definitions and sources for arm
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+if(TARGET_ARCH MATCHES "^arm" OR
+ TARGET_ARCH MATCHES "^aarch64")
set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations:
check: (default) use internal checking code;
@@ -114,8 +126,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
endif()
# set definitions and sources for powerpc
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64*" )
+if(TARGET_ARCH MATCHES "^powerpc*" OR
+ TARGET_ARCH MATCHES "^ppc64*" )
set(PNG_POWERPC_VSX_POSSIBLE_VALUES on off)
set(PNG_POWERPC_VSX "on" CACHE STRING "Enable POWERPC VSX optimizations:
off: disable the optimizations.")
@@ -138,8 +150,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR
endif()
# set definitions and sources for intel
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*" )
+if(TARGET_ARCH MATCHES "^i?86" OR
+ TARGET_ARCH MATCHES "^x86_64*" )
set(PNG_INTEL_SSE_POSSIBLE_VALUES on off)
set(PNG_INTEL_SSE "on" CACHE STRING "Enable INTEL_SSE optimizations:
off: disable the optimizations")
@@ -162,8 +174,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
endif()
# set definitions and sources for MIPS
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*" )
+if(TARGET_ARCH MATCHES "mipsel*" OR
+ TARGET_ARCH MATCHES "mips64el*" )
set(PNG_MIPS_MSA_POSSIBLE_VALUES on off)
set(PNG_MIPS_MSA "on" CACHE STRING "Enable MIPS_MSA optimizations:
off: disable the optimizations")
diff --git a/pngrutil.c b/pngrutil.c
index 7001f1976..91930f1f2 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -422,13 +422,6 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
}
-#if ZLIB_VERNUM >= 0x1290 && \
- defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)
- if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)
- /* Turn off validation of the ADLER32 checksum in IDAT chunks */
- ret = inflateValidate(&png_ptr->zstream, 0);
-#endif
-
if (ret == Z_OK)
png_ptr->zowner = owner;
--
2.33.0.windows.1

41
deps/TIFF/TIFF.cmake vendored
View File

@@ -1,13 +1,32 @@
find_package(OpenGL QUIET REQUIRED)
bambustudio_add_cmake_project(TIFF
URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip
URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32
DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
CMAKE_ARGS
-Dlzma:BOOL=OFF
-Dwebp:BOOL=OFF
-Djbig:BOOL=OFF
-Dzstd:BOOL=OFF
-Dpixarlog:BOOL=OFF
)
if (APPLE)
message(STATUS "Compiling TIFF for macos ${CMAKE_SYSTEM_VERSION}.")
bambustudio_add_cmake_project(TIFF
URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip
URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726
DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
CMAKE_ARGS
-Dlzma:BOOL=OFF
-Dwebp:BOOL=OFF
-Djbig:BOOL=OFF
-Dzstd:BOOL=OFF
-Dpixarlog:BOOL=OFF
)
else()
bambustudio_add_cmake_project(TIFF
URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip
URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32
DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
CMAKE_ARGS
-Dlzma:BOOL=OFF
-Dwebp:BOOL=OFF
-Djbig:BOOL=OFF
-Dzstd:BOOL=OFF
-Dpixarlog:BOOL=OFF
)
endif()

View File

@@ -15,6 +15,10 @@ elseif (MSVC_VERSION LESS 1930)
# 1920-1929 = VS 16.0 (v142 toolset)
set(DEP_VS_VER "16")
set(DEP_BOOST_TOOLSET "msvc-14.2")
elseif (MSVC_VERSION LESS 1940)
# 1930-1939 = VS 17.0 (v143 toolset)
set(DEP_VS_VER "17")
set(DEP_BOOST_TOOLSET "msvc-14.3")
else ()
message(FATAL_ERROR "Unsupported MSVC version")
endif ()

View File

@@ -18,10 +18,21 @@ else ()
set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF")
endif ()
if (MSVC)
set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch)
else ()
set(_patch_cmd test -f WXWIDGETS_PATCHED || ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch && touch WXWIDGETS_PATCHED)
endif ()
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch)
endif ()
bambustudio_add_cmake_project(wxWidgets
GIT_REPOSITORY "https://github.com/wxWidgets/wxWidgets"
GIT_TAG ${_wx_git_tag}
PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch
PATCH_COMMAND ${_patch_cmd}
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG
CMAKE_ARGS
-DwxBUILD_PRECOMP=ON
@@ -53,4 +64,4 @@ bambustudio_add_cmake_project(wxWidgets
if (MSVC)
add_debug_dep(dep_wxWidgets)
endif ()
endif ()

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDZTCCAk2gAwIBAgIUV1FckwXElyek1onFnQ9kL7Bk4N8wDQYJKoZIhvcNAQEL
BQAwQjELMAkGA1UEBhMCQ04xIjAgBgNVBAoMGUJCTCBUZWNobm9sb2dpZXMgQ28u
LCBMdGQxDzANBgNVBAMMBkJCTCBDQTAeFw0yMjA0MDQwMzQyMTFaFw0zMjA0MDEw
MzQyMTFaMEIxCzAJBgNVBAYTAkNOMSIwIAYDVQQKDBlCQkwgVGVjaG5vbG9naWVz
IENvLiwgTHRkMQ8wDQYDVQQDDAZCQkwgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQDL3pnDdxGOk5Z6vugiT4dpM0ju+3Xatxz09UY7mbj4tkIdby4H
oeEdiYSZjc5LJngJuCHwtEbBJt1BriRdSVrF6M9D2UaBDyamEo0dxwSaVxZiDVWC
eeCPdELpFZdEhSNTaT4O7zgvcnFsfHMa/0vMAkvE7i0qp3mjEzYLfz60axcDoJLk
p7n6xKXI+cJbA4IlToFjpSldPmC+ynOo7YAOsXt7AYKY6Glz0BwUVzSJxU+/+VFy
/QrmYGNwlrQtdREHeRi0SNK32x1+bOndfJP0sojuIrDjKsdCLye5CSZIvqnbowwW
1jRwZgTBR29Zp2nzCoxJYcU9TSQp/4KZuWNVAgMBAAGjUzBRMB0GA1UdDgQWBBSP
NEJo3GdOj8QinsV8SeWr3US+HjAfBgNVHSMEGDAWgBSPNEJo3GdOj8QinsV8SeWr
3US+HjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQABlBIT5ZeG
fgcK1LOh1CN9sTzxMCLbtTPFF1NGGA13mApu6j1h5YELbSKcUqfXzMnVeAb06Htu
3CoCoe+wj7LONTFO++vBm2/if6Jt/DUw1CAEcNyqeh6ES0NX8LJRVSe0qdTxPJuA
BdOoo96iX89rRPoxeed1cpq5hZwbeka3+CJGV76itWp35Up5rmmUqrlyQOr/Wax6
itosIzG0MfhgUzU51A2P/hSnD3NDMXv+wUY/AvqgIL7u7fbDKnku1GzEKIkfH8hm
Rs6d8SCU89xyrwzQ0PR853irHas3WrHVqab3P+qNwR0YirL0Qk7Xt/q3O1griNg2
Blbjg3obpHo9
-----END CERTIFICATE-----

View File

@@ -0,0 +1 @@
just a test file

View File

@@ -17,11 +17,12 @@
"FUNC_PRINT_WITHOUT_SD": false,
"FUNC_ALTER_RESOLUTION": false,
"FUNC_AUTO_SWITCH_FILAMENT": false,
"FUNC_CHAMBER_FAN" : false,
"FUNC_SEND_TO_SDCARD": false
"FUNC_EXTRUSION_CALI": true,
"FUNC_PRINT_ALL" : false,
"FUNC_CHAMBER_FAN" : false
},
"camera_resolution":["720p"],
"bed_temperature_limit": 100,
"bed_temperature_limit": 120,
"model_id": "C11",
"printer_type": "C11",
"printer_thumbnail_image": "printer_thumbnail_p1p"
@@ -29,9 +30,11 @@
{
"display_name": "Bambu Lab X1",
"func": {
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
},
"camera_resolution":["720p","1080p"],
"bed_temperature_limit": 120,
"model_id": "BL-P002",
"printer_type": "3DPrinter-X1",
"printer_thumbnail_image": "printer_thumbnail"
@@ -39,10 +42,12 @@
{
"display_name": "Bambu Lab X1 Carbon",
"func": {
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
},
"model_id": "BL-P001",
"camera_resolution":["720p","1080p"],
"bed_temperature_limit": 120,
"printer_type": "3DPrinter-X1-Carbon",
"printer_thumbnail_image": "printer_thumbnail"
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -1,5 +1,5 @@
<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M99.7586 128H28.2414C12.6464 128 0 115.354 0 99.7586V28.2414C0 12.6464 12.6464 0 28.2414 0H99.7586C115.354 0 128 12.6464 128 28.2414V99.7586C128 115.354 115.354 128 99.7586 128Z" fill="#00AE42"/>
<path d="M99.7586 128H28.2414C12.6464 128 0 115.354 0 99.7586V28.2414C0 12.6464 12.6464 0 28.2414 0H99.7586C115.354 0 128 12.6464 128 28.2414V99.7586C128 115.354 115.354 128 99.7586 128Z" fill="#009688"/>
<path d="M65.7826 54.5925V101.264H92.3441V65.0528L65.7826 54.5925Z" fill="white"/>
<path d="M65.7826 26.7924V50.1337L92.3441 60.5939V26.7924H65.7826Z" fill="white"/>
<path d="M35.0999 73.4637V26.7924H61.6615V63.0147L35.0999 73.4637Z" fill="white"/>

Before

Width:  |  Height:  |  Size: 644 B

After

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 641 B

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -0,0 +1,87 @@
<svg width="562" height="238" viewBox="0 0 562 238" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="1" y="1" width="560" height="237" fill="#009688"/>
<g opacity="0.2">
<path d="M19.234 8.7434V25.4149L37.159 18.6717V2.00019L19.234 8.7434Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M19.2341 8.7434V25.4149L1 18.6717V2.00019L19.2341 8.7434Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M90.9363 8.7434V25.4149L73.0113 18.6717V2.00019L90.9363 8.7434Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M127.404 8.7434V25.4149L145.329 18.6717V2.00019L127.404 8.7434Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M19.2341 25.538V42.2238L1 35.4806V18.8091L19.2341 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M19.234 58.7326V75.8463L37.159 68.9302V51.8313L19.234 58.7326Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M55.3944 25.538V42.2238L73.0104 35.4806V18.8091L55.3944 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M90.9363 42.2787V58.7364L73.0113 52.0939V35.6219L90.9363 42.2787Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M90.9363 96.0424V112.5L73.0113 105.858V89.3856L90.9363 96.0424Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M55.3945 25.6388V42.524L37.1604 35.7089V18.8091L55.3945 25.6388Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M55.3945 42.3652V59.0366L37.1604 52.3078V35.6219L55.3945 42.3652Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M127.404 42.2787V58.7364L145.329 52.0939V35.6219L127.404 42.2787Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M163.251 25.538V42.2238L145.326 35.4806V18.8091L163.251 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M127.404 75.4718V92.357L145.329 85.5419V68.6422L127.404 75.4718Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M163.251 42.2233V59.337L145.326 52.4209V35.472L163.251 42.2233Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M90.9338 58.7326V75.8463L108.859 68.9302V51.8313L90.9338 58.7326Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M199.413 25.538V42.2238L181.179 35.4806V18.8091L199.413 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M127.401 25.538V42.2238L108.858 35.4806V18.8091L127.401 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M199.413 58.7326V75.8463L181.179 68.9302V51.8313L199.413 58.7326Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M163.253 8.65694V25.1147L181.178 18.4721V2.00019L163.253 8.65694Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
</g>
<g opacity="0.2">
<path d="M235.752 8.74321V25.4147L253.677 18.6715V2L235.752 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M235.75 8.74321V25.4147L217.516 18.6715V2L235.75 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M307.45 8.74321V25.4147L289.525 18.6715V2L307.45 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M343.92 8.74321V25.4147L361.845 18.6715V2L343.92 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M199.591 42.2785V58.7363L217.516 52.0937V35.6218L199.591 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M235.75 25.5378V42.2236L217.516 35.4804V18.8089L235.75 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M235.752 58.7325V75.8461L253.677 68.93V51.8311L235.752 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M271.91 25.5378V42.2236L289.526 35.4804V18.8089L271.91 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M307.45 42.2785V58.7363L289.525 52.0937V35.6218L307.45 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M307.45 76.8426V93.3003L289.525 86.6577V70.1858L307.45 76.8426Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M271.908 25.6386V42.5238L253.674 35.7087V18.8089L271.908 25.6386Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M271.908 42.365V59.0365L253.674 52.3076V35.6218L271.908 42.365Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M343.92 42.2785V58.7363L361.845 52.0937V35.6218L343.92 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.769 25.5378V42.2236L361.844 35.4804V18.8089L379.769 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M343.92 75.4716V92.3568L361.845 85.5417V68.642L343.92 75.4716Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.769 42.2231V59.3368L361.844 52.4207V35.4719L379.769 42.2231Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M307.452 58.7325V75.8461L325.377 68.93V51.8311L307.452 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M415.925 25.5378V42.2236L397.691 35.4804V18.8089L415.925 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.771 58.7472V75.8461L397.696 68.9447V51.8311L379.771 58.7472Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.769 98.3847V115.484L397.694 108.582V91.4686L379.769 98.3847Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M343.917 25.5378V42.2236L325.374 35.4804V18.8089L343.917 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M415.925 58.7325V75.8461L397.691 68.93V51.8311L415.925 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M455.53 113.522V130.636L437.296 123.72V106.621L455.53 113.522Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.771 8.65675V25.1145L397.696 18.4719V2L379.771 8.65675Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
</g>
<g opacity="0.5">
<g opacity="0.2">
<path d="M452.919 8.74321V25.4147L434.685 18.6715V2L452.919 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M416.76 42.2785V58.7363L434.685 52.0937V35.6218L416.76 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M416.76 75.2345V91.6922L434.685 85.0496V68.5777L416.76 75.2345Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M452.919 25.5378V42.2236L434.685 35.4804V18.8089L452.919 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
</g>
</g>
<g opacity="0.2">
<path d="M452.832 8.74321V25.4147L470.757 18.6715V2L452.832 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M452.832 8.74321V25.4147L434.598 18.6715V2L452.832 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M524.534 8.74321V25.4147L506.609 18.6715V2L524.534 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M452.832 25.5378V42.2236L434.598 35.4804V18.8089L452.832 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M452.832 58.7325V75.8461L470.757 68.93V51.8311L452.832 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M488.992 25.5378V42.2236L506.608 35.4804V18.8089L488.992 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M524.534 42.2785V58.7363L506.609 52.0937V35.6218L524.534 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M524.534 96.0422V112.5L506.609 105.857V89.3854L524.534 96.0422Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M488.992 25.6386V42.5238L470.758 35.7087V18.8089L488.992 25.6386Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M488.992 42.365V59.0365L470.758 52.3076V35.6218L488.992 42.365Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M524.531 58.7325V75.8461L542.457 68.93V51.8311L524.531 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M560.999 25.5378V42.2236L542.456 35.4804V18.8089L560.999 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M560.999 77.5065V94.1923L542.456 87.4491V70.7776L560.999 77.5065Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
</g>
<path d="M248.355 127.203V110.613H243.689V131.077H260.806L259.335 127.203H248.355Z" fill="white"/>
<path d="M280.597 114.678H264.164L265.501 118.212H280.434C280.687 118.212 280.895 118.419 280.895 118.67V120.755H267.566C265.055 120.755 263.02 122.781 263.02 125.279V126.551C263.02 129.05 265.055 131.076 267.566 131.076H285.159V119.188C285.159 116.704 283.123 114.678 280.597 114.678ZM280.88 127.512H267.73C267.477 127.512 267.269 127.305 267.269 127.054V124.732C267.269 124.481 267.477 124.274 267.73 124.274H280.88V127.512Z" fill="white"/>
<path d="M304.669 114.678H293.941V110.583H293.852H289.261V131.076H293.941H304.669C307.18 131.076 309.216 129.05 309.216 126.551V119.218C309.231 116.719 307.195 114.678 304.669 114.678ZM304.64 127.069C304.64 127.32 304.432 127.527 304.179 127.527H293.941V118.286H304.179C304.432 118.286 304.64 118.493 304.64 118.744V127.069Z" fill="white"/>
<path d="M319.319 88.403H296.169V104.801H300.716V92.4543C300.716 92.203 300.924 91.996 301.177 91.996H307.328C307.581 91.996 307.789 92.203 307.789 92.4543V104.801H312.351V92.4543C312.351 92.203 312.559 91.996 312.811 91.996H318.874C319.126 91.996 319.334 92.203 319.334 92.4543V104.801H323.911V92.9275C323.866 90.4287 321.83 88.403 319.319 88.403Z" fill="white"/>
<path d="M367.491 100.779C367.491 101.03 367.283 101.237 367.031 101.237H356.095C355.842 101.237 355.634 101.03 355.634 100.779V88.403H351.34V100.276C351.34 102.775 353.375 104.801 355.887 104.801H367.194C369.705 104.801 371.741 102.775 371.741 100.276V88.403H367.476V100.779H367.491Z" fill="white"/>
<path d="M287.492 88.403H271.058L272.395 91.9368H287.328C287.581 91.9368 287.789 92.1438 287.789 92.3952V94.48H274.461C271.95 94.48 269.914 96.5057 269.914 99.0045V100.276C269.914 102.775 271.95 104.801 274.461 104.801H292.039V92.9127C292.053 90.4139 290.003 88.403 287.492 88.403ZM287.774 101.237H274.624C274.372 101.237 274.164 101.03 274.164 100.779V98.4574C274.164 98.2061 274.372 97.9991 274.624 97.9991H287.774V101.237Z" fill="white"/>
<path d="M342.976 88.4034H332.248V84.3077H332.158H327.567V104.801H332.248H342.976C345.487 104.801 347.522 102.775 347.522 100.276V92.9279C347.537 90.429 345.502 88.4034 342.976 88.4034ZM342.946 100.779C342.946 101.031 342.738 101.238 342.485 101.238H332.248V91.9963H342.485C342.738 91.9963 342.946 92.2033 342.946 92.4547V100.779Z" fill="white"/>
<path d="M266.452 98.0871C266.319 96.5198 265.516 95.1151 264.268 94.0801C264.922 93.1782 265.353 92.084 265.427 90.9012C265.427 90.7829 265.457 89.6887 265.442 89.5409C265.175 86.1401 261.802 83.4639 257.701 83.4639C257.641 83.4639 252.426 83.4639 248.369 83.4639V87.116L243.689 88.9051V104.815H260.539C260.539 104.815 260.821 104.8 260.94 104.8C263.897 104.608 266.259 102.212 266.452 99.2108C266.467 99.063 266.452 98.235 266.452 98.0871ZM248.354 87.1012H258.28C258.577 87.1012 258.86 87.1603 259.112 87.2786C260.048 87.6483 260.717 88.565 260.717 89.6296C260.717 89.6296 260.702 89.9844 260.657 90.1619C260.524 90.9751 259.974 91.6257 259.246 91.9214C258.919 92.0693 258.562 92.158 258.176 92.158H248.354V87.1012ZM258.934 101.237H248.354V95.7805H258.934C260.449 95.7805 261.668 96.993 261.668 98.5011C261.668 100.024 260.449 101.237 258.934 101.237Z" fill="white"/>
<path d="M248.354 83.4486V79.0276L243.689 80.8167V85.2377L248.354 83.4486Z" fill="white"/>
<path d="M212.56 98.4442V131.077H231.222V105.748L212.56 98.4442Z" fill="white"/>
<path d="M212.56 79V95.3236L231.222 102.643V79H212.56Z" fill="white"/>
<path d="M191 111.647V79H209.663V104.328L191 111.647Z" fill="white"/>
<path d="M191 131.076V114.767L209.663 107.448V131.076H191Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 12 KiB

Some files were not shown because too many files have changed in this diff Show More