3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
bubnikv 2019-02-25 08:55:56 +01:00
commit 6c2beeec36
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/profiles/PrusaResearch.idx
View file

@ -1,4 +1,5 @@
min_slic3r_version = 1.42.0-alpha6 min_slic3r_version = 1.42.0-alpha6
0.8.0-alpha7
0.8.0-alpha6 0.8.0-alpha6
min_slic3r_version = 1.42.0-alpha min_slic3r_version = 1.42.0-alpha
0.8.0-alpha 0.8.0-alpha

20
resources/profiles/PrusaResearch.ini
View file

@ -5,7 +5,7 @@
name = Prusa Research name = Prusa Research
# Configuration version of this file. Config file will only be installed, if the config_version differs. # Configuration version of this file. Config file will only be installed, if the config_version differs.
# This means, the server may force the Slic3r configuration to be downgraded. # This means, the server may force the Slic3r configuration to be downgraded.
config_version = 0.8.0-alpha config_version = 0.8.0-alpha7
# Where to get the updates from? # Where to get the updates from?
config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch/ config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch/
@ -1560,27 +1560,19 @@ inherits = *common 0.05*
exposure_time = 6.5 exposure_time = 6.5
initial_exposure_time = 40 initial_exposure_time = 40
########### Materials 0.035 ########### Materials 0.035
[sla_material:Jamg He Orange 0.035] [sla_material:Jamg He PJHC-30 Orange 0.035]
inherits = *common 0.035* inherits = *common 0.035*
exposure_time = 9 exposure_time = 9
initial_exposure_time = 35 initial_exposure_time = 35
########### Materials 0.1 ########### Materials 0.1
## [sla_material:Jamg He Transparent Clear 0.1] [sla_material:Jamg He PJHC-30 Orange 0.1]
## inherits = *common 0.1* inherits = *common 0.1*
exposure_time = 10
## [sla_material:Jamg He Transparent Green 0.1] initial_exposure_time = 45
## inherits = *common 0.1*
## [sla_material:Jamg He Transparent Orange 0.1]
## inherits = *common 0.1*
## [sla_material:Jamg He Transparent Red 0.1]
## inherits = *common 0.1*
[printer:*common*] [printer:*common*]
printer_technology = FFF printer_technology = FFF