Commit Graph

434 Commits

Author SHA1 Message Date
YuSanka
023ca6fbe6 ConfigSnapshotDialog: Fix app name interpolation 2019-04-26 11:05:00 +02:00
YuSanka
ea7cfce286 Restored French localization files (Fix of #2158) 2019-04-25 09:16:18 +02:00
bubnikv
63a0d1aeee Added comments to the gettext dictionaries generated by the xgettext tool.
The prefix to be searched for in the source code comments is TRN
2019-04-18 10:13:56 +02:00
Enrico Turri
f244a643ee Fixed again layers.svg icon 2019-04-15 08:36:44 +02:00
YuSanka
cfa4f3f4d6 Added new icons 2019-04-12 17:10:29 +02:00
Enrico Turri
95eb98a103 Darker icons for 3D and preview menu items 2019-04-12 15:47:40 +02:00
Enrico Turri
e1debd3a4c Added icons for 3D and preview menu items 2019-04-12 14:30:28 +02:00
Enrico Turri
c5fa804c33 Merge branch 'et_copy_and_paste' of https://github.com/prusa3d/Slic3r 2019-04-12 12:40:25 +02:00
YuSanka
3a412a3a82 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 12:28:36 +02:00
YuSanka
50f8f45e0a Added new icons 2019-04-12 12:15:56 +02:00
Enrico Turri
edab2a056e Added icons for Edit menu items: Delete selected, Delete all, Copy, Paste 2019-04-12 11:50:14 +02:00
Enrico Turri
341e5276db Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-12 11:28:43 +02:00
bubnikv
566bb7041a Optimization of the OpenGL shaders for clipping with clipping planes. 2019-04-12 11:01:53 +02:00
Enrico Turri
3e902ecfbd Fixed conflicts after merge with master 2019-04-12 08:41:59 +02:00
Enrico Turri
a8fd1ceca0 New icons for copy and paste toolbar items 2019-04-11 15:51:12 +02:00
bubnikv
112f218c03 Merge branch 'lm_sla_gizmo_clipping_plane' 2019-04-11 15:45:49 +02:00
Enrico Turri
4718c839f6 Copy and paste -> Added items for copy and paste on the toolbar 2019-04-11 13:20:34 +02:00
Enrico Turri
3b8ac62a9e Removed old png icons for gizmos 2019-04-11 12:55:56 +02:00
Lukas Matena
678c513cb9 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-10 13:43:02 +02:00
Vojtech Kral
62d9a44a03 Update SL1 icon 2019-04-10 12:11:47 +02:00
Enrico Turri
4866642c5c Fixed icon layers.svg (again) 2019-04-10 09:52:21 +02:00
YuSanka
7b54c59b61 Added new icons 2019-04-10 09:41:04 +02:00
YuSanka
ed8b1a7ecb Localization: Updated dictionaries 2019-04-09 16:54:31 +02:00
Lukas Matena
3a09f66e51 Fixed a literal in vertex shader that refused to compile on OSX 2019-04-08 16:05:18 +02:00
Enrico Turri
86cb5bb00d Fixed icon layers.svg 2019-04-08 10:38:48 +02:00
Lukas Matena
9b7857aaab SLA gizmo clipping plane logic moved to fragment shader
This means the clipping now works again with both legacy and modern OpenGL
2019-04-08 10:31:16 +02:00
bubnikv
a36bdefda5 Code to load SVG icons into the BitmapCache class. 2019-04-04 09:20:11 +02:00
bubnikv
8e63a6ba97 First batch of SVG icons.
Support for loading SVG icons into a BitmapCache.
2019-04-04 09:02:53 +02:00
bubnikv
d9d0eff0f1 Merge remote-tracking branch 'remotes/origin/ys_comboboxes' 2019-03-21 10:11:27 +01:00
Enrico Turri
9076fb2be1 Removed png textures for printbed 2019-03-19 13:55:10 +01:00
YuSanka
8be8b604f5 Merge remote-tracking branch 'origin/vb_faster_tabs' into ys_comboboxes 2019-03-19 08:52:58 +01:00
bubnikv
e3153fc8fe Updated Prusa3D print profiles 2019-03-16 19:13:30 +01:00
YuSanka
b382ad1ffb Some improvements 2019-03-08 16:20:20 +01:00
Enrico Turri
319a48f42d Added svg icons for view toolbar and gismos 2019-03-04 14:21:52 +01:00
Enrico Turri
3c7ec5f7c6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-03-04 08:33:52 +01:00
Vojtech Kral
ffd7a3d933 avrdude: Use a minimalistic embedded conf instead of an external file 2019-03-01 13:15:20 +01:00
Enrico Turri
9ff8cd01b3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-28 11:45:11 +01:00
Enrico Turri
4b6ab84dbc Code cleanup 2019-02-28 09:37:55 +01:00
Enrico Turri
44b2ca8182 2nd attempt to fix rendering of printbed svg textures on Mac 2019-02-28 09:04:17 +01:00
Enrico Turri
e1eff8fa5c Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-26 12:56:43 +01:00
YuSanka
5cc86c49b9 Added tooltips for mode buttons.
+ some clean of an unused code
+ fix of #1861
2019-02-26 10:50:00 +01:00
Enrico Turri
0f683a6a1e 1st installment of svg icons for toolbars and gizmos 2019-02-26 09:56:23 +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
Vojtech Kral
0e1e87e0ad Update preset bundle 2019-02-22 17:26:25 +01:00
Enrico Turri
a36896e4c9 Fixed conflicts after merge with master 2019-02-22 10:18:15 +01:00
Enrico Turri
aa9994fa35 Gizmos overlay using a single png texture 2019-02-22 10:01:34 +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
Enrico Turri
11fc849b1a Printbed textures generated from svg files 2019-02-20 15:23:23 +01:00
YuSanka
7a4a219f60 Some Ukrainian localization improvements 2019-02-19 15:07:26 +01:00
bubnikv
35b4777e0e Removed the NotoSans hinted fonts as they are too large, they are
currently not used and they only increase installation size
significantly.
2019-02-19 13:28:05 +01:00
Vojtech Kral
59300b61c5 Update profiles 2019-02-15 15:38:41 +01:00
Vojtech Kral
dbfdcaa489 Update printer icons 2019-02-13 11:56:56 +01:00
Vojtech Kral
b0f54e5709 ConfigWizard refactoring 2019-02-12 10:11:00 +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
bubnikv
282ef552f9 SLA print bed rotated by 180 degrees, simplified by removing some internal pieces. 2019-01-26 18:52:31 +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
Enrico Turri
8e001972a9 Added print bed models for mk2 and mk3 printers to 3D scene 2019-01-04 12:56:48 +01:00
Enrico Turri
dd8f79381f Fixed hover icons in view toolbar 2019-01-03 12:35:01 +01:00
ulsanether
fc54716e32
korean translation. Updated December 29, 2018 2019-01-01 22:15:27 +09: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
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
ulsanether
634eb00297
Add files via upload 2018-12-18 23:41:19 +09: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
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
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
Enrico Turri
8460926d36 Added select by part tool to toolbar 2018-09-06 16:10:31 +02:00
Enrico Turri
6a48d79b0b Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-03 08:35:13 +02:00
bubnikv
453e7e37d3 Bundled newer versions of PrusaResearch profiles. 2018-09-01 09:54:02 +02:00
Enrico Turri
bb4329c8d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-31 08:33:42 +02:00
bubnikv
d57725ee18 Bumped up the version number to 1.41.0 release,
bundled updated PrusaResearch configs.
2018-08-30 16:08:25 +02:00
YuSanka
7fd7d83470 Updated PrusaDoubleSlider icons 2018-08-29 11:21:22 +02:00
Enrico Turri
4b25d3924b Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:01:03 +02:00
Enrico Turri
fef5a5252e Fixed conflicts after merging with master 2018-08-27 14:00:53 +02:00
YuSanka
02a325556d Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 16:28:34 +02:00
Enrico Turri
cda135ada7 Removed scale and rotate actions from toolbar 2018-08-24 15:08:19 +02:00
YuSanka
8b148a4fe4 Merge remote-tracking branch 'origin/new_main_page_ui' into dev 2018-08-24 15:01:26 +02:00
YuSanka
d90f5fa591 Added "one_layer" mode for PrusaDoubleSlider 2018-08-24 13:36:19 +02:00
YuSanka
2a7059edb3 Added active icon for selected tick 2018-08-23 13:01:18 +02:00
YuSanka
bc64154f21 PrusaDoubleSlider improvement
+ OnKeyDown
+ marked selected thumb
+ marked selected control
...
2018-08-21 17:48:52 +02:00
Enrico Turri
889d0f1434 3D gizmo grabbers 2018-08-21 14:27:36 +02:00
Lukas Matena
b0dd328fde Lay flat - icons and invalidation improvement 2018-08-20 11:27:25 +02:00
Enrico Turri
b6f6200bd5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-08-13 08:51:58 +02:00
bubnikv
1e8d646586 Updated MK3MM2 presets, updated start G-codes of the MK2 printer
as it does not support the new M204 format.
2018-08-06 18:04:35 +02:00
bubnikv
71b1e09af9 T1 and M702 C are now evaluated by the time estimator to add the new
"filament_load_time" and "filament_unload_time" values to match
the MK3 MMU2 behavior.

Emitting of the remaining times into the output G-code was made optional
through a new "remaining_times" configuration value, so the firmware
flavors and versions, which do not know the M73 code, will not complain.

Configuration changes:

The wipe tower default position was shifted inwards after the wipe tower
coordinate reference point was changed from the center to the left front
corner.

Added the "filament_load_time" and "filament_unload_time" values
to the MK3 MMU filament profiles.

Enabled "remaining_times" for the MK2.5, MK3 and MK3MMU2 printers.
2018-08-04 17:38:25 +02:00
bubnikv
cd919d986a Fixed the *MK3* references in Prusa3D profiles 2018-08-02 13:09:53 +02:00
bubnikv
8fc11c2f14 Configuration improvements:
Bumped up firmware versions for MK2.5/MK3 to 3.3.1, disabled priming areas for MK3MMU2
2018-08-02 09:11:11 +02:00
bubnikv
212ebc5615 Updated the start G-codes for the MK3 MMU2 profiles:
Implemented wiping line for MMU when the priming blocks are disabled,
added initialization of the MMU2 unit with the filament types.
2018-08-01 19:07:49 +02:00
YuSanka
ed5f5239aa Added tooltips for objects list
Updated icons with transparency
2018-08-01 14:17:31 +02:00
Enrico Turri
1c0fa19824 3D scene toolbar uses a single texture 2018-07-31 12:25:00 +02:00
Enrico Turri
22f02acc3d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-30 08:33:28 +02:00
bubnikv
b6c5fa7f68 Added the alpha4 config to the index. 2018-07-27 23:28:59 +02:00
bubnikv
4778312fa5 Merge branch 'master' into wipe_tower_no_priming 2018-07-27 23:26:10 +02:00
bubnikv
4a88075334 Updated change log for the Prusa3D config index,
bumped up the version to 1.41.0-alpha3
2018-07-27 22:31:24 +02:00
bubnikv
db8ba5fb76 New parameter "single_extruder_multi_material_priming" to be able
to suppress the MM priming towers.
The PrusaResearch.ini was modified for the MMU2 printers to
correctly prime the initial extruder when
single_extruder_multi_material_priming is disabled.
2018-07-27 22:19:46 +02:00
bubnikv
78a8acfcf1 New PrusaResearch configuration, renamed and improved the MK3 MMU2 wizard
picture.
2018-07-27 15:57:00 +02:00
Enrico Turri
590773d77b Fixed conflict after merge with master 2018-07-27 12:15:35 +02:00
Enrico Turri
a3cdc7e408 Placeholder icons for hover-pressed toolbar items state 2018-07-27 11:36:31 +02:00
bubnikv
987fc4c6df Merge remote-tracking branch 'origin/backspace_to_delete_on_osx' 2018-07-27 09:55:13 +02:00
YuSanka
e0bb6bafd5 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-07-26 11:27:25 +02:00
YuSanka
da18e25dfb Added callback for 3dScene updating after extruder changing 2018-07-26 10:59:03 +02:00
YuSanka
ac9ba61f06 Correct updating for settings list of the object/part 2018-07-25 16:14:28 +02:00
Enrico Turri
496a83bb28 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-25 08:35:05 +02:00
Vojtech Kral
e0e6a23810 PrusaResearch.idx: Comment 0.2.0-alpha2 2018-07-24 15:54:06 +02:00
Vojtech Kral
07ae905150 Sync PrusaResearch.idx 2018-07-24 15:47:13 +02:00
Enrico Turri
8bf3e63f75 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 11:20:02 +02:00
Enrico Turri
2df6e08eed Reduced size of MK3 bed textures for compatibility with OpenGL 1.1 2018-07-24 10:33:14 +02:00
YuSanka
dd088ba0cc Localized the (modified) profile indicator 2018-07-23 15:44:01 +02:00
Enrico Turri
de085fdb6c Power of two squared bed textures to try to fix #1067 2018-07-23 14:21:14 +02:00
Enrico Turri
f261c83653 Placeholder icons for 3D scene toolbar 2018-07-23 13:22:24 +02:00
bubnikv
a0096cf563 Renamed the key MK3SMMU to MK3MMU2,
added a generic PLA MMU2 material.
2018-07-23 09:42:02 +02:00
bubnikv
109b6fb79c Added the MK3 MMU2 printer into the profiles, added an image
of the MK3 MMU2 to the wizard.
2018-07-21 15:46:54 +02:00
bubnikv
0660862058 For the Marlin firmware, the machine envelope G-code is emitted
based on the Slic3r printer profile.

Also the bundled config has been updated, so that the machine envelope
G-code values were removed and the new Slic3r printer profile values
were updated with the former G-code values.

Slic3r version has been bumped up to 1.41.0-alpha for the configuration
files to work.
2018-07-17 19:37:24 +02:00
bubnikv
83f9813f56 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
bubnikv
68e82a7348 Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
Enrico Turri
9b2f760679 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
YuSanka
5da3986e22 Updated POT-file 2018-06-26 11:17:40 +02:00
YuSanka
0371f368a4 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
Enrico Turri
0c24a65039 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 08:39:26 +02:00
Enrico Turri
550f6e307f Faster gizmos update 2018-06-21 08:37:04 +02:00
bubnikv
02d4f3e14d Provide a callback to libslic3r to translate texts.
Moved the "translate" functions to namespaces to avoid clashes
between the code in libslic3r and Slic3r GUI projects.
2018-06-20 18:33:46 +02:00
YuSanka
86b02224ae Updated PL language 2018-06-20 09:42:14 +02:00
Enrico Turri
b2cf576bf3 1st installment of gizmos 2018-06-13 09:12:16 +02:00
Enrico Turri
2d97d8e7fe Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-13 08:31:30 +02:00
bubnikv
2cd0c64b96 Merge branch 'dev' 2018-06-12 17:11:45 +02:00
bubnikv
0ec06e6981 Fixed missing dependencies in Prusa's profiles for 0.25 and 0.6mm nozzles. 2018-06-12 17:10:12 +02:00
YuSanka
a4b42f44f3 Added translation for FR 2018-06-12 15:30:55 +02:00
YuSanka
6b56f99df7 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-12 13:03:40 +02:00
Enrico Turri
f8664fce71 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-12 11:55:57 +02:00
bubnikv
6cf508e124 Updated slic3r_min_version in prusa3d config version index. 2018-06-12 11:46:15 +02:00
Enrico Turri
756064810c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-12 11:08:16 +02:00
YuSanka
07815891dc Added translations for CZ, DE, ES, IT & PL 2018-06-12 09:55:39 +02:00
Enrico Turri
5f02669d2d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-12 08:32:34 +02:00
Vojtech Kral
43e8fe32aa Add MK2.5 icon, remove testing icons 2018-06-11 18:24:41 +02:00
bubnikv
69705b5e66 Split the MK2.5 profile from the MK2S 2018-06-11 18:20:29 +02:00
Enrico Turri
efe6a29032 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-11 13:46:35 +02:00
Lukas Matena
dc9a46b269 Updated POT file (added PresetUpdater.cpp and FirmwareDialog.cpp, changed keys in WipeTowerDialog.cpp) 2018-06-11 13:44:40 +02:00
Enrico Turri
7b1187992c Added bed texture for Prusa printers 2018-06-11 10:46:32 +02:00
YuSanka
4215b2b373 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-08 10:10:10 +02:00
Enrico Turri
1f79713c15 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-05 10:54:15 +02:00
bubnikv
adcf869eee Fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles. 2018-06-05 10:11:28 +02:00
bubnikv
1343a22dc6 Added Prusa profiles from https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch 2018-06-04 15:58:44 +02:00
Enrico Turri
109dde00b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-04 12:25:04 +02:00
YuSanka
16a5029d58 Fixed issue #875 and updated Slic3rPE.pot 2018-06-04 12:13:07 +02:00
Enrico Turri
7d56b38e40 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-04 09:28:55 +02:00
Vojtech Kral
4df0b94b79 Beta bugfixes (#931)
* Fix: Function signature in avrdude

* Fix: Remove mockup vendor bundles

* Fix: Make ConfigWizard error handling more friendly

* Fix: Opening the datadir in AppImage-based Slic3r
2018-06-04 09:07:29 +02:00
YuSanka
85508fab82 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-05-24 08:32:24 +02:00
Enrico Turri
486180c422 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-23 15:33:25 +02:00
YuSanka
a4261b11d4 Updated translations (de, fr, es, it & pl) 2018-05-23 14:22:52 +02:00
bubnikv
a9499ae45c Fix of a crash intruduced with e8247c5646 2018-05-23 13:19:25 +02:00
Enrico Turri
37ab7594fc Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-23 08:38:29 +02:00
YuSanka
83cec1a640 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-05-23 08:30:27 +02:00
bubnikv
076b293fec Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself. 2018-05-22 15:18:38 +02:00
Enrico Turri
4e29147756 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 11:48:45 +02:00
bubnikv
36b337b7e7 Moved max_print_height from [print:*common*] to [printer:*common*],
there is a bug still in Slic3r, it should refuse to load config keys
from a wrong location.
2018-05-22 11:45:15 +02:00
Eric
ca3ea125e2 Partial french translation (#914)
* partial french translation progress (45%)

* partial french translation progress (60%)
2018-05-22 11:01:05 +02:00
YuSanka
2a8391dfbf Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-05-22 09:05:34 +02:00
Enrico Turri
59af3fb866 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 08:33:23 +02:00
Vojtech Kral
07817c8ee5 avrdude: Compilation on Windows/MSVC 2018-05-21 18:58:22 +02:00
Vojtech Kral
68a570221b avrdude.conf: Remove unsupported stuff 2018-05-21 18:58:22 +02:00
Vojtech Kral
c7e4d1d06f avrdude.conf base 2018-05-21 18:58:22 +02:00
Enrico Turri
7cff6ef6db Shaders loaded from files 2018-05-21 13:08:02 +02:00
bubnikv
687c91d6e9 Parsing of obsolete presets from Config Bundle to remove them
from user's profile when upgrading to a new configuration structure.
2018-05-16 16:34:07 +02:00
YuSanka
e78a885247 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-05-15 09:44:11 +02:00