Skip to content

Darklight72 patch 2 #81

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Darklight72 patch 2 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fdf0d6
Additional update to include Creality_Print
darklight72 Jan 1, 2025
21652c3
Update SlicerEstimator_settings.jinja2
darklight72 Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions octoprint_SlicerEstimator/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def process_line(self, line):

# slicer auto selection
def detect_slicer(path):
line = SlicerEstimatorFileHandling.search_in_file_regex(path,".*(PrusaSlicer|SuperSlicer|Simplify3D|Cura_SteamEngine|Creality Slicer|OrcaSlicer|BambuStudio|Snapmaker Luban).*")
line = SlicerEstimatorFileHandling.search_in_file_regex(path,".*(PrusaSlicer|SuperSlicer|Simplify3D|Cura_SteamEngine|Creality Slicer|Creality_Print V5.1|OrcaSlicer|BambuStudio|Snapmaker Luban).*")
if line:
if "Cura_SteamEngine" in line or "Creality Slicer" in line:
return SLICER_CURA
Expand Down Expand Up @@ -275,4 +275,4 @@ def store_metadata(self):
self._logger.debug(self._plugin._file_manager._storage_managers[self._origin].get_additional_metadata(self.path,"slicer_filament_change"))

def load_file(self):
self._command_arr = SlicerEstimatorFileHandling.search_in_file_regex(self._file_manager.path_on_disk(self._origin, self.path), self._regexStr, 0, True)
self._command_arr = SlicerEstimatorFileHandling.search_in_file_regex(self._file_manager.path_on_disk(self._origin, self.path), self._regexStr, 0, True)
4 changes: 2 additions & 2 deletions octoprint_SlicerEstimator/templates/SlicerEstimator_settings.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
continuously the remaining print time.') }}</li>
<li><b>SuperSlicer</b>: {{ _('Remaining time is read out of M73 commands. This will update
continuously the remaining print time.') }}</li>
<li><b>OrcaSlicer</b>: {{ _('Remaining time is read out of M73 commands. This will update
<li><b>OrcaSlicer</b> (Creality Print 5.1+): {{ _('Remaining time is read out of M73 commands. This will update
continuously the remaining print time.') }}</li>
<li><b>Bambu Studio</b>: {{ _('Remaining time is read out of M73 commands. This will update
continuously the remaining print time.') }}</li>
Expand Down Expand Up @@ -193,4 +193,4 @@
</div>
</div>
</div>
</form>
</form>