Skip to content

Y
ygopro
Commit 98972d8a authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'develop' into server-develop

parents 6f683896 8b91c9d7
Pipeline #38328 passed with stages
        in 12 minutes and 15 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 3 additions and 3 deletions
        .ci/assets-locale.sh
        View file @ 98972d8a
        ......@@ -4,7 +4,7 @@ set -o errexit
        source .ci/asset-branch
        # ygopro-database
        apt update && apt -y install wget git libarchive-tools sqlite3
        git clone --depth=1 -b "$ASSET_BRANCH_NAME" https://code.moenext.com/mycard/ygopro-database
        git clone --depth=1 -b master https://code.moenext.com/nanahira/ygopro-database
        cp -rf ./ygopro-database/locales/$TARGET_LOCALE/strings.conf .
        cp -rf ./ygopro-database/locales/$TARGET_LOCALE/servers.conf .
        rm -f cards.cdb
        ......
        script @ 49961747
        Subproject commit a6d1242563104c5bf7e0584c6e80dafd6b02966d
        Subproject commit 49961747bbe53583deb08f969451805851a96919
        system.conf
        View file @ 98972d8a
        ......@@ -4,7 +4,7 @@ use_d3d = 0
        use_image_scale = 1
        use_image_scale_multi_thread = 1
        use_image_load_background_thread = 0
        pro_version = 4961
        pro_version = 4962
        freever = 1
        antialias = 2
        errorlog = 3
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment