3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,189 Commits 1 Branch 1 Tag 249 MiB
9cd3c594be
Commit Graph

454 Commits

Author SHA1 Message Date
Enrico Turri
0f683a6a1e 1st installment of svg icons for toolbars and gizmos 2019-02-26 09:56:23 +01:00
Vojtech Kral
3aee6ddc4c Attempt to fix 3D scene popup menu on Linux 2019-02-25 10:35:51 +01:00
bubnikv
a0d256f9f7 Restart background processing for all steps on G-code export and send to 
octoprint for SLA if the slicing for a single object only is active.
 2019-02-25 10:21:12 +01:00
Enrico Turri
fab87ff1d9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-25 09:32:02 +01:00
bubnikv
a1fdbf213c Merge remote-tracking branch 'origin/ys_bf_updating' 2019-02-22 16:56:20 +01:00
Enrico Turri
03022ce124 Code cleanup 2019-02-22 12:06:56 +01:00
YuSanka
2f71c38221 Some fixes for the last commit 2019-02-22 11:59:40 +01:00
Enrico Turri
c6607bcd27 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-22 11:40:04 +01:00
Enrico Turri
a36896e4c9 Fixed conflicts after merge with master 2019-02-22 10:18:15 +01:00
bubnikv
4fa2b9e601 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-02-22 10:12:18 +01:00
bubnikv
53ccac6925 Show wait cursor when exporting an STL. 
Fix of SLA gizmo picking by rectangle: point is occluded only if an object
is half its radius away from the point center.
Don't show the temp G-code file name in the status bar when exporting.
 2019-02-22 10:11:57 +01:00
Enrico Turri
aa9994fa35 Gizmos overlay using a single png texture 2019-02-22 10:01:34 +01:00
YuSanka
26833ee641 Fixed bug with update (part of #1801) 2019-02-22 09:38:56 +01:00
Enrico Turri
eb0b3aea09 Fixed conflicts after merge with master 2019-02-22 09:11:49 +01:00
bubnikv
cb900aa5bc Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-02-21 15:46:23 +01:00
bubnikv
ac0c7e8065 Optimization of SLA print time estimation, 
moved SLA print time estimation calculation into rasterization step,
so that the print time estimation is tracked by some SLAPrintStep.

Extended the output file name generator to use the SLA print statistics.
 2019-02-21 15:46:04 +01:00
Vojtech Kral
bf699462c3 imgui: Attempt to fix Tab key 2019-02-21 13:17:26 +01:00
bubnikv
37ab271803 Merge remote-tracking branch 'origin/ys_sla_time_estimation' 2019-02-21 13:11:16 +01:00
bubnikv
76f1aa09d0 Fixed an issue with background processing cancelation & SLA supports 
for a single object only.
Fixed a spelling issue in "call_cancell_xxx"
 2019-02-21 12:39:38 +01:00
Enrico Turri
bfdd702134 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-21 11:44:15 +01:00
bubnikv
159041747d WIP: SLA support "Generate points" and "Apply Changes" will reslice 
just the selected object.
Added "Host upload active" check on background processing state.
Documented requirements on "update_background_process" to
control the upcoming single "Slice Now" / "Export" button.
 2019-02-21 11:40:56 +01:00
Enrico Turri
2eb0b6d1b4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-21 08:20:44 +01:00
bubnikv
c55629259a Merge remote-tracking branch 'origin/ys_hdpi' 2019-02-20 16:20:30 +01:00
YuSanka
fb8c66f223 Merge remote-tracking branch 'origin/master' into ys_sla_time_estimation 2019-02-20 15:14:53 +01:00
Enrico Turri
cb1ef36ceb ENABLE_UNIQUE_BED set as default 2019-02-20 13:50:35 +01:00
Enrico Turri
7443868e87 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-20 13:16:39 +01:00
bubnikv
464808ac49 Merge branch 'lm_sla_supports_auto2' 2019-02-20 10:58:34 +01:00
Enrico Turri
4a9f6ba06a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-20 08:25:34 +01:00
Lukas Matena
d7e14d0792 Ensuring that GLCanvas gets focus when it should (Linux only fix) 2019-02-19 15:54:43 +01:00
Enrico Turri
7121a1177a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-02-19 15:19:49 +01:00
Enrico Turri
75df722fee Bed and Axes classes moved from GLCanva3d to Plater to have a unique instance of them shared by all views 2019-02-19 15:15:27 +01:00
bubnikv
435b5394f7 OnActivate handler to: 
1) Process delayed error messages from background processing
2) Set keyboard focus to the 3D scene if no wx window has keyboard focus.
 2019-02-19 14:57:59 +01:00
