From 952b1f642c51f7af5cbca0748d11193f2d1f5850 Mon Sep 17 00:00:00 2001 From: MrTeferi Date: Wed, 23 Nov 2022 15:13:24 -0600 Subject: [PATCH] Address copyright - Remove build action - Disable copyright/not for sale/cardconjurer --- .github/workflows/build.yml | 43 ------------------------------------- creator/index.html | 3 +++ js/creator-23.js | 6 +++++- 3 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 7be5eac5..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,43 +0,0 @@ -# credit: https://data-dive.com/multi-os-deployment-in-cloud-using-pyinstaller-and-github-actions -name: Card Cojurer (server) -on: - push: - tags: - - "v*" - workflow_dispatch: -jobs: - build: - name: Build packages - runs-on: ${{ matrix.os }} - continue-on-error: true - strategy: - matrix: - include: - - os: macos-latest - TARGET: macos - OUTPUT_FILE: launcher - - os: windows-latest - TARGET: windows - OUTPUT_FILE: launcher.exe - - os: ubuntu-latest - TARGET: linux - OUTPUT_FILE: launcher - steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Install Poetry - uses: snok/install-poetry@v1 - - name: Install dependencies - run: | - poetry install --no-interaction - - name: Build with PyInstaller - run: | - poetry run pyinstaller launcher.spec - - name: Upload artifact Windows - uses: actions/upload-artifact@v3 - with: - path: ./dist/${{ matrix.OUTPUT_FILE }} - name: CC Server (${{ matrix.TARGET }}) \ No newline at end of file diff --git a/creator/index.html b/creator/index.html index 54b8a0a0..2c36f541 100644 --- a/creator/index.html +++ b/creator/index.html @@ -632,6 +632,7 @@ + + diff --git a/js/creator-23.js b/js/creator-23.js index ed8a3610..1a66b0d5 100644 --- a/js/creator-23.js +++ b/js/creator-23.js @@ -1703,7 +1703,11 @@ async function bottomInfoEdited() { card.infoArtist = document.querySelector('#info-artist').value; card.infoYear = document.querySelector('#info-year').value; for (var textObject of Object.entries(card.bottomInfo)) { - await writeText(textObject[1], bottomInfoContext); + if (["NOT FOR SALE", "Wizards of the Coast", "CardConjurer.com", "cardconjurer.com"].some(v => textObject[1].text.includes(v))) { + continue; + } else { + await writeText(textObject[1], bottomInfoContext); + } continue; } drawCard();