1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-31 11:15:52 +00:00
Commit Graph

774 Commits

Author SHA1 Message Date
Enrico Turri 714204b227 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri b6b14ef819 Fixed conflicts after merge with master branch 2018-06-25 15:26:37 +02:00
Enrico Turri 7b0ba7a9d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri 40b327eb11 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
YuSanka 515502e685 Fixed #994.
Print double-type values according to "full" value instead of 2 digits after point
2018-06-25 13:32:28 +02:00
tamasmeszaros f26cb9ebd6 Merge remote-tracking branch 'origin/master' into feature_slice_to_png
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
2018-06-25 13:24:37 +02:00
Enrico Turri 581ed7764c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 13:21:52 +02:00
YuSanka 318212f475 Fixed crashing-bug after language changing (detected under Debug) 2018-06-25 12:27:42 +02:00
YuSanka 362a9d8eda Fixed bug #995 2018-06-25 11:40:40 +02:00
Enrico Turri 789a760fbd Fixed conflict after merge with master 2018-06-25 10:49:30 +02:00
Enrico Turri 8a4a5e487e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:51:47 +02:00
Enrico Turri 7d15a15e14 Fix of #999 2018-06-25 08:48:36 +02:00
Enrico Turri 3da21a4ce8 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:27:09 +02:00
Enrico Turri f9e6bcf872 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
bubnikv b5f97baa28 Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics 2018-06-22 17:44:12 +02:00
Enrico Turri ac0f3a6ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
YuSanka 54c90ee948 Updated PrintConfig default values for machine limits
+ fixed incorrect default value setting for the TextCtrl
2018-06-22 16:13:34 +02:00
Enrico Turri c948ca647c Code cleanup 2018-06-22 16:11:00 +02:00
Enrico Turri 2a03b90d2b Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri de540de9aa 5th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 15:11:04 +02:00
bubnikv 082ed95a94 Activate existing projects after loading AMF/3MF/Config: Initial implementation. 2018-06-22 14:17:03 +02:00
YuSanka 3fdefbfbea Added updatin of the "Machine limits" page according to "use silent mode" 2018-06-22 13:01:41 +02:00
Enrico Turri 00ef0610a5 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:57:16 +02:00
Enrico Turri f8982c0ca1 Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:30:15 +02:00
YuSanka c10e9a6840 Fixed crash-bug when close application after language changing 2018-06-22 12:27:56 +02:00
Enrico Turri 15c69a90ec Changed use of GL_LIGHTING logic and code cleanup 2018-06-22 12:21:43 +02:00
Enrico Turri ac7d21b50a Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
YuSanka bfe7896709 Try to fix uncorrect setup on Linux 2018-06-22 10:59:54 +02:00
Enrico Turri 266a4413bd 4th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 09:42:56 +02:00
YuSanka 9ba1af5834 Merge remote-tracking branch 'origin/master' into add_kinematics 2018-06-22 09:22:29 +02:00
Enrico Turri be52647440 Smaller gizmos icons 2018-06-22 09:00:01 +02:00
Enrico Turri 4ba3cef496 3rd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 08:38:13 +02:00
YuSanka 4454c3437f "Machine limits" page is completed 2018-06-21 16:15:56 +02:00
Enrico Turri 75cd436ae5 2nd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 15:43:34 +02:00
Enrico Turri b139f38784 Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 13:03:53 +02:00
Enrico Turri 8c40a962fb Shift key to move selected instances together 2018-06-21 11:14:17 +02:00
Enrico Turri a7e9ec5757 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 11:05:07 +02:00
Vojtech Kral 1ba81655e2 Octoprint: Add a dialog for setting the filename/path
and a "print now" option
cf. #880, #245, #55, #87
2018-06-21 10:44:29 +02:00
Lukas Matena 6669357c81 Merge branch 'master' into wipe_tower_improvements 2018-06-21 10:41:01 +02:00
Enrico Turri 80e4155cbc Bed textures selection using config inheritance 2018-06-21 10:24:57 +02:00
Enrico Turri b386f52acc Removed error dialog when texture file does not exist 2018-06-21 09:54:43 +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 8abe1b3633 Yet another fix for the OSX. 2018-06-20 19:26:19 +02:00
bubnikv 3a2b501012 Fixed compilation on OSX 2018-06-20 19:07:55 +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 b6ebbdb94a Updated "Machine limits"(Kinematics) page according to the new config 2018-06-20 16:30:55 +02:00
Enrico Turri 4803e7fc84 Fixed crash at startup on OpenGL 1.1 cards 2018-06-20 14:34:20 +02:00
YuSanka fd4feb689e Added prototype for "Kinematics" Page
+ Added enum_labels to localizations
+ Added bold font for the name of Options Groups
2018-06-20 14:20:48 +02:00
Vojtech Kral 635bb1e484 Firmware updater: Add support for l10n firmware images 2018-06-19 18:46:37 +02:00