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
bubnikv
a9499ae45c
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
Enrico Turri
37ab7594fc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 08:38:29 +02:00
YuSanka
83cec1a640
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-23 08:30:27 +02:00
bubnikv
076b293fec
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
Enrico Turri
4e29147756
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 11:48:45 +02:00
bubnikv
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
Eric
ca3ea125e2
Partial french translation ( #914 )
...
* partial french translation progress (45%)
* partial french translation progress (60%)
2018-05-22 11:01:05 +02:00
YuSanka
2a8391dfbf
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-22 09:05:34 +02:00
Enrico Turri
59af3fb866
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 08:33:23 +02:00
Vojtech Kral
07817c8ee5
avrdude: Compilation on Windows/MSVC
2018-05-21 18:58:22 +02:00
Vojtech Kral
68a570221b
avrdude.conf: Remove unsupported stuff
2018-05-21 18:58:22 +02:00
Vojtech Kral
c7e4d1d06f
avrdude.conf base
2018-05-21 18:58:22 +02:00
Enrico Turri
7cff6ef6db
Shaders loaded from files
2018-05-21 13:08:02 +02:00
bubnikv
687c91d6e9
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
e78a885247
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-15 09:44:11 +02:00
YuSanka
b51197b52c
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
613bcf8055
Updated PrusaResearch.ini with the latest version from Slic3r-settings repository
2018-05-11 15:41:26 +02:00
Lukas Matena
5e231bf874
New wipe tower parameters added to INI file with profiles
2018-05-10 17:44:04 +02:00
YuSanka
2e7d623ee4
Created PrusaCollapsiblePane for CollapsiblePane view with disclosure triangles
2018-05-10 16:36:12 +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