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 |
|
Vojtech Kral
|
c29493a41b
|
imgui: Refactor, use in cut gizmo
|
2018-11-26 11:16:39 +01:00 |
|
Enrico Turri
|
31a29e8a32
|
Added NotoSans font
|
2018-11-26 10:57:13 +01:00 |
|
Enrico Turri
|
d5c4c90b67
|
Restored opaque bed textures
|
2018-11-22 13:49:28 +01:00 |
|
Vojtech Kral
|
ee33f0f1d7
|
Add missing icons
|
2018-11-19 13:51:43 +01:00 |
|
YuSanka
|
2e8f21fff8
|
Changed toolbar icons for "split to object/part"
|
2018-11-08 16:44:59 +01:00 |
|
YuSanka
|
a9e7b5c645
|
Implemented adding of support enforcer/blocker to the object list
|
2018-11-05 08:58:14 +01:00 |
|
Lukas Matena
|
f5e8eaedb3
|
Added a special (temporary) icon for SLA supports gizmo, removed igl files from xs/src
|
2018-11-02 10:22:48 +01:00 |
|
bubnikv
|
fd1c5dd218
|
WIP: SL1 profiles, SL1 in wizard, switching between FFF / SLA
|
2018-10-31 16:22:36 +01:00 |
|
supermerill
|
e7cfb20838
|
Merge branch 'master_slic3rPE_PR'
|
2018-10-31 14:54:11 +01:00 |
|
supermerill
|
af0ef31b20
|
Merge remote-tracking branch 'remotes/prusa/master' into master_slic3rPE_PR
(needd to verify supports doesn't break something)
|
2018-10-29 14:11:04 +01:00 |
|
bubnikv
|
720fb29768
|
Updated bundled profiles for 1.41.1 final.
|
2018-10-26 13:20:03 +02:00 |
|
bubnikv
|
44c0032b82
|
Updated Prusa3D config index to only allow 0.2.6 settings for Slic3r
PE 1.41.1
|
2018-10-23 12:47:49 +02:00 |
|
bubnikv
|
49cfa5c759
|
Updated Prusa3D profiles, added an MK2.5 MMU2 wizard image (as of now
it is just a copy of the MK3 MMU2),
changed default brim width on the platter main page (the shortcut checkbox)
to 5mm.
|
2018-10-23 12:42:05 +02:00 |
|
YuSanka
|
84de664fb5
|
Fixed TreeCtrl updating after mode change
+ Added another images for mode visualization
|
2018-10-22 12:08:30 +02:00 |
|
YuSanka
|
f47949504e
|
Prototype of the hiding according to view mode
+ Added mode icon near option's label
+ Fixed segmentation fault on Linux
|
2018-10-21 23:10:36 +02:00 |
|
Vojtech Kral
|
d843f1a76f
|
Fix resources dir location, add wxWidgets to Windows deps build script
|
2018-10-12 11:37:05 +02:00 |
|
bubnikv
|
0558b53493
|
WIP: Moved sources int src/, separated most of the source code from Perl.
The XS was left only for the unit / integration tests, and it links
libslic3r only. No wxWidgets are allowed to be used from Perl starting
from now.
|
2018-09-19 11:02:24 +02:00 |
|
bubnikv
|
fe3b92870f
|
Merged with dev
|
2018-09-17 15:12:13 +02:00 |
|
Enrico Turri
|
4479c5444a
|
1st installment of gizmo move 3D
|
2018-09-11 09:00:28 +02:00 |
|