Lukas Matena
1bb0af1588 SLA gizmo asks about saving changes, right button click removes points 2019-02-19 13:47:28 +01:00
YuSanka
9e3434ecc1 Fixed calculation of the consumed material for the supports 2019-02-19 12:14:13 +01:00
Enrico Turri
d81b957968 Tech ENABLE_REWORKED_BED_SHAPE_CHANGE set as default 2019-02-19 10:28:32 +01:00
Lukas Matena
023b788777 Merge branch 'master' into lm_sla_supports_auto2 2019-02-19 10:15:16 +01:00
Enrico Turri
644794233f Code cleanup 2019-02-18 15:41:12 +01:00
Enrico Turri
8635756b02 Added debug output to investigate further #1788 2019-02-18 15:41:04 +01:00
YuSanka
a690466dbf Fixed a typo for the last commit 2019-02-18 13:24:56 +01:00
YuSanka
2df069323c Time estimation improvement 2019-02-18 12:28:58 +01:00
YuSanka
88f04e0fae Added calculation of the material consumption 2019-02-13 15:35:41 +01:00
YuSanka
c04be58648 Implemented estimated printing time for the SLA printing 2019-02-12 16:34:42 +01:00
Vojtech Kral
b0f54e5709 ConfigWizard refactoring 2019-02-12 10:11:00 +01:00
YuSanka
290c6206cd Fix to last commit 2019-02-11 15:36:05 +01:00
tamasmeszaros
8b2a8822d2 Partial fix for crashing min_obj_distance 2019-02-08 12:30:10 +01:00
YuSanka
2e14f3456e Changed sidebar controls layout 2019-02-07 14:50:48 +01:00
Lukas Matena
9fc75d7b34 SLA support points (better backend->frontend synchronization and more) 
- backend to frontend data synchronization to inform the gizmo that new points have been generated
- fixed the inadvertent cancellation of background processing caused by the SLA gizmo touching frontend data during the process
- inactive instances of the object are hidden when the SLA gizmo is active
- fix of imgui combobox rendering
 2019-02-06 15:16:25 +01:00
bubnikv
fb6f3d8431 Send EVT_SLICING_UPDATE with RELOAD_SLA_SUPPORT_POINTS 
once object's support points are calculated by the backend.
 2019-02-06 14:18:04 +01:00
YuSanka
b2410e0f23 Merge remote-tracking branch 'origin/master' into ys_hdpi 2019-02-06 11:12:44 +01:00
YuSanka
46f32d091a Fixed scaling of the controls and InfoDialogs (Sys and About) 2019-02-06 10:13:27 +01:00
bubnikv
8982664551 Improved stability (fixed crashes) of the Cut by plane function by 
replacing the cut triangulation with freeglu tesselator.
Added performance tracing output of the Cut by plane function.
Added wait cursor to split to parts / objects, object cut, save to AMF/3MF.
 2019-02-05 20:23:24 +01:00
YuSanka
1b5c118fd0 Merge remote-tracking branch 'origin/master' into ys_hdpi 2019-02-05 11:04:28 +01:00
Enrico Turri
e43e89d495 Code cleanup 2019-02-04 15:25:22 +01:00
Enrico Turri
5136ffa94b 2nd attempt to fix SPE-807 2019-02-04 12:27:44 +01:00
YuSanka
b7f24aebe3 Fixed rounding of numbers for the controls width (Try to fix controls flashing on HDPI/linux) 2019-02-04 12:07:15 +01:00
YuSanka
e2b8c3e33c Merge remote-tracking branch 'origin/master' into ys_hdpi 2019-02-04 10:38:23 +01:00
YuSanka
4005d06452 Fixed "hard_code" setting of the size for the Sidebar and Tabs 
+ Fixed assert after config_wizard changing
 2019-02-04 10:35:16 +01:00
Enrico Turri
c31a648bf7 1st attempt to fix SPE-807 2019-02-04 10:06:15 +01:00
bubnikv
cd838561ee Model fixing through Netfabb service (Windows only): 
Model volumes are now fixed one by one, instances & parameters are maintained,
it is now possible to fix just a single volume of a multi-part object.
 2019-02-03 22:14:34 +01:00
bubnikv
0c1f750cba The accelerators Ctrl+A, Ctrl+Del and Del were incorrectly captured 
globally by being defined in the Edit menu.
These accelerators are now suppressed in the menu (shown on Windows
but inactive, not shown on OSX / Linux),
and they are now captured by the 3D scene widget instead.

Fix of ctrl-A doesn't work well #1753
 2019-02-03 14:06:13 +01:00
