supermerill
dda438c74b
Merge commit '5e3e5492487690fb48cd7c4bb0b7e0e019e30a5c' (wip)
2019-12-05 20:53:02 +01:00
YuSanka
ee71f83939
Localization improvements:
...
* fixed "\n" at the end of phrases
+ updated list of files to localization
+ new PrusaSlicer.pot
+ Japanese localization
2019-12-04 11:14:13 +01:00
supermerill
6064dfe2c7
Update on the spacing of perimeters.
...
#113
2019-11-02 02:28:54 +01:00
supermerill
004ec5480d
alternate extra wall: on odd layers
...
#89
2019-10-29 19:12:54 +01:00
supermerill
2f042e030c
Merge remote-tracking branch 'remotes/prusa/master'
...
not merged: fill.cpp, perimeter_generator, because they ahve been reworked and need to be understand fully before adding my extensive modifications.
To verify: glcanvas: maybe filament color selection is deleted (or the other one i added?)
2019-09-26 13:14:01 +02:00
YuSanka
c960c2cf27
Code clean in Tab.cpp and Fixed couple of Mac-warnings in :
...
GUI.cpp
GUI_App.cpp
GUI_ObjectList.cpp
MainFrame.hpp
Plater.cpp
PresetBundle.cpp
PresetHints.cpp
Tab.cpp
Tab.hpp
wxExtensions.cpp
wxExtensions.hpp
2019-09-03 10:29:17 +02:00
supermerill
47f5b30c5a
Merge remote-tracking branch 'remotes/prusa/master'
2019-06-20 17:57:41 +02:00
bubnikv
f5ef537640
Fix of Crash on Export config Bundle (Win64) ( #2307 )
...
Export of the names of the SLA profiles was performed into the config bundle
for SLA profiles, which were nop set. A safe method is now used,
which stores an empty string in such a case.
2019-05-22 11:31:36 +02:00
supermerill
8840d01fb0
Merge remote-tracking branch 'remotes/prusa/master'
2019-05-16 19:55:45 +02:00
YuSanka
cd82b03a0e
Localization improvements : Empty spaces at the end of phrase are removed from dictionary.
...
+ new POT
2019-05-11 23:29:25 +02:00
supermerill
b053a23e1e
option for no z-lift on top solid infill.
2019-01-03 19:57:18 +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
bubnikv
a378bb7bed
Removed some obsolete Perl bindings.
...
Removed libslic3r from the default include paths for all modules but
libslic3r. Now headers from libslic3r need to be included with an
explicit path (libslic3r/libslic3r.h etc)
Split the localization macros into I18N.{cpp,h}
2018-11-26 14:41:58 +01: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
