Commit Graph

122 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Eric
26c216cdc7 Partial french translation (#914)
* partial french translation progress (45%)

* partial french translation progress (60%)
2018-05-22 11:01:05 +02:00
Enrico Turri
dbeeab3859 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 08:33:23 +02:00
Vojtech Kral
cbf820f094 avrdude: Compilation on Windows/MSVC 2018-05-21 18:58:22 +02:00
Vojtech Kral
5c2de18ef5 avrdude.conf: Remove unsupported stuff 2018-05-21 18:58:22 +02:00
Vojtech Kral
f1eaecbc00 avrdude.conf base 2018-05-21 18:58:22 +02:00
Enrico Turri
ea62cb6880 Shaders loaded from files 2018-05-21 13:08:02 +02:00
bubnikv
1d0ed93cf6 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
9215860d18 Updated POT-file, added Spanish and Polish, fixed bug with Ctrl+U,O,L in Italian 2018-05-14 13:56:40 +02:00
Lukas Matena
575154c6c1 Updated PrusaResearch.ini with the latest version from Slic3r-settings repository 2018-05-11 15:41:26 +02:00
Lukas Matena
58bcd27bd0 New wipe tower parameters added to INI file with profiles 2018-05-10 17:44:04 +02:00
YuSanka
16d5faac20 Preparations to the localization update & new Slic3rPE.pot 2018-05-02 16:06:35 +02:00
Vojtech Kral
dce0aa6771 Updating: Start using proper URLs 2018-04-25 17:43:01 +02:00
Vojtech Kral
03e9da804a Update PrusaResearch bundle & index 2018-04-25 16:42:33 +02:00
Vojtech Kral
62d67d35ec Merge branch 'profile_changes_reset' into updating 2018-04-24 18:15:23 +02:00
Vojtech Kral
fea5603409 PresetUpdater: Bundle incompatibility / Slic3r downgrade scnario 2018-04-24 18:06:42 +02:00
YuSanka
9a1dbfa6cf Updated action_undo.png icon and added sys_unlock_grey.png & action_undo_grey.png for dark themes of OS 2018-04-23 10:27:42 +02:00
YuSanka
1e1bf03f61 Added reset buttons description 2018-04-20 12:58:07 +02:00
Vojtech Kral
2e61420747 Sync index file 2018-04-19 18:31:14 +02:00