supermerill
|
95a6ea1477
|
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
|
2019-02-11 15:32:35 +01:00 |
|
supermerill
|
aab7dd32f3
|
settings with width% is from nozzle instead of layer height.
|
2019-02-11 12:18:06 +01:00 |
|
Enrico Turri
|
7c59c218c1
|
Restored old sl1 printbed model
|
2019-02-07 09:15:20 +01:00 |
|
Enrico Turri
|
63e4fa3862
|
New model for sl1 print bed
|
2019-02-06 14:53:52 +01:00 |
|
Enrico Turri
|
98dbe77b8d
|
Textures for print beds 4096x4096 and 8192x8192
|
2019-02-06 14:52:43 +01:00 |
|
bubnikv
|
f2b44645d1
|
Updated profiles
|
2019-02-04 19:10:47 +01:00 |
|
supermerill
|
a0175ebc81
|
update custom settings & icons
|
2019-02-04 16:38:39 +01:00 |
|
supermerill
|
6b268fb4df
|
icons
|
2019-02-01 11:43:41 +01:00 |
|
supermerill
|
ec5ec3f626
|
update profiles (wip)
|
2019-02-01 11:00:32 +01:00 |
|
supermerill
|
a76bb026df
|
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
|
2019-01-29 17:55:24 +01:00 |
|
bubnikv
|
282ef552f9
|
SLA print bed rotated by 180 degrees, simplified by removing some internal pieces.
|
2019-01-26 18:52:31 +01:00 |
|
supermerill
|
1999974f7a
|
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
|
2019-01-25 19:45:50 +01:00 |
|
Enrico Turri
|
322b954c1c
|
Added model for sl1 bed
|
2019-01-23 15:52:08 +01:00 |
|
YuSanka
|
1a474ea282
|
L10n improvements
|
2019-01-21 12:34:28 +01:00 |
|
YuSanka
|
107152b25e
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r
|
2019-01-10 11:10:01 +01:00 |
|
YuSanka
|
c62a51ead1
|
Implemented ModeSizer with ModeButtons for the mode view changing from the settings tabs and plater
|
2019-01-10 11:09:31 +01:00 |
|
bubnikv
|
249658e3ad
|
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
|
2019-01-09 13:08:17 +01:00 |
|
bubnikv
|
c0df7f343e
|
Updated OSX manifest to reference input / output files.
Bundled OSX icon files for STL/AMF/3MF/gcode
|
2019-01-09 13:08:00 +01:00 |
|
Enrico Turri
|
41d189a355
|
Fixed model for mk3 bed
|
2019-01-09 12:15:08 +01:00 |
|
supermerill
|
339531fa71
|
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
|
2019-01-04 19:35:01 +01:00 |
|
Enrico Turri
|
8e001972a9
|
Added print bed models for mk2 and mk3 printers to 3D scene
|
2019-01-04 12:56:48 +01:00 |
|
supermerill
|
72d828cf74
|
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
|
2019-01-03 14:47:34 +01:00 |
|
Enrico Turri
|
dd8f79381f
|
Fixed hover icons in view toolbar
|
2019-01-03 12:35:01 +01:00 |
|
bubnikv
|
2cdf60972f
|
Annotated the system printer profiles with a technology filed.
|
2018-12-21 20:10:42 +01:00 |
|
Enrico Turri
|
c9748bd69a
|
New icons for gizmo overlay
|
2018-12-21 15:29:59 +01:00 |
|
Enrico Turri
|
ec76981f3d
|
New toolbar icons
|
2018-12-21 15:21:41 +01:00 |
|
bubnikv
|
1e325f8374
|
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
|
2018-12-20 17:45:02 +01:00 |
|
bubnikv
|
42fada4576
|
Updated SLA profiles.
Fixed the update downloader to ignore downloaded preset index if it is
older than the currently active one.
|
2018-12-20 17:44:24 +01:00 |
|
Enrico Turri
|
5cd5937795
|
More transparent background texture for toolbars
|
2018-12-20 16:09:25 +01:00 |
|
Enrico Turri
|
64f46999d2
|
New icons for sla support points gizmo overlay
|
2018-12-20 08:38:46 +01:00 |
|
supermerill
|
86d73b9a2a
|
Merge branch 'master_slic3rPE_PR' into masterPE
|
2018-12-19 18:22:51 +01:00 |
|
supermerill
|
a658ae653e
|
Merge branch 'master' into masterPE (renaming)
|
2018-12-19 18:18:18 +01:00 |
|
YuSanka
|
4c55f1ce9e
|
DoubleSlider issues (1 & 3 from SPE-686)
+ added icon for "Keyboard shortcuts" dialog
|
2018-12-19 15:58:42 +01:00 |
|
Enrico Turri
|
d46fd6d957
|
New icons
|
2018-12-19 13:54:27 +01:00 |
|
supermerill
|
2e2fee79ec
|
Merge branch 'masterPE' into master_slic3rPE_PR
# "resolved" Conflicts:
# lib/Slic3r/GUI/Plater.pm
# slic3r.pl
# src/libslic3r/EdgeGrid.cpp
# src/libslic3r/EdgeGrid.hpp
# src/libslic3r/Fill/Fill.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/PreviewData.cpp
# src/libslic3r/GCode/PreviewData.hpp
# src/libslic3r/GCode/WipeTowerPrusaMM.cpp
# src/libslic3r/Geometry.hpp
# src/libslic3r/LayerRegion.cpp
# src/libslic3r/Model.cpp
# src/libslic3r/MultiPoint.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/libslic3r/SupportMaterial.cpp
# src/libslic3r/TriangleMesh.cpp
# src/slic3r/AppController.hpp
# src/slic3r/AppControllerWx.cpp
# src/slic3r/GUI/3DScene.cpp
# src/slic3r/GUI/Field.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI.hpp
# src/slic3r/GUI/OptionsGroup.cpp
# src/slic3r/GUI/Preset.cpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Tab.hpp
# xs/CMakeLists.txt
# xs/xsp/AppController.xsp
# xs/xsp/GUI.xsp
# xs/xsp/Print.xsp
|
2018-12-17 15:58:41 +01:00 |
|
supermerill
|
a11db7a227
|
Merge tag 'mass_rename' into master_slic3rPE_PR
# "resolved" Conflicts:
# lib/Slic3r/GUI/Plater.pm
# lib/Slic3r/GUI/Plater/2DToolpaths.pm
# lib/Slic3r/GUI/Plater/ObjectCutDialog.pm
# lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
# lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
# lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
# src/libslic3r/EdgeGrid.cpp
# src/libslic3r/EdgeGrid.hpp
# src/libslic3r/ExPolygon.cpp
# src/libslic3r/ExtrusionEntity.hpp
# src/libslic3r/ExtrusionEntityCollection.hpp
# src/libslic3r/Fill/Fill.cpp
# src/libslic3r/Fill/FillBase.cpp
# src/libslic3r/Flow.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/ToolOrdering.cpp
# src/libslic3r/GCode/WipeTowerPrusaMM.cpp
# src/libslic3r/Geometry.cpp
# src/libslic3r/LayerRegion.cpp
# src/libslic3r/Model.cpp
# src/libslic3r/MultiPoint.cpp
# src/libslic3r/MultiPoint.hpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/PerimeterGenerator.hpp
# src/libslic3r/Polyline.cpp
# src/libslic3r/Polyline.hpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/libslic3r/SupportMaterial.cpp
# src/libslic3r/TriangleMesh.cpp
# src/libslic3r/TriangleMesh.hpp
# src/libslic3r/Utils.hpp
# src/libslic3r/utils.cpp
# src/slic3r/AppController.hpp
# src/slic3r/AppControllerWx.cpp
# src/slic3r/GUI/3DScene.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI.hpp
# src/slic3r/GUI/Preset.cpp
# src/slic3r/GUI/ProgressIndicator.hpp
# src/slic3r/GUI/Tab.hpp
# xs/CMakeLists.txt
# xs/src/libslic3r/Layer.hpp
# xs/src/libslic3r/Line.cpp
# xs/src/libslic3r/Line.hpp
# xs/src/libslic3r/Point.hpp
# xs/src/libslic3r/Print.hpp
# xs/src/libslic3r/PrintRegion.cpp
# xs/src/slic3r/AppController.cpp
# xs/xsp/AppController.xsp
# xs/xsp/GUI.xsp
# xs/xsp/Print.xsp
|
2018-12-17 15:42:50 +01:00 |
|
supermerill
|
eaedfde887
|
fr loc file updated (because of en typos).
|
2018-12-17 12:58:39 +01:00 |
|
Enrico Turri
|
083c626770
|
Added background texture to toolbars
|
2018-12-17 10:55:14 +01:00 |
|
bubnikv
|
2ed77aadde
|
Korean translations by @ulsanether
WIP: New icons by Memory
WIP: Bicubic interpolation for SLA luminosity correction.
|
2018-12-11 15:19:37 +01:00 |
|
supermerill
|
26f281d763
|
French translation modifications
|
2018-12-07 17:25:21 +01:00 |
|
supermerill
|
9396b6366d
|
text & trad fr
|
2018-12-07 13:10:46 +01:00 |
|
supermerill
|
4e51008923
|
localization changes & typo
|
2018-12-06 18:08:07 +01:00 |
|
Enrico Turri
|
c96c9808aa
|
Removal of tabs from plater -> Nicer icons and reduced flickering when changing view
|
2018-12-06 13:44:38 +01:00 |
|
Enrico Turri
|
c908a4674a
|
Removal of tabs from plater -> added buttons to scene to switch between views
|
2018-12-06 10:38:19 +01:00 |
|
Enrico Turri
|
3caba66347
|
Higher resolution images for textures for print bed
|
2018-12-05 15:56:45 +01:00 |
|
Enrico Turri
|
2f5e69ad9e
|
mirrored sl1 bed bottom image
|
2018-12-03 14:40:34 +01:00 |
|
bubnikv
|
041fae8148
|
Added the bed texture for SL1
|
2018-11-30 15:31:47 +01:00 |
|
Enrico Turri
|
dca0cb04ea
|
New icons for gizmo overlay
|
2018-11-30 08:48:32 +01:00 |
|
Enrico Turri
|
e6369fe548
|
SLA slices preview - wip 3
|
2018-11-27 14:50:57 +01:00 |
|
Lukas Matena
|
d28d4823e0
|
SLA support points gizmo - multiple instance support
|
2018-11-26 13:03:03 +01:00 |
|