Commit Graph

100 Commits

Author SHA1 Message Date
Heiko Liebscher
02bb0f844f first add j1 2023-03-30 09:34:23 +02:00
SoftFever
a76eb554a9 logo change 2023-03-17 19:16:36 +08:00
SoftFever
6aefed4113 fix pot/po 2023-03-16 21:35:31 +08:00
SoftFever
a8d3e161b4 Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
fe5f391dd6 fix colors 2023-03-09 01:05:51 +08:00
SoftFever
38d5ccb29f Merge branch 'master-remote' into feature/1.5
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
#	resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
#	resources/profiles/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
2023-03-08 00:08:26 +08:00
5axes
45083874ef Update French Translation (#337)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

Test to add Layer time ( missing in the original po file)

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

https://github.com/BastR/BambuStudio/blob/french-trad/bbl/i18n/fr/BambuStudio_fr.po

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one

* Update

Last Modification

* Update

Missing term in the German translation

* update

Changement

* update

TimeLaps

* Update 11/1/2023

Minor Change
Update  : Year / Month ( not translated in the previous translation)

* Update French Translation

Update for BambuStudio-SoftFever_V1.4.2

* Change some typro

Update some Typo

* Fix some Typo

Fix somme Typo and Label not presnet in the pot file

* Add Calibration SoftFever

Add missing Label on the SoftFever Calibration Menu

* Update BambuStudio_fr.po

Erreur Taper: -> Type:

* Update text.js

Add French Translation for Web interface

* Add Manual Web text

Translate French Manual Web text

* Update text.js

Back to "en"
2023-02-22 23:07:05 +08:00
lane.wei
ec904f533f ENH: remove Christmas cabin from homepage
the codes have been removed from web before

Change-Id: I39c2b63c1a4ffa276b7d406eca9fc1f910fb31a9
2023-02-22 20:09:17 +08:00
zorro.zhang
012706afb0 ENH: remove Christmas cabin menu
Change-Id: Idb01d9f24eacdaec8e2451f6021a8428bae1858f
2023-02-22 20:09:17 +08:00
qing.zhang
41975d18b2 ENH: add ANYCUIC profile which based on SoftFever
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I85fc64a25dbb761377c63574b3d3ec10fda9dfd6
2023-02-22 20:09:17 +08:00
zorro.zhang
17239dfc56 FIX: correct japanese of logout
Change-Id: Ie7e9e1dce591ac16cbc65398466269912925e7e6
2023-02-22 20:09:17 +08:00
zorro.zhang
4b09cc21aa NEW: Japanese text in userguide
Change-Id: I5e7e15e8fa255715fa3a08b39bac9bf8e8bd3c05
2023-02-22 20:09:17 +08:00
Heiko Liebscher
28716e37fe fix new features in german after pr (#326) 2023-02-18 09:20:48 +08:00
behold81
d5bc4119c0 New printer: TwoTrees SP-5 Klipper (#292)
* Add files via upload

First working version of TwoTrees SP-5 running klipper. this can be the base to start using this slicer. most of the generic materials are OOTB ones and this profile is made for near stock printers just running klipper. roughtly running a max speed of 200mm/s and runs successfully

* Add files via upload

* Delete SP-5.png
2023-02-14 00:02:22 +08:00
SoftFever
e745ac980e Feature/fix more colors (#193)
* fix more colors

* fix more color on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* fix new windows issue on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
#137

* Support more PrusaSlicer variables

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* enhance compatibility: bed_shape and wipe_start_x

* fix more color

* build deps

* only build for PR

Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-18 23:06:39 +08:00
Michael Birkler
b748c0a9f5 ADD Snapmaker A250 and A350 (#171) 2023-01-13 21:48:22 +08:00
Patrice Côté
ff5a5e29f2 Add RatRig V-Cast printer (#152)
Add RatRig V-Cast printer
2023-01-10 22:28:22 +08:00
zorro.zhang
1d8667f9ec FIX: optimize text display
Change-Id: I4e44e12786a1af34cca35edb3c32d9f500b933ed
2023-01-10 19:08:26 +08:00
Heiko Liebscher
e6d173f610 fix typo and color (#138)
* fix typo and color

* fix error
2023-01-08 20:59:33 +08:00
Michael Birkler
727fce47f7 Tronxy profile revised (#123)
* Add Tronxy X5SA 400 Profile

* Update fdm_klipper_common.json

* Addjust Firmware Flavor to Marlin

* Tronxy profile revised
2023-01-06 23:04:11 +08:00
Heiko Liebscher
a9f23e38f2 fix_color_to_#009688 and hover btn (#125)
* fix_color_to_#009688 and hover btn

* fix_color_main_menu

* fix double ##

* tooltip_color

* fix bitmapcache.cpp
2023-01-06 21:22:20 +08:00
SoftFever
b46870b8e4 fix wrong css color
#116
2023-01-05 21:12:23 +08:00
SoftFever
ab1d613f42 change app color 2023-01-03 22:05:20 +08:00
SoftFever
8a86e13670 Revert "Add Tronxy X5SA 400 Profile (#81)"
This reverts commit 022ed78904.
2023-01-03 16:40:54 +08:00
GP3D
232daee3a2 Artillery Sidewinder X2 (#84)
* Fixed deps "directory not found"

* Added Artillery Sidewinder X2

* typo

* forgotten rename

Co-authored-by: GiaPag <120025021+GiaPag@users.noreply.github.com>
2023-01-03 10:02:32 +08:00
Michael Birkler
53edd2d0f5 Add Tronxy X5SA 400 Profile (#81)
* Add Tronxy X5SA 400 Profile

* Update fdm_klipper_common.json

* Addjust Firmware Flavor to Marlin
2023-01-03 10:00:12 +08:00
SoftFever
10d50eeaf0 add Anker M5 printer 2022-12-30 18:11:57 +08:00
SoftFever
af4434c013 add Creality CR-10 Max
#46
2022-12-30 16:54:10 +08:00
erebus04
2928a36c85 Added RatRig Printer Profiles (#71)
* ADD RatRig V-Core 500 Printer Profile

* ADD Other RatRig Printers

ADD V-Core 200/300/400
ADD V-Minion

* Add Printers to Filament

* Update Ratrig.json

* V-Minion correct PNG

* Correct Bed File for Printers

* Update fdm_process_ratrig_common.json

* Filament Settings Update/ Disable Z-Hop /Activate PA with Parameter

* Remove Bed Modell

The bed model was removed due to a known z bug
2022-12-29 20:13:03 +08:00
SoftFever
4ebdc42f41 add Prusa MINI+ 2022-12-18 16:12:32 +08:00
SoftFever
9e1335f7a3 Merge branch 'master' into SoftFever 2022-12-16 23:27:00 +08:00
SoftFever
1ec149b4e1 Merge branch 'master' into SoftFever
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
2022-12-16 13:59:30 +08:00
yifan.wu
207f8fb482 ENH: update Bambu Christmas Cabin
Change infill density from 20% to 15% to reduce warp risk for large
objects.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I48d616b2f07ee93784d12c7d84b83fdb451e5cc1
2022-12-15 10:33:19 -05:00
yifan.wu
aa76f3749b ENH: refine Bambu Christmas Cabin
1. replace lightning infill with gyroid infill
2. lower top surface speed to 150mm/s
3. scale up and move logo text

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Id65f21c04ba602cb7afe38ac3de27b7720c4ade3
2022-12-15 08:38:55 -05:00
yifan.wu
f5a7ae820a ENH: update Bambu Christmas Cabin
1. update Merry Christmas board
2. update the model name

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I2757c67dbf12152da707b73ad2a18083ac8a2f00
2022-12-15 04:49:14 -05:00
yifan.wu
05b2b2ceb1 ENH: update Christmas Cabin to reduce warp risk
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I48ed96ad8bd79d274d2a6d4a83afcc53b0452118
2022-12-15 04:49:14 -05:00
zorro.zhang
e68f05f171 ENH: new 3mf of christmas cabin
Change-Id: I82e67d858fa1349e5c398a489b7fdae83715b450
2022-12-15 04:49:14 -05:00
zorro.zhang
d67e6c407b ENH: remove 3d model entrance
Change-Id: I121a544fec002b87bc409d1b5de857e32ab7427a
2022-12-15 04:38:15 -05:00
zorro.zhang
fb5a8af01d ENH: icon before text
Change-Id: I714aa5d744bb7d6e83b2a58add37bc67302fdd25
2022-12-15 04:38:15 -05:00
zorro.zhang
d734b7ac1d ENH: ScrollBar Color
Change-Id: Ice87a8ddae0ccadaa63652bb4fa8464c4bee408f
(cherry picked from commit 5db33442578ac72433131229889cc1055527de74)
2022-12-15 04:38:15 -05:00
zorro.zhang
fd83d5e464 NEW: Christmas Cabin
Change-Id: I5b8585df171dc3be85e099b1992cef1bbd3d799c
2022-12-15 04:38:15 -05:00
养乐多
c8bc166aec remove: Revert "NEW: add christmas cabin"
This reverts commit 19767aebb827abb83229e100a5ae38ff76de6478.

Change-Id: I2ccceae409a16598658a2b35ec56b11617dd0afa
2022-12-15 04:38:15 -05:00
zorro.zhang
9980effd0f NEW: add christmas cabin
Change-Id: Icf9a56c2fdcc34e8eda6254dbb7d33695b41fc7f
2022-12-15 04:38:15 -05:00
zorro.zhang
771dca03a8 FIX: background color of popup dialog
Change-Id: I2ff95a45cac40be3ceb3920739a86833ac730898
(cherry picked from commit 9fdefaa7f97b70fb6c74d75ef133d5b7a677c63a)
2022-12-15 04:38:15 -05:00
zorro.zhang
4831b12093 ENH: adjust right area scrolBar and text color
Change-Id: Ic430728bef302fec47a4304679cc5955a435d5e3
(cherry picked from commit 2a28dd67098e298957a83bb4d446623844db6bd8)
2022-12-15 04:38:15 -05:00
salt.wei
aee1ab242e ENH: update p1p picture
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I89477ad69a3b1aeeee42cfe682d91656ad69f933
2022-12-15 04:38:15 -05:00
zorro.zhang
b89b7f18b0 ENH: ADJUST MENU BUTTON HEIGHT
Change-Id: I3b252b94ed8811145cfa236302d998c64ac9945a
(cherry picked from commit 0021bc7182b73e165227b6c90045589cfad452be)
2022-12-15 04:38:15 -05:00
zorro.zhang
6261911115 ENH: fix some color again
Change-Id: I8d06c7859cdcb232b0625ef1c22e562253be4dcf
(cherry picked from commit 32d143fe029e36715231156ce857fd841a4a3748)
2022-12-15 04:38:15 -05:00
zorro.zhang
5ea7eee6d5 ENH: fix some color problem
Change-Id: Iaae11323cfab96b05746208b8c31b20f3ab56fba
(cherry picked from commit dbe62188c877afdecc522534a2f85f7a0ea80ef4)
2022-12-15 04:38:15 -05:00
zorro.zhang
1314c9a50c FIX: adjust background color
Change-Id: I7e32013dbd348c74dc79f0fdd38de4c46e38554d
2022-12-15 04:38:15 -05:00