Merge pull request #3919 from freesewing/develop
Get up to date with develop
This commit is contained in:
commit
e9ab680c53
394 changed files with 9683 additions and 6225 deletions
|
@ -8,6 +8,7 @@ import { bannerMacros } from './banner.mjs'
|
|||
import { bannerboxMacros } from './bannerbox.mjs'
|
||||
import { bartackMacros } from './bartack.mjs'
|
||||
import { crossboxMacros } from './crossbox.mjs'
|
||||
import { cutlistStores, cutlistHooks } from './cutlist.mjs'
|
||||
import { scaleboxMacros } from './scalebox.mjs'
|
||||
import { titleMacros } from './title.mjs'
|
||||
// Defs and Macros
|
||||
|
@ -41,6 +42,7 @@ export const plugin = {
|
|||
}
|
||||
},
|
||||
],
|
||||
prePartDraft: [...cutlistHooks.prePartDraft],
|
||||
},
|
||||
macros: {
|
||||
...bannerMacros,
|
||||
|
@ -55,6 +57,7 @@ export const plugin = {
|
|||
...sewtogetherMacros,
|
||||
...titleMacros,
|
||||
},
|
||||
store: [...cutlistStores],
|
||||
}
|
||||
|
||||
export const annotationsPlugin = plugin
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue