3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,850 Commits 1 Branch 1 Tag 249 MiB
593c397b19
Commit Graph

749 Commits

Author SHA1 Message Date
YuSanka
536514ff03 Added default filament(resin) in wizard for selected printers 
Added default_materials field to "Vendor".ini
 2020-01-15 09:34:21 +01:00
Enrico Turri
051fcd4e24 Configurable system printers bed textures and models 2020-01-09 10:27:42 +01:00
Lukas Matena
0551411c48 Merge branch 'master' into lm_tm_hollowing 2020-01-06 12:41:29 +01:00
Lukas Matena
b08a315a46 Fix of #3359: Ender icon case was not matching profile name 
Also added an icon to show when the correct one is not found
 2020-01-06 10:39:33 +01:00
Spencer Owen
e7b835dc52 Add Astrobox to Print Host options 2020-01-06 03:37:35 -05:00
bubnikv
e2fd540815 Updated PrusaResearch.idx, so our in house customer will get updated profiles. 2019-12-22 13:52:47 +01:00
bubnikv
692ed26091 Fix of #3366 
Fixed crash due to incorrect localization of the percent sign in
"The %1% infill pattern is not supposed to work at 100%% density."
This happens for ES, FR, IT, UK and ZH_TW localizations.

Also added a new CMake target "gettext_po_to_mo" to convert
all po files to mo files,
and renamed the "pot" target to "gettext_make_pot".
 2019-12-22 11:54:23 +01:00
bubnikv
9128ba766b Bumped up the PrusaSlicer.ini version number, so that our in house 
customers will get an update.
 2019-12-22 11:12:15 +01:00
Lukas Matena
b3f15b1c98 Merge branch 'master' into lm_tm_hollowing 2019-12-20 10:33:53 +01:00
David Kocik
3a54279cec Merge branch 'master' into dk_remote_devices 2019-12-19 08:58:11 +01:00
YuSanka
0802823703 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-18 15:58:24 +01:00
YuSanka
07f428fe62 Implemented function to get an icon name considering to OS color mode 
For a Dark mode we start to looking of icons in folder "white"

Added missed "white" icons
 2019-12-18 15:54:01 +01:00
bubnikv
74d6c23ba8 Updated Prusa3D config - elephant foot compensation 0.2mm 
allowed for all profiles but 0.25mm dmr nozzles.
 2019-12-18 15:30:00 +01:00
David Kocik
c396ec25a1 Merge branch 'master' into dk_remote_devices 2019-12-17 14:41:56 +01:00
YuSanka
8824468882 Added function to update of custom_gcode_per_print_z in Model from configuration 
considering "colorprint_heights" option.

