Enrico Turri
59904bc16c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-24 11:20:02 +02:00
Enrico Turri
8d46c3dac6
Reduced size of MK3 bed textures for compatibility with OpenGL 1.1
2018-07-24 10:33:14 +02:00
YuSanka
be328fe45c
Localized the (modified) profile indicator
2018-07-23 15:44:01 +02:00
Enrico Turri
4877a092c6
Power of two squared bed textures to try to fix #1067
2018-07-23 14:21:14 +02:00
Enrico Turri
d38dfac16d
Placeholder icons for 3D scene toolbar
2018-07-23 13:22:24 +02:00
bubnikv
21ae4e9d5a
Renamed the key MK3SMMU to MK3MMU2,
...
added a generic PLA MMU2 material.
2018-07-23 09:42:02 +02:00
bubnikv
08dd960d0b
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
5d758b7f73
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
1830f4059a
Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'
2018-07-17 09:37:38 +02:00
bubnikv
3c0e7b82ff
Merge branch 'master' into amf_activate_existing_presets
2018-06-27 10:33:14 +02:00
Enrico Turri
010e2ecc62
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-26 12:20:23 +02:00
YuSanka
d9088b7ad7
Updated POT-file
2018-06-26 11:17:40 +02:00
YuSanka
369e9496cc
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-26 09:26:27 +02:00
Enrico Turri
692858ae4c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 08:39:26 +02:00
Enrico Turri
8881f43162
Faster gizmos update
2018-06-21 08:37:04 +02:00
bubnikv
4bae1bb0be
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
e1a749fc7b
Updated PL language
2018-06-20 09:42:14 +02:00
Enrico Turri
713f1f71db
1st installment of gizmos
2018-06-13 09:12:16 +02:00
Enrico Turri
5bd2f688bc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-13 08:31:30 +02:00
bubnikv
ced92912ad
Merge branch 'dev'
2018-06-12 17:11:45 +02:00
bubnikv
824b349450
Fixed missing dependencies in Prusa's profiles for 0.25 and 0.6mm nozzles.
2018-06-12 17:10:12 +02:00
YuSanka
c4934b5f50
Added translation for FR
2018-06-12 15:30:55 +02:00
YuSanka
6428799a29
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-12 13:03:40 +02:00
Enrico Turri
3f2d5396d6
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 11:55:57 +02:00
bubnikv
f3a5e99bbf
Updated slic3r_min_version in prusa3d config version index.
2018-06-12 11:46:15 +02:00
Enrico Turri
d694ac6509
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 11:08:16 +02:00
YuSanka
fd119906ff
Added translations for CZ, DE, ES, IT & PL
2018-06-12 09:55:39 +02:00
Enrico Turri
26451875a3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 08:32:34 +02:00
Vojtech Kral
b74d308f06
Add MK2.5 icon, remove testing icons
2018-06-11 18:24:41 +02:00
bubnikv
90c0bde249
Split the MK2.5 profile from the MK2S
2018-06-11 18:20:29 +02:00
Enrico Turri
b882057d29
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-11 13:46:35 +02:00
Lukas Matena
88e9a5da3a
Updated POT file (added PresetUpdater.cpp and FirmwareDialog.cpp, changed keys in WipeTowerDialog.cpp)
2018-06-11 13:44:40 +02:00
Enrico Turri
bdf7d766af
Added bed texture for Prusa printers
2018-06-11 10:46:32 +02:00
YuSanka
7c13fb619d
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-08 10:10:10 +02:00
Enrico Turri
39bb66be00
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-05 10:54:15 +02:00
bubnikv
056159e1bc
Fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles.
2018-06-05 10:11:28 +02:00
bubnikv
b8e43e4231
Added Prusa profiles from https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch
2018-06-04 15:58:44 +02:00
Enrico Turri
7fe46a3099
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 12:25:04 +02:00
YuSanka
559c824ff4
Fixed issue #875 and updated Slic3rPE.pot
2018-06-04 12:13:07 +02:00
Enrico Turri
80a840de82
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 09:28:55 +02:00
Vojtech Kral
d032498536
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
c2ae33478f
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-24 08:32:24 +02:00
Enrico Turri
f7bd2a2c07
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 15:33:25 +02:00
YuSanka
3284ff3fdf
Updated translations (de, fr, es, it & pl)
2018-05-23 14:22:52 +02:00
bubnikv
59f3f96443
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
Enrico Turri
9deddc07f2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 08:38:29 +02:00
YuSanka
295924b9b6
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-23 08:30:27 +02:00
bubnikv
b09ce7e6a9
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
Enrico Turri
d0abd0bc4c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 11:48:45 +02:00
bubnikv
15035e4d89
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