bubnikv
f050d91239 OSX specific: The Command short keys over the 3D scene toolbars 
are now shown with the OSX "Command" symbols, not as "Ctrl+"
 2019-02-03 11:10:25 +01:00
bubnikv
a56f7d60e5 Fixed an issue, where the output G-code file name was not always updated 
from the current Model/ModelObjects.
Fixed a possible race condition in updating Print::m_placeholder_parser
with the proposed filename / filename base.
Improved documentation (source code comments).
 2019-02-03 10:41:14 +01:00
Enrico Turri
016507f4ef Merge branch 'sidebar_fixes' of https://github.com/prusa3d/Slic3r 2019-02-01 14:32:21 +01:00
bubnikv
405d18a7fa Changed default the Drag & Drop target from "Move" to "Copy". Fixes #1742 2019-02-01 08:53:29 +01:00
YuSanka
ba6206ab62 First experiment to fix layouts on hdpi 2019-01-31 15:55:09 +01:00
Enrico Turri
5fa5d495bb Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-31 13:32:47 +01:00
Enrico Turri
81c621716b User mode-aware toolbar items 2019-01-31 13:19:26 +01:00
YuSanka
a5ec951180 Added menu item for the "Fix through the Netfabb" 2019-01-30 16:27:33 +01:00
Enrico Turri
3aa9435c80 Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes 2019-01-30 10:03:22 +01:00
Enrico Turri
19c1fc0b3f Hide slicing results after Delete All command 2019-01-30 10:00:38 +01:00
Enrico Turri
6137cc48eb ENABLE_IMPROVED_SIDEBAR_OBJECTS_MANIPULATION set as default 2019-01-28 16:06:44 +01:00
bubnikv
4a5cff3ee2 Reverted the slow auto arrangement of objects on loading. 
(made configurable, once it is sped up, it will be re-enabled)
 2019-01-28 10:56:02 +01:00
bubnikv
588c07c12a Performance improvements: 
Lazy "Place on face" gizmo update.
Caching of MeshObject::raw_mesh_bounding_box() for the object size display.
ModelObject::bounding_box(), raw_mesh_bounding_box(), full_raw_mesh_bounding_box() will not copy the mesh.
TriangleMesh::transformed_bounding_box(const Transform3d &trafo) will not copy the mesh data.
get_options_for_bundle() will not return reference to temp value
is_splittable() calls cheap mesh.has_multiple_patches()
 2019-01-26 18:51:34 +01:00
bubnikv
302a51f6cb Merge remote-tracking branch 'remotes/origin/tm_autoplacement' 2019-01-26 13:32:47 +01:00
bubnikv
241283d956 Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2019-01-26 13:10:58 +01:00
YuSanka
5a7061a7fb Updated settings menu according to the view mode 
+ Created new class PrusaMenu, derived from wxMenu and contains pointers to the separators.
 2019-01-25 16:57:44 +01:00
Enrico Turri
8abae757d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 13:31:56 +01:00
Enrico Turri
5581830ab8 Fixed import of objects greater than print bed (range (5 < 10000) times) 2019-01-25 13:30:01 +01:00
Enrico Turri
348aa48121 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 11:50:34 +01:00
YuSanka
9b8cdb95dc Updated view mode for object_list and object_menu 2019-01-25 10:57:13 +01:00
Enrico Turri
a8437f3ebb Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-25 08:43:25 +01:00
bubnikv
ceea83720a Fixed build on OSX & Linux 2019-01-25 08:37:06 +01:00
Vojtech Kral
3df1ed8f6b Mac: Retina OpenGL: Fix ImGui font switch, dynamic switching, toolbar fixes 2019-01-24 20:03:12 +01:00
Enrico Turri
d086bafb39 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 15:58:40 +01:00
Enrico Turri
d82cacf1d8 Removed debug code committed by mistake 2019-01-24 15:57:53 +01:00
Enrico Turri
752a5b25f4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 15:52:28 +01:00
Enrico Turri
43beaf46d8 Deactivate layers editing tool if user selects more than one object 2019-01-24 15:50:06 +01:00
Enrico Turri
9a69305367 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-24 08:33:14 +01:00
tamasmeszaros
8c57541fe9 Merge remote-tracking branch 'origin/master' into tm_autoplacement 2019-01-23 17:12:28 +01:00
YuSanka
8fd6194403 Improved Instance splitting : 
- Added icon and context menu for Instance.
- Added multiple selection and splitting for the instances (add new object with selected instances)
 2019-01-23 16:12:47 +01:00