Changed thumb_up/down icons to better preview (feedback from #3256)

Commented some uncertain code
 2019-12-17 14:16:38 +01:00
YuSanka
01f1bed060 Added missed icon 2019-12-13 13:51:46 +01:00
Lukas Matena
537260494d Merge branch 'master' into lm_tm_hollowing 2019-12-12 11:37:33 +01:00
YuSanka
0e157b5b07 Updated dictionaries 2019-12-12 08:45:29 +01:00
YuSanka
85645a1253 Fixed crash on ConfigWizard opening after a language change 
+ updated Creality.ini and PrusaResearch.ini
 2019-12-09 13:02:48 +01:00
YuSanka
6bcfc3fe83 Updated PrusaSlicer.pot 2019-12-06 13:58:23 +01:00
Matthias Urlichs
688457b2d0 Grammar fix 2019-12-04 21:13:42 +01:00
YuSanka
ef29b13c5e Updated Creality.ini 2019-12-04 14:11:42 +01:00
bubnikv
75a2e0e3f9 Profiles for PrusaSlicer-2.2.0-alpha0 2019-12-04 11:47:08 +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
YuSanka
71f5ed5b9e Added new icon for "change extruder" menu. 
+ some improvements for colored band
 2019-11-29 11:02:58 +01:00
YuSanka
0005049927 Updated icons for DoubleSlider 2019-11-28 15:40:18 +01:00
YuSanka
a3ff1b4282 Added updated profiles INI files 2019-11-28 10:54:29 +01:00
YuSanka
773dace33c Merge remote-tracking branch 'origin/master' into ys_aliases 2019-11-28 10:34:05 +01:00
YuSanka
dfd38c7818 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-11-28 09:01:14 +01:00
YuSanka
496e09302f Implemented a message on Printer display for pause print 
+ Added new icons
 2019-11-27 14:44:33 +01:00
YuSanka
afb8483250 Merge remote-tracking branch 'origin/master' into ys_aliases 2019-11-25 10:44:58 +01:00
Arthur
dbbaf411ac A translation in brazilian portuguese has been added 2019-11-22 15:41:20 +01:00
Enrico Turri
599403ba94 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-11-22 14:40:59 +01:00
YuSanka
cb395460c4 Implemented aliases for filaments 2019-11-21 13:12:06 +01:00
Enrico Turri
3b084c50cd Revert to older texture for mini printer printbed 2019-11-19 14:44:42 +01:00
tamasmeszaros
7011c58faa Merge branch 'master' into lm_tm_hollowing 2019-11-18 17:50:56 +01:00
Enrico Turri
4fceff6ae3 Cleanup of file 90-3dconnexion.rules 2019-11-18 16:07:39 +01:00
Enrico Turri
b8c09d7a34 Content of file 90-3dconnexion.rules formatted as in: https://github.com/libusb/hidapi/blob/master/udev/99-hid.rules 2019-11-18 15:31:55 +01:00
Enrico Turri
9e7e1fb5e2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-11-18 14:51:06 +01:00
YuSanka
ec6c87756f Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-11-18 09:18:25 +01:00
YuSanka
bc68b8eaf2 ExtruderSequenceDialog : 
Fixed layouts after the second opening of the dialog.
 (Removing any extruder from the sequence does not cause an incorrect layout)
Validation of entered values added
 (0 is not a valid value)
 2019-11-16 02:12:37 +01:00
bubnikv
b2a6a07d72 Make the .gcode and .sl1 thumbnails configurable through printer profile. 2019-11-15 17:33:31 +01:00
Enrico Turri
ac628c8069 New texture for mini printer printbed 2019-11-15 11:53:16 +01:00
Enrico Turri
32d794756e Lighter model for mini printer printbed 2019-11-15 10:05:56 +01:00
Enrico Turri
2dec84a429 Added model and texture for Mini and Ender3 printer printbeds 2019-11-15 09:28:51 +01:00
YuSanka
840c59cd3d Added new PrusaResearch.ini (with MINI and aliases) 2019-11-15 08:34:55 +01:00
YuSanka
8c22b0cd4f Added MINI and Creality Ender to ConfigWizard 2019-11-14 14:04:02 +01:00
Lukas Matena
73ae733484 New icon for the hollowing gizmo 2019-11-12 15:04:40 +01:00
Enrico Turri
a624590b36 Fixed conflicts after merge with master 2019-11-07 09:55:44 +01:00
YuSanka
c4a62819f4 Implemented new color change preview from Gcode 
+ Added missed "change_extruder.svg"
 2019-11-07 08:13:26 +01:00
tamasmeszaros
bdf6f7342e Hollowing step in SLAPrint process, PrintConfig params added. 2019-11-06 13:38:43 +01:00
Lukas Matena
eaf815ca4b Merge branch 'lm_hollow_gizmo' into lm_tm_hollowing 2019-11-05 14:41:06 +01:00
Lukas Matena
04bcdff110 Added new hollowing gizmo 
Basically just copied SLA support gizmo and removed all functionality that will not be needed
 2019-11-05 10:17:27 +01:00
Stephan Reichhelm
6089cadc4e + add new flashair class to localization 2019-11-04 12:53:48 +01:00
lee hakmin
c80cd04c20
Add files via upload 2019-10-25 00:03:18 +09:00
Enrico Turri
1c05d88c00 ENABLE_3DCONNEXION_DEVICES -> Added support for 3Dconnexion universal receiver and battery level report 2019-10-11 15:29:57 +02:00
YuSanka
8e6bb7c20d Add missed icons 2019-10-11 10:39:54 +02:00
Enrico Turri
8aa33a9e05 ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver 2019-10-08 08:44:50 +02:00
Vojtech Kral
82fed1790a 3D connexion support on Linux: 
- Replace hidapi/linux/hid.c with the hidraw variant (link to udev)
- Add CMakeLists.txt for hidapi, refactor
- Add udev rules file (no installation so far)
 2019-09-30 14:59:21 +02:00
Vojtech Kral
270008a3fd Add material_type config option for SLA materials, use in Wizard 2019-09-17 13:20:06 +02:00
Vojtech Kral
34b3548102 Filaments and materials selection/installation 2019-09-17 13:20:06 +02:00
bubnikv
e0ecd283ef Updated Prusa3D profiles, bumped up the version number. 2019-09-13 15:24:13 +02:00
bubnikv
416c1f8c5b Updated dictionaries. 2019-09-11 13:33:15 +02:00
bubnikv
21cc859357 Refreshed dictionaries 2019-09-09 16:40:15 +02:00
Jiang Yue
de1758a424 Optimize some translations 2019-09-09 09:38:49 +02:00
Jiang Yue
c740389cfd Rename dictionary so that wxWidgets can find it. 2019-09-09 09:38:49 +02:00
Jiang Yue
f3e11479f8 Update zh_CN 2019-09-09 09:38:49 +02:00
bubnikv
a48ba21f40 Updated PrusaResearch.idx 2019-09-04 14:56:34 +02:00
bubnikv
a09bb3802b Updated the bundled Prusa Research profiles. 
Bumped up the version number to 2.0.0-rc.
Changed the location of profiles from PrusaSlicer-beta to PrusaSlicer
(that is the location for the released software).
 2019-09-04 12:50:43 +02:00
bubnikv
3f078cd612 Updated ES, FR, IT, PL languages. 2019-09-03 13:23:36 +02:00
bubnikv
b240e93c72 Updated Czech, German, Polish (fully translated), 
Spanish, French, Italian (some translations pending)
dictionaries
 2019-08-30 16:13:42 +02:00
bubnikv
ae3a72d291 Fixed menu icons for undo / redo. 2019-08-30 16:05:12 +02:00
bubnikv
06a2a69261 Manually merged Korean translation by @ulsanether 2019-08-30 14:39:14 +02:00
bubnikv
2dbbfdac11 Refreshed the translation file. 2019-08-30 11:38:05 +02:00
bubnikv
6fb93470de Updated icons for the undo / redo menu. 2019-08-30 10:19:20 +02:00
Enrico Turri
211a38b535 New toolbar icons for undo and redo actions 2019-08-30 08:32:18 +02:00
bubnikv
ab361fc0e7 Refreshed dictionaries with keys from GUI_ObjectLayers.cpp 2019-08-29 14:10:10 +02:00
bubnikv
cd9d20a8b3 Renamed the dictionaries and their directories, so that 
wxWidgets will open German dictionary for de_CH, English dictionary
for en_AU etc.
 2019-08-29 13:36:12 +02:00
bubnikv
885ff11d4c Update of "Volumes in Objects reordered" undo / redo message 2019-08-29 11:16:14 +02:00
bubnikv
4af75c9f23 Updated the translations file. 2019-08-29 10:45:04 +02:00
bubnikv
8865c4b685 Plurals for number of Undo / Redo actions. 2019-08-28 16:19:46 +02:00
bubnikv
2b7a4973a8 Reworded the "Add / remove instance / set number of instances". 2019-08-28 15:35:01 +02:00
bubnikv
048ed74318 Another round of translation adjustments. 2019-08-28 15:12:55 +02:00
bubnikv
cd35fd9b34 Refreshed the dictionaries. 
Introduced a new localization macro L_CONTEXT(string, context)
to define context dependent translations.

The only strings - "Top" and "Bottom" were already using context, but
until now the context had to be added to the PrusaSlicer.pot file
manually, while the context is being generated automatically now.
 2019-08-27 17:14:03 +02:00
bubnikv
1096dff0f6 Bumped up the version number to beta2, updated Prusa3D printer profiles. 2019-08-25 09:16:46 +02:00
lee hakmin
7a5c692a27
Add files via upload 2019-08-25 09:43:28 +09:00
lee hakmin
81b85f5827
Add files via upload 2019-08-23 23:53:05 +09:00
lee hakmin
c4117c5cb6
Delete PrusaSlicer_kr.po 2019-08-23 23:50:53 +09:00
lee hakmin
9b90a923df
Delete PrusaSlicer_kr(new).po 2019-08-23 23:50:41 +09:00
lee hakmin
2093007eb6
Delete PrusaSlicer_kr(new).mo 2019-08-23 23:50:26 +09:00
lee hakmin
2db8c3bb57
Delete PrusaSlicer.po 2019-08-23 23:47:41 +09:00
lee hakmin
55ca41ae9c
Delete PrusaSlicer.mo 2019-08-23 23:47:27 +09:00
lee hakmin
2a06e28795
Add files via upload 2019-08-23 23:46:01 +09:00
bubnikv
29a51bc46f Updated bundled Prusa3d profiles 
Bumped up the version to 2.1.0-beta, changed the user configs directory
to PrusaSlicer-beta.
 2019-08-23 16:15:03 +02:00
YuSanka
0520da3241 Merge remote-tracking branch 'origin' into ys_printable_property 2019-08-06 10:31:17 +02:00
YuSanka
b43f7c3880 Generated new POT-file 
Fixed lines with translation of the empty strings
 2019-08-06 10:01:10 +02:00
YuSanka
885da35544 Merge remote-tracking branch 'origin/master' into ys_printable_property 2019-08-01 15:15:18 +02:00
YuSanka
59db1f7f36 Code refactoring to add PrintableItem column to ObjectList 2019-08-01 14:58:04 +02:00
bubnikv
576643c7ed Bumped up the version to 2.1.0-alpha0. 
Updated the bundled profiles to integrate retract overrides
for PET and FLEX materials.
 2019-08-01 11:53:22 +02:00
YuSanka
47c9714062 Added Real-Time DXT1/DXT5 C compression library to CopyrightsDialog 
+ updated icons for mirroring
 2019-07-31 17:38:06 +02:00
YuSanka
cf6cc1d863 Refactored LockButton class 2019-07-31 17:14:32 +02:00
YuSanka
add171043c Updated icons for layers editing 2019-07-31 15:26:42 +02:00
YuSanka
3bade450b8 Merge remote-tracking branch 'origin/ys_overrides' 2019-07-31 13:05:47 +02:00
bubnikv
ca1c78b3fc Merge remote-tracking branch 'remotes/origin/et_custom_bed' 2019-07-30 16:48:47 +02:00
YuSanka
66497cdb1f Fixed SPE-993 
+ Added new icons for layers editing
 2019-07-30 15:48:30 +02:00
Lukas Matena
7f33e23fbb Added new icons for mirroring buttons and 'drop modifier to bed' function 2019-07-30 08:39:38 +02:00
YuSanka
7d02811823 Add missed bitmap 2019-07-29 15:21:29 +02:00
Enrico Turri
e86d40fe98 Modified bundled bed models 2019-07-25 11:35:16 +02:00
Enrico Turri
48dc2bb762 Fixed positioning of bed model into the scene and changed bundled bed models 2019-07-25 08:43:21 +02:00
bubnikv
bb604242aa Updated the Prusa3D profiles. 2019-07-23 14:04:10 +02:00
Enrico Turri
ba4bc8ac82 Render custom bed textures in png format on prusa beds 2019-07-19 09:18:09 +02:00
bubnikv
ab7ecc1819 Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
Lukas Matena
45db42ca3b Merge branch 'lm_drop_to_bed' 2019-07-12 13:38:18 +02:00
YuSanka
fbf14b42e9 Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar 2019-07-08 18:01:14 +02:00
Lukas Matena
3d8c3804fa Added 'drop to bed' button into object manipulation panel 2019-06-19 11:04:12 +02:00
bubnikv
0c95d4e0d9 Merge remote-tracking branch 'remotes/origin/ys_new_features' 2019-06-18 10:01:29 +02:00
YuSanka
7fe8965c53 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-17 13:50:12 +02:00
Lukas Matena
980c6673d4 Reset buttons - fixed rotation of instances with multiple volumes 
Mirroring buttons now hide where appropriate
 2019-06-14 15:28:09 +02:00
Enrico Turri
ed4b71eb15 Layers editing overlay rendering modified to use a texture drawn on a quad lying in a plane parallel to the camera viewport 2019-06-14 10:55:56 +02:00
YuSanka
dd70dd6e10 Implemented LayerItem for ObjectList 2019-05-27 14:00:34 +02:00
bubnikv
984a475d76 renamed: resources/localization/ko_KR/PrusaSlicer.po -> resources/localization/ko_KR/PrusaSlicer_kr.po 2019-05-24 09:08:29 +02:00
lee hakmin
020870b808 Add files via upload 2019-05-24 09:07:17 +02:00
lee hakmin
f0f64c6fac Add files via upload 2019-05-24 09:07:17 +02:00
lee hakmin
cad520c7ef Add files via upload 2019-05-24 09:07:17 +02:00
bubnikv
ded5ad0517 Support of CJK languages in ImGUI: 
Added glyph tables & CJK font (huge file!)
Added glyph tables for Turkish and Vietnamese.
Added glyph tables Thai (font is still missing)
 2019-05-23 18:04:27 +02:00
lee hakmin
883e00a057
Add files via upload 2019-05-24 00:40:15 +09:00
bubnikv
f7b87ce033 Implements Turkish Language Pack #2342 2019-05-23 10:05:54 +02:00
taksito
4083182acb traditional Chinese language pack added 2019-05-22 09:09:44 +02:00
taksito
dd5f00de0a Create PrusaSlicer_zhtw.po 2019-05-22 09:09:44 +02:00
Jiang Yue
efbb660f28 Update Simplified Chinese translation 2019-05-21 10:53:41 +02:00
lee hakmin
df6219e583
Add files via upload 2019-05-21 09:10:12 +09:00
lee hakmin
590ab38556
Add files via upload 2019-05-21 09:08:58 +09:00
YuSanka
eee23d1653 New dictionaries 2019-05-20 17:14:34 +02:00
YuSanka
b65d5683e2 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-20 16:38:07 +02:00
YuSanka
64aa7237c0 New POT 2019-05-20 16:37:55 +02:00
bubnikv
f0ac0fbd09 Updated profiles for the final release. 2019-05-20 16:25:51 +02:00
YuSanka
7b84d1e710 Fix of #2277 
+ new POT
 2019-05-20 16:05:15 +02:00
bubnikv
eb807fd1fa Re-generated the pot file, context for Top / Bottom added manually 2019-05-20 14:22:34 +02:00
bubnikv
c225644961 Updated PrusaResearch profiles 2019-05-17 16:31:40 +02:00
bubnikv
cd56b05d27 Updated OSX icons 2019-05-16 16:08:47 +02:00
bubnikv
0eeda8e321 Merge branch 'master' of https://github.com/ulsanether/Slic3r into ulsanether-master 2019-05-16 10:47:39 +02:00
lee hakmin
971070ea9f
Add files via upload 2019-05-16 11:19:30 +09:00
lee hakmin
0eef143d60
Add files via upload 2019-05-16 09:57:05 +09:00
bubnikv
e58d530afe Bumped up slicer version, updated bundled profiles 2019-05-14 19:06:52 +02:00
bubnikv
a97d99b336 Updated profiles. 2019-05-14 18:16:04 +02:00
YuSanka
3478d8e09c Updated dictionaries 2019-05-14 18:01:29 +02:00
Vojtech Kral
6c5bdeadc3 Updating: Add localized links 2019-05-14 13:30:55 +02:00
bubnikv
0787fa861a Updated handling of the SLIC3R_BUILD_ID key 2019-05-13 18:01:00 +02:00
bubnikv
8adcd8fa71 Updated the PrusaSlicer icons 2019-05-13 16:44:25 +02:00
bubnikv
3a0c27c6e5 Updated Help menu items to open localized web pages. 
Updated links to PrusaSlicer-settings.
 2019-05-13 16:34:41 +02:00
YuSanka
1b50ea3bda Deleted unused menu items for OSX 
+ Marked items for "Change part type" list
+ new POT
 2019-05-13 15:07:53 +02:00
bubnikv
ee2b8ced16 WIP: Renaming to PrusaSlicer 2019-05-13 14:11:21 +02:00
bubnikv
8da1c1953f Further renaming to PrusaSlicer 2019-05-13 12:42:40 +02:00
bubnikv
56256519cc WIP: Renaming to PrusaSlicer. 
Removed the obsolte icons.
 2019-05-13 12:13:28 +02:00
YuSanka
92fb71e5af Updated POT-file 2019-05-11 23:33:50 +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
YuSanka
ec252eb71d More localization improvements, new POT 
+ fixed crash after application closing with non-saved presets
 2019-05-10 15:10:37 +02:00
YuSanka
c37ec5bc9e New POT-file 2019-05-10 13:26:20 +02:00
YuSanka
62590d291c use _() instead of _utf8() for ButtonsDescription 2019-05-10 12:28:56 +02:00
YuSanka
5804473171 Localization improvements 
New list.txt and POT
 2019-05-10 11:50:11 +02:00
YuSanka
39be95f0f6 Fixed SPE-913 
(Slicer do not display all extruders when it is started with SLA profile)

+ Updated POT-file
 2019-05-10 11:06:46 +02:00
bubnikv
b7361200bf Some more localization improvements. 2019-05-09 19:24:21 +02:00
bubnikv
92ba75ed75 Fixed localization of the "Machine Limits" parameters. 
Fixed localization of some other parameters (templating is not supported
inside the PrintConfig.cpp as these strings are translated not inside
PrintConfig.cpp, but by the calling GUI code).
Fixed localization of SLA status bar.
 2019-05-09 14:15:56 +02:00
YuSanka
8e007c5b6a Localization improvements 2019-05-04 02:07:07 +02:00
YuSanka
f18ebec8e9 Added menu icons for a dark mode 2019-04-30 15:14:18 +02:00
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