3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,227 Commits 1 Branch 1 Tag 249 MiB
62e59a4526
Commit Graph

84 Commits

Author SHA1 Message Date
Lukas Matena
62e59a4526 Fixing conflicts part 1: 
fixed simple conflicts
 2022-06-29 16:43:29 +02:00
Lukas Matena
b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED): 
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250.  Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250.  Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
 2022-06-29 14:37:14 +02:00
Lukas Matena
1fea671ff1 Bumped up version number 2022-06-28 16:02:43 +02:00
Lukáš Hejl
8e19c945ae Bumped up version to 2.5.0-alpha1 2022-05-19 13:04:38 +02:00
Lukas Matena
41b64e189a Bumped up version to 2.6.0-alpha0: 
the development of 2.5.x will be separated and based on 2.4.2.
master branch will be used for development of 2.6.x
 2022-05-19 12:39:51 +02:00
Lukas Matena
d7105dabf1 Bumped up version number to 2.4.2 2022-04-22 13:01:19 +02:00
Lukas Matena
8e5cbf386f Bumped up version to 2.4.2-rc2 2022-04-13 15:28:51 +02:00
Lukas Matena
c6cffcc3a5 Bumped up version to 2.4.2-rc1 2022-04-05 15:39:32 +02:00
Lukas Matena
f196294da5 Bumped up version number to 2.4.1 2022-03-10 11:35:03 +01:00
Lukas Matena
34a0f6d970 Bumped up version to 2.4.1-rc1 2022-03-03 11:16:57 +01:00
Lukas Matena
54b2c67e75 Bumped up version to 2.4.1-beta3 2022-02-24 11:12:34 +01:00
Vojtech Bubnik
46939dd6b8 Bumped version to 2.4.1-beta2. 2022-02-21 15:16:07 +01:00
Lukas Matena
1a2120a43e Changed config folder to -alpha, version increased to 2.5.0-alpha0 2022-02-08 10:06:46 +01:00
Lukas Matena
5c616c5931 Sync to 2.4.1-beta1 2022-02-01 14:16:13 +01:00
Lukas Matena
ebb9041041 Merge branch 'master' into stable - no conflicts fixed 2022-02-01 14:15:18 +01:00
Vojtech Bubnik
9dae482e12 Bumped up version to 2.4.1-beta1 2022-02-01 10:03:22 +01:00
Lukas Matena
c28615cfcb Bumped up version number to 2.4.1-alpha0 2022-01-14 12:09:52 +01:00
Vojtech Bubnik
cc66d1e27b Bumped up version number. 2021-12-20 16:05:57 +01:00
Vojtech Bubnik
5dc2a5a24e Bumped up version to rc2. 2021-12-17 15:00:02 +01:00
Vojtech Bubnik
b3d42df0f7 Bumped up version to release candidate, 
changed the configuration directory from beta to final.
 2021-12-14 14:49:32 +01:00
Vojtech Bubnik
f033a79a2a Bumped up version number. 2021-12-11 10:28:20 +01:00
Vojtech Bubnik
8ee8b915a4 Bumped up version to 2.4.0-beta3 2021-12-04 10:12:59 +01:00
Lukas Matena
30fa6ce1d3 Bumped up version number to 2.4.0-beta2 2021-11-26 13:32:12 +01:00
Vojtech Bubnik
5ccf7e9e47 Updated version and config location to beta. 2021-10-22 17:10:09 +02:00
Lukas Matena
5048dbf8b4 Bumped up version number 2021-09-30 16:50:50 +02:00
Lukas Matena
2356c30356 Bumped up version number 2021-09-24 13:10:23 +02:00
Vojtech Bubnik
c25ca3015a Bumped up version number 2021-09-01 15:15:32 +02:00
Vojtech Bubnik
8f0916e371 Bumped up version number 2021-07-16 12:14:03 +02:00
Vojtech Bubnik
95a84fa826 Bumped up version number 2021-07-08 08:46:36 +02:00
Vojtech Bubnik
0754bc3719 Changed the profile directory to PrusaSlicer, not PrusaSlicer-beta 
Bumped up version number to 2.3.2-rc
 2021-07-05 16:09:42 +02:00
bubnikv
0d03cc4cbe Bumped up version to 2.3.2-beta. 
Changed profile path to Prusa-beta.
 2021-07-01 16:52:32 +02:00
Vojtech Bubnik
dc81cae219 Bumped up version to 2.3.2-alpha0 2021-06-21 14:11:07 +02:00
Vojtech Bubnik
759f733a00 bumped up version 2021-04-16 13:41:00 +02:00
Vojtech Bubnik
77f016246f Bumped up version to 2.3.1-rc 2021-04-14 10:43:56 +02:00
Vojtech Bubnik
2da15e1b1f Bumped the version to 2.3.1-beta 2021-04-12 11:47:53 +02:00
Vojtech Bubnik
10c3e82917 Updated version number, 
alpha stores configs in alpha directory.
 2021-03-23 13:50:53 +01:00
Vojtech Bubnik
fcabe8a0f4 Bumped up version number 2021-01-11 14:01:51 +01:00
Vojtech Bubnik
fd7a555cb3 Bumped up vesion number 2021-01-08 11:06:35 +01:00
Lukas Matena
d2b45c282e Bumped up version number to 2.3.0-rc2 2020-12-22 17:26:55 +01:00
Lukas Matena
5bd1a57650 Bumped up version number to 2.3.0-rc1 2020-12-17 18:07:35 +01:00
Vojtech Bubnik
3795f6b779 Bumped up version number 2020-12-12 16:28:01 +01:00
Vojtech Bubnik
ac05849582 Bumped up version number 2020-12-05 12:00:38 +01:00
Vojtech Bubnik
30d7ef2cf9 Bumped up version number to beta1. 
Changed the location of PrusaSlicer profiles from PrusaSlicer-alpha
to PrusaSlicer-beta.
 2020-11-28 11:14:53 +01:00
Vojtech Bubnik
7527797a36 Bumped up version number 2020-11-21 15:59:02 +01:00
Lukas Matena
ece27dcc42 Bumped up version number 2020-11-04 15:45:37 +01:00
Vojtech Bubnik
b8e77e4d30 Bumped up version number 2020-10-24 17:39:31 +02:00
Vojtech Bubnik
bb79966ddb Bumped up version number 2020-10-17 14:17:33 +02:00
enricoturri1966
ce0312acbd Fixed gcodeviewer application title on Linux and Mac 2020-10-07 16:02:01 +02:00
enricoturri1966
c94fb13369 AppConfig modified to generate a separate config file for the standalone gcodeviewer 2020-10-05 15:42:35 +02:00
enricoturri1966
b991b613de Updated titlebar and splash screen + hidden statusbar for gcode viewer 2020-09-10 14:33:55 +02:00