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.

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

Develop 1.4.0 #76

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

Develop 1.4.0 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1ef0967
Fix schema: make triangleset-attributes required
martinweismann Feb 25, 2022
b2dadb0
Clarify that mirrormesh must point to a mesh
martinweismann Feb 25, 2022
06e1486
Shape fixes
jordig100 Feb 19, 2024
470c9f8
Remove mirrormesh
jordig100 May 6, 2024
80e906c
Added Package Naming Conventions section
netfabb Jun 9, 2024
07c2ee3
Added Package Naming Conventions section index
netfabb Jun 9, 2024
af36559
some fixes
jordig100 Jun 10, 2024
662fe4f
Update 3MF Core Specification.md
jordig100 Jun 13, 2024
aac6979
Update 3MF Core Specification.md
jordig100 Jun 13, 2024
2dd64e0
Update 3MF Core Specification.md
jordig100 Jun 13, 2024
8572fc4
Fixed 3D Model and Print Ticket part in appendixe C
jordig100 Jun 17, 2024
017d674
Add 3MF content type
jordig100 Jun 17, 2024
5de2570
Fix glossary "Object Resource"
jordig100 Oct 31, 2024
e0a23b0
Package Naming Conventions wording from Face2Face NYC
netfabb Oct 31, 2024
bfe587c
Package Naming Conventions wording from Face2Face NYC
netfabb Oct 31, 2024
82c5be4
Package Naming Conventions wording from Face2Face NYC
netfabb Oct 31, 2024
995d6c0
Merge branch 'develop_1.3.1' into develop_1.4.0
jordig100 Nov 4, 2024
e48ac5a
Merge remote-tracking branch 'origin/packagenamingconventions' into d…
jordig100 Nov 4, 2024
36d1bba
Version 1.4.0
jordig100 Nov 4, 2024
c2c8dad
Updated change history
jordig100 Nov 4, 2024
66032e6
Fix change history
jordig100 Nov 4, 2024
8ba3e8a
Update change history header
jordig100 Nov 4, 2024
8b324a2
Fixed dates in change history
jordig100 Nov 4, 2024
19ef217
Fix typo
jordig100 Nov 4, 2024
8f98f97
Update GitHub Actions to use latest versions of checkout and upload-a…
jordig100 Nov 22, 2024
c4b554d
Update mdToPDF.sh
jordig100 Nov 22, 2024
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 .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
env:
SPECNAME: "3MF Core Specification"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true
- run: pip install wheel
- run: pip install grip
- run: ./markdownToPDF/install_wkhtmltopdf.sh
- run: ./markdownToPDF/mdToPDF.sh "$SPECNAME"
- name: Upload PDF
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ env.SPECNAME }}.pdf
path: ${{ env.SPECNAME }}.pdf
Expand Down
209 changes: 89 additions & 120 deletions 3MF Core Specification.md
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified images/element_mesh.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/element_mirrormesh.png
View file
Open in desktop
Binary file not shown.
Binary file removed images/figure_3-2.png
View file
Open in desktop
Binary file not shown.
8 changes: 5 additions & 3 deletions markdownToPDF/mdToPDF.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@

#!/bin/bash

mkdir ~/.grip
echo "PASSWORD = '${GITHUB_API_KEY}'" > ~/.grip/settings.py
# mkdir ~/.grip
# echo "PASSWORD = '${GITHUB_API_KEY}'" > ~/.grip/settings.py

FILE="$1"
TMPFILE="temp.html"

grip "$FILE.md" --export "$FILE.html"
/home/runner/.local/bin/grip "$FILE.md" --export "$FILE.html"
sed "s|readme boxed-group clearfix announce instapaper_body md||g" "$FILE.html" > "$TMPFILE"
sed -i "s|.md$||g" "$TMPFILE"
sed -i 's|<a href="images/3mf_logo_50px.png"|<a|g' "$TMPFILE"
Expand All @@ -40,6 +40,8 @@ sed -i 's|<a href="@|<a href="#|g' "$TMPFILE"
sed -i 's|<pre|<code style="white-space: pre-wrap; page-break-inside: avoid !important; display: block;"|g' "$TMPFILE"
sed -i 's|</pre|</code|g' "$TMPFILE"
sed -i "/Page tweaks/ a * { font-size: large; }" "$TMPFILE"
sed -i 's|margin-top: 64px;|margin-top: 64px; margin-right: 21px;|g' "$TMPFILE"
sed -i 's|margin-bottom: 21px;|margin-bottom: 21px; margin-left: 21px;|g' "$TMPFILE"

MARGIN=14

Expand Down