Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a line to build_bambu.yml to allow building for Windows and added build_win.yml to conserve build time #5074

Closed
wants to merge 91 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
5543239
Update build_bambu.yml
tsmith35 Oct 24, 2024
bdcddf6
Added build_win to conserve resources
tsmith35 Oct 24, 2024
ed838a8
Update BambuStudio_tr.po
fatih5228 Oct 10, 2024
b3b0a88
libslic3r: Add missing include for tbb::spin_mutex
hadess Oct 15, 2024
33f083d
libslic3r: Fix declaration in FlushVolPredictor.hpp
hadess Oct 15, 2024
5503fdf
libslic3r: Fix format calls
hadess Oct 15, 2024
a435d30
slic3r: Fix missing declarations in wxMediaCtrl3.h
hadess Oct 15, 2024
8a94acd
slic3r: Fix wxDisplay declaration
hadess Oct 15, 2024
3f3dde3
slic3r: Fix boost::nowide declaration
hadess Oct 15, 2024
f1da692
slic3r: Fix missing boost::lexical_cast declaration
hadess Oct 16, 2024
76d39e8
slic3r: Fix missing union_ex/diff_ex declaration
hadess Oct 16, 2024
a8388a3
libslic3r: Fix Model declaration
hadess Oct 16, 2024
7802336
slic3r: Fix std::future declaration
hadess Oct 16, 2024
b517bce
slic3r: Fix missing includes in AVVideoDecoder
hadess Oct 16, 2024
f5d2adb
slic3r: Fix missing includes in wxMediaCtrl2
hadess Oct 16, 2024
01e7b38
slic3r: Fix missing wxPaintDC declaration
hadess Oct 17, 2024
7e78816
slic3r: Fix missing BOOST_LOG_TRIVIAL declaration
hadess Oct 17, 2024
0deabb4
Fix build with CGAL 5.6
FFY00 Sep 9, 2024
d5cdcad
FIX: skip auto arrange when switching from small to big
ArthurBambulab Oct 16, 2024
6c29a7d
NEW:support show print history
walterwongbbl Oct 16, 2024
2134c56
ENH: enable filament_long_retraction for A series
XunZhangBambu Oct 16, 2024
950c263
FIX:Maintain good perspective effect
Haidiye00 Oct 16, 2024
0cf080f
NEW: "REVERT: support show print history"
walterwongbbl Oct 17, 2024
acd5a7e
ENH:brim ears calculate the maximum value of the detection radius
MackBambu Oct 17, 2024
2cd6ebb
FIX:Fix the current noise not displaying when printing
walterwongbbl Oct 17, 2024
151e6c4
FIX:fix the issue of macOS crashing easily
walterwongbbl Oct 17, 2024
c9d45ec
FIX: not add speed smooth area
QingZhangBambu Oct 16, 2024
74f2e6d
FIX:update fedora build shell
MackBambu Oct 17, 2024
598ada8
FIX: Add a matching rule with the same name for PA value
zhimin-zeng-bambulab Oct 17, 2024
00620cc
FIX: remove signed/unsigned compare warning
ArthurBambulab Oct 18, 2024
aaa4f7e
FIX:user_bbl_svg_list may is empty when copy machine
Haidiye00 Oct 18, 2024
854ef66
FIX:reload stl from disk,transformation is error
Haidiye00 Oct 18, 2024
e1720ba
FIX: Resolve compilation errors
zhimin-zeng-bambulab Oct 18, 2024
20e3737
FIX: Object skip incorrectly skipped color change
zhimin-zeng-bambulab Oct 17, 2024
d61c03d
FIX: create custom printer crash
DanBao-Bambu Oct 18, 2024
aad2388
FIX: k value is not display when set pa profile
zhimin-zeng-bambulab Oct 18, 2024
a875596
FIX: set wipe tower to default position when switch printer
zhimin-zeng-bambulab Oct 17, 2024
0e9d083
fix:wrong origin point on G92 && scarf seam
FiredEgg-bambu Oct 11, 2024
23c502c
ENH: CLI: remove some warnings
lanewei120 Oct 18, 2024
890e9b4
ENH: CLI: support other volume types in assemble list
lanewei120 Oct 18, 2024
d0d5b21
FIX: crash when slice model
zhimin-zeng-bambulab Oct 18, 2024
0b90a35
ENH: update step mesh ui
MackBambu Oct 21, 2024
f19a7ef
FIX:filename use '/' for save
Haidiye00 Oct 18, 2024
3e1c6ef
ci: update build version to 01.10.00.75
Oct 21, 2024
21ec584
FIX: solve tree support crash
ArthurBambulab Oct 21, 2024
8c41c56
ENH: filamet shrinkage
QingZhangBambu Jun 5, 2024
97ad850
FIX: seam render missing for path split
QingZhangBambu Oct 18, 2024
076d341
FIX:all grabber should use GrabberSizeFactor
Haidiye00 Oct 21, 2024
78ffbb2
FIX:illegal plate name should include escape characters
Haidiye00 Oct 21, 2024
a63bf99
FIX:github workflow build failed
MackBambu Oct 20, 2024
b2e30c8
ENH:Add FLATPAK variable to skip installing FFmpeg
MackBambu Oct 21, 2024
cbd0f5b
FIX:In some perspectives, using only two points of
Haidiye00 Oct 22, 2024
ce6acc3
FIX: Update the page status when entering the calibration page
zhimin-zeng-bambulab Oct 22, 2024
7639b3e
FIX: crash when slicing(15%, generate perimeter)
zhimin-zeng-bambulab Oct 22, 2024
23d51ae
ci: update build version to 01.10.00.76
Oct 22, 2024
fcd1b53
ci: update build version to 01.10.00.77
Oct 23, 2024
8d4abad
ENH: improve tree supports
ArthurBambulab Oct 15, 2024
cfdd61d
FIX:the checkbox in MsgDislog displays error on linux
MackBambu Oct 23, 2024
8d2baa8
ci: update build version to 01.10.00.78
Oct 24, 2024
60a68a7
ci: update network module based on commit 76ae6aa
Oct 24, 2024
48dd273
FIX:Brim Ears are ignored when cloning objects
MackBambu Oct 24, 2024
af7096f
ENH: protect for accuracy issue
QingZhangBambu Oct 22, 2024
6ebe2b3
ENH: add Bambu TPU For AMS
XunZhangBambu Oct 8, 2024
6e96b1b
FIX: wrong filament vendor in bambu tpu for AMS
XunZhangBambu Oct 15, 2024
3e69f43
ci: update network module based on commit 8f93dce
Oct 24, 2024
831a8ad
ENH: modify filament params for pps-CF
XunZhangBambu Oct 24, 2024
48f001a
FIX: normal support crash
ArthurBambulab Oct 24, 2024
3088c91
ENH: move X1 series' purge line to the front
ArthurBambulab Oct 23, 2024
14ad402
FIX: wxMediaCtrl3 zero size crash
bambu123 Oct 25, 2024
33a97ea
FIX:Only third-party printers record custom bed
Haidiye00 Oct 25, 2024
fd65d1b
FIX:not limit bounding box in assembly view
Haidiye00 Oct 25, 2024
40585a6
FIX:mtl name use utf-8 encoding
Haidiye00 Oct 25, 2024
0c4668a
FIX: PA profile is not match correct in mac environment
zhimin-zeng-bambulab Oct 25, 2024
9a38191
ci: update build version to 01.10.00.79
Oct 25, 2024
43f23f8
FIX: finish day dismiss after switching to another printer and return
DanBao-Bambu Oct 18, 2024
cb2443d
FIX: encode problem in python check
XunZhangBambu Oct 25, 2024
bff8731
FIX: fix an ams mapping issue
StoneLiBambulab Oct 25, 2024
1e43f9d
ENH: translation
ArthurBambulab Oct 25, 2024
bbc4c97
FIX: hybrid tree support may crash due to empty extrusion entities
ArthurBambulab Oct 27, 2024
803d6f4
ENH: apply scarf seam by default for pla
QingZhangBambu Oct 28, 2024
819c0d3
ci: update build version to 01.10.00.80
Oct 28, 2024
9f3ee6f
FIX: revert "FIX: fix an ams mapping issue"
StoneLiBambulab Oct 28, 2024
1a03658
ci: update build version to 01.10.00.81
Oct 28, 2024
83c7524
Qidi.json
HYzd766 Oct 21, 2024
ebb483a
Update Qidi.json
HYzd766 Oct 30, 2024
668f834
Update QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json
HYzd766 Oct 30, 2024
577e20f
Update QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json
HYzd766 Oct 30, 2024
0ba3f13
Update QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json
HYzd766 Oct 30, 2024
0071a12
Update fdm_qidi_x3_common.json
HYzd766 Oct 30, 2024
0fcf7fc
Update fdm_qidi_common.json
HYzd766 Oct 30, 2024
c735524
libslic3r: Fix BOOST_LOG_TRIVIAL declaration
hadess Oct 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/workflows/build_bambu.yml
tsmith35 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,9 @@ jobs:
if: inputs.os == 'windows-latest'
run: |
dir "C:/Program Files (x86)/Windows Kits/10/Include"
choco install pkgconfiglite
choco install nsis
choco install pkgconfiglite

