GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-13 02:18:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

Browse Source
This commit is contained in:
YuSanka 2019-12-18 15:58:24 +01:00
commit 0802823703
7 changed files with 72 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -102,7 +102,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/)
enable_testing () enable_testing ()
# Enable C++11 language standard. # Enable C++11 language standard.
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT WIN32) if(NOT WIN32)

7
deps/CGAL/CGAL.cmake vendored
View File

@ -8,8 +8,13 @@ prusaslicer_add_cmake_project(
DEPENDS dep_boost dep_GMP dep_MPFR DEPENDS dep_boost dep_GMP dep_MPFR
) )
include(GNUInstallDirs)
# CGAL, for whatever reason, makes itself non-relocatable by writing the build directory into
# CGALConfig-installation-dirs.cmake and including it in configure time.
# If this file is not present, it will not consider the stored absolute path
ExternalProject_Add_Step(dep_CGAL dep_CGAL_relocation_fix ExternalProject_Add_Step(dep_CGAL dep_CGAL_relocation_fix
DEPENDEES install DEPENDEES install
COMMAND ${CMAKE_COMMAND} -E remove CGALConfig-installation-dirs.cmake COMMAND ${CMAKE_COMMAND} -E remove CGALConfig-installation-dirs.cmake
WORKING_DIRECTORY "${DESTDIR}/usr/local/lib/cmake/CGAL" WORKING_DIRECTORY "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL"
) )

2
deps/MPFR/MPFR.cmake vendored
View File

