Enrico Turri
a02ea39525
GLCanvas3D volumes as a stack variable
2018-06-11 15:13:13 +02:00
Enrico Turri
085110c4d9
Removed 3DScene volumes from perl
2018-06-11 13:48:02 +02:00
Enrico Turri
9a4e250c33
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-11 13:46:55 +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
Enrico Turri
7b4870d1cb
Fixed selection and rendering in object settings dialog
2018-06-11 11:40:11 +02:00
bubnikv
6cafc7f121
Fix of a regression issue, which was certainly in 1.34.0, probably
...
even longer. An infill / perimeter overlap was not applied
when defined with absolute coordinates.
Fixes https://github.com/prusa3d/Slic3r/issues/964
2018-06-11 10:59:02 +02:00
Enrico Turri
7b1187992c
Added bed texture for Prusa printers
2018-06-11 10:46:32 +02:00
Enrico Turri
96d9879d72
class 3D on_select callback moved to c++
2018-06-08 11:37:07 +02:00
Enrico Turri
bf2fd54578
reload_scene method of 3D class moved to c++
2018-06-08 09:40:00 +02:00
Enrico Turri
8867e8ca60
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-08 08:31:21 +02:00
Enrico Turri
f4a687703c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-08 08:30:55 +02:00
bubnikv
95047c1953
Fixed typos from the previous commit.
2018-06-07 22:54:26 +02:00
bubnikv
2b5a1f3e60
Merge remote-tracking branch 'remotes/origin/vk-bugfixes'
2018-06-07 22:10:49 +02:00
bubnikv
7dfe2e2595
Fixed mangling of UTF characters when converted implicitely to
...
wxString on Windows through the + operator.
2018-06-07 22:10:23 +02:00
Lukas Matena
b6455b66bd
Wiping into infill/objects - invalidation of the wipe tower, bugfixes
2018-06-07 16:19:57 +02:00
Enrico Turri
766d1d52a9
Fixed import of model rotated clockwise from 3mf
2018-06-07 16:13:32 +02:00
Vojtech Kral
aef0c489e3
Fix: Dialog initialization ordering on OS X
...
Perform update_check after MainFrame is created
2018-06-07 15:41:36 +02:00
Vojtech Kral
2e061994d4
Fix: GCodeSender: Line number resynchronisation
2018-06-07 15:41:34 +02:00
Enrico Turri
a8500d6bae
class 3D callbacks moved to c++
2018-06-07 11:18:28 +02:00
Enrico Turri
ff86407840
Key down and char event handlers of class 3D moved to c++
2018-06-07 09:22:19 +02:00
Lukas Matena
73452fd79d
More progress on 'wipe into dedicated object' feature (e.g. new value in object settings)
2018-06-06 18:24:42 +02:00
bubnikv
ce6a23ef3b
Repair by the netfabb service: Implemented progress dialog and cancelation.
2018-06-06 15:19:06 +02:00
Enrico Turri
66b4620d9b
Fixed runtime error on Linux when removing canvases
2018-06-06 14:33:04 +02:00
Enrico Turri
8192580b5f
Removed DestroyGL method from 3DScene
2018-06-06 14:19:28 +02:00
Enrico Turri
e79037c44d
3DScene member variables moved to c++
2018-06-06 12:36:52 +02:00
Enrico Turri
71d750c1b8
Remaining time gcode line exported only for Marlin firmware
2018-06-06 12:21:24 +02:00
Enrico Turri
2d34843943
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-06 12:19:12 +02:00
Enrico Turri
2dee4d1a83
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-06 12:18:52 +02:00
Enrico Turri
b2b95d590f
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-06 12:17:16 +02:00
bubnikv
92875709e1
Fixed a bug reporting incorrect compatible_printers and
...
compatible_printers_condition inside the Config Bundle.
2018-06-06 12:01:11 +02:00
Enrico Turri
4009fdcc18
Finalized format for gcode line containing remaining printing time
2018-06-06 11:00:36 +02:00
Enrico Turri
c6e44509e0
3DScene load_object method moved to c++
2018-06-06 10:16:58 +02:00
Enrico Turri
40bb0b6f55
Fixed overflow in Polygon::area()
2018-06-05 16:07:09 +02:00
Enrico Turri
a8254e0053
Generation of preview paths moved to c++
2018-06-05 14:09:36 +02:00
Lukas Matena
4830593cac
Started to work on the 'wipe into dedicated object feature'
2018-06-05 12:50:34 +02:00
Enrico Turri
f262ec9094
Modified logic to finalize volumes geometry
2018-06-05 12:24:26 +02:00
tamasmeszaros
34c850fa9d
initial NFP method with convex polygons working.
2018-06-05 12:02:45 +02:00
Enrico Turri
5392008916
Generation of gcode paths moved to c++
2018-06-05 10:56:55 +02:00
Enrico Turri
e8b32fa1df
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-05 10:54:35 +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
Enrico Turri
489bce5a18
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-05 10:53:20 +02:00
bubnikv
d05d3cb652
Initial working implementation of the "Fix by Netfabb" function.
2018-06-04 21:22:42 +02:00
bubnikv
e65fac5e84
Added initial implementation of fixing 3MFs through the Netfabb
...
API provided through the Windows 10 Universal Windows Platform API.
2018-06-04 17:27:33 +02:00
bubnikv
03518d2ff2
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-06-04 15:47:51 +02:00
bubnikv
03fea392d5
Merge remote-tracking branch 'remotes/origin/wipe_tower_gcode_preview'
2018-06-04 15:45:10 +02:00
Enrico Turri
d74b85f3fe
Another set of 3DScene methods moved to c++
2018-06-04 15:42:34 +02:00
Enrico Turri
9729c71691
Fixed opengl initialization on linux
2018-06-04 14:38:41 +02:00
Enrico Turri
af8e869880
3rd attempt to fix opengl initialization on linux
2018-06-04 14:28:59 +02:00
Enrico Turri
fa60917580
Fixed Linux compile
2018-06-04 13:18:04 +02:00
Enrico Turri
ac47ba5864
1st attempt to fix opengl initialization on linux
2018-06-04 13:15:28 +02:00
Enrico Turri
adca3035f9
Fixed Linux compile
2018-06-04 12:32:23 +02:00
Enrico Turri
676210d6f4
Fixed typo
2018-06-04 12:30:40 +02:00
Enrico Turri
95e7d96f52
3DScene paint event handler moved to c++
2018-06-04 12:26:39 +02:00
Enrico Turri
4672a18b49
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-04 12:25:25 +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
Enrico Turri
78c32bdf9a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-04 12:24:14 +02:00
Lukas Matena
7c9d594ff6
Fixed behaviour of infill wiping for multiple copies of an object
2018-06-04 12:15:59 +02:00
YuSanka
16a5029d58
Fixed issue #875 and updated Slic3rPE.pot
2018-06-04 12:13:07 +02:00
Enrico Turri
8911cf6051
OpenGL info moved to c++
2018-06-04 10:14:09 +02:00
Enrico Turri
8dc3a73571
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-04 09:29:16 +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
Enrico Turri
2e710289eb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-04 09:28:05 +02:00
Enrico Turri
56f0c8fe93
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-06-04 09:25:12 +02:00
Enrico Turri
dab2652cb5
Fixed preference dialog behavior
2018-06-04 09:24:48 +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
Enrico Turri
364134515b
Refactoring and cleanup
2018-06-01 15:54:41 +02:00
Lukas Matena
bdaa1cbdfd
Wiping into infill - no infills are now inadvertedly printed twice (hopefully)
2018-06-01 15:43:22 +02:00
Enrico Turri
2bccb43122
Attempt to fix 3DScene key event on Linux
2018-06-01 09:18:10 +02:00
Enrico Turri
94d608c6c1
3DScene mouse event handler move to c++ completed
2018-06-01 09:00:30 +02:00
Lukas Matena
2d24bf5f73
Wipe into infill - copies of one object are properly processed
2018-05-31 16:21:10 +02:00
Enrico Turri
6bf009edee
3DScene mouse event handler partially moved to c++ - part 2
2018-05-31 16:04:59 +02:00
Enrico Turri
276533e236
3DScene mouse event handler partially moved to c++
2018-05-31 13:51:50 +02:00
Enrico Turri
cf8e7475ca
Removed unused methods from 3DScene
2018-05-31 08:44:39 +02:00
Enrico Turri
30a3b2179b
3DScene timer and _variable_layer_thickness_action method moved to c++
2018-05-30 15:18:45 +02:00
Enrico Turri
5a8d1ffdba
Prototype for exporting estimated remaining time into gcode for default and silent mode
2018-05-30 12:08:03 +02:00
Lukas Matena
8bdbe41505
Wiping into infill should respect infill_first setting, marking moved to separate function
2018-05-30 11:56:30 +02:00
Lukas Matena
db22b2f504
Bugfix: first color of the wipe tower preview was incorrect with some models
2018-05-30 11:02:00 +02:00
Enrico Turri
2f773a89df
3DScene set_viewport_from_scene method moved to c++
2018-05-29 15:36:09 +02:00
Lukas Matena
b95a6f2626
Fix of previous commit
2018-05-29 15:29:20 +02:00
Enrico Turri
df14a3c399
3DScene update_volumes_colors_by_extruder method moved to c++
2018-05-29 15:07:06 +02:00
Enrico Turri
5ee5465f94
3DScene mark_volumes_for_layer_height method moved to c++
2018-05-29 14:34:45 +02:00
Enrico Turri
c3b1eca2c7
Fixed a crash
2018-05-29 14:09:02 +02:00
Enrico Turri
5c745485e1
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-29 13:56:41 +02:00
Enrico Turri
38d0c964d8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-05-29 13:55:46 +02:00
Enrico Turri
363a964ebb
3DScene render method partially moved to c++
2018-05-29 13:54:34 +02:00
Lukas Matena
cb5f5c65b0
Analyzer tags for the wipe tower also generate layer height and line width (so the priming lines+brim are visible and ramming lines are correct width)
2018-05-29 12:41:40 +02:00
Lukas Matena
549351bbb4
Analyzer tags for the wipe tower also generate layer height and line width (so the priming lines+brim are visible and ramming lines are correct width)
2018-05-29 12:32:04 +02:00
Lukas Matena
e4aff5b08a
Feedrate on the first layer of the wipe tower properly set (bugfix)
2018-05-29 09:07:23 +02:00
Lukas Matena
c72ecb382d
Reduction is now correctly calculated for each region, soluble filament excluded from infill wiping
2018-05-28 15:33:19 +02:00
Enrico Turri
db260a669c
3DScene mouse wheel event moved to c++
2018-05-28 15:23:01 +02:00
Enrico Turri
aacdcd4add
3DScene layers editing mouse containment methods moved to c++
2018-05-28 14:39:59 +02:00
Enrico Turri
994222c317
3DScene _first_selected_object_id_for_variable_layer_height_editing method moved to c++
2018-05-28 14:10:02 +02:00
Enrico Turri
951e8528b4
3DScene layers editing parameters moved to c++
2018-05-28 13:43:29 +02:00
Enrico Turri
a8311bd1bd
3DScene layer_editing_allowed method moved to c++
2018-05-25 16:28:24 +02:00
Lukas Matena
bfe4350a89
Calculation of wipe tower reduction corrected, new config option (wipe into infill)
2018-05-25 16:11:55 +02:00
Enrico Turri
c51ce63b9b
3DScene layer editing overlay completely moved to c++
2018-05-25 15:56:14 +02:00
Enrico Turri
455076231b
Layers editing shader moved to c++
2018-05-25 14:05:08 +02:00
Enrico Turri
bdbc86167c
3DScene volume selection methods moved to c++
2018-05-25 09:03:55 +02:00
Lukas Matena
132a67edb2
Wipe tower changes to reduce wiping volumes where appropriate
2018-05-24 17:24:37 +02:00
Enrico Turri
c2e38fc6fe
Fixed compile on Linux
2018-05-24 15:22:53 +02:00
Enrico Turri
70664122af
3DScene layer height profile rendering moved to c++
2018-05-24 15:17:01 +02:00
Lukas Matena
95795f249a
First steps in reorganizing infill order (to use infill instead of the wipe tower)
2018-05-24 14:05:51 +02:00
Enrico Turri
f31c55ceed
3DScene layer editing overlay textures rendering moved to c++
2018-05-24 13:46:17 +02:00
Enrico Turri
157a34bcd9
AMF I/O - Automatic detection if open file is zip archive or xml format
2018-05-24 09:57:12 +02:00
Lukas Matena
1d1c69f300
Merge branch 'master' into wipe_tower_improvements
2018-05-23 19:34:33 +02:00
Enrico Turri
751b41b94b
3DScene picking pass moved to c++
2018-05-23 15:35:11 +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
Enrico Turri
90c50b281a
3DScene mouse variables moved to c++
2018-05-23 13:56:54 +02:00
bubnikv
a9499ae45c
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
Enrico Turri
b36243ba10
Objects rendering moved to c++
2018-05-23 11:14:49 +02:00
Enrico Turri
b4beb7aae9
3DScene plain shader moved to c++
2018-05-23 09:57:44 +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
bubnikv
076b293fec
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
Enrico Turri
85b6784dcb
Merge with master
2018-05-22 15:03:40 +02:00
Vojtech Kral
360b34944d
ErrorDialog: Fix size and message encoding
2018-05-22 14:33:37 +02:00
bubnikv
306d77559e
Merge remote-tracking branch 'remotes/origin/scene_manipulators'
2018-05-22 14:32:07 +02:00
bubnikv
e8247c5646
When loading a config bundle, make sure a config value is not accepted
...
if it is placed in a wrong group (for example, max_print_height
does not belong to print settings, but a printer settings, so Slic3r
will now complain about it being in print settings, and it will
remove the value from the print settings).
2018-05-22 14:17:27 +02:00
Enrico Turri
ae394ca97d
Fixed remember output directory default value set to true
2018-05-22 13:57:28 +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
eef1d500ec
Merge remote-tracking branch 'remotes/origin/brim_width_calculation'
2018-05-22 11:08:37 +02:00
Lukas Matena
e2f44a231e
A fix to use correct spacing with multiloop skirts
2018-05-22 10:50:38 +02:00
Enrico Turri
451c58d58f
3DScene's enable_picking variable moved to c++
2018-05-22 09:02:42 +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
bubnikv
b694f1ac89
One day I will fix it!
2018-05-21 23:40:17 +02:00
bubnikv
512b6dfd88
Yet another fix of the previous commit.
2018-05-21 23:24:18 +02:00
bubnikv
6b4fe7975f
Fix of the previous commit: When asking the operating system to open
...
the datadir using the platform specific file explorer, enquote
and escape the path.
2018-05-21 22:10:38 +02:00
bubnikv
7b4aeef40c
Moved the "Flash firmware" menu to "Configuration",
...
removed the "Check for updates" from the "Configuration" menu,
added an "Open file explorer at the datadir" item to the Help menu.
2018-05-21 21:04:03 +02:00
Vojtech Kral
5697754c5e
avrdude: Fix exit hook not being adapted properly
2018-05-21 18:59:15 +02:00
Vojtech Kral
ee5a5df2a7
Serial port friendly name on Linux
2018-05-21 18:59:13 +02:00
bubnikv
3307dbc0fb
Another fix for linux & osx
2018-05-21 18:58:22 +02:00
bubnikv
1e8a0b69b2
Yet another fix for OSX
2018-05-21 18:58:22 +02:00
bubnikv
0a328789ef
Fixed compilation on Linux.
2018-05-21 18:58:22 +02:00
bubnikv
8917f18ef1
Fix of previous commit, fix of compilation on OSX.
2018-05-21 18:58:22 +02:00
bubnikv
d4e939fd04
Serial port fix, get description for serial ports on OSX.
2018-05-21 18:58:22 +02:00
bubnikv
33f21422e6
Added friendly names to serial ports, added automatic selection of Prusa's printers in the firmware updater dialog
2018-05-21 18:58:22 +02:00
Vojtech Kral
7f8265e2be
FirmwareDialog: Fix log clearing
2018-05-21 18:58:22 +02:00
Vojtech Kral
a43e72f696
Firmware updater: rework cancelling
2018-05-21 18:58:22 +02:00
bubnikv
4f4649d046
avrdude: Fix serial I/O timeout on Windows
2018-05-21 18:58:22 +02:00
Vojtech Kral
4723a99b15
FirmwareDialog: Fix dialog sizing
2018-05-21 18:58:22 +02:00
Vojtech Kral
e1930d57f3
Firmware updater: Disable dictionary flashing menu entry for the time being
2018-05-21 18:58:22 +02:00
Vojtech Kral
fd00ea0ca7
Firmware updater: Add cancelation
2018-05-21 18:58:22 +02:00
Vojtech Kral
98ae20c3df
Firmware updater: Perform work in a background thread
2018-05-21 18:58:22 +02:00
Vojtech Kral
a54672fb54
Firmware updater: Make the GUI less scary
2018-05-21 18:58:22 +02:00
Vojtech Kral
c5f1acfbfb
FirmwareUpdater: Disable dialog close while flashing
2018-05-21 18:58:22 +02:00
Vojtech Kral
fe21ca5510
avrdude: Build fixes
2018-05-21 18:58:22 +02:00
Vojtech Kral
404fdbcfdf
avrdude: Fixes in error handling
2018-05-21 18:58:22 +02:00
Vojtech Kral
97b3c38148
avrdude: Fix h_addr
2018-05-21 18:58:22 +02:00
Vojtech Kral
839c0451f7
avrdude: Fix PATH_MAX
2018-05-21 18:58:22 +02:00
Vojtech Kral
4ac17daad2
avrdude: Use C99, fix alloca include in stk500
2018-05-21 18:58:22 +02:00
Vojtech Kral
af360d7097
Firmware updater GUI
2018-05-21 18:58:22 +02:00
Vojtech Kral
3d09f2a980
avrdude: bugfixes
2018-05-21 18:58:22 +02:00
Vojtech Kral
07817c8ee5
avrdude: Compilation on Windows/MSVC
2018-05-21 18:58:22 +02:00
Vojtech Kral
11a00b025f
avrdude integration basics (WIP)
2018-05-21 18:58:20 +02:00
Vojtech Kral
1caeab913b
avrdude base
2018-05-21 18:55:03 +02:00
Enrico Turri
ae53c7cb2e
Volumes rendering moved to c++
2018-05-21 15:57:03 +02:00
Enrico Turri
0f035d0bae
Background rendering moved to c++
2018-05-21 15:24:52 +02:00
Enrico Turri
bf7b9eb3e7
Legend texture moved to c++
2018-05-21 14:57:43 +02:00
Enrico Turri
3fdc5e20a7
Warning texture moved to c++
2018-05-21 14:40:09 +02:00
YuSanka
c4478ccffa
Fixed wrong updating of the options group tree
2018-05-21 14:36:09 +02:00
Enrico Turri
7cff6ef6db
Shaders loaded from files
2018-05-21 13:08:02 +02:00
Enrico Turri
3fb96ff636
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-21 13:06:16 +02:00
Enrico Turri
308a0b5709
Remember output directory default value set to true
2018-05-21 11:50:48 +02:00
Enrico Turri
3291cbfdad
Fix of #889
2018-05-21 11:19:03 +02:00
Enrico Turri
01b6bc1dc8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-21 08:38:05 +02:00
Enrico Turri
05dcda8ef7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-21 08:37:53 +02:00
YuSanka
deabeaaa7f
Aligned frequently changing parameters according to presets settings on the Plater tab.
...
Fixed missing adding of the Filaments preset settings(for multy material case) to the right_panel
2018-05-20 23:58:09 +02:00
Vojtech Kral
fd43e53aeb
PresetUpdater: Add some more logging
2018-05-18 14:59:24 +02:00
Enrico Turri
a7fc57a176
3DScene reset_object method moved to c++
2018-05-18 14:08:59 +02:00
Enrico Turri
5fc8fdee11
3DScene axes moved to c++
2018-05-18 13:02:47 +02:00
Lukas Matena
99293011e6
Corrected brim generation (width), enabling continuity with skirt
2018-05-18 12:19:54 +02:00
Enrico Turri
1e0a8de5b1
3DScene cutting plane moved to c++
2018-05-18 11:05:48 +02:00
Enrico Turri
0584990b65
Fixed z layers indices under 3D preview sliders
2018-05-18 10:14:47 +02:00
Enrico Turri
5224acad59
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:55:30 +02:00
Enrico Turri
6c6b8ccc42
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:55:21 +02:00
bubnikv
3f08ef70f1
Fix of extraneous infill over thin walls.
...
Fixes https://github.com/prusa3d/Slic3r/issues/670
and some of https://github.com/prusa3d/Slic3r/issues/895
PerimeterGenerator was using an unsafe clipper offset function,
which performed offset for both a contour and its holes together.
With this commit the offsets were replaced with their safe counterparts,
though these safe counterparts may be somehow slower
(performing offset on ExPolygon or ExPolygons, piece by piece).
Also there was a bug, where if the infill & gap fill consumed
everything of the polygon, a polygon one onion shell above was still
used for infill.
2018-05-18 09:52:09 +02:00
Enrico Turri
f34250ea6a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:29:14 +02:00
Enrico Turri
255bec7432
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:29:05 +02:00
bubnikv
651c4ab0ae
Fixed a typo in AppConfig
2018-05-18 08:46:33 +02:00
Enrico Turri
d56b543ff8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 08:32:19 +02:00
Enrico Turri
d85fd5501c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 08:32:09 +02:00
bubnikv
19221b749c
Fix of https://github.com/prusa3d/Slic3r/issues/869
2018-05-18 08:21:24 +02:00
Vojtech Kral
5fd2164612
ConfigWizard: Fix incorrent wizard run after a language change
2018-05-17 17:19:33 +02:00
Vojtech Kral
e783e00578
AppConfig: Remember previous Slic3r version
2018-05-17 16:19:58 +02:00
Enrico Turri
7ca9f46b9c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 14:43:27 +02:00
Enrico Turri
f26bce2538
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 14:43:18 +02:00
bubnikv
37c498d6dc
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-17 14:09:08 +02:00
bubnikv
35bf4aee7d
Fixed loading of configuraton values octoprint_host, support_material_threshold
...
They were incorrectly handled by the handle_legacy() function, which has been
ported from the upstream Slic3r without inspecting its content.
2018-05-17 14:08:50 +02:00
Vojtech Kral
96c7c4a58b
PresetUpdater: Remove obsolete presets
2018-05-17 13:48:11 +02:00
Enrico Turri
15f35a9e9e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 12:12:27 +02:00
Enrico Turri
74b0ed4b23
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 12:12:18 +02:00
Lukas Matena
d98dec3a7c
Merge branch 'gcode_preview_dropdown_ui'
2018-05-17 11:22:38 +02:00
tamasmeszaros
fd829580e9
Working arrange_objects with DJD selection heuristic and a bottom-left placement strategy.
2018-05-17 10:37:26 +02:00
bubnikv
c5dc47c647
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-17 10:30:24 +02:00
bubnikv
e3d84407e0
Fix of https://github.com/prusa3d/Slic3r/issues/896
...
Fixed a bug in parsering a Point from a config file.
2018-05-17 10:30:20 +02:00
Lukas Matena
6f792b7ffb
Horrible workaround to make the gcode preview dropdown (show feature types) work on all platforms
2018-05-17 10:23:02 +02:00
Enrico Turri
24b5d61eb3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 09:53:46 +02:00
Enrico Turri
4a4f4db6a5
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 09:53:36 +02:00
Enrico Turri
e13564cb19
Fixed shell visualization in g-code preview
2018-05-17 09:50:40 +02:00
Enrico Turri
7a6d83e7eb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 08:33:32 +02:00
Enrico Turri
853ebf6ad2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 08:33:16 +02:00
bubnikv
e329f6f5f2
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-16 16:34:19 +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
b8fe48c563
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 13:56:03 +02:00
Vojtech Kral
a97226ae54
PresetUpdater: Fix: Don't offer updates on legacy datadir
2018-05-16 10:15:05 +02:00
bubnikv
5c44453ced
Fixed loading of configuration files after reverting to a snapshot
...
storing the old configuration format.
2018-05-16 10:11:00 +02:00
Enrico Turri
41c51d7614
3DScene's char event handler moved to c++
2018-05-15 16:09:04 +02:00
Enrico Turri
2b4829a4b9
3DScene bed variables moved to c++
2018-05-15 15:38:25 +02:00
bubnikv
4b87f71bbc
Fix of the previous commmit. gcc and clang rightfully complained about a typo.
2018-05-15 14:20:32 +02:00
bubnikv
868b400120
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-15 14:04:49 +02:00
bubnikv
7645e9cb7a
Added layer_num, layer_z variables to the end_gcode, end_filament_gcode,
...
added min(.,.), max(.,.) functions to the placeholder parser syntax.
2018-05-15 14:04:29 +02:00
Enrico Turri
c60bf694ef
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-15 12:22:44 +02:00
Enrico Turri
43784f3409
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-15 12:22:35 +02:00
Enrico Turri
a612b5b648
Replacement of xml escape characters when exporting to amf
2018-05-15 12:19:43 +02:00
Enrico Turri
f0d1888ca9
3DScene select_view() function moved to c++
2018-05-15 11:30:11 +02:00
Lukas Matena
1f62978251
Merge branch 'master' into wipe_tower_improvements
2018-05-15 11:22:58 +02:00
Enrico Turri
75f1f832aa
3DScene bed origin moved to c++
2018-05-15 11:07:32 +02:00
Enrico Turri
7519e34507
3DScene zoom functions moved to c++
2018-05-15 10:32:38 +02:00
Enrico Turri
f4303ebdb8
1st attempt of perl callback from c++ for 3DScene
2018-05-15 09:50:01 +02:00
Enrico Turri
0155f4a7f7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-15 08:41:59 +02:00
Enrico Turri
986630c2dc
3DScene's idle even handler moved to c++
2018-05-14 14:47:13 +02:00
Enrico Turri
a12e3c1cc9
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-14 14:15:31 +02:00
Enrico Turri
0c1655b884
3DScene::Resize() method moved to c++
2018-05-14 14:14:19 +02:00
YuSanka
3bc8d7517a
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-05-14 13:57:08 +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
Enrico Turri
a73cb45792
Camera angle clamping moved to c++
2018-05-14 12:08:23 +02:00
Enrico Turri
1fd59144c7
Camera data moved to c++ - WIP
2018-05-14 11:31:58 +02:00
Enrico Turri
32063cbe23
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-14 10:02:28 +02:00
Enrico Turri
1edd2d01f0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-14 10:01:27 +02:00
Enrico Turri
e90bc3fcab
Fix in _3DScene::_load_gcode_extrusion_paths::Helper::path_color()
2018-05-14 09:00:19 +02:00
Lukas Matena
b6db3767a2
Bugfix: extruder temperature only changes when the temperature differs from the one last set (wipe tower)
2018-05-11 17:35:42 +02:00
YuSanka
d53127fa44
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-11 14:42:19 +02:00
YuSanka
8c4c392cb8
Fixed enable/disable of the tooltips on GTK
2018-05-11 14:41:21 +02:00
Lukas Matena
03c6efe0d6
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-05-11 12:29:34 +02:00
Lukas Matena
d89f8128cd
Fixed a GCode preview crash on Linux due to returning a reference to temporary (issue #872 )
2018-05-11 12:28:31 +02:00
YuSanka
e91ebddeea
Added possibility of select all TextCtrl context using Ctrl+A
2018-05-11 09:53:35 +02:00
bubnikv
d620961c34
Fixed the version number. We have an alpha state as of today.
2018-05-10 18:37:57 +02:00
YuSanka
98d9ce31de
Corrected error message to last commit
2018-05-10 12:54:02 +02:00
YuSanka
754bfd926b
Auto-correction of the input values according to the admissible range
2018-05-10 11:10:44 +02:00
Enrico Turri
5024fc4be7
OpenGL to c++ 1st installment - WIP
2018-05-09 10:47:04 +02:00
Enrico Turri
86155ae4c0
Fixed conflict in previous merge
2018-05-09 10:28:26 +02:00
Enrico Turri
bd4061c3b0
Merge with master branch
2018-05-09 10:16:28 +02:00
Enrico Turri
8eb9ddc2eb
Max count of auto assigned extruders when splitting object set as dependent of current printer
2018-05-07 16:13:58 +02:00
Enrico Turri
c579ec7f5f
Fixed wrong extrusion paths detection with multimaterial objects
2018-05-07 14:23:07 +02:00
Enrico Turri
678cbd9d47
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-04 08:56:16 +02:00
bubnikv
19977edae2
Removed the "Broken croak" support, which was useful on broken
...
64bit Strawberry perl only. We don't use Strawberry perl anymore,
so this has been removed for clarity.
Added a PerlCallback wrapper to call a Perl subroutine from a C++ code.
2018-05-03 21:45:43 +02:00
Enrico Turri
471f90659f
Fixed typo preventing to build on Win
2018-05-03 16:28:41 +02:00
Enrico Turri
6d88d0d39b
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-03 16:13:22 +02:00
YuSanka
af4e0308ae
Fixed visibility of the contents of the GCode fields
2018-05-03 13:49:37 +02:00
Enrico Turri
717fbc1196
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-03 11:11:48 +02:00
Enrico Turri
d19b1162b3
Fixed normals on wipe tower box
2018-05-03 11:09:13 +02:00
YuSanka
20d9bda87e
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-05-03 09:22:10 +02:00
YuSanka
20b83c5b53
Save the Canonical Language Name instead of the Enumerator to the Slic3r.ini
2018-05-03 09:21:01 +02:00
Enrico Turri
e8d5c939b0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-03 08:29:08 +02:00
Vojtech Kral
8ad6053544
PresetUpdater: More logging
2018-05-02 17:14:09 +02:00
YuSanka
4131a92cec
Merge remote-tracking branch 'origin/master' into updating
2018-05-02 16:13:00 +02:00
YuSanka
16d5faac20
Preparations to the localization update & new Slic3rPE.pot
2018-05-02 16:06:35 +02:00
Enrico Turri
65f3b52cad
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-02 15:17:32 +02:00
Enrico Turri
cb486522a8
Fixed crash when pressing 'A' with empty print bed
2018-05-02 14:55:17 +02:00
Enrico Turri
81636abaa9
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-02 14:45:42 +02:00
Vojtech Kral
e9b83a20d0
ConfigWizard: Add additional logging
2018-05-02 12:44:53 +02:00
Lukas Matena
de0d1f34f3
Label in filament settings changed
2018-05-02 10:57:25 +02:00
Lukas Matena
b4e63d47cb
Yet another attempt to fix the layer height profile validation
2018-05-02 10:56:06 +02:00
Lukas Matena
71b4337036
Label in filament settings changed
2018-05-02 10:52:17 +02:00
Vojtech Kral
4758b68e55
Fix: Turn two Preset & PresetUpdater exceptions into error logs
2018-05-01 11:20:44 +02:00
Vojtech Kral
28effac0f1
Fix bitmap loading in new dialogs
2018-05-01 10:35:30 +02:00
YuSanka
6d34db352d
Merge branch 'updating' of https://github.com/prusa3d/Slic3r into updating
2018-04-30 16:30:23 +02:00
YuSanka
2d4cac0018
Added ability to change color of the labels of the system or modified values
2018-04-30 16:29:13 +02:00
Enrico Turri
3c13c4f103
Added versioning to 3mf file
2018-04-30 15:27:01 +02:00
Vojtech Kral
5624b8afd2
Add a new error dialog
2018-04-30 14:34:47 +02:00
Enrico Turri
4344eaebca
Added versioning to amf file
2018-04-30 12:03:06 +02:00
YuSanka
43d2027b76
ToolTips are showing on GTK
2018-04-30 11:11:48 +02:00
Vojtech Kral
bb4c4d9ecf
Legacy data update dialog: Add link to wiki
2018-04-27 15:45:04 +02:00
Enrico Turri
ad54210c3e
3mf I/O - Added import/export of layer heights profile
2018-04-27 12:56:35 +02:00
Vojtech Kral
6d38943222
Fix & refactor legacy datadir dialog
2018-04-27 12:29:18 +02:00
Vojtech Kral
a3d5251b8e
Merge branch 'cpp_ui_optimization' into updating
2018-04-27 12:04:43 +02:00
Enrico Turri
4811abfa99
Apply gradient to colors in GCode Preview
2018-04-27 09:54:21 +02:00
bubnikv
86e4c7b6ad
Merge branch 'new_cooling_logic' into updating
2018-04-26 19:03:21 +02:00
bubnikv
25d47c1da8
Fix of the new cooling logic.
2018-04-26 18:56:16 +02:00
YuSanka
19f8e0bc63
Changed background color in AboutDialog from wxWHITE to wxSYS_COLOUR_WINDOW,
...
AboutDialogLogo is replaced to wxStaticBitmap.
2018-04-26 17:46:24 +02:00
YuSanka
6467513f60
Set default bitmap (white_bullet) when creating Field's reset buttons
2018-04-26 16:33:37 +02:00
YuSanka
7698ba168e
Merge branch 'updating' of https://github.com/prusa3d/Slic3r into updating
2018-04-26 15:11:48 +02:00
YuSanka
9548593b57
Forbid tabstop on resert buttons
2018-04-26 15:11:02 +02:00
Enrico Turri
a223655973
Inverted order of range items in legend texture
2018-04-26 13:40:29 +02:00
Enrico Turri
ad9dca2bd9
Fixed update of ranges for GCode paths colors selection
2018-04-26 13:03:54 +02:00
YuSanka
4d07b63b5a
Merge remote-tracking branch 'origin/profile_changes_reset' into updating
2018-04-26 12:47:32 +02:00
YuSanka
b3859c49c1
Updated description preset line for each type of presets...
...
Disabled m_btn_delete_preset for default and system presets.
Enabled update of the current preset if it was modified and selected again.
2018-04-26 12:40:17 +02:00
Lukas Matena
24dc4c0f23
Yet another attempt to fix the layer height profile validation
2018-04-26 11:19:51 +02:00
bubnikv
cbaf0ccc51
Refactored cooling logic for readibility and maintainability.
2018-04-25 22:54:52 +02:00
bubnikv
269770bbbc
Fix of a new cooling logic.
2018-04-25 22:06:44 +02:00
Vojtech Kral
dce0aa6771
Updating: Start using proper URLs
2018-04-25 17:43:01 +02:00
Enrico Turri
166ee4c2c8
Export of print config enabled as default in save file dialog when exporting to amf and 3mf files
2018-04-25 15:31:37 +02:00
Vojtech Kral
f23f86d91c
PresetUpdate: Fix UpdateConfig dialog
2018-04-25 15:21:38 +02:00
Vojtech Kral
933c0eb650
Fixes in SemVer and MsgUpdateConfig
2018-04-25 15:14:01 +02:00
Enrico Turri
1a4827ba33
Fixed incorrect z values set into GCode Preview sliders
2018-04-25 14:38:44 +02:00
Vojtech Kral
bbc3c890ea
Snapshots: Disable activation of incompatible snapshots
2018-04-25 14:00:29 +02:00
YuSanka
91db0a6e05
Merge remote-tracking branch 'origin/profile_changes_reset' into updating
2018-04-25 13:53:22 +02:00
YuSanka
cfac6c0ebb
Aligned printer settings on Plater tab
2018-04-25 11:10:34 +02:00
bubnikv
6c627be4c1
New cooling logic to equalize extrusion velocity. The old behavior caused bad outer surface print quality on Prusa i3 MK3
2018-04-25 10:37:31 +02:00
Vojtech Kral
0feb4d823f
PresetUpdater: Fix string type
2018-04-25 10:17:43 +02:00
Vojtech Kral
60f62a6463
Fix text in UpdateDialogs
2018-04-24 18:29:36 +02:00
Vojtech Kral
62d67d35ec
Merge branch 'profile_changes_reset' into updating
2018-04-24 18:15:23 +02:00
Vojtech Kral
a50bde4267
Merge branch 'master' into updating
2018-04-24 18:11:34 +02:00
Vojtech Kral
fea5603409
PresetUpdater: Bundle incompatibility / Slic3r downgrade scnario
2018-04-24 18:06:42 +02:00
YuSanka
7c7c37a4f4
Added tooltips for reset buttons near each option
2018-04-24 14:11:23 +02:00
Lukas Matena
650489dd8a
New parameters actually connected to the wipe tower generator
2018-04-24 13:43:39 +02:00
Lukas Matena
ec2d37451b
Merge branch 'master' into wipe_tower_improvements
2018-04-24 13:10:33 +02:00
Lukas Matena
8c77b9645c
Loading, unloading and cooling reworked, new filament parameters regarding cooling were added
2018-04-24 13:02:08 +02:00
YuSanka
92b67fb62e
Change reset buttons tooltips according to its state
2018-04-24 12:12:15 +02:00
YuSanka
1e8d302fd4
Fixed wrong updating of "Top/Bottom fill pattern"
2018-04-24 10:33:11 +02:00
Enrico Turri
71d9500b2e
More robust fix for 3D view and GUI buttons not in synch when object's size is almost identical to print volume's size
2018-04-24 09:00:33 +02:00
YuSanka
e31f5fc4b6
Modified text for tooltips and ButtonsDescription
2018-04-24 08:49:37 +02:00
YuSanka
b0841f78f4
Experiment failed
2018-04-23 15:39:55 +02:00
YuSanka
6432ec8a9b
Experiment with extruders count change
2018-04-23 15:09:01 +02:00
Enrico Turri
cd3be74e3b
Workaround for 3D view and GUI buttons not in synch when object's size is almost identical to print volume's size
2018-04-23 15:03:38 +02:00
Vojtech Kral
a7a8030fea
PresetUpdater: Don't install updates that are already present in a snapshot
2018-04-23 13:58:50 +02:00
YuSanka
ec7e10e068
Fixed wrong behavior of options group Tree after extruders count change
2018-04-23 11:52:03 +02:00
Vojtech Kral
33c0d1dca3
PresetUpdater: Add/fix logging, comments
2018-04-23 11:16:47 +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
b8cb936973
Added effective update of ComboBoxes on Plater
2018-04-20 17:32:08 +02:00
YuSanka
27f77c7680
Added little more information to ButtonsDescription dialog
2018-04-20 15:40:43 +02:00
YuSanka
48bbd2d22a
Added new files to MackList
2018-04-20 15:02:54 +02:00
Vojtech Kral
e0421a3ba6
PresetUpdater: Don't display new Slic3r version notifications multiple times for the same version
2018-04-20 14:53:11 +02:00
YuSanka
669b0b68ab
Added missed files to commit
2018-04-20 13:27:25 +02:00
YuSanka
1e1bf03f61
Added reset buttons description
2018-04-20 12:58:07 +02:00
Vojtech Kral
134a083662
Merge branch 'config_snapshots' into updating
2018-04-20 11:08:23 +02:00
Vojtech Kral
9b5480b7ba
PresetUpdater: Use PID in cache tmp filenames
2018-04-20 11:05:00 +02:00
bubnikv
ab397e5ce1
Added SnapshotDB::snapshot_with_vendor_preset() utility function
...
to find out whether there has ever been a snapshot taken with a given
configuration version.
Implemented an "on snapshot" flag, which indicates, whether the current
state equals to some snapshot. If so, a new snapshot is not taken
in upgrade / downgrade case.
2018-04-20 10:26:23 +02:00
Vojtech Kral
d671e06c32
Fix alpha legacy dir detection, Fix SemVer value ctor
2018-04-19 18:29:19 +02:00
Vojtech Kral
bdaf1b01be
ConfigWizard: Fix reset checkbox
2018-04-19 16:49:22 +02:00
YuSanka
88dadcec78
Added tooltips for reverse buttons
...
* Corrected default size of undo buttons for GTK
* Experiment with rich tooltips
2018-04-19 16:20:30 +02:00
YuSanka
7083f58326
Added lock icons to system presets in ComboBoxes.
...
Added right event handling if informative string is selected in ComboBoxes
2018-04-19 12:08:59 +02:00
bubnikv
8ab62d702c
Fixed memory leak of TabIface.
...
Added documentation of the XS interface on how the Ref<> and Clone<>
wrappers work.
2018-04-18 18:06:07 +02:00
YuSanka
f38f0edaaf
Cleaned code from commented code
2018-04-18 14:15:13 +02:00
bubnikv
fa97a86751
Implemented merging of system profiles from various vendors.
2018-04-18 13:35:51 +02:00
YuSanka
3ca2dfbc1d
Added some performance changes
2018-04-18 13:32:21 +02:00
Vojtech Kral
0711f84ea0
Add version check & preset update options to Preferences
2018-04-18 12:33:07 +02:00
Vojtech Kral
81c6ad3ab7
ConfigWizard: Add reset option, fixes
...
Fix mock vendors
2018-04-18 11:40:43 +02:00
Vojtech Kral
c884f3b213
Display app update notification with the main frame
2018-04-17 17:11:56 +02:00
Vojtech Kral
df03b8e4e8
PresetUpdater: Notify about Slic3r updates
2018-04-17 16:59:53 +02:00
Enrico Turri
3bedcf4413
Tweaks in generation of rendering geometry for preview toolpaths. Fixes #240 and #348
2018-04-17 15:04:14 +02:00
Vojtech Kral
6286c9ee7c
ConfigWizard & updating: Fixes & cleanups
2018-04-17 11:54:59 +02:00
bubnikv
98785e47b1
Removed the
...
"The Wipe Tower currently supports only:\n"
"- first layer height 0.2mm\n"
"- layer height from 0.15mm to 0.35mm\n"
message as the new wipe tower is more generic.
2018-04-17 10:55:58 +02:00
bubnikv
3b0eb6b786
Merge remote-tracking branch 'origin/updating' into cpp_ui_optimization
2018-04-17 10:38:02 +02:00
Vojtech Kral
b506aa11fa
PresetUpdater: Fix: Compare versions when installing indices
2018-04-17 10:28:32 +02:00
YuSanka
d254c39a77
Added "smart" setting of label color
2018-04-17 10:15:48 +02:00
Lukas Matena
d7dc04eb57
Removed parameter filament_cooling_time (fixed value of 14s for now)
2018-04-17 08:18:12 +02:00
Vojtech Kral
37cf839b27
ConfigWizard: Fix regression
2018-04-16 18:33:33 +02:00
Vojtech Kral
d26c8e5336
Fix: Avoid the infamous major
& minor
macros on GCC
2018-04-16 17:43:23 +02:00
Vojtech Kral
214ad2925b
Merge branch 'master' into updating
2018-04-16 17:32:58 +02:00
Vojtech Kral
7710b541da
Merge branch 'config_snapshots' into updating
2018-04-16 17:00:31 +02:00