- name: Build slicer Win
if: inputs.os == 'windows-latest'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
working-directory: ${{ github.workspace }}
run: |
choco install strawberryperl
choco install pkgconfiglite
mkdir ${{ github.workspace }}\deps\build
mkdir ${{ github.workspace }}\deps\build\BambuStudio_dep
cd "${{ github.workspace }}\deps\build"
Expand All @@ -86,7 +87,7 @@ jobs:
if: inputs.os == 'macos-13'
working-directory: ${{ github.workspace }}
run: |
brew install automake texinfo
brew install automake texinfo nasm yasm x264
brew uninstall --ignore-dependencies zstd
mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/BambuStudio_dep_${{ inputs.arch }}
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/build_win.yml
tsmith35 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Build Win

on:
push:
branches:
- main
paths:
- 'deps/**'
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
- ".github/workflows/build_*.yml"

pull_request:
branches:
- master
paths:
- 'deps/**'
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- ".github/workflows/build_*.yml"
- 'BuildLinux.sh'
- 'build_win.bat'

workflow_dispatch: # manual dispatch
inputs:
build-deps-only:
description: 'Only build dependencies (bypasses caching)'
type: boolean
default: false

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build_win:
name: Build Win
strategy:
fail-fast: false
matrix:
include:
- os: windows-latest
arch: x86_64
uses: ./.github/workflows/build_check_cache.yml
with:
os: ${{ matrix.os }}
arch: ${{ matrix.arch }}
build-deps-only: ${{ inputs.build-deps-only || false }}
secrets: inherit
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")