tamasmeszaros
4e8c570d52 Polishing autoplacement feature for testing 2019-01-23 13:13:12 +01:00
Enrico Turri
9a5d7a98a6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-23 08:26:55 +01:00
tamasmeszaros
4628ba5767 Initial version of smart auto placement intended to replace autocenter. 2019-01-22 17:50:33 +01:00
YuSanka
94b5f9c567 Implemented splitting of object instances by : 
- drag & drop outside of any object
 - set as a separated Object (context menu)
 2019-01-22 16:40:37 +01:00
Enrico Turri
f44510c272 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-22 08:32:05 +01:00
bubnikv
3366ce51e5 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-01-21 17:02:40 +01:00
bubnikv
ceb08d6380 Variable layer height editing: 
Smarter updates of the SlicingParameters (update on ScheduleBackgroundProcessing
or on object selection change)
 2019-01-21 17:02:16 +01:00
Enrico Turri
d8d7eac5a9 Fixed conflicts after merge with master 2019-01-21 14:43:57 +01:00
YuSanka
7a30dd250a Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-01-21 13:05:59 +01:00
YuSanka
1a474ea282 L10n improvements 2019-01-21 12:34:28 +01:00
Enrico Turri
25319113f1 Code cleanup 2019-01-21 11:29:45 +01:00
Enrico Turri
4577a49d5a Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-21 11:21:21 +01:00
bubnikv
ba1abf3f1f Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-01-21 10:07:27 +01:00
bubnikv
d64b55d27d WIP Restoration of the layer editing. 2019-01-21 10:06:51 +01:00
Enrico Turri
cef761e6b6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering 2019-01-21 08:23:43 +01:00
Enrico Turri
1eb01df0c8 Fixed .prusa i/o and split to objects 2019-01-18 16:01:43 +01:00
Vojtech Kral
4ffe76f012 Cut: Prevent the neither part kept option 2019-01-18 15:43:40 +01:00
Enrico Turri
ce099e91c7 Fixed .amf i/o 2019-01-18 14:40:10 +01:00
Enrico Turri
80bae6dd98 1st installment of volumes centering fixes (WIP) 2019-01-18 12:52:09 +01:00
Enrico Turri
aa7ff0700b Reworked management of bed shape changes (may fix #1671) 2019-01-17 13:21:33 +01:00
Enrico Turri
8146be5510 Added shortcut strings to gizmos and toolbars tooltips 2019-01-16 11:51:30 +01:00
YuSanka
d6a203613d Fix of SPE-772 
"Debug Assertion Failed" after the attention to D&D single material *.3mf to MMU preset
 2019-01-15 15:54:48 +01:00
YuSanka
793e3cd470 Added "Frequently changed parameters for SLA-profiles" 2019-01-15 09:33:50 +01:00
bubnikv
2b0e1633cf Fix of "macos crash on WipeTower when using multi extruder + tower + support #1632" 
Added a new validation into Print::validation() to verify, that
the non-soluble supports need to be printed with "current" extruder.
This check was already there, though for the global parameters only.
Now the check is performed inside the Print class for the object
override parameters as well.

Improved the Print::validate() handling. The Print::validate() is only
called if the Print::apply() indicates a change, or if the slicing
was executed by the user explicitely (with the "Slice now" button,
with the "Send to octoprint" button, or by switching to the print
path preview).
 2019-01-10 16:06:24 +01:00
YuSanka
fcf41c7eb8 Fixed OSX compilation bug 2019-01-10 13:44:31 +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
5b1c1d5922 Fixed a bug in the Win32 start wrapper (wrong number of parameters was passed for the GUI slic3r.exe). 
Reworked command line processing for the GUI slic3r. Now the config is loaded first, then the model files (also the configs from AMF/3MF are applied), and lastly the free standing parameters are applied.
Fixed unescaping for command line parameters. The string parameters are now not unescaped, string vector parameters are unescaped only if enquoted.
Tab::load_current_preset() - disabled CallAfter for predictability. With CallAfter, it was difficult to call the method in sequence with other methods.
Fixed some missing ->Destroy() calls on dialogs created from MainFrame
Fixed some compiler warnings.
 2019-01-09 10:43:17 +01:00
Enrico Turri
474e06ac85 Fixed missing mirror transform data when increasing instances count 2019-01-03 15:04:29 +01:00
bubnikv
8d1b854acb Replaced all wxString.ToStdString() with wxString.ToUTF8().data() 
to be sure that the strings are correctly converted to UTF8.
 2019-01-03 14:34:53 +01:00
Enrico Turri
b099d5c05e Removal of wxNotebook from plater set as default 2019-01-03 12:59:06 +01:00
Enrico Turri
0997825e0e Fixed import from amf files 2019-01-03 12:04:14 +01:00
Enrico Turri
ca6a7ac8d5 Further improvement in objects manipulation using sidebar (multiselection) 2019-01-03 11:24:03 +01:00
Enrico Turri
d426895580 Automatic selection of newly loaded objects 2019-01-03 09:12:50 +01:00
bubnikv
c4d5c7cefd Fix of "When exporting plate as STL Files are saved as 1KB and corrupted #1536" 
This is a regression issue, and it only happened when exporting the plater.
 2019-01-02 18:36:48 +01:00
bubnikv
4227499534 Fix of "Color Picker Placement #1496" 
Now the color picker from the plater is centered around the associated
combo box. Keep your fingers crossed, it seems to be working, but
on a two monitor setup the color picker may jump to the other screen.
 2019-01-02 17:54:54 +01:00
Enrico Turri
2adce62643 Background texture for toolbars set as default 2019-01-02 16:26:22 +01:00
Vojtech Kral
2db0906071 Fix fs::path <-> wxString conversions 2019-01-02 15:53:52 +01:00
Enrico Turri
9b8a68565f Modified camera target behavior set as default 2019-01-02 14:04:26 +01:00
Enrico Turri
611d9aa0d8 Model's volume transform set as default 2019-01-02 10:49:13 +01:00
bubnikv
126035f6f8 Fixed many errors in background processing synchronization and update. 
Fixed couple of compiler warnings.
 2018-12-22 10:02:42 +01:00
Enrico Turri
4a2c0722f7 2nd attempt to fix switching between 3d view/preview using tab key on Mac 2018-12-21 11:39:37 +01:00
Enrico Turri
4c823fea40 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-21 11:13:47 +01:00
Enrico Turri
6370902a1b Code cleanup 2018-12-21 11:13:33 +01:00
YuSanka
fb78957687 Fixed updating of settings after selection of the preset with "modified" suffix 
+ Added EVT_SPINCTRL binding
 2018-12-21 10:59:21 +01:00
Enrico Turri
964209f89b Attempt to fix switching between 3d view/preview using tab key on Mac 2018-12-21 10:43:22 +01:00
Enrico Turri
1d3d87c2b9 Fixed toolbar update when switching between 3d view/preview using tab or ctrl+5/6 2018-12-21 10:10:49 +01:00
bubnikv
cb0488df12 Tab key to switch between the 3D view / path preview. 2018-12-20 22:30:42 +01:00
Enrico Turri
68684dd003 Removed obsolete GLCanvas3D::m_shader_enabled 2018-12-20 13:20:21 +01:00
Enrico Turri
780e3c700e Attempt to reduce ugly artifacts when switching to preview for the 1st time 2018-12-20 12:51:42 +01:00
bubnikv
5553d10c1e Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-19 14:47:25 +01:00
bubnikv
e9990ed79e Fix of SPE-691 Slicer crash after extruder change 
Added synchronization of GCodePreviewData between the front end / back end
(GCodePreview data is only used if PrintStep psGCodeExport is finished).
Added reset of GCodePreviewData on Print::apply() to conserve RAM.
 2018-12-19 14:47:16 +01:00
YuSanka
b7c506170d Fixed OSX build 
+ Added shortcut (?) for "Keyboard Shortcuts" dialog
 2018-12-19 14:01:46 +01:00
bubnikv
354458ae73 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-19 12:07:53 +01:00
bubnikv
a6a1a866d8 Fix of SPE-695 Minus key should not delete object 2018-12-19 12:07:45 +01:00
Enrico Turri
9d8e78636b Fixed loading of huge models 2018-12-19 09:54:15 +01:00
bubnikv
bb5caf2e08 Fixed scaling of the object, if it was loaded too big. 
Here the large object was not scaled uniformly, and the Z height
of the bed was set incorrectly to one.
 2018-12-18 18:41:20 +01:00
YuSanka
7d1fb201e7 Implemented updating of the settings values for PointCtrl and Choice. 
* wx_EVT_KILL_FOCES doesn't handled on OSX, so values are updating on wx_EVT_TEXT like a temporary workaround.
 2018-12-18 15:29:49 +01:00
Vojtech Kral
66b5deccf5 PrintHost: Basic SL1 support 2018-12-18 14:37:35 +01:00
YuSanka
01edb23ffc Fixed the enabling of the "split to objects/parts" buttons 2018-12-17 18:08:32 +01:00
Vojtech Kral
862217a6b3 OctoPrint basics working, niceties to-do 2018-12-17 17:14:00 +01:00