Filip Sykala
f75f326f8e
Merge branch 'master' into fs_emboss_with_CGAL_5_4
...
# Conflicts:
# src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
2022-03-09 11:08:39 +01:00
Filip Sykala
70b94d592b
Merge branch 'et_world_coordinates' into fs_emboss_with_CGAL_5_4
...
# Conflicts:
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
# src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
2022-03-09 11:06:58 +01:00
rtyr
8d3f4e633e
Added Ender 3 Pro thumbnail
2022-03-07 15:06:43 +01:00
rtyr
b2fba940fe
Sync with PrusaSlicer-settings
2022-03-02 09:47:29 +01:00
Lukas Matena
e058f794d9
Merge branch 'stable'
2022-02-24 13:05:05 +01:00
Filip Sykala
24207403ea
Merge branch 'master' into fs_emboss
2022-02-22 13:51:04 +01:00
YuSanka
3d5353d444
Localization: Updated CS, DE, ES, FR, IT and PL dictionaries
2022-02-16 09:26:16 +01:00
rtyr
41e31c31b6
Updated Anycubic Photon structure.
2022-02-14 09:33:40 +01:00
ole00
df0751716c
Added resources and settings for Anycubic Photon Mono X SLA printer
2022-02-12 12:55:28 +00:00
Filip Sykala
faa63f3182
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Format/3mf.cpp
2022-02-10 14:04:02 +01:00
YuSanka
d52807ccaf
Localization: Updated POT.
...
+ Changed a script of the merging new POT with existing PO files.
Now it processes just a PO-files which are provided by community.
Community PO-files are updated from the new POT
2022-02-09 12:52:50 +01:00
enricoturri1966
92aa6540f5
Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity
2022-02-08 12:57:56 +01:00
enricoturri1966
6b041429f6
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Removed Slic3r::GUI::GeometryBuffer from 3DBed.hpp and replaced with GLModel
2022-02-07 10:24:24 +01:00
Filip Sykala
a50d93cd66
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Geometry.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
# src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
# src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
# src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
# src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
# src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
# src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
# src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
# src/slic3r/GUI/ImGuiWrapper.cpp
# src/slic3r/GUI/ImGuiWrapper.hpp
# src/slic3r/GUI/Selection.cpp
# tests/slic3rutils/slic3r_jobs_tests.cpp
2022-02-02 15:27:25 +01:00
Lukas Matena
cb5ff10a88
Merge branch 'master' into dev
2022-02-01 14:17:34 +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
rtyr
1fe9e5231b
Added G92 E0.
2022-01-31 14:44:43 +01:00
enricoturri1966
1a47211bfc
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Textures rendering
2022-01-28 16:50:07 +01:00
enricoturri1966
eda55701a2
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Background rendering
2022-01-28 11:30:04 +01:00
enricoturri1966
703aefa75c
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2022-01-27 12:04:47 +01:00
YuSanka
725a45f112
Localization: Added Hungarian dictionary. Thanks for Attila Zombori( https://github.com/zomatt )
2022-01-27 10:29:03 +01:00
YuSanka
e20a06a850
Localization: Updated POT and dictionaries for CZ, PL, IT, ES, DE, FR
...
+ Added one phrase in Tab.cpp
+ POs for CA, KR, NL, BR, RU, TR, UK, ZH are merged with new POT
2022-01-26 09:24:05 +01:00
rtyr
eb1463d46a
Fixed texture extension
2022-01-25 15:23:53 +01:00
rtyr
321b656ccc
Added texture
2022-01-25 14:14:27 +01:00
rtyr
04f09361b9
Delete Jubilee_texture.svg
2022-01-25 14:12:59 +01:00
rtyr
d5d9e33486
Added bed texture.
2022-01-25 14:07:58 +01:00
rtyr
eb2f14c0ec
Jubilee bed texture
2022-01-25 14:06:02 +01:00
rtyr
8211721b9c
Jubilee initial bundle
2022-01-25 08:22:09 +01:00
rtyr
18be6a9395
Sync with PrusaSlicer-settings.
2022-01-24 14:28:38 +01:00
YuSanka
7111da2dbf
Merge remote-tracking branch 'origin/master' into dev
2022-01-24 08:37:51 +01:00
rtyr
ea61190c1c
Merge pull request #7782 from top-gun/master
...
RatRig printer profiles: optimizations
2022-01-21 23:36:35 +01:00
top-gun
94c3110887
RatRig printers: Prifle optimizations
...
changed the default infill to cubic
remove accidental .bak file
2022-01-21 22:58:38 +01:00
Filip Sykala
c2608ce2fa
Improove icons
2022-01-21 20:49:42 +01:00
YuSanka
0cc3a67b8c
Localization: CA: Manual merge of the https://github.com/prusa3d/PrusaSlicer/pull/7566
2022-01-21 15:53:08 +01:00
YuSanka
c9dbc1cbba
Localization: Added missed phrases -> Updated POT and dictionaries for CZ, PL, IT, ES, DE, FR
...
+ Command to remove obsolite lines is added to gettext_concat_wx_po_with_po and gettext_merge_po_with_pot scripts
+ POs for CA, KR, NL, BR, RU, TR, UK, ZH are merged with new POT
+ Updated all MO files
2022-01-21 15:31:01 +01:00
Filip Sykala
770a5c5501
Redesign GUI of emboss
2022-01-20 16:09:48 +01:00
YuSanka
94b8c4f096
Merge remote-tracking branch 'origin/master' into dev
2022-01-20 15:22:24 +01:00
YuSanka
d1523d2a6b
Localization: Updated POT and dictionaries for CZ, PL, IT, ES, DE, FR
...
+ Fixed phrases in Tab.cpp, hints.ini, NotificationManager.cpp
+ POs for CA, KR, NL, BR, RU, TR, UK, ZH are merged with new POT
+ Updated all MO files
2022-01-20 14:18:55 +01:00
enricoturri1966
d09a0cea83
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2022-01-18 10:48:56 +01:00
enricoturri1966
22f38235ea
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - 1st installment - Selection bounding box
2022-01-18 10:42:46 +01:00
YuSanka
fec654513e
Merge remote-tracking branch 'origin/master' into dev
2022-01-18 08:41:10 +01:00
top-gun
347c544931
RatRig printer profiles: optimizations
...
Some optimizations for speed and infill
Modified start-code to avoid automatic generation of heater commands.
2022-01-17 22:22:36 +01:00
YuSanka
2cc20594a4
Localization: Updated POT
...
+ Fixed some phrases in Preferences and Hints
+ fixed #7588 - Typo in new help feature in 2.4.0
2022-01-17 13:42:35 +01:00
enricoturri1966
a9bd58639c
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2022-01-17 08:05:41 +01:00
rtyr
3586f1c3fe
Delete VCORE_thumbnail.png
2022-01-14 14:06:13 +01:00
rtyr
109a90e300
Initial RatRig bundle
...
Based on https://github.com/slic3r/slic3r-profiles/pull/13 .
2022-01-14 13:46:55 +01:00
rtyr
1d77080421
Added Artillery Hornet
...
Hornet profile based on https://github.com/slic3r/slic3r-profiles/pull/14
2022-01-14 13:33:46 +01:00
enricoturri1966
b9b702d550
Fixed conflicts after merge with branch dev
2022-01-14 09:55:13 +01:00
YuSanka
ced6d26917
Merge remote-tracking branch 'origin/master' into dev
2022-01-12 15:05:31 +01:00