@ -19,7 +19,7 @@ if (MSVC)
else () else ()
ExternalProject_Add(dep_MPFR ExternalProject_Add(dep_MPFR
URL https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2 URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2 # mirrors are allowed
BUILD_IN_SOURCE ON BUILD_IN_SOURCE ON
CONFIGURE_COMMAND ./configure --prefix=${DESTDIR}/usr/local --with-gmp=${DESTDIR}/usr/local --with-pic CONFIGURE_COMMAND ./configure --prefix=${DESTDIR}/usr/local --with-gmp=${DESTDIR}/usr/local --with-pic
BUILD_COMMAND make -j BUILD_COMMAND make -j

109
resources/profiles/PrusaResearch.ini
View File

@ -106,7 +106,7 @@ compatible_printers =
complete_objects = 0 complete_objects = 0
default_acceleration = 1000 default_acceleration = 1000
dont_support_bridges = 1 dont_support_bridges = 1
elefant_foot_compensation = 0 elefant_foot_compensation = 0.2
ensure_vertical_shell_thickness = 1 ensure_vertical_shell_thickness = 1
external_fill_pattern = rectilinear external_fill_pattern = rectilinear
external_perimeters_first = 0 external_perimeters_first = 0
@ -223,6 +223,7 @@ extruder_clearance_radius = 35
# Print parameters common to a 0.25mm diameter nozzle. # Print parameters common to a 0.25mm diameter nozzle.
[print:*0.25nozzle*] [print:*0.25nozzle*]
elefant_foot_compensation = 0
external_perimeter_extrusion_width = 0.25 external_perimeter_extrusion_width = 0.25
extrusion_width = 0.25 extrusion_width = 0.25
first_layer_extrusion_width = 0.3 first_layer_extrusion_width = 0.3
@ -238,6 +239,7 @@ support_material_xy_spacing = 150%
output_filename_format = {input_filename_base}_{nozzle_diameter[0]}n_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode output_filename_format = {input_filename_base}_{nozzle_diameter[0]}n_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode
[print:*0.25nozzleMK3*] [print:*0.25nozzleMK3*]
elefant_foot_compensation = 0
external_perimeter_extrusion_width = 0.25 external_perimeter_extrusion_width = 0.25
extrusion_width = 0.25 extrusion_width = 0.25
first_layer_extrusion_width = 0.3 first_layer_extrusion_width = 0.3
@ -271,6 +273,7 @@ fill_density = 20%
output_filename_format = {input_filename_base}_{nozzle_diameter[0]}n_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode output_filename_format = {input_filename_base}_{nozzle_diameter[0]}n_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode
[print:*0.25nozzleMINI*] [print:*0.25nozzleMINI*]
elefant_foot_compensation = 0
external_perimeter_extrusion_width = 0.25 external_perimeter_extrusion_width = 0.25
extrusion_width = 0.25 extrusion_width = 0.25
first_layer_extrusion_width = 0.3 first_layer_extrusion_width = 0.3
@ -2993,21 +2996,21 @@ inherits = *common 0.025*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Grey Tough @0.025] [sla_material:Prusa Grey Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 7 exposure_time = 7
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Azure Blue Tough @0.025] [sla_material:Prusa Azure Blue Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 7 exposure_time = 7
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Maroon Tough @0.025] [sla_material:Prusa Maroon Tough @0.025]
@ -3015,56 +3018,56 @@ inherits = *common 0.025*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Beige Tough @0.025] [sla_material:Prusa Beige Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Pink Tough @0.025] [sla_material:Prusa Pink Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 7 exposure_time = 7
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa White Tough @0.025] [sla_material:Prusa White Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 6.5 exposure_time = 6.5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Transparent Tough @0.025] [sla_material:Prusa Transparent Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 15 initial_exposure_time = 15
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Green Dental Casting @0.025] [sla_material:Prusa Green Dental Casting @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 12 exposure_time = 12
initial_exposure_time = 40 initial_exposure_time = 40
material_type = Casting material_type = Casting
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Transparent Green Tough @0.025] [sla_material:Prusa Transparent Green Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 5 exposure_time = 5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Clear ABS like @0.025] [sla_material:Prusa Clear ABS like @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 30 initial_exposure_time = 30
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
## [sla_material:Prusa ABS like White @0.025] ## [sla_material:Prusa ABS like White @0.025]
## inherits = *common 0.025* ## inherits = *common 0.025*
@ -3076,35 +3079,35 @@ inherits = *common 0.025*
exposure_time = 5 exposure_time = 5
initial_exposure_time = 30 initial_exposure_time = 30
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Super Low Odor Cyan Tough @0.025] [sla_material:Prusa Super Low Odor Cyan Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 5 exposure_time = 5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Super Low Odor Magenta Tough @0.025] [sla_material:Prusa Super Low Odor Magenta Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 5 exposure_time = 5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Super Low Odor Yellow Tough @0.025] [sla_material:Prusa Super Low Odor Yellow Tough @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 5 exposure_time = 5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Orange-Yellow Teeth Model @0.025] [sla_material:Prusa Orange-Yellow Teeth Model @0.025]
inherits = *common 0.025* inherits = *common 0.025*
exposure_time = 5 exposure_time = 5
initial_exposure_time = 30 initial_exposure_time = 30
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
########### Materials 0.05 ########### Materials 0.05
@ -3333,91 +3336,91 @@ inherits = *common 0.05*
exposure_time = 7 exposure_time = 7
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Orange Tough @0.05] [sla_material:Prusa Orange Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 7.5 exposure_time = 7.5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Grey Tough @0.05] [sla_material:Prusa Grey Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 8.5 exposure_time = 8.5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Black Tough @0.05] [sla_material:Prusa Black Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
## [sla_material:Prusa Super Low Odor Beige Tough @0.05] ## [sla_material:Prusa Super Low Odor Beige Tough @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
## exposure_time = 7.5 ## exposure_time = 7.5
## initial_exposure_time = 35 ## initial_exposure_time = 35
## material_type = Tough ## material_type = Tough
## material_vendor = Prusa ## material_vendor = Made for Prusa
## [sla_material:Prusa Super Low Odor White Tough @0.05] ## [sla_material:Prusa Super Low Odor White Tough @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
## exposure_time = 6.5 ## exposure_time = 6.5
## initial_exposure_time = 35 ## initial_exposure_time = 35
## material_type = Tough ## material_type = Tough
## material_vendor = Prusa ## material_vendor = Made for Prusa
## [sla_material:Prusa Super Low Odor Grey Tough @0.05] ## [sla_material:Prusa Super Low Odor Grey Tough @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
## exposure_time = 6.5 ## exposure_time = 6.5
## initial_exposure_time = 35 ## initial_exposure_time = 35
## material_type = Tough ## material_type = Tough
## material_vendor = Prusa ## material_vendor = Made for Prusa
[sla_material:Prusa Super Low Odor Cyan Tough @0.05] [sla_material:Prusa Super Low Odor Cyan Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Super Low Odor Magenta Tough @0.05] [sla_material:Prusa Super Low Odor Magenta Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Super Low Odor Yellow Tough @0.05] [sla_material:Prusa Super Low Odor Yellow Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
## [sla_material:Prusa Black High Tenacity @0.05] ## [sla_material:Prusa Black High Tenacity @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
## exposure_time = 7 ## exposure_time = 7
## initial_exposure_time = 35 ## initial_exposure_time = 35
## material_type = Tough ## material_type = Tough
## material_vendor = Prusa ## material_vendor = Made for Prusa
[sla_material:Prusa Orange-Yellow Teeth Model @0.05] [sla_material:Prusa Orange-Yellow Teeth Model @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 7 exposure_time = 7
initial_exposure_time = 30 initial_exposure_time = 30
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Green Dental Casting @0.05] [sla_material:Prusa Green Dental Casting @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 50 initial_exposure_time = 50
material_type = Casting material_type = Casting
material_vendor = Prusa material_vendor = Made for Prusa
## [sla_material:Prusa Yellow Solid @0.05] ## [sla_material:Prusa Yellow Solid @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
@ -3429,49 +3432,49 @@ inherits = *common 0.05*
exposure_time = 7.5 exposure_time = 7.5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Transparent Green Tough @0.05] [sla_material:Prusa Transparent Green Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Transparent Red Tough @0.05] [sla_material:Prusa Transparent Red Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Maroon Tough @0.05] [sla_material:Prusa Maroon Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 7.5 exposure_time = 7.5
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Pink Tough @0.05] [sla_material:Prusa Pink Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 8 exposure_time = 8
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Azure Blue Tough @0.05] [sla_material:Prusa Azure Blue Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 8 exposure_time = 8
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Transparent Tough @0.05] [sla_material:Prusa Transparent Tough @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 7 exposure_time = 7
initial_exposure_time = 15 initial_exposure_time = 15
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
## [sla_material:Prusa Yellow Flexible @0.05] ## [sla_material:Prusa Yellow Flexible @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
@ -3483,7 +3486,7 @@ inherits = *common 0.05*
exposure_time = 5 exposure_time = 5
initial_exposure_time = 15 initial_exposure_time = 15
material_type = Flexible material_type = Flexible
material_vendor = Prusa material_vendor = Made for Prusa
## [sla_material:Prusa White Flexible @0.05] ## [sla_material:Prusa White Flexible @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
@ -3495,7 +3498,7 @@ inherits = *common 0.05*
exposure_time = 5 exposure_time = 5
initial_exposure_time = 15 initial_exposure_time = 15
material_type = Flexible material_type = Flexible
material_vendor = Prusa material_vendor = Made for Prusa
## [sla_material:Prusa Black Flexible @0.05] ## [sla_material:Prusa Black Flexible @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
@ -3512,7 +3515,7 @@ inherits = *common 0.05*
exposure_time = 8 exposure_time = 8
initial_exposure_time = 30 initial_exposure_time = 30
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
## [sla_material:Prusa ABS like White @0.05] ## [sla_material:Prusa ABS like White @0.05]
## inherits = *common 0.05* ## inherits = *common 0.05*
@ -3524,14 +3527,14 @@ inherits = *common 0.05*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 45 initial_exposure_time = 45
material_type = Casting material_type = Casting
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Grey High Tenacity @0.05] [sla_material:Prusa Grey High Tenacity @0.05]
inherits = *common 0.05* inherits = *common 0.05*
exposure_time = 7 exposure_time = 7
initial_exposure_time = 30 initial_exposure_time = 30
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
########### Materials 0.035 ########### Materials 0.035
@ -3540,7 +3543,7 @@ inherits = *common 0.035*
exposure_time = 6 exposure_time = 6
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
########### Materials 0.1 ########### Materials 0.1
@ -3565,70 +3568,70 @@ inherits = *common 0.1*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 45 initial_exposure_time = 45
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Beige Tough @0.1] [sla_material:Prusa Beige Tough @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 45 initial_exposure_time = 45
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Pink Tough @0.1] [sla_material:Prusa Pink Tough @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 45 initial_exposure_time = 45
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Azure Blue Tough @0.1] [sla_material:Prusa Azure Blue Tough @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 45 initial_exposure_time = 45
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Maroon Tough @0.1] [sla_material:Prusa Maroon Tough @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 45 initial_exposure_time = 45
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa White Tough @0.1] [sla_material:Prusa White Tough @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 45 initial_exposure_time = 45
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Black Tough @0.1] [sla_material:Prusa Black Tough @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 13 exposure_time = 13
initial_exposure_time = 55 initial_exposure_time = 55
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Transparent Tough @0.1] [sla_material:Prusa Transparent Tough @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 8 exposure_time = 8
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Green Dental Casting @0.1] [sla_material:Prusa Green Dental Casting @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 15 exposure_time = 15
initial_exposure_time = 50 initial_exposure_time = 50
material_type = Casting material_type = Casting
material_vendor = Prusa material_vendor = Made for Prusa
[sla_material:Prusa Transparent Green Tough @0.1] [sla_material:Prusa Transparent Green Tough @0.1]
inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 7 exposure_time = 7
initial_exposure_time = 35 initial_exposure_time = 35
material_type = Tough material_type = Tough
material_vendor = Prusa material_vendor = Made for Prusa
[printer:*common*] [printer:*common*]
printer_technology = FFF printer_technology = FFF

3
src/avrdude/CMakeLists.txt
View File

@ -1,8 +1,5 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE) # To enable various useful macros and functions on Unices add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE) # To enable various useful macros and functions on Unices
remove_definitions(-D_UNICODE -DUNICODE) remove_definitions(-D_UNICODE -DUNICODE)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

8
src/slic3r/GUI/Plater.cpp
View File

@ -3234,7 +3234,13 @@ void Plater::priv::reload_from_disk()
{ {
// ask user to select the missing file // ask user to select the missing file
std::string search = missing_input_paths.back().string(); std::string search = missing_input_paths.back().string();
wxFileDialog dialog(q, _(L("Please select the file to reload:")), "", from_u8(fs::path(search).filename().string()), file_wildcards(FT_MODEL), wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxString title = _(L("Please select the file to reload"));
#if defined(__APPLE__)
title += " (" + from_u8(fs::path(search).filename().string()) + "):";
#else
title += ":";
#endif // __APPLE__
wxFileDialog dialog(q, title, "", from_u8(fs::path(search).filename().string()), file_wildcards(FT_MODEL), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (dialog.ShowModal() != wxID_OK) if (dialog.ShowModal() != wxID_OK)
return; return;

2
src/slic3r/GUI/wxExtensions.hpp
View File

@ -962,7 +962,7 @@ private:
bool operator<(const TICK_CODE& other) const { return other.tick > this->tick; } bool operator<(const TICK_CODE& other) const { return other.tick > this->tick; }
bool operator>(const TICK_CODE& other) const { return other.tick < this->tick; } bool operator>(const TICK_CODE& other) const { return other.tick < this->tick; }
int tick; int tick = 0;
std::string gcode = Slic3r::ColorChangeCode; std::string gcode = Slic3r::ColorChangeCode;
int extruder = 0; int extruder = 0;
std::string color; std::string color;