merge: integrate OrcaSlicer-ImageMap onto kx-v2.4.2 base
Rebuilds experimental/imagemap on the correct base. The previous attempt
merged onto upstream 8500fcdcca, which silently dropped all 13 KX commits
(branding, Gitea updater, Kobra X profile, AMS fixes) and reverted the
Moonraker AMS feature set.
Conflict resolution:
- KX side: branding assets, workflows, Kobra X profile, Gitea updater,
GUI_App declarations, PrintObject filament-id structure, GLCanvas3D
reload fixes, PresetBundle extruder validation, ZAA/Polyline3 in GCode.
- ImageMap side: texture/colour machinery (GCode texture sampling,
ToolOrdering zone resolution, MeshBoolean provenance, CGAL repair
colour remap, top-surface image fill params).
- Rewrote ImageMap's wall_filament/sparse_infill_filament/
solid_infill_filament accesses onto the KX *_filament_id options
instead of adding duplicate config fields.
This commit is contained in:
@@ -345,7 +345,11 @@ modules:
|
||||
post-install:
|
||||
|
||||
- | # Desktop integration files
|
||||
install -Dm644 -t /app/share/icons/hicolor/scalable/apps/ resources/images/OrcaSlicer.svg
|
||||
install -Dm644 resources/images/OrcaSlicer_32px.png /app/share/icons/hicolor/32x32/apps/OrcaSlicer.png
|
||||
install -Dm644 resources/images/OrcaSlicer_64.png /app/share/icons/hicolor/64x64/apps/OrcaSlicer.png
|
||||
install -Dm644 resources/images/OrcaSlicer_128px.png /app/share/icons/hicolor/128x128/apps/OrcaSlicer.png
|
||||
install -Dm644 resources/images/OrcaSlicer_192px.png /app/share/icons/hicolor/192x192/apps/OrcaSlicer.png
|
||||
install -Dm644 resources/images/OrcaSlicer.png /app/share/icons/hicolor/256x256/apps/OrcaSlicer.png
|
||||
install -Dm644 ${FLATPAK_ID}.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
|
||||
desktop-file-edit --set-key=Exec --set-value="entrypoint %U" /app/share/applications/${FLATPAK_ID}.desktop
|
||||
install -Dm755 entrypoint /app/bin
|
||||
@@ -382,6 +386,8 @@ modules:
|
||||
path: ../../LICENSE.txt
|
||||
- type: file
|
||||
path: ../../version.inc
|
||||
- type: file
|
||||
path: ../../version_number.txt
|
||||
- type: file
|
||||
path: ../run_gettext.sh
|
||||
dest: scripts
|
||||
|
||||
Reference in New Issue
Block a user