8bf3e63f75
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-24 11:20:02 +02:00
2df6e08eed
Reduced size of MK3 bed textures for compatibility with OpenGL 1.1
2018-07-24 10:33:14 +02:00
de085fdb6c
Power of two squared bed textures to try to fix #1067
2018-07-23 14:21:14 +02:00
f261c83653
Placeholder icons for 3D scene toolbar
2018-07-23 13:22:24 +02:00
a0096cf563
Renamed the key MK3SMMU to MK3MMU2,
...
added a generic PLA MMU2 material.
2018-07-23 09:42:02 +02:00
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
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
83f9813f56
Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'
2018-07-17 09:37:38 +02:00
68e82a7348
Merge branch 'master' into amf_activate_existing_presets
2018-06-27 10:33:14 +02:00
9b2f760679
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-26 12:20:23 +02:00
5da3986e22
Updated POT-file
2018-06-26 11:17:40 +02:00
0c24a65039
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 08:39:26 +02:00
550f6e307f
Faster gizmos update
2018-06-21 08:37:04 +02:00
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
86b02224ae
Updated PL language
2018-06-20 09:42:14 +02:00
b2cf576bf3
1st installment of gizmos
2018-06-13 09:12:16 +02:00
2d97d8e7fe
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-13 08:31:30 +02:00
2cd0c64b96
Merge branch 'dev'
2018-06-12 17:11:45 +02:00
0ec06e6981
Fixed missing dependencies in Prusa's profiles for 0.25 and 0.6mm nozzles.
2018-06-12 17:10:12 +02:00
a4b42f44f3
Added translation for FR
2018-06-12 15:30:55 +02:00
f8664fce71
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 11:55:57 +02:00
6cf508e124
Updated slic3r_min_version in prusa3d config version index.
2018-06-12 11:46:15 +02:00
756064810c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 11:08:16 +02:00
07815891dc
Added translations for CZ, DE, ES, IT & PL
2018-06-12 09:55:39 +02:00
5f02669d2d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 08:32:34 +02:00
43e8fe32aa
Add MK2.5 icon, remove testing icons
2018-06-11 18:24:41 +02:00
69705b5e66
Split the MK2.5 profile from the MK2S
2018-06-11 18:20:29 +02:00
efe6a29032
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-11 13:46:35 +02:00
dc9a46b269
Updated POT file (added PresetUpdater.cpp and FirmwareDialog.cpp, changed keys in WipeTowerDialog.cpp)
2018-06-11 13:44:40 +02:00
7b1187992c
Added bed texture for Prusa printers
2018-06-11 10:46:32 +02:00
1f79713c15
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-05 10:54:15 +02:00
adcf869eee
Fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles.
2018-06-05 10:11:28 +02:00
1343a22dc6
Added Prusa profiles from https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch
2018-06-04 15:58:44 +02:00
109dde00b2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 12:25:04 +02:00
16a5029d58
Fixed issue #875 and updated Slic3rPE.pot
2018-06-04 12:13:07 +02:00
7d56b38e40
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 09:28:55 +02:00
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
486180c422
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 15:33:25 +02:00
a4261b11d4
Updated translations (de, fr, es, it & pl)
2018-05-23 14:22:52 +02:00
a9499ae45c
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
37ab7594fc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 08:38:29 +02:00
076b293fec
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
4e29147756
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 11:48:45 +02:00
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
ca3ea125e2
Partial french translation ( #914 )
...
* partial french translation progress (45%)
* partial french translation progress (60%)
2018-05-22 11:01:05 +02:00
59af3fb866
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 08:33:23 +02:00
07817c8ee5
avrdude: Compilation on Windows/MSVC
2018-05-21 18:58:22 +02:00
68a570221b
avrdude.conf: Remove unsupported stuff
2018-05-21 18:58:22 +02:00
c7e4d1d06f
avrdude.conf base
2018-05-21 18:58:22 +02:00
7cff6ef6db
Shaders loaded from files
2018-05-21 13:08:02 +02:00
Enrico Turri