set(IS_CROSS_COMPILE FALSE)

set(FLATPAK FALSE CACHE BOOL "Not copy FFMPEG file")


if (APPLE)
set(CMAKE_FIND_FRAMEWORK LAST)
Expand Down Expand Up @@ -760,7 +762,7 @@ else ()
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
endif ()

if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT FLATPAK)
set(LIBRARY_FILES
${LIBDIR_BIN}/libavcodec.so.61
${LIBDIR_BIN}/libavcodec.so.61.3.100
Expand Down
53 changes: 49 additions & 4 deletions bbl/i18n/BambuStudio.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"POT-Creation-Date: 2024-10-25 21:39+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -2165,6 +2165,11 @@ msgstr ""
msgid "No arrangeable objects are selected."
msgstr ""

msgid ""
"The following plates are skipped due to different arranging settings from "
"global:"
msgstr ""

msgid ""
"This plate is locked,\n"
"We can not do auto-arrange on this plate."
Expand Down Expand Up @@ -4708,6 +4713,21 @@ msgstr ""
msgid "Step file import parameters"
msgstr ""

msgid "Rough"
msgstr ""

msgid "Reduce Linear"
msgstr ""

msgid "Reduce Angle"
msgstr ""

msgid "Fewer faces"
msgstr ""

msgid "More faces"
msgstr ""

msgid "Linear Deflection"
msgstr ""

Expand Down Expand Up @@ -5038,6 +5058,9 @@ msgstr ""
msgid "Invalid name, the following characters are not allowed:"
msgstr ""

msgid "(Including its escape characters)"
msgstr ""

msgid "Sliced Info"
msgstr ""

Expand Down Expand Up @@ -8753,6 +8776,18 @@ msgid ""
"and should be accurate"
msgstr ""

msgid "Shrinkage"
msgstr ""

#, no-c-format, no-boost-format
msgid ""
"Enter the shrinkage percentage that the filament will get after cooling (94% "
"if you measure 94mm instead of 100mm). The part will be scaled in xy to "
"compensate. Only the filament used for the perimeter is taken into account.\n"
"Be sure to allow enough space between objects, as this compensation is done "
"after the checks."
msgstr ""

msgid "Density"
msgstr ""

Expand Down Expand Up @@ -10062,7 +10097,7 @@ msgid ""
"threshold."
msgstr ""

msgid "Tree support branch angle"
msgid "Branch angle"
msgstr ""

msgid ""
Expand All @@ -10071,19 +10106,29 @@ msgid ""
"printed more horizontally, allowing them to reach farther."
msgstr ""

msgid "Tree support branch distance"
msgid "Branch distance"
msgstr ""

msgid ""
"This setting determines the distance between neighboring tree support nodes."
msgstr ""

msgid "Tree support branch diameter"
msgid "Branch diameter"
msgstr ""

msgid "This setting determines the initial diameter of support nodes."
msgstr ""

msgid "Branch diameter angle"
msgstr ""

msgid ""
"The angle of the branches' diameter as they gradually become thicker towards "
"the bottom. An angle of 0 will cause the branches to have uniform thickness "
"over their length. A bit of an angle can increase stability of the tree "
"support."
msgstr ""

msgid "Support wall loops"
msgstr ""

Expand Down
70 changes: 62 additions & 8 deletions bbl/i18n/cs/BambuStudio_cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"POT-Creation-Date: 2024-10-25 21:39+0800\n"
"PO-Revision-Date: 2023-10-18 10:45+0800\n"
"Last-Translator: René Mošner <renemosner@seznam.cz>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -2196,6 +2196,11 @@ msgstr ""
msgid "No arrangeable objects are selected."
msgstr ""

msgid ""
"The following plates are skipped due to different arranging settings from "
"global:"
msgstr ""

msgid ""
"This plate is locked,\n"
"We can not do auto-arrange on this plate."
Expand Down Expand Up @@ -4892,6 +4897,21 @@ msgstr ""
msgid "Step file import parameters"
msgstr ""

msgid "Rough"
msgstr ""

msgid "Reduce Linear"
msgstr ""

msgid "Reduce Angle"
msgstr ""

msgid "Fewer faces"
msgstr ""

msgid "More faces"
msgstr ""

msgid "Linear Deflection"
msgstr ""

Expand Down Expand Up @@ -5230,6 +5250,9 @@ msgstr " podložka %1%: "
msgid "Invalid name, the following characters are not allowed:"
msgstr "Neplatné jméno, následující znaky nejsou povoleny:"

msgid "(Including its escape characters)"
msgstr ""

msgid "Sliced Info"
msgstr "Informace o slicování"

Expand Down Expand Up @@ -9212,6 +9235,18 @@ msgstr ""
"Průměr filamentu se používá k výpočtu vytlačování v gcode, takže je důležitý "
"a měl by být přesný"

msgid "Shrinkage"
msgstr ""

#, no-c-format, no-boost-format
msgid ""
"Enter the shrinkage percentage that the filament will get after cooling (94% "
"if you measure 94mm instead of 100mm). The part will be scaled in xy to "
"compensate. Only the filament used for the perimeter is taken into account.\n"
"Be sure to allow enough space between objects, as this compensation is done "
"after the checks."
msgstr ""

msgid "Density"
msgstr "Hustota"

Expand Down Expand Up @@ -10643,8 +10678,8 @@ msgstr ""
"Podpěry budou generovány pro převisy, jejichž úhel sklonu je pod hraniční "
"hodnotou."

msgid "Tree support branch angle"
msgstr "Úhel větve podpěr stromu"
msgid "Branch angle"
msgstr ""

msgid ""
"This setting determines the maximum overhang angle that t he branches of "
Expand All @@ -10655,19 +10690,29 @@ msgstr ""
"stromu dělat. Pokud se úhel zvětší, větve mohou být vytištěny více "
"vodorovně, což jim umožní dosáhnout dále."

msgid "Tree support branch distance"
msgstr "Vzdálenost větví podpěr stromů"
msgid "Branch distance"
msgstr ""

msgid ""
"This setting determines the distance between neighboring tree support nodes."
msgstr "Toto nastavení určuje vzdálenost mezi sousedními uzly podpěr stromů."

msgid "Tree support branch diameter"
msgstr "Průměr větve podpěr stromů"
msgid "Branch diameter"
msgstr ""

msgid "This setting determines the initial diameter of support nodes."
msgstr "Toto nastavení určuje počáteční průměr uzlů poděry."

msgid "Branch diameter angle"
msgstr ""

msgid ""
"The angle of the branches' diameter as they gradually become thicker towards "
"the bottom. An angle of 0 will cause the branches to have uniform thickness "
"over their length. A bit of an angle can increase stability of the tree "
"support."
msgstr ""

msgid "Support wall loops"
msgstr ""

Expand Down Expand Up @@ -13172,6 +13217,15 @@ msgid ""
"probability of warping."
msgstr ""

#~ msgid "Tree support branch angle"
#~ msgstr "Úhel větve podpěr stromu"

#~ msgid "Tree support branch distance"
#~ msgstr "Vzdálenost větví podpěr stromů"

#~ msgid "Tree support branch diameter"
#~ msgstr "Průměr větve podpěr stromů"

#~ msgid ""
#~ "Object will be raised by this number of support layers. Use this function "
#~ "to avoid wrapping when print ABS"
Expand Down
Loading