Update translation source strings (#7028)

Co-authored-by: github-actions <github-actions@github.com>

.ci/Arch/Dockerfile

@@ -7,6 +7,7 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
         git \
         gtest \
         mariadb-libs \
+        ninja \
         protobuf \
         qt6-base \
         qt6-imageformats \

.ci/Debian12/Dockerfile

@@ -15,13 +15,14 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
-        qt6-svg-dev \
+        ninja-build \
-        qt6-websockets-dev \
         protobuf-compiler \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
+        qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \
+        qt6-websockets-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

.ci/Debian13/Dockerfile

@@ -1,8 +1,9 @@
-FROM ubuntu:22.04
+FROM debian:13
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         build-essential \
+        ca-certificates \
         ccache \
         clang-format \
         cmake \
@@ -15,13 +16,14 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
-        libqt6svg6-dev \
+        ninja-build \
-        libqt6websockets6-dev \
         protobuf-compiler \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
+        qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \
+        qt6-websockets-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

.ci/Fedora43/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:43
 
 RUN dnf install -y \
         ccache \
@@ -6,6 +6,7 @@ RUN dnf install -y \
         gcc-c++ \
         git \
         mariadb-devel \
+        ninja-build \
         protobuf-devel \
         qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
         qt6-qtimageformats \

.ci/Fedora44/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:44
 
 RUN dnf install -y \
         ccache \
@@ -6,6 +6,7 @@ RUN dnf install -y \
         gcc-c++ \
         git \
         mariadb-devel \
+        ninja-build \
         protobuf-devel \
         qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
         qt6-qtimageformats \

.ci/Servatrice_Debian12/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:11
+FROM debian:12
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -9,17 +9,13 @@ RUN apt-get update && \
         file \
         g++ \
         git \
-        liblzma-dev \
         libmariadb-dev-compat \
         libprotobuf-dev \
-        libqt5multimedia5-plugins \
+        libqt6sql6-mysql \
-        libqt5sql5-mysql \
+        ninja-build \
-        libqt5svg5-dev \
-        libqt5websockets5-dev \
         protobuf-compiler \
-        qt5-image-formats-plugins \
+        qt6-tools-dev \
-        qtmultimedia5-dev \
+        qt6-tools-dev-tools \
-        qttools5-dev \
+        qt6-websockets-dev \
-        qttools5-dev-tools \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

.ci/Ubuntu24.04/Dockerfile

@@ -15,13 +15,14 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
-        qt6-svg-dev \
+        ninja-build \
-        qt6-websockets-dev \
         protobuf-compiler \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
+        qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \
+        qt6-websockets-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

.ci/Ubuntu26.04/Dockerfile

@@ -1,26 +1,29 @@
-FROM ubuntu:20.04
+FROM ubuntu:26.04
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         build-essential \
+        ca-certificates \
         ccache \
         clang-format \
         cmake \
         file \
         g++ \
         git \
+        libgl-dev \
         liblzma-dev \
         libmariadb-dev-compat \
         libprotobuf-dev \
-        libqt5multimedia5-plugins \
+        libqt6multimedia6 \
-        libqt5sql5-mysql \
+        libqt6sql6-mysql \
-        libqt5svg5-dev \
+        ninja-build \
-        libqt5websockets5-dev \
         protobuf-compiler \
-        qt5-default \
+        qt6-image-formats-plugins \
-        qt5-image-formats-plugins \
+        qt6-l10n-tools \
-        qtmultimedia5-dev \
+        qt6-multimedia-dev \
-        qttools5-dev \
+        qt6-svg-dev \
-        qttools5-dev-tools \
+        qt6-tools-dev \
+        qt6-tools-dev-tools \
+        qt6-websockets-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

.ci/compile.sh

@@ -10,10 +10,12 @@
 # --test runs tests
 # --debug or --release sets the build type ie CMAKE_BUILD_TYPE
 # --ccache [<size>] uses ccache and shows stats, optionally provide size
+# --evict-ccache <age> runs ccache eviction based on given age after build
 # --dir <dir> sets the name of the build dir, default is "build"
-# --parallel <core count> sets how many cores cmake should build with in parallel
+# --cmake-generator <generator> sets CMAKE_GENERATOR as used by cmake
-# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR PARALLEL_COUNT
+# --target-macos-version <version> sets the min os version - only used for macOS builds
-# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir> --parallel <core_count>)
+# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_NO_CLIENT MAKE_TEST USE_CCACHE CCACHE_SIZE CCACHE_EVICTION_AGE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION
+# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir>)
 # exitcode: 1 for failure, 3 for invalid arguments
 
 # Read arguments
@@ -47,6 +49,10 @@ while [[ $# != 0 ]]; do
       MAKE_SERVER=1
       shift
       ;;
+    '--no-client')
+      MAKE_NO_CLIENT=1
+      shift
+      ;;
     '--test')
       MAKE_TEST=1
       shift
@@ -67,6 +73,19 @@ while [[ $# != 0 ]]; do
         shift
       fi
       ;;
+    '--evict-ccache')
+      shift
+      if [[ $# == 0 ]]; then
+        echo "::error file=$0::--evict-ccache expects an argument"
+        exit 3
+      fi
+      CCACHE_EVICTION_AGE=$1
+      shift
+      ;;
+    '--vcpkg')
+      USE_VCPKG=1
+      shift
+      ;;
     '--dir')
       shift
       if [[ $# == 0 ]]; then
@@ -76,13 +95,22 @@ while [[ $# != 0 ]]; do
       BUILD_DIR="$1"
       shift
       ;;
-    '--parallel')
+    '--cmake-generator')
       shift
       if [[ $# == 0 ]]; then
-        echo "::error file=$0::--parallel expects an argument"
+        echo "::error file=$0::--cmake-generator expects an argument"
         exit 3
       fi
-      PARALLEL_COUNT="$1"
+      export CMAKE_GENERATOR=$1
+      shift
+      ;;
+    '--target-macos-version')
+      shift
+      if [[ $# == 0 ]]; then
+        echo "::error file=$0::--target-macos-version expects an argument"
+        exit 3
+      fi
+      TARGET_MACOS_VERSION="$1"
       shift
       ;;
     *)
@@ -105,11 +133,17 @@ fi
 mkdir -p "$BUILD_DIR"
 cd "$BUILD_DIR"
 
+# Set minimum CMake Version
+export CMAKE_POLICY_VERSION_MINIMUM=3.10
+
 # Add cmake flags
 flags=("-DCMAKE_BUILD_TYPE=$BUILDTYPE")
 if [[ $MAKE_SERVER ]]; then
   flags+=("-DWITH_SERVER=1")
 fi
+if [[ $MAKE_NO_CLIENT ]]; then
+  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0")
+fi
 if [[ $MAKE_TEST ]]; then
   flags+=("-DTEST=1")
 fi
@@ -123,19 +157,12 @@ fi
 if [[ $PACKAGE_TYPE ]]; then
   flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE")
 fi
+if [[ $USE_VCPKG ]]; then
+  flags+=("-DUSE_VCPKG=1")
+fi
 
 # Add cmake --build flags
 buildflags=(--config "$BUILDTYPE")
-if [[ $PARALLEL_COUNT ]]; then
-  if [[ $(cmake --build /not_a_dir --parallel 2>&1 | head -1) =~ parallel ]]; then
-    # workaround for bionic having an old cmake
-    echo "this version of cmake does not support --parallel, using native build tool -j instead"
-    buildflags+=(-- -j "$PARALLEL_COUNT")
-    # note, no normal build flags should be added after this
-  else
-    buildflags+=(--parallel "$PARALLEL_COUNT")
-  fi
-fi
 
 function ccachestatsverbose() {
   # note, verbose only works on newer ccache, discard the error
@@ -148,6 +175,88 @@ function ccachestatsverbose() {
 }
 
 # Compile
+if [[ $RUNNER_OS == macOS ]]; then
+  # QTDIR is needed for macOS since we actually only use the cached thin Qt binaries instead of the install-qt-action,
+  # which sets a few environment variables
+  if QTDIR=$(find "$GITHUB_WORKSPACE/Qt" -depth -maxdepth 2 -name macos -type d -print -quit); then
+    echo "found QTDIR at $QTDIR"
+  else
+    echo "could not find QTDIR!"
+    exit 2
+  fi
+  # the qtdir is located at Qt/[qtversion]/macos
+  # we use find to get the first subfolder with the name "macos"
+  # this works independent of the qt version as there should be only one version installed on the runner at a time
+  export QTDIR
+
+  if [[ $TARGET_MACOS_VERSION ]]; then
+    # CMAKE_OSX_DEPLOYMENT_TARGET is a vanilla cmake flag needed to compile to target macOS version
+    flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=$TARGET_MACOS_VERSION")
+
+    # vcpkg dependencies need a vcpkg triplet file to compile to the target macOS version
+    # an easy way is to copy the x64-osx.cmake file and modify it
+    triplets_dir="/tmp/cmake/triplets"
+    triplet_version="custom-triplet"
+    triplet_file="$triplets_dir/$triplet_version.cmake"
+    arch=$(uname -m)
+    if [[ $arch == x86_64 ]]; then
+      arch="x64"
+    fi
+    mkdir -p "$triplets_dir"
+    triplet_source="../vcpkg/triplets/$arch-osx.cmake"
+    if [[ ! -f "$triplet_source" ]]; then
+      triplet_source="../vcpkg/triplets/community/$arch-osx.cmake"
+    fi
+    cp "$triplet_source" "$triplet_file"
+    echo "set(VCPKG_CMAKE_SYSTEM_VERSION $TARGET_MACOS_VERSION)" >>"$triplet_file"
+    echo "set(VCPKG_OSX_DEPLOYMENT_TARGET $TARGET_MACOS_VERSION)" >>"$triplet_file"
+    flags+=("-DVCPKG_OVERLAY_TRIPLETS=$triplets_dir")
+    flags+=("-DVCPKG_HOST_TRIPLET=$triplet_version")
+    flags+=("-DVCPKG_TARGET_TRIPLET=$triplet_version")
+    echo "::group::Generated triplet $triplet_file"
+    cat "$triplet_file"
+    echo "::endgroup::"
+  fi
+
+  echo "::group::Signing Certificate"
+  if [[ -n "$MACOS_CERTIFICATE_NAME" ]]; then
+    echo "$MACOS_CERTIFICATE" | base64 --decode >"certificate.p12"
+    security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+    security default-keychain -s build.keychain
+    security set-keychain-settings -t 3600 -l build.keychain
+    security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+    security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
+    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+    echo "macOS signing certificate successfully imported and keychain configured."
+  else
+    echo "No signing certificate configured. Skipping set up of keychain in macOS environment."
+  fi
+  echo "::endgroup::"
+
+  if [[ $MAKE_PACKAGE ]]; then
+    # Workaround https://github.com/actions/runner-images/issues/7522
+    # have hdiutil repeat the command 10 times in hope of success
+    hdiutil_script="/tmp/hdiutil.sh"
+    # shellcheck disable=SC2016
+    echo '#!/bin/bash
+    i=0
+    while ! hdiutil "$@"; do
+      if (( ++i >= 10 )); then
+        echo "Error: hdiutil failed $i times!" >&2
+        break
+      fi
+      sleep 1
+    done' >"$hdiutil_script"
+    chmod +x "$hdiutil_script"
+    flags+=(-DCPACK_COMMAND_HDIUTIL="$hdiutil_script")
+  fi
+
+elif [[ $RUNNER_OS == Windows ]]; then
+  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
+  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
+  buildflags+=(-- -p:UseMultiToolTask=true -p:EnableClServerMode=true)
+fi
+
 if [[ $USE_CCACHE ]]; then
   echo "::group::Show ccache stats"
   ccachestatsverbose
@@ -156,23 +265,39 @@ fi
 
 echo "::group::Configure cmake"
 cmake --version
+echo "Running cmake with flags: ${flags[*]}"
 cmake .. "${flags[@]}"
 echo "::endgroup::"
 
 echo "::group::Build project"
-if [[ $RUNNER_OS == Windows ]]; then
+echo "Running cmake --build with flags: ${buildflags[*]}"
-  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
+cmake --build . "${buildflags[@]}"
-  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
-  cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
-else
-  cmake --build . "${buildflags[@]}"
-fi
 echo "::endgroup::"
 
 if [[ $USE_CCACHE ]]; then
+  if [[ $CCACHE_EVICTION_AGE ]]; then
+    echo "::group::evict ccache files older than $CCACHE_EVICTION_AGE"
+    ccache --evict-older-than "$CCACHE_EVICTION_AGE"
+    echo "::endgroup::"
+  fi
   echo "::group::Show ccache stats again"
   ccachestatsverbose
   echo "::endgroup::"
+elif [[ $CCACHE_EVICTION_AGE ]]; then
+  echo "::error file=$0::ccache eviction is enabled while ccache is disabled!"
+fi
+
+if [[ $RUNNER_OS == macOS ]]; then
+  echo "::group::Inspect Mach-O binaries"
+  for app in cockatrice oracle servatrice; do
+    binary="$GITHUB_WORKSPACE/build/$app/$app.app/Contents/MacOS/$app"
+    echo "Inspecting $app..."
+    vtool -show-build "$binary"
+    file "$binary"
+    lipo -info "$binary"
+    echo ""
+  done
+  echo "::endgroup::"
 fi
 
 if [[ $MAKE_TEST ]]; then
@@ -189,12 +314,6 @@ fi
 
 if [[ $MAKE_PACKAGE ]]; then
   echo "::group::Create package"
-  
-  if [[ $RUNNER_OS == macOS ]]; then
-    # Workaround https://github.com/actions/runner-images/issues/7522
-    echo "killing XProtectBehaviorService"; sudo pkill -9 XProtect >/dev/null || true;
-    echo "waiting for XProtectBehaviorService kill"; while pgrep "XProtect"; do sleep 3; done;
-  fi
   cmake --build . --target package --config "$BUILDTYPE"
   echo "::endgroup::"
 

.ci/docker.sh

@@ -3,17 +3,28 @@
 # This script is to be used by the ci environment from the project root directory, do not use it from somewhere else.
 
 # Creates or loads docker images to use in compilation, creates RUN function to start compilation on the docker image.
-# <arg> sets the name of the docker image, these correspond to directories in .ci
+#
+# usage: source <script> <name> [--get] [--build] [--save] [--interactive] [--set-cache <location>]
+# <name> sets the name of the docker image, these correspond to directories in .ci
 # --get loads the image from a previously saved image cache, will build if no image is found
 # --build builds the image from the Dockerfile in .ci/$NAME
 # --save stores the image, if an image was loaded it will not be stored
 # --interactive immediately starts the image interactively for debugging
 # --set-cache <location> sets the location to cache the image or for ccache
+#
 # requires: docker
 # uses env: NAME CACHE BUILD GET SAVE INTERACTIVE
 # (correspond to args: <name> --set-cache <cache> --build --get --save --interactive)
 # sets env: RUN CCACHE_DIR IMAGE_NAME RUN_ARGS RUN_OPTS BUILD_SCRIPT
 # exitcode: 1 for failure, 2 for missing dockerfile, 3 for invalid arguments
+#
+# exported RUN function will run the BUILD_SCRIPT inside of the docker container.
+# note that the docker container will not inherit any environment variables!
+#
+# usage: RUN [arguments for build script]
+# roughly equivalent to `docker run $IMAGE_NAME bash $BUILD_SCRIPT $@`
+# uses env: CCACHE_DIR IMAGE_NAME RUN_ARGS RUN_OPTS BUILD_SCRIPT
+# exitcode: 3 for invalid arguments, returns the returncode of docker run
 export BUILD_SCRIPT=".ci/compile.sh"
 
 project_name="cockatrice"
@@ -41,12 +52,17 @@ while [[ $# != 0 ]]; do
       shift
       ;;
     '--set-cache')
-      CACHE=$2
+      shift
+      if [[ $# == 0 ]]; then
+        echo "--set-cache expects an argument" >&2
+        exit 3
+      fi
+      CACHE=$1
+      shift
       if ! [[ -d $CACHE ]]; then
         echo "could not find cache path: $CACHE" >&2
         return 3
       fi
-      shift 2
       ;;
     *)
       if [[ ${1:0:1} == - ]]; then
@@ -137,10 +153,11 @@ if [[ $SAVE ]]; then
 fi
 
 # Set compile function, runs the compile script on the image, passes arguments to the script
+# shellcheck disable=2120
 function RUN ()
 {
   echo "running image:"
-  if [[ $(docker images) =~ "$IMAGE_NAME" ]]; then
+  if [[ $(docker images) =~ $IMAGE_NAME ]]; then
     local args=(--mount "type=bind,source=$PWD,target=/src")
     args+=(--workdir "/src")
     args+=(--user "$(id -u):$(id -g)")
@@ -148,6 +165,11 @@ function RUN ()
       args+=(--mount "type=bind,source=$CCACHE_DIR,target=/.ccache")
       args+=(--env "CCACHE_DIR=/.ccache")
     fi
+    if [[ $GITHUB_OUTPUT ]]; then
+      args+=(--mount "type=bind,source=$GITHUB_OUTPUT,target=/gh_output")
+      args+=(--env "GITHUB_OUTPUT=/gh_output")
+    fi
+    # shellcheck disable=2086
     docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@"
     return $?
   else
@@ -161,5 +183,6 @@ function RUN ()
 if [[ $INTERACTIVE ]]; then
   export BUILD_SCRIPT="-i"
   export RUN_ARGS="$RUN_ARGS -it"
+  # shellcheck disable=2119
   RUN
 fi

.ci/lint_cpp.sh

@@ -11,9 +11,9 @@ if ! git merge-base origin/master HEAD; then
 fi
 
 # Check formatting using format.sh
-echo "Checking your code using clang-format/cmake-format..."
+echo "Checking your code using format.sh..."
 
-diff="$(./format.sh --diff --cmake --cf-version --branch origin/master)"
+./format.sh --color-diff --cmake --shell --print-version --branch origin/master
 err=$?
 
 case $err in
@@ -32,16 +32,6 @@ case $err in
 ***                                                     ***
 ***********************************************************
 
-Used version:
-${diff%%
-----------
-*}
-
-The following changes should be made:
-${diff#*
-----------
-}
-
 Exiting...
 EOM
     exit 2

.ci/name_build.sh

@@ -2,7 +2,6 @@
 # used by the ci to rename build artifacts
 # renames the file to [original name][SUFFIX].[original extension]
 # where SUFFIX is either available in the environment or as the first arg
-# if MAKE_ZIP is set instead a zip is made
 # expected to be run in the build directory unless BUILD_DIR is set
 # adds output to GITHUB_OUTPUT
 builddir="${BUILD_DIR:=.}"
@@ -22,8 +21,8 @@ set -e
 
 # find file
 found="$(find "$builddir" -maxdepth 1 -type f -name "$findrx" -print -quit)"
-path="${found%/*}" # remove all after last /
+path="${found%/*}"    # remove all including first "/" from right side
-file="${found##*/}" # remove all before last /
+file="${found##*/}"    # remove all including last "/" from left side
 if [[ ! $file ]]; then
   echo "::error file=$0::could not find package"
   exit 1
@@ -35,21 +34,16 @@ if ! cd "$path"; then
 fi
 
 # set filename
-name="${file%.*}" # remove all after last .
+name="${file%.*}"    # remove all including first "." from right side
-new_name="$name$SUFFIX."
+new_name="$name$SUFFIX"
-if [[ $MAKE_ZIP ]]; then
+extension="${file##*.}"    # remove all including last "." from left side
-  filename="${new_name}zip"
+filename="$new_name.$extension"
-  echo "creating zip '$filename' from '$file'"
+echo "renaming '$file' to '$filename'"
-  zip "$filename" "$file"
+mv "$file" "$filename"
-else
-  extension="${file##*.}" # remove all before last .
-  filename="$new_name$extension"
-  echo "renaming '$file' to '$filename'"
-  mv "$file" "$filename"
-fi
 
 cd "$oldpwd"
 relative_path="$path/$filename"
 ls -l "$relative_path"
 echo "path=$relative_path" >>"$GITHUB_OUTPUT"
-echo "name=$filename" >>"$GITHUB_OUTPUT"
+echo "name=$new_name" >>"$GITHUB_OUTPUT"
+echo "fullname=$filename" >>"$GITHUB_OUTPUT"

.ci/prep_release.sh

@@ -89,6 +89,8 @@ else
       echo "'$previous' to '$TAG' ($count commits)"
       # --> is the markdown comment escape sequence, emojis are way better
       generated_list="${generated_list//-->/→}"
+      # Escape & to preserve it from commit message into markdown output
+      generated_list="${generated_list//&/\\&}"
       body="${body//--REPLACE-WITH-GENERATED-LIST--/$generated_list}"
       body="${body//--REPLACE-WITH-COMMIT-COUNT--/$count}"
       body="${body//--REPLACE-WITH-PREVIOUS-RELEASE-TAG--/$previous}"

.ci/release_template.md

@@ -4,24 +4,30 @@
 git push -d origin --REPLACE-WITH-BETA-LIST--
  -->
 
-<!-- This list of binaries should be updated every time the CI is changed to
+<!-- This list of binaries should be updated every time the CI is changed to include all targets -->
-include different targets -->
 <pre>
-<b>Pre-compiled binaries we serve:</b>
+Available pre-compiled binaries for installation:
- - <kbd>Windows 10+</kbd>
- - <kbd>Windows 7+</kbd>
- - <kbd>macOS 14+</kbd> ("Sonoma") / Apple M
- - <kbd>macOS 13+</kbd> ("Ventura") / Intel
- - <kbd>Ubuntu 24.04 LTS</kbd> ("Noble Numbat")
- - <kbd>Ubuntu 22.04 LTS</kbd> ("Jammy Jellyfish")
- - <kbd>Ubuntu 20.04 LTS</kbd> ("Focal Fossa")
- - <kbd>Debian 12</kbd> ("Bookworm")
- - <kbd>Debian 11</kbd> ("Bullseye")
- - <kbd>Fedora 41</kbd>
- - <kbd>Fedora 40</kbd>
 
-<i>We are also packaged in <kbd>Arch Linux</kbd>'s official "extra" repository, courtesy of @FFY00</i>
+  <b>Windows</b>
-<i>General Linux support is available via a <kbd>flatpak</kbd> package (Flathub)</i>
+   • <kbd>Windows 10+</kbd>
+
+  <b>macOS</b>
+   • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>
+   • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub> <sub>Apple M</sub>
+   • <kbd>macOS 13+</kbd> <sub><i>Ventura</i></sub> <sub>Intel</sub>
+
+  <b>Linux</b>
+   • <kbd>Ubuntu 26.04 LTS</kbd> <sub><i>Resolute Racoon</i></sub>
+   • <kbd>Ubuntu 24.04 LTS</kbd> <sub><i>Noble Numbat</i></sub>
+   • <kbd>Debian 13</kbd> <sub><i>Trixie</i></sub>
+   • <kbd>Debian 12</kbd> <sub><i>Bookworm</i></sub>
+   • <kbd>Fedora 44</kbd>
+   • <kbd>Fedora 43</kbd>
+
+<sub>We are also packaged in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>, courtesy of @FFY00.</sub>
+<sub>General Linux support is available via a <kbd>flatpak</kbd> package at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a>!</sub>
+
+<sub>We provide a <kbd>Docker</kbd> image for "Servatrice" in <a href="https://github.com/Cockatrice/Cockatrice/pkgs/container/servatrice">GHCR</a>. You can docker pull it or use our Docker Compose files!</sub>
 </pre>
 
 
@@ -35,7 +41,7 @@ If you ever encounter a bug, have a suggestion or idea, or feel a need for a dev
 
 For basic information related to the app and getting started, please take a look at our official site: **https://cockatrice.github.io**
 
-If you'd like to help and contribute to Cockatrice in any way, check out our [README](https://github.com/Cockatrice/Cockatrice#get-involved-).  
+If you'd like to help and contribute to Cockatrice in any way, check out our [README](https://github.com/Cockatrice/Cockatrice#contribute).  
 We're always available to answer questions you may have on how the program works and how you can provide a meaningful contribution.
 
 
@@ -77,7 +83,6 @@ Remove empty headers when done.
 ### Under the Hood
 ### Oracle
 ### Servatrice
-### Webatrice
 
 </details>
 

.ci/resolve_latest_aqt_qt_version.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# This script is used to resolve the latest patch version of Qt using aqtinstall.
+# It interprets wildcards to get the latest patch version. E.g. "6.6.*" -> "6.6.3".
+
+# This script is meant to be used by the ci enironment.
+# It uses the runner's GITHUB_OUTPUT env variable.
+
+# Usage example: .ci/resolve_latest_aqt_qt_version.sh "6.6.*"
+
+qt_spec=$1
+if [[ ! $qt_spec ]]; then
+  echo "usage: $0 [version]"
+  exit 2
+fi
+
+# If version is already specific (no wildcard), use it as-is
+if [[ $qt_spec != *"*" ]]; then
+  echo "version $qt_spec is already resolved"
+  echo "version=$qt_spec" >> "$GITHUB_OUTPUT"
+  exit 0
+fi
+
+if ! hash aqt; then
+  echo "aqt could not be found, has aqtinstall been installed?"
+  exit 2
+fi
+
+# Resolve latest patch
+if [[ $RUNNER_OS == macOS ]]; then
+  if ! qt_resolved=$(aqt list-qt mac desktop --spec "$qt_spec" --latest-version); then
+    exit 1
+  fi
+elif [[ $RUNNER_OS == Windows ]]; then
+  if ! qt_resolved=$(aqt list-qt windows desktop --spec "$qt_spec" --latest-version); then
+    exit 1
+  fi
+else
+  echo "aqt command for $RUNNER_OS not defined."
+  exit 1
+fi
+
+echo "resolved $qt_spec to $qt_resolved"
+if [[ ! $qt_resolved ]]; then
+  echo "Error: Could not resolve Qt version for $qt_spec"
+  exit 1
+fi
+
+echo "version=$qt_resolved" >> "$GITHUB_OUTPUT"

.ci/thin_macos_qtlib.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# The macos binaries from aqt are fat (universal), so we thin them to the target architecture to reduce the size of
+# the packages and caches using lipo.
+
+# This script is meant to be used by the ci enironment on macos runners only.
+# It uses the runner's GITHUB_WORKSPACE env variable.
+arch=$(uname -m)
+nproc=$(sysctl -n hw.ncpu)
+
+function thin() {
+  local libfile=$1
+  if [[ $(file -b --mime-type "$libfile") == application/x-mach-binary* ]]; then
+    echo "Processing $libfile"
+    lipo "$libfile" -thin "$arch" -output "$libfile"
+  fi
+  return 0
+}
+export -f thin  # export to allow use in xargs
+export arch
+set -eo pipefail
+
+echo "::group::Thinning Qt libraries to $arch using $nproc cores"
+find "$GITHUB_WORKSPACE/Qt" -type f -print0 | xargs -0 -n1 -P"$nproc" -I{} bash -c "thin '{}'"
+echo "::endgroup::"

.ci/update_translation_source_strings_template.md

@@ -10,5 +10,5 @@ Last changes are based on commit {{ .commit }}.
 *This PR is automatically generated and updated by the workflow at `.github/workflows/translations-push.yml`. Review [action runs][2].*<br>
 *After merging, all changes to the source language are available for translation at [Transifex][1] shortly.*
 
-[1]: https://app.transifex.com/cockatrice/cockatrice/
+[1]: https://explore.transifex.com/cockatrice/cockatrice/
 [2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-push.yml?query=branch%3Amaster

.clang-format

@@ -3,7 +3,9 @@ AccessModifierOffset: -4
 ColumnLimit: 120
 ---
 Language: Cpp
-BreakBeforeBraces: Custom
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: None
+BinPackParameters: false
 BraceWrapping:
   AfterClass: true
   AfterControlStatement: false
@@ -18,13 +20,14 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-AllowShortFunctionsOnASingleLine: None
+BreakBeforeBraces: Custom
-BinPackParameters: false
-AllowAllParametersOfDeclarationOnNextLine: false
-IndentCaseLabels: true
-PointerAlignment: Right
-SortIncludes: true
 IncludeBlocks: Regroup
+IndentCaseLabels: true
+InsertBraces: true
+PointerAlignment: Right
+RemoveSemicolon: true
+SortIncludes: true
+StatementAttributeLikeMacros: [emit]
 ---
 Language: Proto
 AllowShortFunctionsOnASingleLine: None

.github/CONTRIBUTING.md

@@ -1,3 +1,5 @@
+<!--! @page contributing Contributing -->
+
 &nbsp; [Introduction](#contributing-to-cockatrice) | [Code Style Guide](
 #code-style-guide) | [Translations](#translations) | [Release Management](
 #release-management)
@@ -7,32 +9,33 @@
 <br>
 
 # Contributing to Cockatrice #
-First off, thanks for taking the time to contribute to our project! 🎉 ❤ ️✨
 
-The following is a set of guidelines for contributing to Cockatrice. These are
+First off, thanks for taking the time and considering to lend a helping hand to our project! 🎉 ❤ ️✨
-mostly guidelines, not rules. Use your best judgment, and feel free to propose
+
-changes to this document in a pull request.
+> [!NOTE]
+> The following is a set of guidelines for contributing to Cockatrice.  
+> These are mostly guidelines, not rules. Use your best judgment, and feel free to
+> propose changes to this document in a pull request.
+>
+> [![Discord](
+> https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](
+> https://discord.gg/3Z9yzmA)  
+> If you'd like to ask questions, get advice, or just want to say "Hi",
+> the Cockatrice Development Team uses [Discord](https://discord.gg/ZASRzKu)
+> for communications and you can reach out in the `#dev` channel.
 
 
 # Recommended Setups #
 
-For those developers who like the Linux or MacOS environment, many of our
+For those developers on **Linux** or **macOS** environment, many of our
 developers like working with a nifty program called [CLion](
-https://www.jetbrains.com/clion/). The program's a great asset and one of the
+https://www.jetbrains.com/clion/). The program is a great asset and one of the
-best tools you'll find on these systems, but you're welcomed to use any IDE
+best tools you'll find on these systems.
-you most enjoy.
 
-Developers who like Windows development tend to find [Visual Studio](
+Developers on **Windows** systems tend to find [Visual Studio](
 https://www.visualstudio.com/) the best tool for the job.
 
-[![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white&color=7289da)](https://discord.gg/ZASRzKu)
+But you're welcomed to use any IDE you enjoy most of course!
-[![Gitter Chat](https://img.shields.io/gitter/room/Cockatrice/Cockatrice.svg)](https://gitter.im/Cockatrice/Cockatrice)
-
-If you'd like to ask questions, get advice, or just want to say hi,
-the Cockatrice Development Team uses [Discord](https://discord.gg/ZASRzKu)
-for communications in the #dev channel. If you're not into Discord, we also
-have a [Gitter](https://gitter.im/Cockatrice/Cockatrice) channel available,
-albeit slightly less active.
 
 
 # Code Style Guide #
@@ -64,7 +67,7 @@ information on our formatting guidelines.
 
 ### Compatibility ###
 
-Cockatrice is currently compiled on all platforms using <kbd>C++11</kbd>.
+Cockatrice is currently compiled on all platforms using <kbd>C++20</kbd>.
 You'll notice <kbd>C++03</kbd> code throughout the codebase. Please feel free
 to help convert it over!
 
@@ -78,11 +81,12 @@ or other appropriate conversion.
 ### Formatting ###
 
 The handy tool `clang-format` can format your code for you, it is available for
-almost any environment. A special `.clang-format` configuration file is
+almost any environment. A special [`.clang-format`](
+https://github.com/Cockatrice/Cockatrice/blob/master/.clang-format) configuration file is
 included in the project and is used to format your code.
 
 We've also included a bash script, `format.sh`, that will use clang-format to
-format all files in your pr in one go. Use `./format.sh --help` to show a full
+format all files in your PR in one go. Use `./format.sh --help` to show a full
 help page.
 
 To run clang-format on a single source file simply use the command
@@ -90,10 +94,10 @@ To run clang-format on a single source file simply use the command
 clang-format with a specific version number appended,
 `find /usr/bin -name clang-format*` should find it for you)
 
-See [the clang-format documentation](
+See the [clang-format documentation](
 https://clang.llvm.org/docs/ClangFormat.html) for more information about the tool.
 
-#### Header files ####
+#### Header Files ####
 
 Use header files with the extension `.h` and source files with the extension
 `.cpp`.
@@ -205,6 +209,16 @@ nowadays and clean it up for you.
 Lines should be 120 characters or less. Please break up lines that are too long
 into smaller parts, for example at spaces or after opening a brace.
 
+### Documentation Comments ###
+
+Use [Doxygen](https://www.doxygen.nl/) for code documentation:
+
+- **Doc blocks**: Use `/** @brief Description */` (Javadoc-style), not `///`
+- **Member comments**: Use trailing `///<` for inline member documentation
+- **TODOs**: Use `//! \todo Description` (Qt-style), Doxygen collects them into a Todo List
+  (uses [Qt-style comments](https://www.doxygen.nl/manual/docblocks.html) with
+  Doxygen's [\todo command](https://www.doxygen.nl/manual/commands.html#cmdtodo))
+
 ### Memory Management ###
 
 New code should be written using references over pointers and stack allocation
@@ -234,7 +248,7 @@ mutating objects.)
 When pointers can't be avoided, try to use a smart pointer of some sort, such
 as `QScopedPointer`, or, less preferably, `QSharedPointer`.
 
-### Database migrations ###
+### Database Migrations ###
 
 The servatrice database's schema can be found at `servatrice/servatrice.sql`.
 Everytime the schema gets modified, some other steps are due:
@@ -255,7 +269,7 @@ Ensure that the migration produces the expected effects; e.g. if you add a
 new column, make sure the migration places it in the same order as
 servatrice.sql.
 
-### Protocol buffer ###
+### Protocol Buffer ###
 
 Cockatrice and Servatrice exchange data using binary messages. The syntax of
 these messages is defined in the `proto` files in the `common/pb` folder. These
@@ -268,6 +282,7 @@ new clients incompatible to the old server and vice versa.
 You can find more information on how we use Protobuf on [our wiki!](
 https://github.com/Cockatrice/Cockatrice/wiki/Client-server-protocol)
 
+
 # Reviewing Pull Requests #
 
 After you have finished your changes to the project you should put them on a
@@ -286,6 +301,7 @@ all changes have been approved your pull request will be squashed into a single
 commit and merged into the master branch by a team member. Your change will then
 be included in the next release 👍
 
+
 # Translations #
 
 Basic workflow for translations:
@@ -294,16 +310,16 @@ Basic workflow for translations:
  3. Maintainer verifies and merges the change;
  4. Transifex picks up the new files from GitHub automatically;
  5. Translators translate the new untranslated strings on Transifex;
- 6. Before a release, a maintainer fetches the updated translations from Transifex.
+ 6. Before a release, a maintainer fetches the newest translations from Transifex.
 
 ### Using Translations (for developers) ###
 
 All user interface strings inside Cockatrice's source code must be written
 in English (US).
 Translations to other languages are managed using [Transifex](
-https://www.transifex.com/projects/p/cockatrice/).
+https://transifex.com/cockatrice/cockatrice/).
 
-Adding a new string to translate is as easy as adding the string in the
+Adding a new string for translation is as easy as adding the string in the
 `tr("")` function, the string will be picked up as translatable automatically
 and translated as needed.
 For example, setting the text of a label in the way that the string
@@ -315,9 +331,9 @@ nameLabel.setText(tr("My name is:"));
 To translate a string that would have plural forms you can add the amount to
 the tr() call, also you can add an extra string as a hint for translators:
 ```c++
-QString message = tr("Everyone draws %n cards", "pop up message", amount);
+QString message = tr("Everyone draws %n cards", "english hint for translators", amount);
 ```
-See [QT's wiki on translations](
+See [Qt's wiki on translations](
 https://doc.qt.io/qt-5/i18n-source-translation.html#handling-plurals)
 
 If you're about to propose a change that adds or modifies any translatable
@@ -325,7 +341,7 @@ string in the code, you don't need to take care of adding the new strings to
 the translation files.<br>
 We have an automated process to update our language source files on a schedule
 and provide the translators on Transifex with the new contents.<br>
-Maintainers can also manually trigger this on demand.
+Maintainers can also manually trigger this workflow on demand via GitHub Actions.
 
 ### Maintaining Translations (for maintainers) ###
 
@@ -389,27 +405,27 @@ Now you are ready to commit your changes and open a PR.
 </details>
 
 Once the changes get merged, Transifex will pick up the modified files
-automatically (checked every few hours) and update their online editor where
+automatically (checked every few hours) and update the web editor where
 translators will be able to translate the new strings right in the browser.
 
 ### Releasing Translations (for maintainers) ###
 
-Before rushing out a new release, a maintainer should fetch the most up to date
+Before publishing a new release, a maintainer should fetch the most up to date
 translations from Transifex and commit them into the Cockatrice source code.
-This can be done manually from the Transifex web interface, but it's quite time
+We utilize the official GitHub integration to push all languages that are 100%
-consuming.
+translated from Transifex to our GitHub repo automatically.
-
+On top, it runs on a quarterly schedule to update changes for incomplete languages.
-As an alternative, you can install the Transifex CLI:
+A synchronisation/update can also be triggered manually from the Transifex web interface
-
+and a translation treshold can be set.
-    http://docs.transifex.com/developer/client/
 
+As an alternative, you can install the [Transifex CLI](https://developers.transifex.com/docs/cli).
 You'll then be able to use a git-like cli command to push and pull translations
 from Transifex to the source code and vice versa.
 
 ### Adding Translations (for translators) ###
 
-As a translator you can help translate the new strings on [Transifex](
+As a translator, you can help to translate new strings on [Transifex](
-https://www.transifex.com/projects/p/cockatrice/).
+https://www.transifex.com/projects/p/cockatrice/) to your native language.
 Please have a look at the specific [FAQ for translators](
 https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ).
 
@@ -419,9 +435,9 @@ https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ).
 ### Publishing A New Release ###
 
 We use [GitHub Releases](https://github.com/Cockatrice/Cockatrice/releases) to
-publish new stable versions and betas.
+publish new stable versions and beta releases.
-Whenever a git tag is pushed to the repository github will create a draft
+Whenever a git tag is pushed to the repository, GitHub will create a draft
-release and upload binaries automatically.
+release and upload binaries from our CI automatically.
 
 To create a tag, simply do the following:
 ```bash
@@ -433,18 +449,16 @@ git push $UPSTREAM $TAG_NAME
 ```
 
 You should define the variables as such:
-```
+ - `$UPSTREAM`: the remote for `git@github.com:Cockatrice/Cockatrice.git`
-`$UPSTREAM` - the remote for git@github.com:Cockatrice/Cockatrice.git
+ - `$TAG_NAME` should be formatted as:
-`$TAG_NAME` should be formatted as:
      - `YYYY-MM-DD-Release-MAJ.MIN.PATCH` for **stable releases**
      - `YYYY-MM-DD-Development-MAJ.MIN.PATCH-beta.X` for **beta releases**<br>
-    With *MAJ.MIN.PATCH* being the NEXT release version!
+       With <kbd>MAJ</kbd>.<kbd>MIN</kbd>.<kbd>PATCH</kbd> being the NEXT release version!
-```
 
 This will cause a tagged release to be established on the GitHub repository,
-with the binaries being added to the release whenever they are ready.
+with the binaries being added to the release whenever they are done building in CI.
-The release is initially a draft, where the path notes can be edited and after
+The release is initially a draft, where the release notes can be edited and after
-all is good and ready it can be published on GitHub.
+all is checked and ready, it can be published as GitHub release.
 If you use a SemVer tag including "beta", the release that will be created at
 GitHub will be marked as a "Pre-release" automatically.
 The target of the `.../latest` URL will not be changed in that case, it always
@@ -457,7 +471,11 @@ revoke the tag by doing the following:
 git push --delete upstream $TAG_NAME
 git tag -d $TAG_NAME
 ```
-You can also do this on GitHub, you'll also want to delete the new release.
+You can also do this on GitHub.
+
+> [!NOTE]
+> If you want to push a new release to replace it immediately with the same
+> name you have to delete the automatically created release first!
 
 In the first lines of [CMakeLists.txt](
 https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt)
@@ -468,25 +486,24 @@ coming from the tag title, it's good practice to increment the ones at CMake
 after every full release to stress that master is ahead of the last stable
 release.
 The preferred flow of operation is:
- * Just before a release, make sure the version number in CMakeLists.txt is set
+ - Just before a release, make sure the version number in CMakeLists.txt is set
    to the same release version you are about to tag.
- * This is also the time to change the pretty name in CMakeLists.txt called
+ - This is also the time to change the pretty name in CMakeLists.txt called
- GIT_TAG_RELEASENAME and commit and push these changes.
+   `GIT_TAG_RELEASENAME` and commit and push these changes.
- * Tag the release following the previously described syntax in order to get it
+ - Tag the release following the previously described syntax in order to get it
    correctly built and deployed by CI.
- * Wait for the configure step to create the release and update the patch
+ - Wait for the configuration step to create the release and update the patch
    notes.
- * Check on the github actions page for build progress which should be the top
+ - Check on the GitHub Actions page for build progress which should be the top
    listed [here](
  https://github.com/Cockatrice/Cockatrice/actions?query=event%3Apush+-branch%3Amaster
  ).
- * When the build has been completed you can verify all uploaded files on the
+ - When the build has been completed, you can verify if all uploaded files on the
- release are in order and hit the publish button.
+   draft release are included and hit the publish button.
- * After the release is complete, update the CMake version number again to the
+ - After the release is complete, update the CMake version number again to the
    next targeted beta version, typically increasing `PROJECT_VERSION_PATCH` by
    one.
 
 When releasing a new stable version, all previous beta releases (and tags)
-should be deleted. This is needed for Cockatrice to update users of the "Beta"
+should be deleted as well.
-release channel correctly to the latest stable version as well.
 This can be done the same way as revoking tags, mentioned above.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,20 +2,31 @@
 name: "🐛 Bug Report"
 about: Report an issue encountered while using Cockatrice
 title: ''
-labels: 'Bug'
+type: 'Bug'
+labels: ''
 assignees: ''
 
 ---
 
 <!--                   READ THIS BEFORE POSTING
-Go to "Help → View Debug Log" in Cockatrice and copy all information at the
+In Cockatrice, go to "Help" → "View Debug Log" and copy all information displayed at the
-top (above the separation line) below "System Information" in this ticket!
+top (above the separation line "----"), to below "System Information" section in this ticket!
 If you can't start Cockatrice to access these details, make
-sure to post your OS and the file name of the setup binary instead. -->
+sure to post your OS and the file name of the setup binary instead.
+-->
 
 **System Information:**
+<!-- Read the hint above on where to find the important information to provide here! -->
 
 
+<details><summary>Debug Log:</summary>
+<!--
+In Cockatrice, go to "Help" → "View Debug Log", click the "Copy to clickboard" button and paste the output here.
+-->
+
+
+</details>
+
 _______________________________________________________________________________________
 
 <!-- Explain your issue in detail here! Please attach screenshots if possible. -->
@@ -25,7 +36,7 @@ ________________________________________________________________________________
 
 _______________________________________________________________________________________
 
-<!-- Describe the sequence of actions needed to experience the bug -->
+<!-- Describe the sequence of actions needed to experience the bug. -->
 
 **Steps to reproduce:**
  - Do A

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +1,12 @@
 blank_issues_enabled: false
 contact_links:
   - name: 💬 Discord Community (Get help with server issues, e.g. Login)
-    url: https://discord.gg/3Z9yzmA
+    url: https://discord.com/invite/3Z9yzmA
     about: Need help with using the client? Want to find some games? Try the Discord server!
   - name: 🌐 Translations (Help improve the localization of the app)
-    url: https://www.transifex.com/cockatrice/cockatrice/
+    url: https://explore.transifex.com/cockatrice/cockatrice/
     # it is not possible to add a link to the wiki to this description
     about: For more information and guidance check our Translation FAQ on our wiki!
+  - name: 📖 Code Documentation
+    url: https://cockatrice.github.io/docs/
+    about: Helpful source focusing on developers, but there are also references for users!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,8 +1,9 @@
 ---
 name: "💡 Feature Request"
-about: Request a new feature
+about: Request a new feature for Cockatrice
 title: ''
-labels: 'Feature Request'
+type: 'Feature'
+labels: ''
 assignees: ''
 
 ---

.github/dependabot.yml

@@ -2,19 +2,21 @@
 
 version: 2
 updates:
- # # Enable version updates for git submodules
+ # Enable version updates for git submodules
- # Not yet possible to bump only on tags or releases, see:
+ # If SemVer is used, updates will happen to new releases only (not HEAD)
  # https://github.com/dependabot/dependabot-core/issues/1639
  # https://github.com/dependabot/dependabot-core/issues/2192
- # Alternative: Action that updates submodule and can be manually run on demand (workflow_dispatch)
+  - package-ecosystem: "gitsubmodule"
- # - package-ecosystem: "gitsubmodule"
+    # Look for `.gitmodules` in the `root` directory
- #   # Look for `.gitmodules` in the `root` directory
+    directory: "/"
- #   directory: "/"
+    ignore:
- #   # Check for updates once a month
+      # Ignore updates for vcpkg (Bump to latest tag not working (no SemVer used)
- #   schedule:
+      - dependency-name: "vcpkg"
- #     interval: "monthly"
+    # Check for updates once a month
- #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+    schedule:
- #   open-pull-requests-limit: 1
+      interval: "monthly"
+    # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+    open-pull-requests-limit: 2
 
  # # Enable version updates for Docker
  # Not yet possible to bump from one LTS version to the next and skip others, see:
@@ -37,13 +39,3 @@ updates:
       interval: "weekly"
     # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
     open-pull-requests-limit: 2
-
- # # Enable version updates for npm
- # - package-ecosystem: "npm"
- #   # Look for `package.json` and `lock` files in the `webclient` subdirectory
- #   directory: "/webclient"
- #   # Check the npm registry for updates once a week
- #   schedule:
- #     interval: "weekly"
- #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
- #   open-pull-requests-limit: 5

.github/workflows/desktop-build.yml

@@ -1,305 +1,504 @@
 name: Build Desktop
 
+permissions:
+  actions: write    # needed to delete entries in GHA cache (update ccache)
+  attestations: write    # needed to persist the attestation.
+  contents: write
+  id-token: write    # needed for signing certificate in attestation
+
 on:
   push:
     branches:
       - master
-    paths-ignore:
+    paths:
-      - '**.md'
+      - '*/**'    # matches all files not in root
-      - 'webclient/**'
+      - '!**.md'
-      - '.github/workflows/web-*.yml'
+      - '!.github/**'
-      - '.github/workflows/translations-*.yml'
+      - '!.tx/**'
+      - '!doc/**'
+      - '.github/workflows/desktop-build.yml'
+      - 'CMakeLists.txt'
+      - 'vcpkg.json'
+      - 'vcpkg'    # needed to match submodule bumps (gitlink)
     tags:
       - '*'
   pull_request:
-    paths-ignore:
+    paths:
-      - '**.md'
+      - '*/**'    # matches all files not in root
-      - 'webclient/**'
+      - '!**.md'
-      - '.github/workflows/web-*.yml'
+      - '!.github/**'
-      - '.github/workflows/translations-*.yml'
+      - '!.tx/**'
+      - '!doc/**'
+      - '.github/workflows/desktop-build.yml'
+      - 'CMakeLists.txt'
+      - 'vcpkg.json'
+      - 'vcpkg'    # needed to match submodule bumps (gitlink)
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_name != 'master' }}
+  cancel-in-progress: ${{ github.ref_type != 'tag' }}
 
 jobs:
   configure:
     name: Configure
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     outputs:
-      tag: ${{steps.configure.outputs.tag}}
+      tag: ${{ steps.configure.outputs.tag }}
-      sha: ${{steps.configure.outputs.sha}}
+      sha: ${{ steps.configure.outputs.sha }}
 
     steps:
-      - name: Configure
+      - name: "Configure"
+        env:
+          RESOLVED_SHA: ${{ case(github.event_name == 'pull_request', github.event.pull_request.head.sha, github.sha) }}
         id: configure
         shell: bash
         run: |
-          tag_regex='^refs/tags/'
+          if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then    # release
-          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then    # pull request
+            echo "tag=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"
-            sha="${{github.event.pull_request.head.sha}}"
-          elif [[ $GITHUB_REF =~ $tag_regex ]]; then    # release
-            sha="$GITHUB_SHA"
-            tag="${GITHUB_REF/refs\/tags\//}"
-            echo "tag=$tag" >>"$GITHUB_OUTPUT"
-          else    # push to branch
-            sha="$GITHUB_SHA"
           fi
-          echo "sha=$sha" >>"$GITHUB_OUTPUT"
+          echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT"
 
-      - name: Checkout
+      - name: "Checkout"
         if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
-          fetch-depth: 0
+          fetch-depth: 0    # fetch all history for all branches and tags
 
-      - name: Prepare release parameters
+      - name: "Prepare release parameters"
         id: prepare
         if: steps.configure.outputs.tag != null
         shell: bash
         env:
-          TAG: ${{steps.configure.outputs.tag}}
+          TAG: ${{ steps.configure.outputs.tag }}
         run: .ci/prep_release.sh
 
-      - name: Create release
+      - name: "Create release"
         if: steps.configure.outputs.tag != null
         id: create_release
         shell: bash
         env:
-          GH_TOKEN: ${{github.token}}
+          GH_TOKEN: ${{ github.token }}
-          tag_name: ${{steps.configure.outputs.tag}}
+          tag_name: ${{ steps.configure.outputs.tag }}
-          target: ${{steps.configure.outputs.sha}}
+          target: ${{ steps.configure.outputs.sha }}
-          release_name: ${{steps.prepare.outputs.title}}
+          release_name: ${{ steps.prepare.outputs.title }}
-          body_path: ${{steps.prepare.outputs.body_path}}
+          body_path: ${{ steps.prepare.outputs.body_path }}
-          prerelease: ${{steps.prepare.outputs.is_beta}}
+          prerelease: ${{ steps.prepare.outputs.is_beta }}
         run: |
-          if [[ $prerelease == yes ]]; then
+          args=()
-            args="--prerelease"
+          [[ $prerelease == yes ]] && args+=(--prerelease)
-          fi
+
-          gh release create "$tag_name" --draft --verify-tag $args \
+          gh release create "$tag_name" --verify-tag --draft "${args[@]}" \
-              --target "$target" --title "$release_name" \
+            --target "$target" \
+            --title "$release_name" \
             --notes-file "$body_path"
 
   build-linux:
     strategy:
       fail-fast: false
       matrix:
-        # These names correspond to the files in ".ci/$distro$version"
+        # The files in ".ci/$distro$version" correspond to the values given here
         include:
           - distro: Arch
-            package: skip    # We are packaged in Arch already
-            allow-failure: yes
 
-          - distro: Debian
+            allow-failure: yes
-            version: 11
+            package: skip    # We are packaged in Arch already
+
+          - distro: Servatrice_Debian
+            version: 12
+
             package: DEB
-            test: skip    # Running tests on all distros is superfluous
+            server_only: yes
+            test: skip
 
           - distro: Debian
             version: 12
+
+            package: DEB
+            test: skip    # Running tests on all distros is superfluous
+
+          - distro: Debian
+            version: 13
+
             package: DEB
 
           - distro: Fedora
-            version: 40
+            version: 43
+
             package: RPM
             test: skip    # Running tests on all distros is superfluous
 
           - distro: Fedora
-            version: 41
+            version: 44
+
             package: RPM
 
-          - distro: Ubuntu
-            version: 20.04
-            package: DEB
-            test: skip    # Ubuntu 20.04 has a broken Qt for debug builds
-
-          - distro: Ubuntu
-            version: 22.04
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
-
           - distro: Ubuntu
             version: 24.04
+
+            package: DEB
+            test: skip    # Running tests on all distros is superfluous
+
+          - distro: Ubuntu
+            version: 26.04
+
             package: DEB
 
-    name: ${{matrix.distro}} ${{matrix.version}}
+    name: ${{ matrix.distro }} ${{ matrix.version }}
     needs: configure
     runs-on: ubuntu-latest
-    continue-on-error: ${{matrix.allow-failure == 'yes'}}
+    continue-on-error: ${{ matrix.allow-failure == 'yes' }}
+    timeout-minutes: 70
     env:
-      NAME: ${{matrix.distro}}${{matrix.version}}
+      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching docker image and ccache
-      CACHE: /tmp/${{matrix.distro}}${{matrix.version}}-cache    # ${{runner.temp}} does not work?
+      CCACHE_EVICTION_AGE: 7d
-      # Cache size over the entire repo is 10Gi:
+      CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
-      # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      CMAKE_GENERATOR: 'Ninja'
-      CCACHE_SIZE: 200M
+      NAME: ${{ matrix.distro }}${{ matrix.version }}
 
     steps:
-      - name: Checkout
+      - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
-      - name: Generate cache timestamp
+      - name: "Restore compiler cache (ccache)"
-        id: cache_timestamp
+        id: ccache_restore
-        shell: bash
+        uses: actions/cache/restore@v6
-        run: echo "timestamp=$(date -u '+%Y%m%d%H%M%S')" >>"$GITHUB_OUTPUT"
-
-      - name: Restore cache
-        uses: actions/cache@v4
         env:
-          timestamp: ${{steps.cache_timestamp.outputs.timestamp}}
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
-          path: ${{env.CACHE}}
+          key: ccache-${{ matrix.distro }}${{ matrix.version }}-${{ env.BRANCH_NAME }}
-          key: docker-${{matrix.distro}}${{matrix.version}}-cache-${{env.timestamp}}
+          path: ${{ env.CACHE }}
-          restore-keys: |
+          restore-keys: ccache-${{ matrix.distro }}${{ matrix.version }}-
-            docker-${{matrix.distro}}${{matrix.version}}-cache-
 
-      - name: Build ${{matrix.distro}} ${{matrix.version}} Docker image
+      - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image"
         shell: bash
         run: source .ci/docker.sh --build
 
-      - name: Build debug and test
+      - name: "Build debug and test"
         if: matrix.test != 'skip'
         shell: bash
         run: |
           source .ci/docker.sh
-          RUN --server --debug --test --ccache "$CCACHE_SIZE" --parallel 4
+          RUN --server --debug --test --ccache "$CCACHE_SIZE" \
+            --cmake-generator "$CMAKE_GENERATOR"
 
-      - name: Build release package
+      - name: "Build release package"
         id: build
         if: matrix.package != 'skip'
         shell: bash
         env:
-          BUILD_DIR: build
+          SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
-          SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
+          package: '${{ matrix.package }}'
-          type: '${{matrix.package}}'
+          server_only: '${{ matrix.server_only }}'
         run: |
           source .ci/docker.sh
-          RUN --server --release --package "$type" --dir "$BUILD_DIR" \
+          args=()
-                  --ccache "$CCACHE_SIZE" --parallel 4
+          [[ $server_only == yes ]] && args+=(--no-client)
-          .ci/name_build.sh
+          [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
+          args+=(--ccache "$CCACHE_SIZE")
+          args+=(--cmake-generator "$CMAKE_GENERATOR")
+          args+=(--suffix "$SUFFIX")
 
-      - name: Upload artifact
+          RUN --server --release --package "$package" "${args[@]}"
-        if: matrix.package != 'skip'
+
-        uses: actions/upload-artifact@v4
+      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
+      - name: "Delete remote compiler cache (ccache)"
+        if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
+        continue-on-error: true
+        env:
+          CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then
+            echo "Cache deleted successfully"
+          fi
+
+      - name: "Save updated compiler cache (ccache)"
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@v6
         with:
-          name: ${{matrix.distro}}${{matrix.version}}-package
+          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
-          path: ${{steps.build.outputs.path}}
+          path: ${{ env.CACHE }}
-          if-no-files-found: error
 
-      - name: Upload to release
+      - name: "Upload artifact"
+        id: upload_artifact
+        if: matrix.package != 'skip'
+        uses: actions/upload-artifact@v7
+        with:
+          archive: false
+          if-no-files-found: error
+          path: ${{ steps.build.outputs.path }}
+
+      - name: "Upload to release"
+        id: upload_release
         if: matrix.package != 'skip' && needs.configure.outputs.tag != null
         shell: bash
         env:
-          GH_TOKEN: ${{github.token}}
+          asset_name: ${{ steps.build.outputs.fullname }}
-          tag_name: ${{needs.configure.outputs.tag}}
+          asset_path: ${{ steps.build.outputs.path }}
-          asset_path: ${{steps.build.outputs.path}}
+          GH_TOKEN: ${{ github.token }}
-          asset_name: ${{steps.build.outputs.name}}
+          tag_name: ${{ needs.configure.outputs.tag }}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
-  build-macos:
+      - name: "Attest binary provenance"
+        id: attestation
+        if: steps.upload_release.outcome == 'success'
+        uses: actions/attest@v4
+        with:
+          show-summary: false
+          subject-path: ${{ steps.build.outputs.path }}
+
+      - name: "Verify binary attestation"
+        if: steps.attestation.outcome == 'success'
+        shell: bash
+        env:
+          BUILD_PATH: ${{ steps.build.outputs.path }}
+          GH_TOKEN: ${{ github.token }}
+        run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice
+
+  build-vcpkg:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - target: 13
+          - os: macOS
+            target: 13
+            runner: macos-15-intel
+
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
+            make_package: 1
+            override_target: 13
+            package_suffix: "-macOS13_Intel"
+            qt_version: 6.11.0
+            qt_arch: clang_64
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Intel
-            os: macos-13
-            xcode: "14.3.1"
             type: Release
-            core_count: 4
+            use_ccache: 1
-            make_package: 1
+            xcode: "16.4"
 
-          - target: 14
+          - os: macOS
+            target: 14
+            runner: macos-14
+
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
+            make_package: 1
+            package_suffix: "-macOS14"
+            qt_version: 6.11.0
+            qt_arch: clang_64
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
-            os: macos-14
+            type: Release
+            use_ccache: 1
             xcode: "15.4"
-            type: Release
-            core_count: 3
-            make_package: 1
 
-          - target: 15
+          - os: macOS
-            soc: Apple
+            target: 15
-            os: macos-15
+            runner: macos-15
-            xcode: "16.2"
-            type: Release
-            core_count: 3
-            make_package: 1
 
-          - target: 15
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
+            make_package: 1
+            package_suffix: "-macOS15"
+            qt_version: 6.11.0
+            qt_arch: clang_64
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            soc: Apple
+            type: Release
+            use_ccache: 1
+            xcode: "16.4"
+
+          - os: macOS
+            target: 15
+            runner: macos-15
+
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
+            qt_version: 6.11.0
+            qt_arch: clang_64
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
-            os: macos-15
-            xcode: "16.2"
             type: Debug
-            core_count: 3
+            use_ccache: 1
+            xcode: "16.4"
 
-    name: macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
+          - os: Windows
+            target: 10
+            runner: windows-2025
+
+            cmake_generator: "Visual Studio 18 2026"
+            cmake_generator_platform: x64
+            make_package: 1
+            package_suffix: "-Win10"
+            qt_version: 6.11.0
+            qt_arch: win64_msvc2022_64
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            type: Release
+
+    name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
     needs: configure
-    runs-on: ${{matrix.os}}
+    runs-on: ${{ matrix.runner }}
-    continue-on-error: ${{matrix.allow-failure == 'yes'}}
+    timeout-minutes: 100
     env:
-      DEVELOPER_DIR:
+      CCACHE_DIR: ${{ github.workspace }}/.cache/
-        /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
+      CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
 
     steps:
-      - name: Checkout
+      - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
+        with:
+          submodules: recursive
 
-      - name: Install dependencies using Homebrew
+      - name: "[Windows] Add msbuild to PATH"
-        shell: bash
+        if: matrix.os == 'Windows'
-        # CMake cannot find the MySQL connector
+        id: add-msbuild
-        # Neither of these works: mariadb-connector-c mysql-connector-c++
+        uses: microsoft/setup-msbuild@v3
+        with:
+          msbuild-architecture: x64
+
+      - name: "[macOS] Setup ccache"
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+        run: brew install ccache
+
+      - name: "[macOS] Restore compiler cache (ccache)"
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+        id: ccache_restore
+        uses: actions/cache/restore@v6
         env:
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-        run: |
+        with:
-          brew update
+          key: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
-          brew install protobuf qt --force-bottle
+          path: ${{ env.CCACHE_DIR }}
+          restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
 
-      - name: Build & Sign on Xcode ${{matrix.xcode}}
+      - name: "Install aqtinstall"
+        run: pipx install aqtinstall
+
+      # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases
+      - name: "Resolve latest Qt patch version"
+        env:
+          QT_VERSION: ${{ matrix.qt_version }}
+        id: resolve_qt_version
         shell: bash
+        run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION"
+
+      - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries"
+        if: matrix.os == 'macOS'
+        id: restore_qt
+        uses: actions/cache/restore@v6
+        with:
+          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
+          path: ${{ github.workspace }}/Qt
+
+      # Using jurplel/install-qt-action to install Qt without using brew
+      # Qt build using vcpkg either just fails or takes too long to build
+      - name: "[macOS] Install fat Qt ${{ steps.resolve_qt_version.outputs.version }}"
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+        uses: jurplel/install-qt-action@v4
+        with:
+          arch: ${{ matrix.qt_arch }}
+          cache: false
+          dir: ${{ github.workspace }}
+          modules: ${{ matrix.qt_modules }}
+          version: ${{ steps.resolve_qt_version.outputs.version }}
+
+      - name: "[macOS] Create thin Qt libraries"
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+        run: .ci/thin_macos_qtlib.sh
+
+      - name: "[macOS] Cache thin Qt libraries"
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v6
+        with:
+          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
+          path: ${{ github.workspace }}/Qt
+
+      - name: "[Windows] Install Qt ${{ matrix.qt_version }}"
+        if: matrix.os == 'Windows'
+        uses: jurplel/install-qt-action@v4
+        with:
+          # Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released
+          aqtsource: git+https://github.com/miurahr/aqtinstall.git
+          arch: ${{ matrix.qt_arch }}
+          cache: true
+          modules: ${{ matrix.qt_modules }}
+          version: ${{ steps.resolve_qt_version.outputs.version }}
+
+      - name: "[Windows] Install NSIS"
+        if: matrix.os == 'Windows'
+        shell: bash
+        run: choco install nsis
+
+      - name: "Setup vcpkg cache"
+        id: vcpkg-cache
+        uses: TAServers/vcpkg-cache@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Uses environment variables, see compile.sh for more details
+      - name: "Build Cockatrice"
         id: build
+        shell: bash
         env:
-          BUILDTYPE: '${{matrix.type}}'
+          BUILDTYPE: '${{ matrix.type }}'
-          MAKE_TEST: 1
+          CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }}
-          MAKE_PACKAGE: '${{matrix.make_package}}'
+          CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
-          PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}'
+          CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
+          DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
-          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
-        # macOS runner have 3 cores usually - only the macos-13 image has 4:
+          MAKE_PACKAGE: '${{ matrix.make_package }}'
-        # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+          PACKAGE_SUFFIX: '${{ matrix.package_suffix }}'
-        # https://github.com/actions/runner-images?tab=readme-ov-file#available-images
+          TARGET_MACOS_VERSION: ${{ matrix.override_target }}
-        run: |
+          USE_CCACHE: ${{ matrix.use_ccache }}
-          if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-          then
+          VCPKG_DISABLE_METRICS: 1
-            echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+        run: .ci/compile.sh --server --test --vcpkg
-            security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            security default-keychain -s build.keychain
-            security set-keychain-settings -t 3600 -l build.keychain
-            security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-            security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-          fi
-          .ci/compile.sh --server --parallel ${{matrix.core_count}}
 
-      - name: Sign app bundle
+      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
-        if: matrix.make_package
+      - name: "[macOS] Delete remote compiler cache (ccache)"
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
+        continue-on-error: true
         env:
+          CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then
+            echo "Cache deleted successfully"
+          fi
+
+      - name: "[macOS] Save updated compiler cache (ccache)"
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master'
+        uses: actions/cache/save@v6
+        with:
+          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
+          path: ${{ env.CCACHE_DIR }}
+
+      - name: "[macOS] Sign app bundle"
+        if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
+        id: sign_macos
+        env:
+          BUILD_PATH: ${{ steps.build.outputs.path }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
         run: |
           if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
           then
             security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose ${{steps.build.outputs.path}}
+            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose "$BUILD_PATH"
           fi
 
-      - name: Notarize app bundle
+      - name: "[macOS] Notarize app bundle"
-        if: matrix.make_package
+        if: matrix.os == 'macOS' && steps.sign_macos.outcome == 'success'
         env:
+          BUILD_PATH: ${{ steps.build.outputs.path }}
           MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
-          MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
           MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
+          MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
         run: |
           if [[ -n "$MACOS_NOTARIZATION_APPLE_ID" ]]
           then
@@ -311,7 +510,7 @@ jobs:
             # Therefore, we create a zip file containing our app bundle, so that we can send it to the
             # notarization service
             echo "Creating temp notarization archive"
-            ditto -c -k --keepParent ${{steps.build.outputs.path}} "notarization.zip"
+            ditto -c -k --keepParent "$BUILD_PATH" "notarization.zip"
 
             # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
             # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
@@ -323,112 +522,52 @@ jobs:
             # Finally, we need to "attach the staple" to our executable, which will allow our app to be
             # validated by macOS even when an internet connection is not available.
             echo "Attach staple"
-            xcrun stapler staple ${{steps.build.outputs.path}}
+            xcrun stapler staple "$BUILD_PATH"
           fi
 
-      - name: Upload artifact
+      - name: "Upload artifact"
         if: matrix.make_package
-        uses: actions/upload-artifact@v4
+        id: upload_artifact
+        uses: actions/upload-artifact@v7
         with:
-          name: macOS${{matrix.target}}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-dmg
+          archive: false
-          path: ${{steps.build.outputs.path}}
           if-no-files-found: error
+          path: ${{ steps.build.outputs.path }}
 
-      - name: Upload to release
+      - name: "[Windows] Upload PDBs (Program Databases)"
-        if: matrix.package != 'skip' && needs.configure.outputs.tag != null
+        if: matrix.os == 'Windows' && github.ref_type != 'tag'
-        shell: bash
+        uses: actions/upload-artifact@v7
-        env:
-          GH_TOKEN: ${{github.token}}
-          tag_name: ${{needs.configure.outputs.tag}}
-          asset_path: ${{steps.build.outputs.path}}
-          asset_name: ${{steps.build.outputs.name}}
-        run: gh release upload "$tag_name" "$asset_path#$asset_name"
-
-  build-windows:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: 7
-            qt_version: 5.15.*
-            qt_arch: msvc2019_64
-
-          - target: 10
-            qt_version: 6.6.*
-            qt_arch: msvc2019_64
-            qt_modules: "qtimageformats qtmultimedia qtwebsockets"
-
-    name: Windows ${{matrix.target}}
-    needs: configure
-    runs-on: windows-2022
-    env:
-      CMAKE_GENERATOR: 'Visual Studio 17 2022'
-
-    steps:
-      - name: Add msbuild to PATH
-        id: add-msbuild
-        uses: microsoft/setup-msbuild@v2
         with:
-          msbuild-architecture: x64
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install Qt ${{matrix.qt_version}}
-        uses: jurplel/install-qt-action@v4
-        with:
-          cache: true
-          setup-python: false
-          version: ${{matrix.qt_version}}
-          arch: win64_${{matrix.qt_arch}}
-          tools: ${{matrix.qt_tools}}
-          modules: ${{matrix.qt_modules}}
-
-      - name: Run vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
-          doNotCache: false
-        env:
-          VCPKG_DEFAULT_TRIPLET: 'x64-windows'
-          VCPKG_DISABLE_METRICS: 1
-
-      - name: Build Cockatrice
-        id: build
-        shell: bash
-        env:
-          PACKAGE_SUFFIX: '-Win${{matrix.target}}'
-          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
-          CMAKE_GENERATOR_PLATFORM: 'x64'
-          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win64_${{matrix.qt_arch}}'
-        # No need for --parallel flag, MTT is added in the compile script to let cmake/msbuild manage core count,
-        # project and process parallelism: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
-        run: .ci/compile.sh --server --release --test --package
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Windows${{matrix.target}}-installer
-          path: ${{steps.build.outputs.path}}
           if-no-files-found: error
-
+          name: ${{ steps.build.outputs.name }}-PDBs
-      - name: Upload pdb database
-        uses: actions/upload-artifact@v4
-        with:
-          name: Windows${{matrix.target}}-debug-pdbs
           path: |
             build/cockatrice/Release/*.pdb
+            build/oracle/Release/*.pdb
             build/servatrice/Release/*.pdb
-          if-no-files-found: error
 
-      - name: Upload to release
+      - name: "Upload to release"
-        if: matrix.package != 'skip' && needs.configure.outputs.tag != null
+        if: needs.configure.outputs.tag != null && matrix.make_package == '1'
+        id: upload_release
         shell: bash
         env:
-          GH_TOKEN: ${{github.token}}
+          asset_name: ${{ steps.build.outputs.fullname }}
-          tag_name: ${{needs.configure.outputs.tag}}
+          asset_path: ${{ steps.build.outputs.path }}
-          asset_path: ${{steps.build.outputs.path}}
+          GH_TOKEN: ${{ github.token }}
-          asset_name: ${{steps.build.outputs.name}}
+          tag_name: ${{ needs.configure.outputs.tag }}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
+
+      - name: "Attest binary provenance"
+        if: steps.upload_release.outcome == 'success'
+        id: attestation
+        uses: actions/attest@v4
+        with:
+          show-summary: false
+          subject-path: ${{ steps.build.outputs.path }}
+
+      - name: "Verify binary attestation"
+        if: steps.attestation.outcome == 'success'
+        shell: bash
+        env:
+          BUILD_PATH: ${{ steps.build.outputs.path }}
+          GH_TOKEN: ${{ github.token }}
+        run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice

.github/workflows/desktop-lint.yml

@@ -1,29 +1,40 @@
 name: Code Style (C++) 
 
 on:
+  # Push trigger not needed for linting, we do not allow direct pushes to master
   pull_request:
-    paths-ignore:
+    paths:
-      - '**.md'
+      - '*/**'    # matches all files not in root
-      - 'webclient/**'
+      - '!**.md'
-      - '.github/workflows/web-*.yml'
+      - '!.ci/**'
-      - '.github/workflows/translations-*.yml'
+      - '!.github/**'
+      - '!.tx/**'
+      - '!doc/**'
+      - '.ci/lint_cpp.sh'
+      - '.github/workflows/desktop-lint.yml'
+      - '.clang-format'
+      - '.cmake-format.json'
+      - 'format.sh'
 
 jobs:
   format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-slim
 
     steps:
-    - name: Checkout
+    - name: "Checkout"
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
       with:
         fetch-depth: 20    # should be enough to find merge base
 
-    - name: Install dependencies
+    - name: "Install dependencies"
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends clang-format cmake-format
+        sudo apt-get install -y --no-install-recommends \
+          clang-format \
+          cmake-format \
+          shellcheck
 
-    - name: Check code formatting
+    - name: "Check code formatting"
       shell: bash
       run: ./.ci/lint_cpp.sh

.github/workflows/docker-release.yml

@@ -0,0 +1,77 @@
+name: Build Docker Image
+
+permissions:
+  contents: read
+  packages: write
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+    paths:
+      - '.github/workflows/docker-release.yml'
+      - 'Dockerfile'
+  release:
+    types:
+      - released    # publishing of stable releases
+
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
+  cancel-in-progress: ${{ github.event_name != 'release' }}
+
+jobs:
+  docker:
+    name: amd64 & arm64
+    if: ${{ github.repository_owner == 'Cockatrice' }}
+    runs-on: ubuntu-latest
+  
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v7
+
+      - name: "Docker metadata"
+        id: metadata
+        uses: docker/metadata-action@v6
+        env:
+          DOCKER_METADATA_ANNOTATIONS_LEVELS: index    # needed for GHCR
+        with:
+          annotations: |
+            org.opencontainers.image.title=Servatrice
+            org.opencontainers.image.url=https://cockatrice.github.io/
+            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
+          images: |
+            ghcr.io/cockatrice/servatrice
+          labels: |
+            org.opencontainers.image.title=Servatrice
+            org.opencontainers.image.url=https://cockatrice.github.io/
+            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
+
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v4
+
+      - name: "Set up Docker buildx"
+        uses: docker/setup-buildx-action@v4
+
+      - name: "Login to GitHub Container Registry"
+        if: contains(github.event.release.tag_name, 'Release') && github.event.release.target_commitish == 'master'
+        uses: docker/login-action@v4
+        with:
+          password: ${{ github.token }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+
+      - name: "Build and push Docker image"
+        uses: docker/build-push-action@v7
+        with:
+          annotations: ${{ steps.metadata.outputs.annotations }}
+          cache-from: type=gha,scope=servatrice
+          cache-to: type=gha,mode=max,scope=servatrice
+          context: .
+          labels: ${{ steps.metadata.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.ref_type == 'tag' }}
+          tags: ${{ steps.metadata.outputs.tags }}

.github/workflows/documentation-build.yml

@@ -0,0 +1,63 @@
+name: Generate Docs
+
+on:
+  pull_request:
+    paths:
+      - 'doc/doxygen/**'
+      - '.github/workflows/documentation-build.yml'
+      - 'Doxyfile'
+  release:
+    types:
+      - published    # publishing of stable releases and pre-releases
+  workflow_dispatch:
+
+env:
+  COCKATRICE_REF: ${{ github.ref_name }}    # tag name if the commit is tagged, otherwise branch name
+
+jobs:
+  docs:
+    name: Doxygen
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v7
+        with:
+          submodules: recursive
+
+      - name: "Install Graphviz"
+        run: |
+          sudo apt-get install -y graphviz
+          dot -V
+
+      - name: "Install Doxygen"
+        uses: ssciwr/doxygen-install@v2
+        with:
+          version: "1.16.1"
+
+      - name: "Update Doxygen Configuration"
+        run: |
+          git diff Doxyfile
+          doxygen -u Doxyfile
+          if git diff --quiet Doxyfile; then
+            echo "::notice::No config changes in Doxyfile detected."
+          else
+            echo "::error::Config changes in Doxyfile detected! Please update the file by running 'doxygen -u Doxyfile'."
+            echo ""
+            git diff --color=always Doxyfile
+            exit 1
+          fi
+
+      - name: "Generate Documentation"
+        if: always()
+        run: doxygen Doxyfile
+
+      - name: "Deploy to cockatrice.github.io"
+        if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
+          destination_dir: docs    # docs will be available at https://cockatrice.github.io/docs/
+          external_repository: Cockatrice/cockatrice.github.io
+          publish_branch: master
+          publish_dir: ./docs/html

.github/workflows/translations-pull.yml

@@ -1,13 +1,14 @@
 name: Update Translations
 
 on:
-  workflow_dispatch:
-  schedule:
-    # runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built
-    - cron: '0 0 15 1,4,7,10 *'
   pull_request:
     paths:
+      - '.tx/**'
       - '.github/workflows/translations-pull.yml'
+  schedule:
+    # Runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built
+    - cron: '0 0 15 1,4,7,10 *'
+  workflow_dispatch:
 
 jobs:
   translations:
@@ -15,35 +16,31 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Pull languages
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
-      - name: Checkout repo
+      - name: "Checkout repo"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
-      - name: Pull translated strings from Transifex
+      - name: "Pull translated strings from Transifex"
+        # Do not run this step for PR's from forks, they don't have access to the secret
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
         uses: transifex/cli-action@v2
         with:
-          # used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config
+          # Used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config
-          # https://github.com/transifex/cli#pulling-files-from-transifex
+          # Docs: https://github.com/transifex/cli#pulling-files-from-transifex
-          token: ${{ secrets.TX_TOKEN }}
           args: pull --force --all
+          token: ${{ secrets.TX_TOKEN }}
 
-      - name: Create pull request
+      - name: "Create pull request"
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           add-paths: |
             cockatrice/translations/*.ts
             oracle/translations/*.ts
-            webclient/public/locales/*/translation.json
+          author: github-actions <github-actions@github.com>    # owner of the commit
-          commit-message: Update translation files
-          # author is the owner of the commit
-          author: github-actions <github-actions@github.com>
-          branch: ci-update_translations
-          delete-branch: true
-          title: 'Update translations'
           body: |
             Pulled all translated strings from [Transifex][1].
 
@@ -51,22 +48,24 @@ jobs:
             *This PR is automatically generated and updated by the workflow at `.github/workflows/translations-pull.yml`. Review [action runs][2].*<br>
             *After merging, all new languages and translations are available in the next build.*
 
-            [1]: https://app.transifex.com/cockatrice/cockatrice/
+            [1]: https://explore.transifex.com/cockatrice/cockatrice/
             [2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-pull.yml?query=branch%3Amaster
+          branch: ci-update_translations
+          commit-message: Update translation files
+          delete-branch: true
+          draft: false
           labels: |
             CI
             Translation
-          draft: false
+          title: 'Update translations'
 
-      - name: PR Status
+      - name: "PR Status"
         if: github.event_name != 'pull_request'
         shell: bash
         env:
-          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
+          PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }}
+          PR_URL: ${{ steps.create_pr.outputs.pull-request-url }}
+          STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }}
         run: |
-          if [[ "$STATUS" == "none" ]]; then
+          echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY"
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
+          echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY"
-          else
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/translations-push.yml

@@ -1,13 +1,14 @@
 name: Update Translation Source
 
 on:
-  workflow_dispatch:
-  schedule:
-    # runs at the start of each quarter (UTC)
-    - cron: '0 0 1 1,4,7,10 *'
   pull_request:
     paths:
+      - '.ci/update_translation_source_strings.sh'
       - '.github/workflows/translations-push.yml'
+  schedule:
+    # Runs at the start of each quarter (UTC)
+    - cron: '0 0 1 1,4,7,10 *'
+  workflow_dispatch:
 
 jobs:
   translations:
@@ -15,37 +16,38 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Push strings
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
-      - name: Checkout repo
+      - name: "Checkout repo"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
-      - name: Install lupdate
+      - name: "Install lupdate"
         shell: bash
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends qttools5-dev-tools
 
-      - name: Update Cockatrice translation source
+      - name: "Update Cockatrice translation source"
+        env:
+          FILE: cockatrice/cockatrice_en@source.ts
         id: cockatrice
         shell: bash
-        env:
+        run: >
-          FILE: 'cockatrice/cockatrice_en@source.ts'
+          DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
-          DIRS: 'cockatrice/src common'
+          .ci/update_translation_source_strings.sh
-        run: .ci/update_translation_source_strings.sh
 
-      - name: Update Oracle translation source
+      - name: "Update Oracle translation source"
         id: oracle
         shell: bash
         env:
-          FILE: 'oracle/oracle_en@source.ts'
           DIRS: 'oracle/src'
+          FILE: 'oracle/oracle_en@source.ts'
         run: .ci/update_translation_source_strings.sh
 
-      - name: Render template
+      - name: "Render template"
         id: template
-        uses: chuhlomin/render-template@v1
+        uses: chuhlomin/render-template/binary@v1
         with:
           template: .ci/update_translation_source_strings_template.md
           vars: |
@@ -53,35 +55,32 @@ jobs:
             oracle_output: ${{ steps.oracle.outputs.output }}
             commit: ${{ github.sha }}
 
-      - name: Create pull request
+      - name: "Create pull request"
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           add-paths: |
             cockatrice/cockatrice_en@source.ts
             oracle/oracle_en@source.ts
-          commit-message: Update translation source strings
+          author: github-actions <github-actions@github.com>    # owner of the commit
-          # author is the owner of the commit
-          author: github-actions <github-actions@github.com>
-          branch: ci-update_translation_source
-          delete-branch: true
-          title: 'Update source strings'
           body: ${{ steps.template.outputs.result }}
+          branch: ci-update_translation_source
+          commit-message: Update translation source strings
+          delete-branch: true
+          draft: false
           labels: |
             CI
             Translation
-          draft: false
+          title: 'Update source strings'
 
-      - name: PR Status
+      - name: "PR Status"
         if: github.event_name != 'pull_request'
         shell: bash
         env:
-          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
+          PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }}
+          PR_URL: ${{ steps.create_pr.outputs.pull-request-url }}
+          STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }}
         run: |
-          if [[ "$STATUS" == "none" ]]; then
+          echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY"
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
+          echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY"
-          else
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/web-build.yml

@@ -1,52 +0,0 @@
-name: Build Web
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.github/workflows/web-*.yml'
-      - 'webclient/**'
-      - '!**.md'
-  pull_request:
-    paths:
-      - '.github/workflows/web-*.yml'
-      - 'webclient/**'
-      - '!**.md'
-
-jobs:
-  build-web:
-    name: React (Node ${{matrix.node_version}})
-
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: webclient
-
-    strategy:
-      fail-fast: false
-      matrix:
-        node_version:
-          - 16
-          - lts/*
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{matrix.node_version}}
-          cache: 'npm'
-          cache-dependency-path: 'webclient/package-lock.json'
-
-      - name: Install dependencies
-        run: npm clean-install
-
-      - name: Build app
-        run: npm run build
-
-      - name: Test app
-        run: npm run test

.github/workflows/web-lint.yml

@@ -1,32 +0,0 @@
-name: Code Style (TypeScript) 
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/web-*.yml'
-      - 'webclient/**'
-      - '!**.md'
-
-jobs:
-  ESLint:
-    runs-on: ubuntu-latest
-    
-    defaults:
-      run:
-        working-directory: webclient
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        cache: 'npm'
-        cache-dependency-path: 'webclient/package-lock.json'
-
-    - name: Install ESLint
-      run: npm clean-install --ignore-scripts
-
-    - name: Run ESLint
-      run: npm run lint

.gitignore

@@ -14,3 +14,4 @@ compile_commands.json
 .cache
 .gdb_history
 cockatrice/resources/config/qtlogging.ini
+docs/

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git
+[submodule "doxygen-awesome-css"]
+	path = doc/doxygen/theme
+	url = https://github.com/jothepro/doxygen-awesome-css.git

.husky/pre-commit

@@ -1,7 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-cd webclient
-npm run translate
-
-git add src/i18n-default.json

.tx/config

@@ -16,11 +16,3 @@ source_file = oracle/oracle_en@source.ts
 file_filter = oracle/translations/oracle_<lang>.ts
 type = QT
 minimum_perc = 10
-
-[o:cockatrice:p:cockatrice:r:webclient-src-i18n-default-json--master]
-resource_name = Webclient
-source_lang = en
-source_file = webclient/src/i18n-default.json
-file_filter = webclient/public/locales/<lang>/translation.json
-type = KEYVALUEJSON
-minimum_perc = 10

CMakeLists.txt

@@ -20,10 +20,10 @@ option(WITH_SERVER "build servatrice" OFF)
 option(WITH_CLIENT "build cockatrice" ON)
 # Compile oracle
 option(WITH_ORACLE "build oracle" ON)
-# Compile dbconverter
-option(WITH_DBCONVERTER "build dbconverter" ON)
 # Compile tests
 option(TEST "build tests" OFF)
+# Use vcpkg regardless of OS
+option(USE_VCPKG "Use vcpkg regardless of OS" OFF)
 
 # Default to "Release" build type
 # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call
@@ -48,8 +48,8 @@ if(USE_CCACHE)
   endif()
 endif()
 
-if(WIN32)
+if(WIN32 OR USE_VCPKG)
-  # Use vcpkg toolchain on Windows
+  # Use vcpkg toolchain on Windows (and on macOS in CI)
   set(CMAKE_TOOLCHAIN_FILE
       ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
       CACHE STRING "Vcpkg toolchain file"
@@ -74,11 +74,11 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 2.10.0)
+project("Cockatrice" VERSION 3.1.0)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Rings of the Wild")
+  set(GIT_TAG_RELEASENAME "Graduation Day")
 endif()
 
 # Use c++20 for all targets
@@ -174,6 +174,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
       -Wno-error=delete-non-virtual-dtor
       -Wno-error=sign-compare
       -Wno-error=missing-declarations
+      -Wno-error=sfinae-incomplete  # GCC 16+: Qt MOC + protobuf forward decls trigger this
   )
 
   foreach(FLAG ${ADDITIONAL_DEBUG_FLAGS})
@@ -254,7 +255,9 @@ endif()
 set(CPACK_PACKAGE_CONTACT "Zach Halpern <zach@cockatrice.us>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VENDOR "Cockatrice Development Team")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
+set(CPACK_PACKAGE_DESCRIPTION
+    "Cockatrice is an open-source, multiplatform application for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline."
+)
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
@@ -301,6 +304,7 @@ if(UNIX)
       set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice")
       if(Qt6_FOUND)
         set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins")
+        set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
       elseif(Qt5_FOUND)
         set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins, libqt5svg5")
       endif()
@@ -325,7 +329,24 @@ endif()
 
 include(CPack)
 
-add_subdirectory(common)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_interfaces ${CMAKE_BINARY_DIR}/libcockatrice_interfaces)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol)
+if(WITH_CLIENT
+   OR WITH_SERVER
+   OR WITH_ORACLE
+)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
+endif()
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility)
+if(WITH_ORACLE OR WITH_CLIENT)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_models ${CMAKE_BINARY_DIR}/libcockatrice_models)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_filters ${CMAKE_BINARY_DIR}/libcockatrice_filters)
+endif()
+
 if(WITH_SERVER)
   add_subdirectory(servatrice)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
@@ -341,11 +362,6 @@ if(WITH_ORACLE)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Oracle;Oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
 endif()
 
-if(WITH_DBCONVERTER)
-  add_subdirectory(dbconverter)
-  set(CPACK_INSTALL_CMAKE_PROJECTS "Dbconverter;Dbconverter;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
-endif()
-
 if(TEST)
   include(CTest)
   add_subdirectory(tests)

Dockerfile

@@ -1,8 +1,9 @@
-FROM ubuntu:24.04
+# -------- Build Stage --------
+FROM ubuntu:26.04 AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y\
+RUN apt-get update && apt-get install -y --no-install-recommends \
   build-essential \
   cmake \
   file \
@@ -16,16 +17,28 @@ RUN apt-get update && apt-get install -y\
   qt6-tools-dev \
   qt6-tools-dev-tools
 
-COPY . /home/servatrice/code/
+WORKDIR /src
-WORKDIR /home/servatrice/code
+COPY . .
-
+RUN mkdir build && cd build && \
-WORKDIR build
+    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 && \
-RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=0 &&\
+    make -j$(nproc) && \
-  make &&\
     make install
 
+
+# -------- Runtime Stage (clean) --------
+FROM ubuntu:26.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  libprotobuf32t64 \
+  libqt6sql6-mysql \
+  libqt6websockets6 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Only copy installed binaries, not source
+COPY --from=build /usr/local /usr/local
+
 WORKDIR /home/servatrice
 
-EXPOSE 4747 4748
+EXPOSE 4748
-
 ENTRYPOINT [ "servatrice", "--log-to-console" ]

LICENSE

@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
+    with this program; if not, see <https://www.gnu.org/licenses/>.
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -329,8 +328,8 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  <signature of Ty Coon>, 1 April 1989
+  <signature of Moe Ghoul>, 1 April 1989
-  Ty Coon, President of Vice
+  Moe Ghoul, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may

README.md

@@ -5,154 +5,174 @@
 <p align='center'>
    <a href="#cockatrice"><b>Cockatrice</b></a> <b>|</b>
    <a href="#download-">Download</a> <b>|</b>
-   <a href="#get-involved-">Get Involved</a> <b>|</b>
+   <a href="#related-repositories">Related</a> <b>|</b>
-   <a href="#community-resources">Community</a> <b>|</b>
+   <a href="#community-resources-">Community</a> <b>|</b>
-   <a href="#translations-">Translations</a> <b>|</b>
+   <a href="#contribute">Contribute</a> <b>|</b>
    <a href="#build--">Build</a> <b>|</b>
-   <a href="#run">Run</a> <b>|</b>
+   <a href="#run">Run</a>
-   <a href="#license-">License</a>
 </p>
 
 ---
 
-<br><pre>
+<br><pre><p align='center'>
-<b>To get started, &#8674; [view our webpage](https://cockatrice.github.io/)</b><br>
+<b>To get started with Cockatrice &#8674; [view our webpage](https://cockatrice.github.io/)</b><br>
-<b>To get support or suggest changes &#8674; [file an issue](https://github.com/Cockatrice/Cockatrice/issues) ([How?](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))</b>
+<b>To get support, or suggest changes to the app &#8674; [file an issue](https://github.com/Cockatrice/Cockatrice/issues) ([How?](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))</b>
-<b>To help with development, see how to [get involved](#get-involved-)</b>
+<b>To help with development &#8674; learn [how to contribute](#contribute-)</b>
-</pre><br>
+</pre><p><br>
 
 
 # Cockatrice
 
-Cockatrice is an open-source, multiplatform program for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline. This project uses C++ and the Qt5 libraries.<br>
+Cockatrice is an open-source, multiplatform application for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline.<br><br>
+This project uses <kbd>C++</kbd> and the <kbd>Qt</kbd> libraries.<br>
 
 
-# Download [![Cockatrice Eternal Download Count](https://img.shields.io/github/downloads/cockatrice/cockatrice/total.svg)](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice)
+# Download [![Cockatrice Eternal Download Count](https://img.shields.io/github/downloads/cockatrice/cockatrice/total.svg)](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice&search=0)
 
-Downloads are available for full releases and the current beta version in development. There is no strict release schedule for either of them.
+Downloads are available for **stable releases** and the current **beta version** in development.  
+There is no strict release schedule for either of them.
+<br><pre>
+Latest <kbd>stable</kbd> release:
+[![Download Stable Release](https://img.shields.io/github/release/cockatrice/cockatrice.svg?label=version&colorB=0d7ebf "Download Latest Stable Release")](https://github.com/cockatrice/cockatrice/releases/latest) ![](https://img.shields.io/github/release-date/Cockatrice/Cockatrice.svg?label=released&colorB=0d7ebf "Release Date") [![](https://img.shields.io/github/downloads/cockatrice/cockatrice/latest/total.svg?label=downloads&colorB=0d7ebf "Number of Downloads")](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice&search=0)
+</pre><pre>
+Latest <kbd>beta</kbd> version:
+[![Download Beta Release](https://img.shields.io/github/release/cockatrice/cockatrice/all.svg?label=version&colorB=f37f40 "Download Latest Beta Release")](https://github.com/cockatrice/cockatrice/releases) ![](https://img.shields.io/github/release-date-pre/Cockatrice/Cockatrice.svg?label=released&colorB=f37f40 "Release Date") [![](https://img.shields.io/github/downloads-pre/cockatrice/cockatrice/latest/total.svg?label=downloads&colorB=f37f40 "Number of Downloads")](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice&search=0) [![](https://img.shields.io/github/commits-since/Cockatrice/Cockatrice/latest.svg?label=changes&colorB=f37f40 "Changes over Stable Release")](https://github.com/Cockatrice/Cockatrice/pulls?q=is%3Apr+is%3Aclosed)
+<sub><i>While incorporating the latest fixes and features, beta builds may not be stable or contain new bugs!</i></sub>
+<sub><b><i>Please report any findings and open new issues when testing them!</i></b></sub>
+</pre>
 
-- Latest `stable` release: [![Download from GitHub Releases](https://img.shields.io/github/release/cockatrice/cockatrice.svg)](https://github.com/cockatrice/cockatrice/releases/latest) [![DL Count on Latest Release](https://img.shields.io/github/downloads/cockatrice/cockatrice/latest/total.svg?label=downloads)](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice)<br>
+# Related Repositories
-  - Stable versions are checkpoints featuring major feature and UI enhancements.
-  - **Recommended for most users!**
 
-- Latest `beta` release: [![Download from GitHub Pre-Releases](https://img.shields.io/github/release/cockatrice/cockatrice/all.svg)](https://github.com/cockatrice/cockatrice/releases) [![DL Count on Latest Pre-Release](https://img.shields.io/github/downloads-pre/cockatrice/cockatrice/latest/total.svg?label=downloads)](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice)
+- [Magic-Token](https://github.com/Cockatrice/Magic-Token): File with MtG token data for use in Cockatrice
-   - Beta versions include the most recently added features and bugfixes, but can be unstable.
+- [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Code to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) for use in Cockatrice
-   - To be a Cockatrice Beta Tester, use this version. Find more information [here](https://github.com/Cockatrice/Cockatrice/wiki/Release-Channels)!
+- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official Cockatrice webpage
+- [io.github.Cockatrice.cockatrice](https://github.com/flathub/io.github.Cockatrice.cockatrice): Configuration of our Linux `flatpak` package hosted at [Flathub](https://flathub.org/en/apps/io.github.Cockatrice.cockatrice)
+- [Webatrice](https://github.com/Cockatrice/Webatrice): Web client for Cockatrice servers (TypeScript / React)
 
 
-# Get Involved [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
+# Community Resources [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
 
-Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with the project, contributors or fellow users of the app. Come here to talk about the application, features, or just to hang out.<br>
+Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other project contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
-For support regarding specific servers, please contact that server's admin or forum for support rather than asking here.<br>
+- [Official Website](https://cockatrice.github.io)
-
+- [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki)
-To contribute code to the project, please review [the guidelines](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md).
+- [Official Discord](https://discord.gg/3Z9yzmA)
-We maintain two tags for contributors to find issues to work on:
-- [Good first issue](https://github.com/Cockatrice/Cockatrice/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22Good%20first%20issue%22%20): issues tagged in this way provide a simple way to get started. They don't require much experience to be worked on.
-- [Help wanted](https://github.com/Cockatrice/Cockatrice/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22Help%20Wanted%22%20): This tag is used for issues that we are looking for a contributor to work on. Often this is for feature suggestions we are willing to accept, but don't have the time to work on ourselves.
-
-For both tags, we're willing to provide help to contributors in showing them where and how they can make changes, as well as code review for changes they submit.
-
-We try to be responsive to new issues. We'll provide advice on how best to implement a feature; alternately, we can show you where the codebase is doing something similar before you get too far along.
-
-Cockatrice uses the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
-
-
-# Community Resources
-
-- [Cockatrice Official Site](https://cockatrice.github.io)
-- [Cockatrice Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki)
-- [Cockatrice Official Discord](https://discord.gg/3Z9yzmA)
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
 
-
+> [!IMPORTANT]
-# Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://transifex.com/cockatrice/cockatrice/)
+> For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
-
-Cockatrice uses Transifex for translations. You can help us bring Cockatrice, Oracle and Webatrice to your language or just adjust single wordings right from within your browser by visiting our [Transifex project page](https://transifex.com/cockatrice/cockatrice/).<br>
-
-Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about contributing!<br>
 
 
-# Build [![CI Desktop](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml?query=branch%3Amaster+event%3Apush) [![CI Web](https://github.com/Cockatrice/Cockatrice/actions/workflows/web-build.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/web-build.yml?query=branch%3Amaster+event%3Apush)
+# Contribute
+<p>
+   <a href="#code">Code</a> <b>|</b>
+   <a href="#documentation-">Documentation</a> <b>|</b>
+   <a href="#translation-">Translation</a>
+</p>
 
-**Detailed compiling instructions can be found on the Cockatrice wiki under [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)**
+#### Repository Activity
+![Cockatrice Repo Analytics](https://repobeats.axiom.co/api/embed/c7cec938789a5bbaeb4182a028b4dbb96db8f181.svg "Cockatrice Repo Analytics by Repobeats")
 
-Dependencies: *(for minimum requirements search our [CMake file](https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt))*
+<details>
+<summary><b>Kudos to all our amazing contributors ❤️</b></summary>
+<br>
+   <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
+      <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />
+   </a><br>
+   <sub><i>Made with <a href="https://contrib.rocks">contrib.rocks</a></i></sub>
+</details>
+
+### Code
+
+To contribute code to the project, please review our [guidelines](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md) first.<br>
+We maintain two tags for contributors to easier find issues to potentially work on:
+- [![Good first issue](https://img.shields.io/github/issues/cockatrice/cockatrice/Good%20First%20Issue)](https://github.com/Cockatrice/Cockatrice/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22Good%20first%20issue%22%20)<br>
+Issues tagged in this way provide a simple way to get started. They don't require much experience to be worked on.
+- [![Help wanted](https://img.shields.io/github/issues/cockatrice/cockatrice/Help%20Wanted)](https://github.com/Cockatrice/Cockatrice/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22Help%20Wanted%22%20)<br>
+This tag is used for issues that we are looking for somebody to pick up. Often this is for feature suggestions we support, but don't have the time to work on ourselves.
+
+For both tags, we're willing to provide help to contributors in showing them where and how they can make changes, as well as code reviews for submitted changes.<br>
+We'll happily advice on how best to implement a feature, or we can show you where the codebase is doing something similar before you get too far along - put a note on an issue you want to discuss more on!
+
+You can also have a look at our `Todo List` in our [Code Documentation](https://cockatrice.github.io/docs) or search the repo for [`\todo` comments](https://github.com/search?q=repo%3ACockatrice%2FCockatrice%20%5Ctodo&type=code).
+
+### Documentation [![CI Docs](https://github.com/Cockatrice/Cockatrice/actions/workflows/documentation-build.yml/badge.svg?event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/documentation-build.yml?query=event%3Apush)
+
+There are various places where useful information for different needs are maintained:
+- [Official Code Documentation](https://cockatrice.github.io/docs/) 
+- [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) `Community supported`
+- [Official Webpage](https://cockatrice.github.io/)
+- [Official README](https://github.com/Cockatrice/Cockatrice/blob/master/README.md) `This file`
+
+Cockatrice tries to use the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
+
+### Translation [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://explore.transifex.com/cockatrice/cockatrice/)
+
+Cockatrice uses Transifex to manage translations. You can help us bring <kbd>Cockatrice</kbd> and <kbd>Oracle</kbd> to your language and just adjust single wordings right from within your browser by visiting our [Transifex project page](https://explore.transifex.com/cockatrice/cockatrice/). The [Webatrice](https://github.com/seavor/Webatrice) web client manages its own translations in its repo.<br>
+
+Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about getting involved, and join a group of hundreds of others!<br>
+
+
+# Build [![CI Desktop](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml?query=branch%3Amaster+event%3Apush) [![CI Docker](https://github.com/Cockatrice/Cockatrice/actions/workflows/docker-release.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/docker-release.yml?query=branch%3Amaster+event%3Apush)
+
+Dependencies: *(for minimum versions search our [CMake file](https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt))*
 - [Qt](https://www.qt.io/developers/)
 - [protobuf](https://github.com/protocolbuffers/protobuf)
 - [CMake](https://www.cmake.org/)
 
-Oracle can optionally use zlib and xz to load compressed files:
+Oracle can *optionally* use some packages to load compressed card files:
 - [xz](https://tukaani.org/xz/)
 - [zlib](https://www.zlib.net/)
 
-To compile:
+<br>
 
-    mkdir build
+**Basic compilation steps:**
-    cd build
+```bash
-    cmake ..
+mkdir build
-    make
+cd build
-
+cmake ..
-You can then run
+make
+```
 
+You can then
+ - Create a Cockatrice installation inside the `release` folder:
+    ```bash
     make install
-
+    ```
-to get a cockatrice installation inside the `release` folder, or:
+ - Or make an installation package specific to your system:
-
+    ```bash
     make package
+    ```
 
-to create a system-specific installation package.
+> [!NOTE]
+> Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
 
-The following flags can be passed to `cmake`:
+<br>
 
-- `-DWITH_SERVER=1` Whether to build the server (default 0 = no).
+The following flags (with their non-default values) can be passed to `cmake`:
-- `-DWITH_CLIENT=0` Whether to build the client (default 1 = yes).
+| Flag | Description |
-- `-DWITH_ORACLE=0` Whether to build oracle (default 1 = yes).
+| --- | --- |
-- `-DCMAKE_BUILD_TYPE=Debug` Compile in debug mode. Enables extra logging output, debug symbols, and much more verbose compiler warnings (default `Release`).
+| `-DWITH_SERVER=1` | Build <kbd>Servatrice</kbd> server |
-- `-DWARNING_AS_ERROR=0` Whether to treat compilation warnings as errors in debug mode (default 1 = yes).
+| `-DWITH_CLIENT=0` | Don't build <kbd>Cockatrice</kbd> client |
-- `-DUPDATE_TRANSLATIONS=1` Configure `make` to update the translation .ts files for new strings in the source code. Note: Running `make clean` will remove the .ts files (default 0 = no).
+| `-DWITH_ORACLE=0` | Don't build <kbd>Oracle</kbd> card database tool |
-- `-DTEST=1` Enable regression tests (default 0 = no). Note: needs googletest, will be downloaded on the fly if unavailable. To run tests: ```make test```.
+| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode<br> Enables extra logging output, debug symbols, and much more verbose compiler warnings |
-- `-DFORCE_USE_QT5=1` Skip looking for Qt6 before trying to find Qt5
+| `-DWARNING_AS_ERROR=0` | Don't treat compilation warnings as errors in debug mode |
+| `-DUPDATE_TRANSLATIONS=1` |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
+| `-DTEST=1` | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available |
+| `-DFORCE_USE_QT5=1` | Skip looking for Qt6 before trying to find Qt5 |
 
 
 # Run
 
-`Cockatrice` is the game client<br>
+<kbd>Cockatrice</kbd> is the game client<br>
-`Oracle` fetches card data<br>
+<kbd>Oracle</kbd> fetches card data<br>
-`Servatrice` is the server<br>
+<kbd>Servatrice</kbd> is the server<br>
 
-**Servatrice Docker container**
+#### Docker
 
-You can run an instance of Servatrice (the Cockatrice server) using [Docker](https://www.docker.com/what-docker) and the Cockatrice Dockerfile.<br>
+You can build an image & deploy a <kbd>Servatrice</kbd> (Cockatrice server) container using [Docker](https://www.docker.com/resources/what-container/) and our Dockerfile yourself.<br>
 
-First, create an image from the Dockerfile<br>
+For more details, look into our wiki section on [Setting up Servatrice](https://github.com/Cockatrice/Cockatrice/wiki/Setting-up-Servatrice#using-docker).<br>
-`cd /path/to/Cockatrice-Repo/`
+You'll also find more hints on our **pre-build image** there, or the **docker-compose** file which will configure and run both a MySQL server and Servatrice.
-`docker build -t servatrice .`<br>
-And then run it<br>
-`docker run -i -p 4747:4747/tcp -t servatrice:latest`<br>
-
->Note: Running this command exposes the TCP port 4747 of the docker container<br>
-to permit connections to the server.
-
-Find more information on how to use Servatrice with Docker in our [wiki](https://github.com/Cockatrice/Cockatrice/wiki/Setting-up-Servatrice#using-docker).
-
-**Docker compose**
-
-There is also a docker-compose file available which will configure and run both a MySQL server and Servatrice. The docker-compose setup scripts can be found in the `servatrice/docker` folder and vary only slightly from the default sql and server .ini files. The setup scripts can either be modified in place, or docker-compose can mount alternative files into the images, as you prefer.
-
-To run Servatrice via docker-compose, first install docker-compose following the [install instructions](https://docs.docker.com/compose/install/). Once installed, run the following from the root of the repository:
-```bash
-docker-compose build    # Build the Servatrice image using the same Dockerfile as above.
-docker-compose up       # Setup and run both the MySQL server and Servatrice.
-```
-
->Note: Similar to the above Docker setup, this will expose TCP ports 4747 and 4748.
-
->Note: The first time running the docker-compose setup, the MySQL server will take a little time to run the initial setup scripts. Due to this, the Servatrice instance may fail the first few attempts to connect to the database. Servatrice is set to `restart: always` in the docker-compose.yml, which will allow it to continue attempting to start up. Once the MySQL scripts have completed, Servatrice should then connect automatically on the next attempt.
-
-**Docker compose in Windows**
-A out of box working docker-compose file has been added to help setup in Windows.
-
-Docker in Windows requires additional steps in form of using Docker Desktop to allow resource sharing from the drive the volumes are mapped from, as well as potential workarounds needed to get file sharing working in Windows. This [StackOverflow discussion sheds some light on it](https://stackoverflow.com/questions/42203488/settings-to-windows-firewall-to-allow-docker-for-windows-to-share-drive)
 
 
 # License [![GPLv2 License](https://img.shields.io/github/license/Cockatrice/Cockatrice.svg)](https://github.com/Cockatrice/Cockatrice/blob/master/LICENSE)

cmake/CMakeDMGSetup.script

@@ -42,7 +42,6 @@ tell disk image_name
       set position of item "Cockatrice.app" to { 139, 214 }
       set position of item "Oracle.app" to { 139, 414 }
       set position of item "Servatrice.app" to { 139, 614 }
-      set position of item "dbconverter.app" to { 1400, 1400 }
       set position of item "Applications" to { 861, 414 }
     end tell
     update without registering applications

cmake/FindQtRuntime.cmake

@@ -1,12 +1,11 @@
 # Find a compatible Qt version
-# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, WITH_DBCONVERTER, FORCE_USE_QT5
+# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, FORCE_USE_QT5
 # Optional Input: QT6_DIR -- Hint as to where Qt6 lives on the system
 # Optional Input: QT5_DIR -- Hint as to where Qt5 lives on the system
 # Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt5, Qt6
 # Output: SERVATRICE_QT_MODULES
 # Output: COCKATRICE_QT_MODULES
 # Output: ORACLE_QT_MODULES
-# Output: DBCONVERTER_QT_MODULES
 # Output: TEST_QT_MODULES
 
 set(REQUIRED_QT_COMPONENTS Core)
@@ -29,22 +28,21 @@ endif()
 if(WITH_ORACLE)
   set(_ORACLE_NEEDED Concurrent Network Svg Widgets)
 endif()
-if(WITH_DBCONVERTER)
-  set(_DBCONVERTER_NEEDED Network Widgets)
-endif()
 if(TEST)
-  set(_TEST_NEEDED Widgets)
+  # Union of Qt modules required across all test targets (independent of application targets).
+  # When adding a new test that needs additional Qt modules, add them here rather than in the test's CMakeLists.txt.
+  set(_TEST_NEEDED Concurrent Network Svg Widgets)
 endif()
 
 set(REQUIRED_QT_COMPONENTS ${REQUIRED_QT_COMPONENTS} ${_SERVATRICE_NEEDED} ${_COCKATRICE_NEEDED} ${_ORACLE_NEEDED}
-                           ${_DBCONVERTER_NEEDED} ${_TEST_NEEDED}
+                           ${_TEST_NEEDED}
 )
 list(REMOVE_DUPLICATES REQUIRED_QT_COMPONENTS)
 
 if(NOT FORCE_USE_QT5)
   # Linguist is now a component in Qt6 instead of an external package
   find_package(
-    Qt6 6.2.3
+    Qt6 6.4.2
     COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
     QUIET HINTS ${Qt6_DIR}
   )
@@ -63,7 +61,7 @@ if(Qt6_FOUND)
   endif()
 else()
   find_package(
-    Qt5 5.8.0
+    Qt5 5.15.2
     COMPONENTS ${REQUIRED_QT_COMPONENTS}
     QUIET HINTS ${Qt5_DIR}
   )
@@ -112,7 +110,9 @@ message(DEBUG "QT_LIBRARY_DIR = ${QT_LIBRARY_DIR}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" SERVATRICE_QT_MODULES "${_SERVATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" COCKATRICE_QT_MODULES "${_COCKATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" ORACLE_QT_MODULES "${_ORACLE_NEEDED}")
-string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" DB_CONVERTER_QT_MODULES "${_DBCONVERTER_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" TEST_QT_MODULES "${_TEST_NEEDED}")
 
+# Core-only export (useful for headless libs)
+set(QT_CORE_MODULE "${COCKATRICE_QT_VERSION_NAME}::Core")
+
 message(STATUS "Found Qt ${${COCKATRICE_QT_VERSION_NAME}_VERSION} at: ${${COCKATRICE_QT_VERSION_NAME}_DIR}")

cmake/NSIS.template.in

@@ -11,6 +11,7 @@ SetCompressor LZMA
 Var NormalDestDir
 Var PortableDestDir
 Var PortableMode
+Var ReinstallMode
 
 !include LogicLib.nsh
 !include FileFunc.nsh
@@ -26,14 +27,25 @@ Var PortableMode
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue."
 !define MUI_FINISHPAGE_RUN "$INSTDIR/cockatrice.exe"
 !define MUI_FINISHPAGE_RUN_TEXT "Run 'Cockatrice' now"
+!define MUI_ICON "${NSIS_SOURCE_PATH}\cockatrice\resources\appicon.ico"
 
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_WELCOME
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_LICENSE "${NSIS_SOURCE_PATH}\LICENSE"
+
 Page Custom PortableModePageCreate PortableModePageLeave
 !define MUI_PAGE_CUSTOMFUNCTION_PRE componentsPagePre
 !insertmacro MUI_PAGE_COMPONENTS
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_DIRECTORY
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_FINISH
 
 !insertmacro MUI_UNPAGE_CONFIRM
@@ -72,6 +84,7 @@ ${IfNot} ${Errors}
     MessageBox MB_ICONINFORMATION|MB_SETFOREGROUND "\
       /PORTABLE : Install in portable mode$\n\
       /S : Silent install$\n\
+      /R : Silent upgrade$\n\
       /D=%directory% : Specify destination directory$\n"
     Quit
 ${EndIf}
@@ -89,13 +102,40 @@ ${Else}
     ${EndIf}
 ${EndIf}
 
+ClearErrors
+${GetOptions} $9 "/R" $8
+${IfNot} ${Errors}
+    StrCpy $ReinstallMode 1
+    SetSilent silent
+    SetAutoClose true
+${Else}
+    StrCpy $ReinstallMode 0
+${EndIf}
+
 ${If} $InstDir == ""
     ; User did not use /D to specify a directory,
     ; we need to set a default based on the install mode
     StrCpy $InstDir $0
 ${EndIf}
+
+; --- Detect portable install when using /R (must come BEFORE SetModeDestinationFromInstdir) ---
+${If} $ReinstallMode = 1
+    IfFileExists "$InstDir\portable.dat" 0 not_portable
+        StrCpy $PortableMode 1
+        Goto portable_done
+    not_portable:
+        StrCpy $PortableMode 0
+    portable_done:
+${EndIf}
+
+; Now that $PortableMode reflects reality, commit InstDir into the correct slot
 Call SetModeDestinationFromInstdir
 
+${If} $ReinstallMode = 1
+${AndIf} $PortableMode = 0
+    Call AutoUninstallIfNeeded
+${EndIf}
+
 FunctionEnd
 
 Function un.onInit
@@ -125,8 +165,46 @@ ${Else}
 ${EndIf}
 FunctionEnd
 
+Function SkipIfReinstall
+${If} $ReinstallMode = 1
+    Abort
+${EndIf}
+FunctionEnd
+
+Function AutoUninstallIfNeeded
+
+SetShellVarContext all
+
+; --- 32-bit uninstall ---
+SetRegView 32
+ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
+
+StrCmp $R0 "" done32
+DetailPrint "Removing previous version (32-bit)..."
+ExecWait '$R0'
+
+done32:
+
+; --- 64-bit uninstall ---
+${If} ${RunningX64}
+    SetRegView 64
+    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
+
+    StrCmp $R0 "" done64
+    DetailPrint "Removing previous version (64-bit)..."
+    ExecWait '$R0'
+
+    done64:
+${EndIf}
+
+FunctionEnd
 
 Function PortableModePageCreate
+
+${If} $ReinstallMode = 1
+    Abort
+${EndIf}
+
 Call SetModeDestinationFromInstdir ; If the user clicks BACK on the directory page we will remember their mode specific directory
 !insertmacro MUI_HEADER_TEXT "Install Mode" "Choose how you want to install Cockatrice."
 nsDialogs::Create 1018
@@ -158,6 +236,11 @@ ${EndIf}
 FunctionEnd
 
 Function componentsPagePre
+
+${If} $ReinstallMode = 1
+    Return
+${EndIf}
+
 ${If} $PortableMode = 0
     SetShellVarContext all
 
@@ -167,8 +250,12 @@ ${If} $PortableMode = 0
     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
     StrCmp $R0 "" done32
 
+    ${If} $ReinstallMode = 0
         MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst32
         Abort
+    ${Else}
+        Goto uninst32
+    ${EndIf}
 
     uninst32:
     ClearErrors
@@ -183,8 +270,12 @@ ${If} $PortableMode = 0
 	    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
 	    StrCmp $R0 "" done64
 
+	    ${If} $ReinstallMode = 0
             MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
             Abort
+        ${Else}
+            Goto uninst64
+        ${EndIf}
 
 	    uninst64:
 	    ClearErrors
@@ -213,7 +304,6 @@ ${AndIf} ${FileExists} "$INSTDIR\portable.dat"
 	Delete "$INSTDIR\uninstall.exe"
 	Delete "$INSTDIR\cockatrice.exe"
 	Delete "$INSTDIR\oracle.exe"
-	Delete "$INSTDIR\dbconverter.exe"
 	Delete "$INSTDIR\servatrice.exe"
 	Delete "$INSTDIR\Qt*.dll"
 	Delete "$INSTDIR\libmysql.dll"
@@ -277,6 +367,12 @@ ${Else}
     FileWrite $0 "PORTABLE"
     FileClose $0
 ${EndIf}
+
+${If} $ReinstallMode = 1
+    IfFileExists "$INSTDIR\cockatrice.exe" 0 +2
+        Exec '"$INSTDIR\cockatrice.exe"'
+${EndIf}
+
 SectionEnd
 
 Section "Start menu item" SecStartMenu

cmake/SignMacApplications.cmake

@@ -3,7 +3,7 @@
 string(LENGTH "$ENV{MACOS_CERTIFICATE_NAME}" MACOS_CERTIFICATE_NAME_LEN)
 
 if(APPLE AND MACOS_CERTIFICATE_NAME_LEN GREATER 0)
-  set(APPLICATIONS "cockatrice" "servatrice" "oracle" "dbconverter")
+  set(APPLICATIONS "cockatrice" "servatrice" "oracle")
   foreach(app_name IN LISTS APPLICATIONS)
     set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${app_name}.app")
 

cmake/getversion.cmake

@@ -213,7 +213,8 @@ set(PROJECT_VERSION_FRIENDLY "${PROJECT_VERSION} (${GIT_COMMIT_DATE_FRIENDLY})")
 # Format: <program name>[-ReleaseName]-MAJ.MIN.PATCH[-prerelease_label]
 set(PROJECT_VERSION_FILENAME "${PROJECT_NAME}")
 if(PROJECT_VERSION_RELEASENAME)
-  set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION_RELEASENAME}")
+  string(REPLACE " " "-" PROJECT_VERSION_RELEASENAME_SAFE "${PROJECT_VERSION_RELEASENAME}")
+  set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION_RELEASENAME_SAFE}")
 endif()
 set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION}")
 

cmake/gtest-CMakeLists.txt.in

@@ -1,11 +1,12 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.10)
 
 project(gtest-download LANGUAGES NONE)
 
 include(ExternalProject)
-ExternalProject_Add(googletest
+externalproject_add(
-  URL https://github.com/google/googletest/archive/release-1.11.0.zip
+  googletest
-  URL_HASH SHA1=9ffb7b5923f4a8fcdabf2f42c6540cce299f44c0
+  URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
+  URL_HASH SHA1=f638fa0e724760e2ba07ff8cfba32cd644e1ce28
   SOURCE_DIR "${CMAKE_BINARY_DIR}/gtest-src"
   BINARY_DIR "${CMAKE_BINARY_DIR}/gtest-build"
   CONFIGURE_COMMAND ""

cockatrice/CMakeLists.txt

@@ -5,194 +5,358 @@
 project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 set(cockatrice_SOURCES
-    src/game/cards/abstract_card_drag_item.cpp
-    src/game/cards/abstract_card_item.cpp
-    src/client/game_logic/abstract_client.cpp
-    src/game/board/abstract_counter.cpp
-    src/game/board/abstract_graphics_item.cpp
-    src/game/board/arrow_item.cpp
-    src/game/board/arrow_target.cpp
-    src/game/cards/card_database.cpp
-    src/game/cards/card_database_manager.cpp
-    src/game/cards/card_database_model.cpp
-    src/game/cards/card_database_parser/card_database_parser.cpp
-    src/game/cards/card_database_parser/cockatrice_xml_3.cpp
-    src/game/cards/card_database_parser/cockatrice_xml_4.cpp
-    src/game/cards/card_drag_item.cpp
-    src/game/filters/filter_card.cpp
-    src/client/ui/widgets/cards/card_info_frame_widget.cpp
-    src/client/ui/widgets/cards/card_info_picture_widget.cpp
-    src/client/ui/widgets/cards/card_info_text_widget.cpp
-    src/client/ui/widgets/cards/card_info_display_widget.cpp
-    src/client/ui/widgets/cards/card_size_widget.cpp
-    src/game/cards/card_item.cpp
-    src/game/cards/card_list.cpp
-    src/game/zones/card_zone.cpp
-    src/server/chat_view/chat_view.cpp
-    src/game/board/counter_general.cpp
-    src/deck/custom_line_edit.cpp
-    src/deck/deck_loader.cpp
-    src/deck/deck_list_model.cpp
-    src/deck/deck_stats_interface.cpp
-    src/dialogs/dlg_connect.cpp
-    src/dialogs/dlg_convert_deck_to_cod_format.cpp
-    src/dialogs/dlg_create_token.cpp
-    src/dialogs/dlg_create_game.cpp
-    src/dialogs/dlg_edit_avatar.cpp
-    src/dialogs/dlg_edit_password.cpp
-    src/dialogs/dlg_edit_tokens.cpp
-    src/dialogs/dlg_edit_user.cpp
-    src/dialogs/dlg_filter_games.cpp
-    src/dialogs/dlg_forgot_password_challenge.cpp
-    src/dialogs/dlg_forgot_password_request.cpp
-    src/dialogs/dlg_forgot_password_reset.cpp
-    src/dialogs/dlg_load_deck_from_clipboard.cpp
-    src/dialogs/dlg_load_remote_deck.cpp
-    src/dialogs/dlg_manage_sets.cpp
-    src/dialogs/dlg_move_top_cards_until.cpp
-    src/dialogs/dlg_register.cpp
-    src/dialogs/dlg_roll_dice.cpp
-    src/dialogs/dlg_settings.cpp
-    src/dialogs/dlg_tip_of_the_day.cpp
-    src/dialogs/dlg_update.cpp
-    src/dialogs/dlg_view_log.cpp
-    src/dialogs/dlg_load_deck.cpp
-    src/game/deckview/deck_view.cpp
-    src/game/deckview/deck_view_container.cpp
-    src/game/filters/filter_string.cpp
-    src/game/filters/filter_builder.cpp
-    src/game/filters/filter_tree.cpp
-    src/game/filters/filter_tree_model.cpp
-    src/client/ui/layouts/flow_layout.cpp
-    src/client/ui/widgets/general/layout_containers/flow_widget.cpp
-    src/game/game_scene.cpp
-    src/game/game_selector.cpp
-    src/game/games_model.cpp
-    src/game/game_view.cpp
-    src/client/get_text_with_max.cpp
-    src/game/hand_counter.cpp
-    src/server/handle_public_servers.cpp
-    src/game/zones/hand_zone.cpp
-    src/client/game_logic/key_signals.cpp
-    src/client/ui/line_edit_completer.cpp
-    src/server/local_client.cpp
-    src/server/local_server.cpp
-    src/server/local_server_interface.cpp
-    src/utility/logger.cpp
-    src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp
-    src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
-    src/client/ui/widgets/general/display/banner_widget.cpp
-    src/client/ui/widgets/general/display/labeled_input.cpp
-    src/client/ui/widgets/general/display/dynamic_font_size_label.cpp
-    src/client/ui/widgets/general/display/dynamic_font_size_push_button.cpp
-    src/client/ui/widgets/general/display/shadow_background_label.cpp
-    src/main.cpp
-    src/server/message_log_widget.cpp
-    src/client/ui/layouts/overlap_layout.cpp
-    src/client/ui/widgets/general/layout_containers/overlap_widget.cpp
-    src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp
-    src/server/pending_command.cpp
-    src/game/phase.cpp
-    src/client/ui/phases_toolbar.cpp
-    src/client/ui/picture_loader/picture_loader.cpp
-    src/client/ui/picture_loader/picture_loader_worker.cpp
-    src/client/ui/picture_loader/picture_to_load.cpp
-    src/game/zones/pile_zone.cpp
-    src/client/ui/pixel_map_generator.cpp
-    src/game/player/player.cpp
-    src/game/player/player_list_widget.cpp
-    src/game/player/player_target.cpp
-    src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp
-    src/client/ui/widgets/printing_selector/card_amount_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_view_options_toolbar_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp
-    src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
-    src/client/network/release_channel.cpp
-    src/client/network/client_update_checker.cpp
-    src/server/remote/remote_client.cpp
-    src/server/remote/remote_decklist_tree_widget.cpp
-    src/server/remote/remote_replay_list_tree_widget.cpp
-    src/client/network/replay_timeline_widget.cpp
-    src/game/zones/select_zone.cpp
-    src/utility/sequence_edit.cpp
-    src/client/network/sets_model.cpp
-    src/settings/card_database_settings.cpp
-    src/settings/download_settings.cpp
-    src/settings/game_filters_settings.cpp
-    src/settings/layouts_settings.cpp
-    src/settings/message_settings.cpp
-    src/settings/recents_settings.cpp
-    src/settings/servers_settings.cpp
-    src/settings/settings_manager.cpp
-    src/settings/cache_settings.cpp
-    src/settings/shortcuts_settings.cpp
-    src/settings/shortcut_treeview.cpp
-    src/settings/card_override_settings.cpp
-    src/settings/debug_settings.cpp
-    src/client/sound_engine.cpp
-    src/client/network/spoiler_background_updater.cpp
-    src/game/zones/stack_zone.cpp
-    src/client/tabs/tab.cpp
-    src/client/tabs/tab_account.cpp
-    src/client/tabs/tab_admin.cpp
-    src/client/tabs/tab_deck_editor.cpp
-    src/client/tabs/tab_deck_storage.cpp
-    src/client/tabs/tab_game.cpp
-    src/client/tabs/tab_logs.cpp
-    src/client/tabs/tab_message.cpp
-    src/client/tabs/tab_replays.cpp
-    src/client/tabs/tab_room.cpp
-    src/client/tabs/tab_server.cpp
-    src/client/tabs/tab_supervisor.cpp
-    src/client/tabs/api/edhrec/tab_edhrec.cpp
-    src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
-    src/client/tabs/api/edhrec/edhrec_commander_api_response_card_details_display_widget.cpp
-    src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
-    src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_details.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_list.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_prices.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_commander_details.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.cpp
-    src/game/zones/table_zone.cpp
-    src/client/tapped_out_interface.cpp
-    src/client/ui/theme_manager.cpp
-    src/client/ui/tip_of_the_day.cpp
-    src/client/translate_counter_name.cpp
-    src/client/update_downloader.cpp
-    src/server/user/user_context_menu.cpp
-    src/server/user/user_info_connection.cpp
-    src/server/user/user_info_box.cpp
-    src/server/user/user_list_manager.cpp
-    src/server/user/user_list_widget.cpp
-    src/client/ui/window_main.cpp
-    src/game/zones/view_zone_widget.cpp
-    src/game/zones/view_zone.cpp
-    src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
-    src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
     ${VERSION_STRING_CPP}
+    # sort by alphabetical order, so that there is no debate about where to add new sources to the list
+    src/client/network/connection_controller/remote_connection_controller.cpp
+    src/client/network/update/client/update_downloader.cpp
+    src/client/network/interfaces/deck_stats_interface.cpp
+    src/client/network/interfaces/tapped_out_interface.cpp
+    src/client/network/parsers/deck_link_to_api_transformer.cpp
+    src/client/network/update/client/client_update_checker.cpp
+    src/client/network/update/client/release_channel.cpp
+    src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+    src/client/sound_engine.cpp
+    src/client/settings/cache_settings.cpp
+    src/client/settings/card_counter_settings.cpp
+    src/client/settings/shortcut_treeview.cpp
+    src/client/settings/shortcuts_settings.cpp
+    src/interface/deck_loader/card_node_function.cpp
+    src/interface/deck_loader/deck_file_format.cpp
+    src/interface/deck_loader/deck_loader.cpp
+    src/interface/deck_loader/loaded_deck.cpp
+    src/interface/widgets/dialogs/dlg_connect.cpp
+    src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
+    src/interface/widgets/dialogs/dlg_create_game.cpp
+    src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+    src/interface/widgets/dialogs/dlg_edit_avatar.cpp
+    src/interface/widgets/dialogs/dlg_edit_password.cpp
+    src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+    src/interface/widgets/dialogs/dlg_edit_user.cpp
+    src/interface/widgets/dialogs/dlg_filter_games.cpp
+    src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
+    src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
+    src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+    src/interface/widgets/dialogs/dlg_load_deck.cpp
+    src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
+    src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
+    src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
+    src/interface/widgets/dialogs/dlg_local_game_options.cpp
+    src/interface/widgets/dialogs/dlg_manage_sets.cpp
+    src/interface/widgets/dialogs/dlg_register.cpp
+    src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+    src/interface/widgets/dialogs/dlg_settings.cpp
+    src/interface/widgets/dialogs/dlg_startup_card_check.cpp
+    src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
+    src/interface/widgets/dialogs/dlg_update.cpp
+    src/interface/widgets/dialogs/dlg_view_log.cpp
+    src/interface/widgets/dialogs/override_printing_warning.cpp
+    src/interface/widgets/dialogs/tip_of_the_day.cpp
+    src/filters/deck_filter_string.cpp
+    src/filters/filter_builder.cpp
+    src/filters/filter_tree_model.cpp
+    src/filters/syntax_help.cpp
+    src/game/abstract_game.cpp
+    src/game/arrow_registry.cpp
+    src/game_graphics/board/abstract_card_drag_item.cpp
+    src/game_graphics/board/abstract_card_item.cpp
+    src/game_graphics/board/abstract_counter.cpp
+    src/game/board/arrow_data.cpp
+    src/game_graphics/board/arrow_item.cpp
+    src/game_graphics/board/arrow_target.cpp
+    src/game_graphics/board/card_drag_item.cpp
+    src/game_graphics/board/card_item.cpp
+    src/game/board/card_list.cpp
+    src/game/board/card_state.cpp
+    src/game_graphics/board/counter_general.cpp
+    src/game/board/counter_state.cpp
+    src/game_graphics/board/translate_counter_name.cpp
+    src/game_graphics/deckview/deck_view.cpp
+    src/game_graphics/deckview/deck_view_container.cpp
+    src/game_graphics/deckview/tabbed_deck_view_container.cpp
+    src/game_graphics/dialogs/dlg_create_token.cpp
+    src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
+    src/game_graphics/dialogs/dlg_roll_dice.cpp
+    src/game/game.cpp
+    src/game/game_event_handler.cpp
+    src/game/game_meta_info.cpp
+    src/game_graphics/game_scene.cpp
+    src/game/game_state.cpp
+    src/game_graphics/game_view.cpp
+    src/game_graphics/hand_counter.cpp
+    src/game/selection_subtype_tally.cpp
+    src/game_graphics/log/message_log_widget.cpp
+    src/game/phase.cpp
+    src/game_graphics/phases_toolbar.cpp
+    src/game_graphics/player/menu/card_menu.cpp
+    src/game_graphics/player/menu/custom_zone_menu.cpp
+    src/game_graphics/player/menu/grave_menu.cpp
+    src/game_graphics/player/menu/hand_menu.cpp
+    src/game_graphics/player/menu/library_menu.cpp
+    src/game_graphics/player/menu/move_menu.cpp
+    src/game_graphics/player/menu/player_menu.cpp
+    src/game_graphics/player/menu/pt_menu.cpp
+    src/game_graphics/player/menu/rfg_menu.cpp
+    src/game_graphics/player/menu/say_menu.cpp
+    src/game_graphics/player/menu/sideboard_menu.cpp
+    src/game_graphics/player/menu/utility_menu.cpp
+    src/game/player/player_actions.cpp
+    src/game_graphics/player/player_area.cpp
+    src/game_graphics/player/player_dialogs.cpp
+    src/game/player/player_event_handler.cpp
+    src/game_graphics/player/player_graphics_item.cpp
+    src/game/player/player_info.cpp
+    src/game_graphics/player/player_list_widget.cpp
+    src/game/player/player_logic.cpp
+    src/game/player/player_manager.cpp
+    src/game_graphics/player/player_target.cpp
+    src/game/replay.cpp
+    src/game/zones/card_zone_logic.cpp
+    src/game/zones/hand_zone_logic.cpp
+    src/game/zones/pile_zone_logic.cpp
+    src/game/zones/stack_zone_logic.cpp
+    src/game/zones/table_zone_logic.cpp
+    src/game/zones/view_zone_logic.cpp
+    src/game_graphics/zones/card_zone.cpp
+    src/game_graphics/zones/hand_zone.cpp
+    src/game_graphics/zones/pile_zone.cpp
+    src/game_graphics/zones/select_zone.cpp
+    src/game_graphics/zones/stack_zone.cpp
+    src/game_graphics/zones/table_zone.cpp
+    src/game_graphics/zones/view_zone.cpp
+    src/game_graphics/zones/view_zone_widget.cpp
+    src/game_graphics/board/abstract_graphics_item.cpp
+    src/interface/card_picture_loader/card_picture_loader.cpp
+    src/interface/card_picture_loader/card_picture_loader_local.cpp
+    src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
+    src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
+    src/interface/card_picture_loader/card_picture_loader_worker.cpp
+    src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
+    src/interface/card_picture_loader/card_picture_to_load.cpp
+    src/interface/layouts/flow_layout.cpp
+    src/interface/layouts/overlap_layout.cpp
+    src/interface/widgets/utility/line_edit_completer.cpp
+    src/interface/pixel_map_generator.cpp
+    src/interface/theme_config.cpp
+    src/interface/theme_manager.cpp
+    src/interface/palette_editor/color_button.cpp
+    src/interface/palette_editor/palette_generator.cpp
+    src/interface/palette_editor/quick_setup_panel.cpp
+    src/interface/palette_editor/palette_grid_widget.cpp
+    src/interface/palette_editor/palette_editor_dialog.cpp
+    src/interface/widgets/cards/additional_info/color_identity_widget.cpp
+    src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
+    src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
+    src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
+    src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
+    src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
+    src/interface/widgets/cards/card_info_display_widget.cpp
+    src/interface/widgets/cards/card_info_frame_widget.cpp
+    src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
+    src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
+    src/interface/widgets/cards/card_info_picture_widget.cpp
+    src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
+    src/interface/widgets/cards/card_info_text_widget.cpp
+    src/interface/widgets/cards/card_size_widget.cpp
+    src/interface/widgets/cards/deck_card_zone_display_widget.cpp
+    src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
+    src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
+    src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
+    src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
+    src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp
+    src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
+    src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
+    src/interface/widgets/deck_analytics/resizable_panel.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
+    src/interface/widgets/deck_editor/card_database_view.cpp
+    src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
+    src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
+    src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
+    src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
+    src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+    src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
+    src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
+    src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
+    src/interface/widgets/deck_editor/deck_state_manager.cpp
+    src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
+    src/interface/widgets/general/background_sources.cpp
+    src/interface/widgets/general/display/background_plate_widget.cpp
+    src/interface/widgets/general/display/banner_widget.cpp
+    src/interface/widgets/general/display/dynamic_font_size_label.cpp
+    src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
+    src/interface/widgets/general/display/labeled_input.cpp
+    src/interface/widgets/general/display/shadow_background_label.cpp
+    src/interface/widgets/general/display/charts/bars/bar_widget.cpp
+    src/interface/widgets/general/display/charts/bars/color_bar.cpp
+    src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
+    src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
+    src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
+    src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
+    src/interface/widgets/general/display/charts/pies/color_pie.cpp
+    src/interface/widgets/general/home_styled_button.cpp
+    src/interface/widgets/general/home_widget.cpp
+    src/interface/widgets/general/layout_containers/flow_widget.cpp
+    src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
+    src/interface/widgets/general/layout_containers/overlap_widget.cpp
+    src/interface/widgets/menus/deck_editor_menu.cpp
+    src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
+    src/interface/widgets/printing_selector/card_amount_widget.cpp
+    src/interface/widgets/printing_selector/printing_selector.cpp
+    src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
+    src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+    src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
+    src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
+    src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
+    src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
+    src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
+    src/interface/widgets/quick_settings/settings_button_widget.cpp
+    src/interface/widgets/quick_settings/settings_popup_widget.cpp
+    src/interface/widgets/replay/replay_manager.cpp
+    src/interface/widgets/replay/replay_timeline_widget.cpp
+    src/interface/widgets/server/chat_view/chat_view.cpp
+    src/interface/widgets/server/game_filter_configs.cpp
+    src/interface/widgets/server/game_selector.cpp
+    src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
+    src/interface/widgets/server/games_model.cpp
+    src/interface/widgets/server/handle_public_servers.cpp
+    src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
+    src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
+    src/interface/widgets/server/user/user_avatar_provider.cpp
+    src/interface/widgets/server/user/user_card_art_provider.cpp
+    src/interface/widgets/server/user/user_card_settings_dialog.cpp
+    src/interface/widgets/server/user/user_context_menu.cpp
+    src/interface/widgets/server/user/user_info_box.cpp
+    src/interface/widgets/server/user/user_info_connection.cpp
+    src/interface/widgets/server/user/user_list_manager.cpp
+    src/interface/widgets/server/user/user_list_painter.cpp
+    src/interface/widgets/server/user/user_list_widget.cpp
+    src/interface/widgets/settings_page/appearance_settings_page.cpp
+    src/interface/widgets/settings_page/deck_editor_settings_page.cpp
+    src/interface/widgets/settings_page/general_settings_page.cpp
+    src/interface/widgets/settings_page/messages_settings_page.cpp
+    src/interface/widgets/settings_page/shortcut_settings_page.cpp
+    src/interface/widgets/settings_page/sound_settings_page.cpp
+    src/interface/widgets/settings_page/storage_settings_page.cpp
+    src/interface/widgets/settings_page/user_interface_settings_page.cpp
+    src/interface/widgets/utility/custom_line_edit.cpp
+    src/interface/widgets/utility/get_text_with_max.cpp
+    src/interface/widgets/utility/sequence_edit.cpp
+    src/interface/widgets/utility/visibility_change_listener.cpp
+    src/interface/widgets/utility/visibility_change_listener.h
+    src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
+    src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
+    src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
+    src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
+    src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
+    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
+    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
+    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
+    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
+    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
+    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
+    src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+    src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+    src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
+    src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
+    src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
+    src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
+    src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+    src/interface/window_main.cpp
+    src/main.cpp
+    src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+    src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
+    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
+    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
+    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
+    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
+    src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
+    src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+    src/interface/widgets/tabs/tab.cpp
+    src/interface/widgets/tabs/tab_account.cpp
+    src/interface/widgets/tabs/tab_admin.cpp
+    src/interface/widgets/tabs/tab_card_art_rules.cpp
+    src/interface/widgets/tabs/tab_deck_editor.cpp
+    src/interface/widgets/tabs/tab_deck_storage.cpp
+    src/interface/widgets/tabs/tab_game.cpp
+    src/interface/widgets/tabs/tab_home.cpp
+    src/interface/widgets/tabs/tab_logs.cpp
+    src/interface/widgets/tabs/tab_message.cpp
+    src/interface/widgets/tabs/tab_replays.cpp
+    src/interface/widgets/tabs/tab_room.cpp
+    src/interface/widgets/tabs/tab_server.cpp
+    src/interface/widgets/tabs/tab_supervisor.cpp
+    src/interface/widgets/tabs/tab_visual_database_display.cpp
+    src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+    src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
+    src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+    src/interface/key_signals.cpp
+    src/interface/logger.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
+    src/interface/widgets/utility/compact_push_button.cpp
+    src/interface/widgets/utility/compact_push_button.h
+    src/interface/widgets/server/user/user_info_popup.cpp
+    src/interface/widgets/server/user/user_info_popup.h
 )
 
 add_subdirectory(sounds)
@@ -204,15 +368,23 @@ configure_file(
 set(cockatrice_RESOURCES cockatrice.qrc)
 
 if(UPDATE_TRANSLATIONS)
+  # Cockatrice main sources
   file(GLOB_RECURSE translate_cockatrice_SRCS ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp
        ${CMAKE_SOURCE_DIR}/cockatrice/src/*.h
   )
-  file(GLOB_RECURSE translate_common_SRCS ${CMAKE_SOURCE_DIR}/common/*.cpp ${CMAKE_SOURCE_DIR}/common/*.h)
+
-  set(translate_SRCS ${translate_cockatrice_SRCS} ${translate_common_SRCS})
+  # All libcockatrice_* libraries (recursively)
+  file(GLOB_RECURSE translate_lib_SRCS ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.cpp
+       ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.h
+  )
+
+  # Combine all sources for translation
+  set(translate_SRCS ${translate_cockatrice_SRCS} ${translate_lib_SRCS})
+
   set(cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/cockatrice_en@source.ts")
 else()
   file(GLOB cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
-endif(UPDATE_TRANSLATIONS)
+endif()
 
 if(WIN32)
   set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc)
@@ -242,12 +414,6 @@ set(DESKTOPDIR
     CACHE STRING "desktop file destination"
 )
 
-# Include directories
-include_directories(../common)
-include_directories(${PROTOBUF_INCLUDE_DIR})
-include_directories(${CMAKE_BINARY_DIR}/common)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translations")
 set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
 set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
@@ -287,9 +453,31 @@ elseif(Qt5_FOUND)
 endif()
 
 if(Qt5_FOUND)
-  target_link_libraries(cockatrice cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(
+    cockatrice
+    libcockatrice_card
+    libcockatrice_deck_list
+    libcockatrice_filters
+    libcockatrice_utility
+    libcockatrice_network
+    libcockatrice_models
+    libcockatrice_rng
+    libcockatrice_settings
+    ${COCKATRICE_QT_MODULES}
+  )
 else()
-  target_link_libraries(cockatrice PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(
+    cockatrice
+    PUBLIC libcockatrice_card
+           libcockatrice_deck_list
+           libcockatrice_filters
+           libcockatrice_utility
+           libcockatrice_network
+           libcockatrice_models
+           libcockatrice_rng
+           libcockatrice_settings
+           ${COCKATRICE_QT_MODULES}
+  )
 endif()
 
 if(UNIX)
@@ -338,6 +526,13 @@ if(APPLE)
     PATTERN "tls/*.dylib"
   )
 
+  install(
+    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
+    DESTINATION ${qtconf_dest_dir}/
+    FILES_MATCHING
+    PATTERN "*.ini"
+  )
+
   install(
     CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -372,6 +567,14 @@ if(WIN32)
     PATTERN "*.dll"
   )
 
+  install(
+    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
+    DESTINATION ./
+    FILES_MATCHING
+    PATTERN "CMakeFiles" EXCLUDE
+    PATTERN "*.ini"
+  )
+
   # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
@@ -394,6 +597,9 @@ if(WIN32)
     PATTERN "styles/qopensslbackend.dll"
     PATTERN "styles/qschannelbackend.dll"
     PATTERN "styles/qwindowsvistastyle.dll"
+    PATTERN "styles/qwindows11style.dll"
+    PATTERN "styles/qmodernwindowsstyle.dll"
+    PATTERN "styles/qmodernwindowsstyled.dll"
     PATTERN "tls/qcertonlybackend.dll"
     PATTERN "tls/qopensslbackend.dll"
     PATTERN "tls/qschannelbackend.dll"

cockatrice/cockatrice.qrc

@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/" >
+    <qresource prefix="/">
         <file>resources/cardback.svg</file>
         <file>resources/cockatrice.svg</file>
         <file>resources/hand.svg</file>
@@ -7,27 +7,46 @@
 
         <file>resources/icons/arrow_bottom_green.svg</file>
         <file>resources/icons/arrow_down_green.svg</file>
+        <file>resources/icons/arrow_history.svg</file>
         <file>resources/icons/arrow_left_green.svg</file>
+        <file>resources/icons/arrow_redo.svg</file>
         <file>resources/icons/arrow_right_blue.svg</file>
         <file>resources/icons/arrow_right_green.svg</file>
         <file>resources/icons/arrow_top_green.svg</file>
         <file>resources/icons/arrow_up_green.svg</file>
+        <file>resources/icons/arrow_undo.svg</file>
+        <file>resources/icons/circle_half_stroke.svg</file>
         <file>resources/icons/clearsearch.svg</file>
+        <file>resources/icons/cogwheel.svg</file>
         <file>resources/icons/conceded.svg</file>
         <file>resources/icons/decrement.svg</file>
         <file>resources/icons/delete.svg</file>
+        <file>resources/icons/dragon.svg</file>
+        <file>resources/icons/dropdown_collapsed.svg</file>
+        <file>resources/icons/dropdown_expanded.svg</file>
+        <file>resources/icons/filter.svg</file>
+        <file>resources/icons/floppy_disk.svg</file>
         <file>resources/icons/forgot_password.svg</file>
+        <file>resources/icons/gear.svg</file>
         <file>resources/icons/increment.svg</file>
         <file>resources/icons/info.svg</file>
         <file>resources/icons/lock.svg</file>
         <file>resources/icons/not_ready_start.svg</file>
+        <file>resources/icons/pen_to_square.svg</file>
         <file>resources/icons/pencil.svg</file>
+        <file>resources/icons/pin.svg</file>
         <file>resources/icons/player.svg</file>
         <file>resources/icons/ready_start.svg</file>
+        <file>resources/icons/reload.svg</file>
         <file>resources/icons/remove_row.svg</file>
+        <file>resources/icons/rename.svg</file>
+        <file>resources/icons/scale_balanced.svg</file>
         <file>resources/icons/scales.svg</file>
+        <file>resources/icons/scroll.svg</file>
         <file>resources/icons/search.svg</file>
         <file>resources/icons/settings.svg</file>
+        <file>resources/icons/share.svg</file>
+        <file>resources/icons/sort_arrow_down.svg</file>
         <file>resources/icons/spectator.svg</file>
         <file>resources/icons/swap.svg</file>
         <file>resources/icons/sync.svg</file>
@@ -35,11 +54,23 @@
         <file>resources/icons/update.png</file>
         <file>resources/icons/view.svg</file>
 
+        <file>resources/icons/mana/B.svg</file>
+        <file>resources/icons/mana/C.svg</file>
+        <file>resources/icons/mana/G.svg</file>
+        <file>resources/icons/mana/R.svg</file>
+        <file>resources/icons/mana/U.svg</file>
+        <file>resources/icons/mana/W.svg</file>
+
+        <file>resources/backgrounds/home.png</file>
+        <file>resources/backgrounds/card_triplet.svg</file>
+        <file>resources/backgrounds/placeholder_printing_selector.svg</file>
+
         <file>resources/config/general.svg</file>
         <file>resources/config/appearance.svg</file>
         <file>resources/config/interface.svg</file>
         <file>resources/config/messages.svg</file>
         <file>resources/config/deckeditor.svg</file>
+        <file>resources/config/storage.svg</file>
         <file>resources/config/shorcuts.svg</file>
         <file>resources/config/sound.svg</file>
         <file>resources/config/debug.ini</file>
@@ -342,21 +373,32 @@
 
         <!-- ADD TIP OF THE DAY IMAGES HERE -->
         <file>resources/tips/images/accounts_tab.png</file>
+        <file>resources/tips/images/add_card.png</file>
         <file>resources/tips/images/arrows.png</file>
+        <file>resources/tips/images/card_select.png</file>
         <file>resources/tips/images/cockatrice_register.png</file>
         <file>resources/tips/images/cockatrice_wiki.png</file>
         <file>resources/tips/images/coin_flip.png</file>
         <file>resources/tips/images/counter_expression.png</file>
         <file>resources/tips/images/discord.png</file>
+        <file>resources/tips/images/edhrec.png</file>
+        <file>resources/tips/images/expand_card_view.png</file>
         <file>resources/tips/images/face_down.png</file>
         <file>resources/tips/images/filter_games.png</file>
         <file>resources/tips/images/github_logo.png</file>
+        <file>resources/tips/images/highlight_cards.png</file>
+        <file>resources/tips/images/pawns.png</file>
         <file>resources/tips/images/setpt.png</file>
         <file>resources/tips/images/shortcuts.png</file>
+        <file>resources/tips/images/syntax_help.png</file>
         <file>resources/tips/images/themes.png</file>
         <file>resources/tips/images/tip_of_the_day.png</file>
+        <file>resources/tips/images/token.png</file>
+        <file>resources/tips/images/updates.png</file>
+        <file>resources/tips/images/visual_deck_tags.png</file>
         <file>resources/tips/tips_of_the_day.xml</file>
 
         <file>resources/help/search.md</file>
+        <file>resources/help/deck_search.md</file>
     </qresource>
 </RCC>

cockatrice/resources/backgrounds/card_triplet.svg

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="250"
+   id="svg13"
+   height="231.66667"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <g
+     transform="matrix(1.705559,0,0,1.705559,-18.310328,-4.2419088)"
+     id="g13">
+    <path
+       d="M 90.069854,3.479957 C 89.356513,1.2235709 86.980392,-0.01102897 84.723451,0.70218215 L 3.4767601,26.377781 C 1.2199188,27.090982 -0.01486587,29.46663 0.69839437,31.723116 L 33.512365,135.52112 c 0.713341,2.25639 3.089462,3.49099 5.346403,2.77777 l 81.246672,-25.6756 c 2.25684,-0.71319 3.49163,-3.08884 2.77837,-5.34533 L 90.074852,3.479957 Z"
+       style="display:none;fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path1" />
+    <path
+       d="m 110.61293,7.4983294 c -0.36657,-2.337853 -2.53055,-3.9150142 -4.86886,-3.5484627 L 21.563382,17.14452 c -2.338314,0.366502 -3.915784,2.529976 -3.549207,4.867929 L 34.876507,129.55893 c 0.366577,2.33786 2.530549,3.91502 4.868863,3.54847 l 84.18069,-13.19466 c 2.33831,-0.3665 3.91578,-2.52997 3.5492,-4.86793 L 110.61093,7.4983294 Z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path4" />
+    <path
+       d="m 130.53623,15.555064 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 41.067426 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 124.41102 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208344 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path7" />
+    <path
+       d="m 149.43988,26.480639 c 0.38018,-2.335754 -1.1846,-4.508374 -3.52082,-4.88852 L 61.817351,7.9076636 C 59.481136,7.5275576 57.308066,9.0920839 56.927894,11.427736 L 39.439773,118.87426 c -0.380182,2.33576 1.184602,4.50838 3.520816,4.88852 l 84.102711,13.68346 c 2.33622,0.38011 4.50929,-1.18442 4.88946,-3.52007 L 149.43688,26.479639 Z"
+       style="display:inline;fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path10" />
+  </g>
+</svg>

cockatrice/resources/backgrounds/placeholder_printing_selector.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com        License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.-->
+
+<svg
+   version="1.1"
+   width="172.65051"
+   id="svg13"
+   height="213.30714"
+   xml:space="preserve"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"><defs
+     id="defs13" /><g
+     transform="matrix(1.705559,0,0,1.705559,-97.653345,-68.741256)"
+     id="g13"><path
+       d="m 151.48519,45.063813 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 62.016385 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 153.91977 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208345 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path7" /><path
+       d="m 154.70135,48.441704 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 65.232545 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 157.29767 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208345 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path7-5" /><path
+       d="m 157.98403,51.75453 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 68.515228 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 v 108.85596 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208342 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path7-6" /></g><path
+     d="m 196.24576,207.42361 c 0,0.11213 0,0.22413 0,0.33621 -0.0498,4.54511 -4.18399,7.63329 -8.72909,7.63329 h -12.19086 c -3.29988,0 -5.97713,2.67727 -5.97713,5.97712 0,0.4234 0.0498,0.83433 0.12449,1.23279 0.26149,1.27014 0.80939,2.49046 1.34485,3.72325 0.75959,1.71843 1.50674,3.4244 1.50674,5.22998 0,3.95986 -2.68971,7.55859 -6.64956,7.72046 -0.43583,0.0128 -0.87166,0.025 -1.31995,0.025 -17.60761,0 -31.878,-14.27038 -31.878,-31.878 0,-17.60761 14.28284,-31.878 31.89046,-31.878 17.60762,0 31.87801,14.27039 31.87801,31.878 z m -47.81703,3.98475 c 0,-2.20407 -1.78067,-3.98475 -3.98473,-3.98475 -2.20407,0 -3.98477,1.78068 -3.98477,3.98475 0,2.20406 1.7807,3.98475 3.98477,3.98475 2.20406,0 3.98473,-1.78069 3.98473,-3.98475 z m 0,-11.95426 c 2.20407,0 3.98477,-1.78068 3.98477,-3.98475 0,-2.20407 -1.7807,-3.98475 -3.98477,-3.98475 -2.20405,0 -3.98473,1.78068 -3.98473,3.98475 0,2.20407 1.78068,3.98475 3.98473,3.98475 z m 19.92376,-11.95424 c 0,-2.20408 -1.78068,-3.98477 -3.98473,-3.98477 -2.20407,0 -3.98477,1.78069 -3.98477,3.98477 0,2.20405 1.7807,3.98474 3.98477,3.98474 2.20405,0 3.98473,-1.78069 3.98473,-3.98474 z m 11.95426,11.95424 c 2.20407,0 3.98475,-1.78068 3.98475,-3.98475 0,-2.20407 -1.78068,-3.98475 -3.98475,-3.98475 -2.20406,0 -3.98475,1.78068 -3.98475,3.98475 0,2.20407 1.78069,3.98475 3.98475,3.98475 z"
+     id="path1"
+     style="display:none;fill:#3b3b3b;fill-opacity:1;stroke:#000000;stroke-width:2.53798;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="M 126.20915,54.574783 82.324247,83.8512 c -5.76807,3.845383 -9.435059,10.089163 -10.029703,16.90777 12.348823,2.53716 22.081191,12.26955 24.638191,24.63819 6.838435,-0.59465 13.062395,-4.26163 16.907775,-10.0297 l 29.2566,-43.904722 c 1.32804,-2.001984 2.04162,-4.340923 2.04162,-6.75915 0,-6.719506 -5.45092,-12.170428 -12.17043,-12.170428 -2.3984,0 -4.75718,0.713573 -6.75915,2.041623 z M 88.052677,131.81933 c 0,-12.26953 -9.930593,-22.20012 -22.200138,-22.20012 -12.269532,0 -22.200126,9.93059 -22.200126,22.20012 0,0.77305 0.03966,1.54609 0.118929,2.2993 0.356787,3.46877 -2.021792,7.21505 -5.510393,7.21505 h -0.951431 c -3.508409,0 -6.342895,2.83447 -6.342895,6.3429 0,3.5084 2.834486,6.34289 6.342895,6.34289 h 28.543021 c 12.269545,0 22.200138,-9.93059 22.200138,-22.20014 z"
+     id="path1-2"
+     style="fill:#989898;fill-opacity:1;stroke-width:0.198215" /></svg>

cockatrice/resources/config/qtlogging.ini

@@ -1,54 +1,74 @@
 [Rules]
-# Uncomment a rule to disable logging for that category
+# The default log level is info
+*.debug = false
+#*.info = true
+#*.warning = true
+#*.critical = true
+#*.fatal = true
 
-# main = false
+# Uncomment a rule to see debug level logs for that category,
-# qt_translator = false
+# or set <category> = false to disable logging
-# window_main.* = false
-# release_channel = false
-# spoiler_background_updater = false
-# theme_manager = false
-# sound_engine = false
-# tapped_out_interface = false
 
-# tab_game = false
+#main = true
-# tab_message = false
+#qt_translator = true
-# tab_supervisor = false
+#window_main.* = true
+#release_channel = true
+#spoiler_background_updater = true
+#theme_manager = true
+#sound_engine = true
+#tapped_out_interface = true
 
-# dlg_edit_avatar = false
+#tab_game = true
-# dlg_settings = false
+#tab_message = true
-# dlg_tip_of_the_day = false
+#tab_supervisor = true
-# dlg_update = false
 
-# settings_cache = false
+#dlg_edit_avatar = true
-# servers_settings = false
+#dlg_load_deck_from_website = true
-# shortcuts_settings = false
+#dlg_settings = true
+#dlg_tip_of_the_day = true
+#dlg_update = true
 
-# remote_client = false
+#general_settings_page = true
 
-# player = false
+#settings_cache = true
-# game_scene = false
+#servers_settings = true
-# game_scene.player_addition_removal = false
+#shortcuts_settings = true
-# card_zone = false
-# view_zone = false
 
-# user_info_connection = false
+#local_client = true
+#remote_client = true
 
-# picture_loader = false
+#player = true
-# picture_loader.worker = false
+#game_scene = true
-# picture_loader.card_back_cache_fail = false
+#game_scene.player_addition_removal = true
-# picture_loader.picture_to_load = false
+#card_zone = true
-# deck_loader = false
+#view_zone = true
-# card_database = false
-# card_database.loading = false
-# card_database.loading.success_or_failure = false
-# cockatrice_xml.* = false
-# cockatrice_xml.xml_3_parser = false
-# cockatrice_xml.xml_4_parser = false
-# card_list = false
 
-# flow_layout = false
+#game_event_handler = true
-flow_widget.* = false
 
-# pixel_map_generator = false
+#user_info_connection = true
 
-# filter_string = false
+#card_picture_loader = true
+#card_picture_loader.worker = true
+#card_picture_loader.card_back_cache_fail = true
+#card_picture_loader.picture_to_load = true
+#deck_loader = true
+#card_database = true
+#card_database.loading = true
+#card_database.loading.success_or_failure = true
+#cockatrice_xml.* = true
+#cockatrice_xml.xml_3_parser = true
+#cockatrice_xml.xml_4_parser = true
+#card_info = true
+#card_list = true
+
+#flow_layout = true
+#flow_widget = true
+#flow_widget.size = true
+
+#card_info_picture_widget = true
+
+#pixel_map_generator = true
+
+#deck_filter_string = true
+#filter_string = true
+#syntax_help = true

cockatrice/resources/config/storage.svg

@@ -0,0 +1,799 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   width="62.636364"
+   height="62.090908"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   sodipodi:docname="storage.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"><defs
+     id="defs4"><linearGradient
+       id="linearGradient3169"><stop
+         style="stop-color:#0000ff;stop-opacity:1;"
+         offset="0"
+         id="stop3171" /><stop
+         style="stop-color:#000067;stop-opacity:1;"
+         offset="1"
+         id="stop3173" /></linearGradient><linearGradient
+       id="linearGradient4766"><stop
+         style="stop-color:#784421;stop-opacity:1;"
+         offset="0"
+         id="stop4768" /><stop
+         style="stop-color:#3d2210;stop-opacity:0;"
+         offset="1"
+         id="stop4770" /></linearGradient><linearGradient
+       id="linearGradient4758"><stop
+         style="stop-color:#a05a2c;stop-opacity:1;"
+         offset="0"
+         id="stop4760" /><stop
+         style="stop-color:#3d2210;stop-opacity:1;"
+         offset="1"
+         id="stop4762" /></linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" /><inkscape:perspective
+       id="perspective2484"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4758"
+       id="linearGradient4764"
+       x1="466.09601"
+       y1="485.96021"
+       x2="715.14801"
+       y2="485.96021"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4766"
+       id="linearGradient4772"
+       x1="496.548"
+       y1="485.26816"
+       x2="683.31201"
+       y2="485.26816"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3175"
+       cx="120.07376"
+       cy="56.138123"
+       fx="120.07376"
+       fy="56.138123"
+       r="82.790039"
+       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6482"
+       id="linearGradient6488"
+       x1="32.18182"
+       y1="3.2835093"
+       x2="32.18182"
+       y2="13.02554"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0281354,0,0,1.0429299,85.21874,131.0326)" /><linearGradient
+       id="linearGradient6482"><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6484" /><stop
+         style="stop-color:#00ff00;stop-opacity:0;"
+         offset="1"
+         id="stop6486" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6464"
+       id="linearGradient6470"
+       x1="32.090908"
+       y1="1.8181819"
+       x2="31.09091"
+       y2="62.909088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.1818182)" /><linearGradient
+       id="linearGradient6464"><stop
+         style="stop-color:#0061ff;stop-opacity:1;"
+         offset="0"
+         id="stop6466" /><stop
+         style="stop-color:#001c4c;stop-opacity:1;"
+         offset="1"
+         id="stop6468" /></linearGradient><linearGradient
+       y2="62.909088"
+       x2="31.09091"
+       y1="1.8181819"
+       x1="32.090908"
+       gradientTransform="translate(86.2151,131.5372)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4477"
+       xlink:href="#linearGradient6464"
+       inkscape:collect="always" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient2916"><stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2918" /><stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2920" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient2902"><stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop2905" /><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2907" /></linearGradient><linearGradient
+       id="linearGradient2064"><stop
+         id="stop2066"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" /><stop
+         style="stop-color:#555753;stop-opacity:0.60000002;"
+         offset="0.5"
+         id="stop2070" /><stop
+         id="stop2068"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" /></linearGradient><linearGradient
+       id="linearGradient9641"><stop
+         style="stop-color:white;stop-opacity:1"
+         offset="0"
+         id="stop9643" /><stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop9645" /></linearGradient><linearGradient
+       id="linearGradient9633"><stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0"
+         id="stop9635" /><stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop9639" /></linearGradient><linearGradient
+       id="linearGradient9613"><stop
+         style="stop-color:white;stop-opacity:1"
+         offset="0"
+         id="stop9615" /><stop
+         id="stop9619"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:1;" /><stop
+         style="stop-color:#cccfca;stop-opacity:1"
+         offset="1"
+         id="stop9617" /></linearGradient><linearGradient
+       id="linearGradient8710"><stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop8712" /><stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="1"
+         id="stop8714" /></linearGradient><linearGradient
+       id="linearGradient8631"><stop
+         id="stop8633"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" /><stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0.2"
+         id="stop8637" /><stop
+         id="stop8635"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:1" /></linearGradient><linearGradient
+       id="linearGradient8625"><stop
+         id="stop8627"
+         offset="0"
+         style="stop-color:white;stop-opacity:1" /><stop
+         id="stop8629"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:1" /></linearGradient><linearGradient
+       id="linearGradient8613"><stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop8615" /><stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1"
+         id="stop8617" /></linearGradient><linearGradient
+       id="linearGradient5740"><stop
+         style="stop-color:#d0d0cb;stop-opacity:1;"
+         offset="0"
+         id="stop5742" /><stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop5744" /></linearGradient><linearGradient
+       id="linearGradient5690"><stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5692" /><stop
+         style="stop-color:#888a85;stop-opacity:0.59848487"
+         offset="1"
+         id="stop5694" /></linearGradient><linearGradient
+       id="linearGradient2899"><stop
+         id="stop2901"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1" /><stop
+         id="stop2903"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:1" /></linearGradient><linearGradient
+       id="linearGradient3468"><stop
+         style="stop-color:#fdfdfc;stop-opacity:1"
+         offset="0"
+         id="stop3470" /><stop
+         style="stop-color:white;stop-opacity:0.37121212"
+         offset="1"
+         id="stop3472" /></linearGradient><linearGradient
+       id="linearGradient2909"><stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="0"
+         id="stop2911" /><stop
+         id="stop2917"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:1;" /><stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2913" /></linearGradient><linearGradient
+       id="linearGradient2839"><stop
+         style="stop-color:white;stop-opacity:0.25773194;"
+         offset="0"
+         id="stop2841" /><stop
+         id="stop2847"
+         offset="0.5472973"
+         style="stop-color:white;stop-opacity:1;" /><stop
+         style="stop-color:white;stop-opacity:0.24705882;"
+         offset="0.66243607"
+         id="stop2849" /><stop
+         id="stop2851"
+         offset="0.875"
+         style="stop-color:white;stop-opacity:0.83505154;" /><stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2843" /></linearGradient><linearGradient
+       id="linearGradient2900"><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2902" /><stop
+         id="stop2908"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" /><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2904" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3468"
+       id="linearGradient3474"
+       x1="24.748737"
+       y1="35.354588"
+       x2="24.998737"
+       y2="14.997767"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.995556,0,-3.931113)" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2902"
+       id="radialGradient4700"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.095822,0,0,3.101282,-9.53921,-94.5433)"
+       cx="0"
+       cy="17"
+       fx="0"
+       fy="17"
+       r="2" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2902"
+       id="radialGradient4702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.095822,0,0,3.101282,38.20996,-10.90025)"
+       cx="0"
+       cy="17"
+       fx="0"
+       fy="17"
+       r="2" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2900"
+       id="linearGradient4704"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.047911,0,0,2.067521,1.347566,6.673675)"
+       x1="9.8994951"
+       y1="20"
+       x2="9.8994951"
+       y2="13.979153" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2909"
+       id="linearGradient4711"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.42294,10.5,-14.95703)"
+       x1="15.335379"
+       y1="33.06237"
+       x2="20.329321"
+       y2="36.37693" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2909"
+       id="linearGradient4713"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.42294,-0.875,-15.04578)"
+       x1="15.335379"
+       y1="33.06237"
+       x2="20.329321"
+       y2="36.37693" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2909"
+       id="linearGradient4715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.459833,0,-0.391165,1.370105,40.62503,-13.29892)"
+       x1="15.335379"
+       y1="33.06237"
+       x2="20.329321"
+       y2="36.37693" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5740"
+       id="radialGradient5748"
+       cx="25.251999"
+       cy="16.47991"
+       fx="25.251999"
+       fy="16.47991"
+       r="21.980215"
+       gradientTransform="matrix(1.032991,-0.596398,0.575121,0.99614,-12.23456,11.55448)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2064"
+       id="linearGradient5790"
+       gradientUnits="userSpaceOnUse"
+       x1="18.048874"
+       y1="25.461344"
+       x2="22.211937"
+       y2="12.143078"
+       gradientTransform="matrix(0.940224,0,0,0.931632,1.331811,1.401537)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8631"
+       id="linearGradient5865"
+       x1="24"
+       y1="36.638382"
+       x2="25.818018"
+       y2="6.8314762"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2839"
+       id="linearGradient7658"
+       gradientUnits="userSpaceOnUse"
+       x1="27.057796"
+       y1="12.669416"
+       x2="32.042896"
+       y2="31.219666" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5690"
+       id="linearGradient8603"
+       x1="20.304037"
+       y1="24.035707"
+       x2="18.498415"
+       y2="40.647167"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8613"
+       id="radialGradient8619"
+       cx="7.5177727"
+       cy="30.573555"
+       fx="7.5177727"
+       fy="30.573555"
+       r="0.53125"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9613"
+       id="radialGradient8623"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.389748,0,0,1.348872,-2.91982,-10.63815)"
+       cx="7.5191436"
+       cy="30.304251"
+       fx="7.5191436"
+       fy="30.304251"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9633"
+       id="radialGradient8664"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.569487,0,0,1.523325,-4.288627,-15.92107)"
+       cx="7.5336008"
+       cy="30.307562"
+       fx="7.5336008"
+       fy="30.307562"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8613"
+       id="radialGradient8666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.5177727"
+       cy="30.573555"
+       fx="7.5177727"
+       fy="30.573555"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8625"
+       id="radialGradient8676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.4792061"
+       cy="30.36071"
+       fx="7.4792061"
+       fy="30.36071"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8613"
+       id="radialGradient8678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.5177727"
+       cy="30.573555"
+       fx="7.5177727"
+       fy="30.573555"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9641"
+       id="radialGradient8680"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.4893188"
+       cy="30.337601"
+       fx="7.4893188"
+       fy="30.337601"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8613"
+       id="radialGradient8682"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.5177727"
+       cy="30.573555"
+       fx="7.5177727"
+       fy="30.573555"
+       r="0.53125" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="40.617188"
+       y1="30.554688"
+       x2="40.710938"
+       y2="30.359375"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9605"
+       gradientUnits="userSpaceOnUse"
+       x1="40.617188"
+       y1="30.554688"
+       x2="40.710938"
+       y2="30.359375"
+       gradientTransform="matrix(0.602867,-0.797841,0.797841,0.602867,-41.12611,44.62773)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9649"
+       gradientUnits="userSpaceOnUse"
+       x1="40.617188"
+       y1="30.554688"
+       x2="40.710938"
+       y2="30.359375"
+       gradientTransform="rotate(-30.000012,-5.5813167,76.089146)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9654"
+       gradientUnits="userSpaceOnUse"
+       x1="40.617188"
+       y1="30.554688"
+       x2="40.710938"
+       y2="30.359375"
+       gradientTransform="matrix(0.707107,0.527555,-0.707107,0.527555,29.0058,-24.09196)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2916"
+       id="linearGradient2973"
+       x1="12.5"
+       y1="43.1875"
+       x2="12.5"
+       y2="34.045513"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2899"
+       id="linearGradient5655"
+       gradientUnits="userSpaceOnUse"
+       x1="53.812813"
+       y1="43.573235"
+       x2="-2.8138931"
+       y2="35.500015"
+       gradientTransform="translate(0,50)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2902"
+       id="linearGradient2992"
+       x1="21.9375"
+       y1="39"
+       x2="21.9375"
+       y2="37.995617"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2902"
+       id="linearGradient2910"
+       x1="22.101398"
+       y1="27.658131"
+       x2="22.971142"
+       y2="20.903238"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2916"
+       id="linearGradient2922"
+       x1="24.847851"
+       y1="28.908398"
+       x2="24.847851"
+       y2="25.757175"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2)" /></defs><sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.8830488"
+     inkscape:cx="-3.9945275"
+     inkscape:cy="-14.363301"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1408"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:showpageshadow="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050" /><metadata
+     id="metadata7"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-86.987816,-132.85536)"><rect
+       style="fill:url(#linearGradient4477);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-opacity:1"
+       id="rect6462"
+       width="61.636364"
+       height="61.090908"
+       x="87.487816"
+       y="133.35536"
+       ry="5.6363635" /><rect
+       style="fill:url(#linearGradient6488);fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="rect6472"
+       width="59.796619"
+       height="13.251164"
+       x="88.407707"
+       y="134.45705"
+       ry="4.7325583" /><g
+       inkscape:label="Livello 1"
+       id="layer1-3"
+       style="display:inline"
+       transform="matrix(1.1537183,0,0,1.1537183,91.003924,136.40297)"><g
+         id="g3519"
+         style="opacity:0.7"
+         transform="matrix(1.030831,0,0,1.151147,-0.73609,-12.57431)"
+         inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"><rect
+           transform="scale(-1)"
+           y="-48.024086"
+           x="-9.5392103"
+           height="12.405126"
+           width="8.1916437"
+           id="rect2884"
+           style="opacity:1;fill:url(#radialGradient4700);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><rect
+           y="35.618961"
+           x="38.209965"
+           height="12.405126"
+           width="8.1916437"
+           id="rect2894"
+           style="opacity:1;fill:url(#radialGradient4702);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><rect
+           y="35.618961"
+           x="9.5392103"
+           height="12.405126"
+           width="28.670753"
+           id="rect2898"
+           style="opacity:1;fill:url(#linearGradient4704);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></g><g
+         id="g5672"
+         transform="translate(0,-48.99747)"><path
+           sodipodi:nodetypes="ccccccccccccc"
+           id="rect2010"
+           d="M 4.5182287,80.500013 H 43.481768 c 0.564099,0 1.018229,0.45413 1.018229,1.018229 v 2.963543 c 0,1.315584 -0.450231,3.018228 -2.455729,3.018228 L 40.5,87.5 v 1 h -33 v -1 l -1.8567713,1.3e-5 c -1.2712053,0 -2.1432282,-0.884627 -2.1432282,-2.255665 v -3.726106 c 0,-0.564099 0.4541297,-1.018229 1.0182282,-1.018229 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5655);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
+           transform="translate(0,50)"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2973);stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m 4.59375,31.59375 v 3.729743 c 0,0.599619 0.3756505,1.104854 0.8863276,1.104854 H 42.426407 c 0.512469,0 0.979843,-0.507235 0.979843,-1.016466 V 31.59375 Z"
+           id="path2076"
+           sodipodi:nodetypes="ccccccc" /><g
+           transform="translate(0,50)"
+           style="opacity:0.5"
+           id="g4706"><path
+             style="opacity:0.109524;fill:url(#linearGradient4711);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 26.144738,32.088747 c 0,0 -1.502602,5.533939 -3.226175,5.911253 0,0 6.231378,-0.125771 6.231378,-0.125771 1.387072,-0.317461 3.358758,-5.785482 3.358758,-5.785482 z"
+             id="path2907"
+             sodipodi:nodetypes="ccccc"
+             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+             inkscape:export-xdpi="90"
+             inkscape:export-ydpi="90" /><path
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+             sodipodi:nodetypes="ccccc"
+             id="path2892"
+             d="m 14.769738,32 c 0,0 -1.502602,5.533939 -3.226175,5.911253 0,0 6.231378,-0.125771 6.231378,-0.125771 C 19.162013,37.468021 21.133699,32 21.133699,32 Z"
+             style="opacity:0.109524;fill:url(#linearGradient4713);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+             sodipodi:nodetypes="ccccc"
+             id="path2896"
+             d="m 34.886139,32 c 0,0 -2.212224,5.328458 -3.108503,5.691761 0,0 2.899969,-0.121101 2.899969,-0.121101 C 35.402697,37.264987 37.8125,32 37.8125,32 Z"
+             style="opacity:0.109524;fill:url(#linearGradient4715);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></g><path
+         style="fill:url(#radialGradient5748);fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 11.693127,10.498788 h 24.572566 c 1.68417,0 2.396517,0.117479 3.040019,2.385005 l 5.074491,17.881119 c 0.501024,1.765471 -1.355848,2.735101 -3.040018,2.735101 H 6.6186312 c -1.868408,0 -3.4893833,-1.181417 -3.0400182,-2.735101 L 8.8290448,12.611497 c 0.5683008,-1.964905 1.1799122,-2.112709 2.8640822,-2.112709 z"
+         id="rect1879"
+         sodipodi:nodetypes="cczzcczzc"
+         inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" /><path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="-0.5"
+         inkscape:original="M 11.6875 10.5 C 10.00333 10.5 9.4120513 10.660095 8.84375 12.625 L 3.59375 30.75 C 3.1443849 32.303684 4.7565918 33.500002 6.625 33.5 L 41.34375 33.5 C 43.02792 33.5 44.876024 32.515471 44.375 30.75 L 39.3125 12.875 C 38.668998 10.607474 37.965419 10.5 36.28125 10.5 L 11.6875 10.5 z "
+         style="display:inline;opacity:0.462406;fill:url(#linearGradient7658);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         id="path5806"
+         d="m 11.6875,11 c -0.826242,0 -1.28475,0.05742 -1.5625,0.242188 -0.2777497,0.184768 -0.5284825,0.580009 -0.8007812,1.521484 l -5.2500001,18.125 c -0.1708248,0.590628 0.021709,1.039316 0.4902344,1.4375 C 5.0329784,32.724356 5.7975106,33.000001 6.625,33 h 34.71875 c 0.744655,0 1.538941,-0.232575 2.03125,-0.609375 0.492309,-0.3768 0.719298,-0.799984 0.519531,-1.503906 l -5.0625,-17.875 C 38.52278,11.922001 38.224454,11.462814 37.910156,11.253906 37.595859,11.044998 37.112699,11 36.28125,11 Z" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8623);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8621"
+         transform="matrix(-2.628602,0,0,1.777765,27.79309,-23.77739)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><path
+         style="fill:none;fill-opacity:1;stroke:url(#linearGradient5790);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 16.110953,12.552805 c -0.573581,0 -1.02837,0.431821 -1.02837,0.989859 l -0.940223,3.230801 c -2.859962,1.276514 -4.6423552,3.099073 -4.6423552,5.123976 0,3.856957 6.4790242,6.987239 14.4853222,6.98724 8.006296,0 14.514705,-3.130284 14.514704,-6.98724 0,-2.039034 -1.835591,-3.875388 -4.730501,-5.153089 l -0.940224,-3.201688 c 0,-0.558038 -0.454788,-0.989859 -1.02837,-0.989859 z"
+         id="path2784"
+         sodipodi:nodetypes="cccssscccc" /><path
+         style="display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient3474);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 11.6875,11.500005 c -0.803124,0 -1.097168,0.07051 -1.21875,0.155556 -0.121582,0.08504 -0.357707,0.40212 -0.6875,1.306667 l -5.25,18.137786 c -0.1337204,0.366765 -0.054827,0.533865 0.3125,0.84 0.3673267,0.306136 1.066693,0.56 1.78125,0.560001 h 34.71875 c 0.639793,0 1.393345,-0.237954 1.78125,-0.52889 0.387905,-0.290935 0.488311,-0.382809 0.3125,-0.871111 L 38.375,13.242228 c -0.377206,-1.04766 -0.68208,-1.439297 -0.84375,-1.555556 -0.16167,-0.116259 -0.443711,-0.186667 -1.25,-0.186667 z"
+         id="path3394"
+         sodipodi:nodetypes="csccsccsccscc" /><g
+         id="g5657"
+         transform="translate(7,-1)"
+         style="opacity:0.302857"><rect
+           ry="0.74712253"
+           rx="0.75130093"
+           y="35.500008"
+           x="18.499996"
+           height="1.9999924"
+           width="14.000004"
+           id="rect5641"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="19"
+           height="1"
+           width="1"
+           id="rect5645"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="22"
+           height="1"
+           width="1"
+           id="rect5647"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="24"
+           height="1"
+           width="1"
+           id="rect5649"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="26"
+           height="1"
+           width="1"
+           id="rect5651"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="29"
+           height="1"
+           width="2"
+           id="rect5653"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /></g><path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="-0.44194174"
+         inkscape:original="M 16.125 12.5625 C 15.55142 12.5625 15.09375 12.973212 15.09375 13.53125 L 14.15625 16.78125 C 11.296288 18.057765 9.5 19.881347 9.5 21.90625 C 9.5 25.763206 15.993702 28.874999 24 28.875 C 32.006296 28.874999 38.500001 25.763206 38.5 21.90625 C 38.5 19.867215 36.67616 18.027701 33.78125 16.75 L 32.84375 13.53125 C 32.843748 12.973212 32.386082 12.5625 31.8125 12.5625 L 16.125 12.5625 z "
+         style="display:inline;fill:url(#linearGradient5865);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path5857"
+         d="m 16.125,13.003906 c -0.362612,0 -0.589844,0.210942 -0.589844,0.527344 a 0.44198593,0.44198593 0 0 1 -0.01758,0.123047 l -0.9375,3.25 a 0.44198593,0.44198593 0 0 1 -0.24414,0.28125 c -1.389903,0.620369 -2.504368,1.368471 -3.25586,2.177734 -0.751491,0.809263 -1.1386718,1.661199 -1.1386717,2.542969 0,1.680455 1.4530107,3.311153 3.9980467,4.533203 2.545037,1.22205 6.114654,1.99414 10.060547,1.994141 3.945892,-1e-6 7.51551,-0.772091 10.060547,-1.994141 2.545037,-1.22205 3.998047,-2.852748 3.998047,-4.533203 0,-0.887751 -0.391823,-1.747213 -1.154297,-2.5625 -0.762474,-0.815287 -1.893636,-1.568394 -3.300781,-2.189453 a 0.44198593,0.44198593 0 0 1 -0.246094,-0.28125 l -0.9375,-3.21875 a 0.44198593,0.44198593 0 0 1 -0.01758,-0.123047 c -10e-7,-0.316404 -0.22723,-0.527344 -0.589844,-0.527344 z" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:0.0530303;fill-rule:nonzero;stroke:url(#linearGradient8603);stroke-width:2.52015;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8595"
+         transform="matrix(0.449978,0,0,0.349909,16.36363,12.21469)"
+         cx="16.970562"
+         cy="25.107418"
+         rx="7.7781744"
+         ry="4.2868347" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8619);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8611"
+         transform="matrix(1.411772,0,0,0.969697,-3.014767,0.848485)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.462594;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8660"
+         transform="matrix(-2.628602,0,0,1.777765,60.79309,-23.77739)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8666);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8662"
+         transform="matrix(1.411772,0,0,0.969697,29.98523,0.848485)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8676);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8668"
+         transform="matrix(-2.628602,0,0,1.777765,31.79309,-40.77739)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8678);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8670"
+         transform="matrix(1.411772,0,0,0.969697,0.985233,-16.15152)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8672"
+         transform="matrix(-2.628602,0,0,1.777765,56.3029,-40.77739)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8682);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8674"
+         transform="matrix(1.411772,0,0,0.969697,25.49504,-16.15152)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><path
+         style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8716);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 40.328109,30.261401 0.874999,0.430332"
+         id="path8700" /><path
+         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9605);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 7.330186,30.695906 8.201031,30.257228"
+         id="path9603" /><path
+         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9649);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 11.263531,13.446473 0.972937,-0.06482"
+         id="path9647" /><path
+         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9654);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 36.124038,13.147874 0.314427,0.688634"
+         id="path9652" /><rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.12;fill:url(#linearGradient2992);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.681836;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="rect2984"
+         width="32.03125"
+         height="1"
+         x="8"
+         y="38" /><path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.12;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2910);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 10.460155,15.082355 6.8513979,27.675762 C 8.2982685,28.375511 10.625,29.167061 10.429825,31.533131 H 37.299883 C 37.869398,29.640915 39.875,28.375 41.34614,28.25 L 37.498106,15.082355 32.350135,12.523347 H 14.318912 Z"
+         id="path1997"
+         sodipodi:nodetypes="ccccccccc" /><path
+         sodipodi:nodetypes="ccccc"
+         id="path2912"
+         d="m 7.9763979,27.050762 c 1.4468706,0.699749 3.1789321,1.433241 3.4256991,3.357369 H 36.857941 C 37.427456,28.515915 38.875,27.5 40.34614,27.375 Z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.834286;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2922);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /></g></g></svg>

cockatrice/resources/help/deck_search.md

@@ -0,0 +1,52 @@
+@page deck_search_syntax_help Deck Search Syntax Help
+
+## Deck Search Syntax Help
+
+The search bar recognizes a set of special commands.<br>
+In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all
+searches are case insensitive.
+
+<dl>
+
+<dt>Display Name (The deck name, or the filename if the deck name isn't set):</dt>
+<dd>[red deck wins](#red deck wins) <small>(Any deck with a display name containing the words red, deck, and wins)</small></dd>
+<dd>["red deck wins"](#%22red deck wins%22) <small>(Any deck with a display name containing the exact phrase "red deck wins")</small></dd>
+
+<dt>Deck <u>N</u>ame:</dt>
+<dd>[n:aggro](#n:aggro) <small>(Any deck with a name containing the word aggro)</small></dd>
+<dd>[n:red n:deck n:wins](#n:red n:deck n:wins) <small>(Any deck with a name containing the words red, deck, and wins)</small></dd>
+<dd>[n:"red deck wins"](#n:%22red deck wins%22) <small>(Any deck with a name containing the exact phrase "red deck wins")</small></dd>
+
+<dt><u>F</u>ile <u>N</u>ame:</dt>
+<dd>[fn:aggro](#fn:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
+<dd>[fn:red fn:deck fn:wins](#fn:red fn:deck fn:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
+<dd>[fn:"red deck wins"](#fn:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
+
+<dt>Relative <u>P</u>ath (starting from the deck folder):</dt>
+<dd>[p:aggro](#p:aggro) <small>(Any deck that has "aggro" somewhere in its relative path)</small></dd>
+<dd>[p:edh/](#p:edh/) <small>(Any deck with "edh/" in its relative path, A.K.A. decks in the "edh" folder)</small></dd>
+
+<dt><u>F</u>ormat:</dt>
+<dd>[f:standard](#f:standard) <small>(Any deck with format set to standard)</small></dd>
+
+<dt><u>C</u>omments:</dt>
+<dd>[c:good](#c:good) <small>(Any deck with comments containing the word good)</small></dd>
+<dd>[c:good c:deck](#c:good c:deck) <small>(Any deck with comments containing the words good and deck)</small></dd>
+<dd>[c:"good deck"](#c:%22good deck%22) <small>(Any deck with comments containing the exact phrase "good deck")</small></dd>
+
+<dt>Deck Contents (Uses [card search expressions](#cardSearchSyntaxHelp)):</dt>
+<dd><a href="#[[plains]]">[[plains]]</a> <small>(Any deck that contains at least one card with "plains" in its name)</small></dd>
+<dd><a href="#[[t:legendary]]">[[t:legendary]]</a> <small>(Any deck that contains at least one legendary)</small></dd>
+<dd><a href="#[[t:legendary]]>5">[[t:legendary]]>5</a> <small>(Any card that contains at least 5 legendaries)</small></dd>
+<dd><a href="#[[]]:100">[[]]:100</a> <small>(Any deck that contains exactly 100 cards)</small></dd>
+
+<dt>Negate:</dt>
+<dd>[soldier -aggro](#soldier -aggro) <small>(Any deck filename that contains "soldier", but not "aggro")</small></dd>
+
+<dt>Branching:</dt>
+<dd>[t:aggro OR o:control](#t:aggro OR o:control) <small>(Any deck filename that contains either aggro or control)</small></dd>
+
+<dt>Grouping:</dt>
+<dd><a href="#red -([[]]:100 OR aggro)">red -([[]]:100 OR aggro)</a> <small>(Any deck that has red in its filename but is not 100 cards or has aggro in its filename)</small></dd>
+
+</dl>

cockatrice/resources/help/search.md

@@ -1,8 +1,12 @@
+@page search_syntax_help Search Syntax Help
+
 ## Search Syntax Help
------
+
 The search bar recognizes a set of special commands similar to some other card databases.<br>
 In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all searches are case insensitive.
+
 <dl>
+
 <dt>Name:</dt>
 <dd>[birds of paradise](#birds of paradise) <small>(Any card name containing the words birds, of, and paradise)</small></dd>
 <dd>["birds of paradise"](#%22birds of paradise%22) <small>(Any card name containing the exact phrase "birds of paradise")</small></dd>
@@ -47,15 +51,20 @@ In this list of examples below, each entry has an explanation and can be clicked
 
 <dt><u>E</u>dition:</dt>
 <dd>[set:lea](#set:lea) <small>(Cards that appear in Alpha, which has the set code LEA)</small></dd>
-<dd>[e:lea or e:leb](#e:lea or e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
+<dd>[e:lea OR e:leb](#e:lea OR e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
 
 <dt>Negate:</dt>
 <dd>[c:wu -c:m](#c:wu -c:m) <small>(Any card that is white or blue, but not multicolored)</small></dd>
 
 <dt>Branching:</dt>
-<dd>[t:sliver or o:changeling](#t:sliver or o:changeling) <small>(Any card that is either a sliver or has changeling)</small></dd>
+<dd>[t:sliver OR o:changeling](#t:sliver OR o:changeling) <small>(Any card that is either a sliver or has changeling)</small></dd>
 
 <dt>Grouping:</dt>
-<dd><a href="#t:angel -(angel or c:w)">t:angel -(angel or c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
+<dd><a href="#t:angel -(angel OR c:w)">t:angel -(angel OR c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
+
+<dt>Regular Expression:</dt>
+<dd>[/^fell/](#/^fell/) <small>(Any card name that begins with "fell")</small></dd>
+<dd>[o:/counter target .* spell/](#o:/counter target .* spell/) <small>(Any card text with "counter target *something* spell")</small></dd>
+<dd>[o:/for each .* and\/or .*/](#o:/for each .* and\/or .*/) <small>(/'s can be escaped with a \)</small></dd>
 
 </dl>

cockatrice/resources/icons/arrow_history.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+    <title>
+        history
+    </title>
+    <path d="M9 6v5h.06l2.48 2.47 1.41-1.41L11 10.11V6H9z"/>
+    <path d="M10 1a9 9 0 0 0-7.85 13.35L.5 16H6v-5.5l-2.38 2.38A7 7 0 1 1 10 17v2a9 9 0 0 0 0-18z"/>
+</svg>

cockatrice/resources/icons/arrow_redo.svg

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px"
+     y="0px" width="485.212px" height="485.212px" viewBox="0 0 485.212 485.212"
+     style="enable-background:new 0 0 485.212 485.212;" xml:space="preserve">
+<g>
+	<path d="M242.607,424.559c-75.252,0-136.468-61.209-136.468-136.465c0-75.252,61.216-136.466,136.468-136.466v90.978   l151.629-121.302L242.607,0v90.978c-108.687,0-197.117,88.432-197.117,197.117c0,108.691,88.43,197.118,197.117,197.118   c108.687,0,197.114-88.427,197.114-197.118h-60.645C379.077,363.35,317.859,424.559,242.607,424.559z"/>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+</svg>

cockatrice/resources/icons/arrow_undo.svg

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px"
+     y="0px" width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;"
+     xml:space="preserve">
+<g>
+	<path d="M256,448c79.406,0,144-64.594,144-144s-64.594-144-144-144v96L96,128L256,0v96c114.688,0,208,93.313,208,208   c0,114.688-93.312,208-208,208c-114.687,0-208-93.312-208-208h64C112,383.406,176.594,448,256,448z"/>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+    <g>
+</g>
+</svg>

cockatrice/resources/icons/circle_half_stroke.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M512 320C512 214 426 128 320 128L320 512C426 512 512 426 512 320zM64 320C64 178.6 178.6 64 320 64C461.4 64 576 178.6 576 320C576 461.4 461.4 576 320 576C178.6 576 64 461.4 64 320z"/></svg>

cockatrice/resources/icons/cogwheel.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+     xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="102.5024mm" height="102.24421mm"
+     viewBox="0 0 102.5024 102.24421" version="1.1"
+     id="svg1"
+     inkscape:version="1.4 (e7c3feb100, 2024-10-09)" sodipodi:docname="cog_wheel.svg"
+     xmlns="http://www.w3.org/2000/svg">
+    <sodipodi:namedview id="namedview1" pagecolor="#ffffff" bordercolor="#000000" borderopacity="0.25"
+                        inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0"
+                        inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.66101291"
+                        inkscape:cx="146.74449" inkscape:cy="193.64221" inkscape:window-width="1829"
+                        inkscape:window-height="951" inkscape:window-x="0" inkscape:window-y="0"
+                        inkscape:window-maximized="1" inkscape:current-layer="layer1"/>
+    <defs id="defs1"/>
+    <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-66.148059,-97.377896)">
+        <g id="g1" transform="translate(-165.09777,-82.009607)">
+            <g id="g2" transform="matrix(0.26458333,0,0,0.26458333,64.983323,161.37858)">
+                <path style="fill:#333333;stroke-width:94.4882"
+                      d="m 721.34301,94.413051 40.00966,29.763289 29.51933,-9.27053 14.63768,-46.840589 36.83817,0.48792 13.41787,46.108699 28.29952,9.5145 40.74155,-28.299519 29.0314,21.468599 -15.85748,47.08454 16.58937,23.66426 48.30432,-2.68358 12.93,34.88648 -41.71741,27.07971 -0.48792,29.27536 40.49763,26.10387 -10.2464,34.15459 -48.54834,-0.97584 -18.78502,23.42029 15.85749,45.37681 -28.29952,21.71256 -41.22947,-29.27536 -28.54348,9.75846 -13.66184,47.57246 -38.30194,-0.73188 -14.63768,-48.30435 -27.07971,-9.27054 -40.00966,29.27537 -30.25121,-20.49276 17.32125,-46.35266 -17.80918,-24.64009 -49.76812,3.17149 -11.22222,-34.64251 40.74155,-27.07971 0.48792,-30.00725 -41.71739,-27.32367 12.19807,-32.93479 48.30435,2.68358 20.24879,-24.6401 -17.32126,-47.08455 z"
+                      id="path1"/>
+                <circle style="fill:#f9f9f9;stroke-width:72.1317" id="path2" cx="822.09906" cy="261.28262"
+                        r="83.434792"/>
+                <circle style="fill:#4d4d4d;stroke-width:40.5147" id="circle2" cx="822.09906" cy="261.28262"
+                        r="46.863361"/>
+            </g>
+        </g>
+    </g>
+</svg>

cockatrice/resources/icons/dragon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M352 188.5L300.1 175.5C293.6 173.9 288.8 168.4 288.1 161.7C287.4 155 290.9 148.6 296.8 145.6L337.6 125.2L294.3 92.7C288.8 88.6 286.5 81.4 288.7 74.8C290.9 68.2 297.1 64 304 64L464 64C494.2 64 522.7 78.2 540.8 102.4L598.4 179.2C604.6 187.5 608 197.6 608 208C608 234.5 586.5 256 560 256L538.5 256C521.5 256 505.2 249.3 493.2 237.3L479.9 224L447.9 224L447.9 245.5C447.9 270.3 460.7 293.4 481.7 306.6L588.3 373.2C620.4 393.3 639.9 428.4 639.9 466.3C639.9 526.9 590.8 576.1 530.1 576.1L32.3 576C29 576 25.7 575.6 22.7 574.6C13.5 571.8 6 565 2.3 556C1 552.7 .1 549.1 0 545.3C-.2 541.6 .3 538 1.3 534.6C4.1 525.4 10.9 517.9 19.9 514.2C22.9 513 26.1 512.2 29.4 512L433.3 476C441.6 475.3 448 468.3 448 459.9C448 455.6 446.3 451.5 443.3 448.5L398.9 404.1C368.9 374.1 352 333.4 352 291L352 188.5zM512 136.3C512 136.2 512 136.1 512 136C512 135.9 512 135.8 512 135.7L512 136.3zM510.7 143.7L464.3 132.1C464.1 133.4 464 134.7 464 136C464 149.3 474.7 160 488 160C498.6 160 507.5 153.2 510.7 143.7zM130.9 180.5C147.2 166 171.3 164.3 189.4 176.4L320 263.4L320 290.9C320 323.7 328.4 355.7 344 383.9L112 383.9C105.3 383.9 99.3 379.7 97 373.5C94.7 367.3 96.5 360.2 101.6 355.8L171 296.3L18.4 319.8C11.4 320.9 4.5 317.2 1.5 310.8C-1.5 304.4 .1 296.8 5.4 292L130.9 180.5z"/></svg>

cockatrice/resources/icons/dropdown_collapsed.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+        <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+        <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+        ]>
+<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="460.5" height="531.74"
+     viewBox="0 0 460.5 531.74" overflow="visible" enable-background="new 0 0 460.5 531.74" xml:space="preserve">
+<polygon fill="#918d8d" points="0.5,0.866 459.5,265.87 0.5,530.874 "/>
+</svg>

cockatrice/resources/icons/dropdown_expanded.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+        <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+        <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+        ]>
+<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="531.74" height="460.5"
+     viewBox="0 0 531.74 460.5" overflow="visible" enable-background="new 0 0 531.74 460.5" xml:space="preserve">
+<polygon fill="#918d8d" points="530.874,0.5 265.87,459.5 0.866,0.5 "/>
+</svg>

cockatrice/resources/icons/filter.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg fill="#000000" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg"
+     width="800px" height="800px" viewBox="0 0 971.986 971.986"
+     xml:space="preserve">
+<g>
+	<path d="M370.216,459.3c10.2,11.1,15.8,25.6,15.8,40.6v442c0,26.601,32.1,40.101,51.1,21.4l123.3-141.3
+		c16.5-19.8,25.6-29.601,25.6-49.2V500c0-15,5.7-29.5,15.8-40.601L955.615,75.5c26.5-28.8,6.101-75.5-33.1-75.5h-873
+		c-39.2,0-59.7,46.6-33.1,75.5L370.216,459.3z"/>
+</g>
+</svg>

cockatrice/resources/icons/floppy_disk.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M160 96C124.7 96 96 124.7 96 160L96 480C96 515.3 124.7 544 160 544L480 544C515.3 544 544 515.3 544 480L544 237.3C544 220.3 537.3 204 525.3 192L448 114.7C436 102.7 419.7 96 402.7 96L160 96zM192 192C192 174.3 206.3 160 224 160L384 160C401.7 160 416 174.3 416 192L416 256C416 273.7 401.7 288 384 288L224 288C206.3 288 192 273.7 192 256L192 192zM320 352C355.3 352 384 380.7 384 416C384 451.3 355.3 480 320 480C284.7 480 256 451.3 256 416C256 380.7 284.7 352 320 352z"/></svg>

cockatrice/resources/icons/gear.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M259.1 73.5C262.1 58.7 275.2 48 290.4 48L350.2 48C365.4 48 378.5 58.7 381.5 73.5L396 143.5C410.1 149.5 423.3 157.2 435.3 166.3L503.1 143.8C517.5 139 533.3 145 540.9 158.2L570.8 210C578.4 223.2 575.7 239.8 564.3 249.9L511 297.3C511.9 304.7 512.3 312.3 512.3 320C512.3 327.7 511.8 335.3 511 342.7L564.4 390.2C575.8 400.3 578.4 417 570.9 430.1L541 481.9C533.4 495 517.6 501.1 503.2 496.3L435.4 473.8C423.3 482.9 410.1 490.5 396.1 496.6L381.7 566.5C378.6 581.4 365.5 592 350.4 592L290.6 592C275.4 592 262.3 581.3 259.3 566.5L244.9 496.6C230.8 490.6 217.7 482.9 205.6 473.8L137.5 496.3C123.1 501.1 107.3 495.1 99.7 481.9L69.8 430.1C62.2 416.9 64.9 400.3 76.3 390.2L129.7 342.7C128.8 335.3 128.4 327.7 128.4 320C128.4 312.3 128.9 304.7 129.7 297.3L76.3 249.8C64.9 239.7 62.3 223 69.8 209.9L99.7 158.1C107.3 144.9 123.1 138.9 137.5 143.7L205.3 166.2C217.4 157.1 230.6 149.5 244.6 143.4L259.1 73.5zM320.3 400C364.5 399.8 400.2 363.9 400 319.7C399.8 275.5 363.9 239.8 319.7 240C275.5 240.2 239.8 276.1 240 320.3C240.2 364.5 276.1 400.2 320.3 400z"/></svg>

cockatrice/resources/icons/mana/B.svg

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+        width="169.34801mm"
+        height="169.34801mm"
+        viewBox="0 0 600 600"
+        version="1.1"
+        id="svg1"
+        sodipodi:docname="B.svg"
+        inkscape:export-filename="B.svg"
+        inkscape:export-xdpi="96"
+        inkscape:export-ydpi="96"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns="http://www.w3.org/2000/svg">
+  <defs
+          id="defs1"/>
+  <sodipodi:namedview
+          id="namedview1"
+          pagecolor="#505050"
+          bordercolor="#eeeeee"
+          borderopacity="1"
+          inkscape:showpageshadow="0"
+          inkscape:pageopacity="0"
+          inkscape:pagecheckerboard="0"
+          inkscape:deskcolor="#505050"
+          inkscape:document-units="mm">
+    <inkscape:page
+            x="0"
+            y="0"
+            width="600"
+            height="600"
+            id="page2"
+            margin="0"
+            bleed="0"/>
+  </sodipodi:namedview>
+  <path
+          id="Selection"
+          fill="none"
+          stroke="#000000"
+          stroke-width="1"
+          d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
+          style="display:inline;fill:#ababab;fill-opacity:1"/>
+  <path
+          d="m 299.67889,84.945431 c -118.26949,0 -214.122988,83.892719 -214.122988,187.357619 0,58.63289 30.863828,110.90901 79.041488,145.28579 8.02961,5.77129 12.71356,15.13917 11.29165,25.0089 l -7.86234,55.37086 c -1.17098,8.02962 5.01851,15.22281 13.13176,15.22281 h 64.98968 v -46.83939 c 0,-3.68025 3.01111,-6.69135 6.69135,-6.69135 h 13.38268 c 3.68024,0 6.69135,3.0111 6.69135,6.69135 v 46.83939 h 53.53075 v -46.83939 c 0,-3.68025 3.01111,-6.69135 6.69134,-6.69135 h 13.38269 c 3.68023,0 6.69134,3.0111 6.69134,6.69135 v 46.83939 h 64.98967 c 8.11327,0 14.30275,-7.19319 13.13177,-15.22281 l -7.86234,-55.37086 c -1.4219,-9.78609 3.1784,-19.23761 11.29165,-25.0089 48.17767,-34.37678 79.0415,-86.6529 79.0415,-145.28579 0,-103.4649 -95.8535,-187.357619 -214.123,-187.357619 z M 219.38277,352.59917 c -29.52555,0 -53.53075,-24.0052 -53.53075,-53.53075 0,-29.52555 24.0052,-53.53075 53.53075,-53.53075 29.52555,0 53.53075,24.0052 53.53075,53.53075 0,29.52555 -24.0052,53.53075 -53.53075,53.53075 z m 160.59225,0 c -29.52555,0 -53.53075,-24.0052 -53.53075,-53.53075 0,-29.52555 24.0052,-53.53075 53.53075,-53.53075 29.52555,0 53.53075,24.0052 53.53075,53.53075 0,29.52555 -24.0052,53.53075 -53.53075,53.53075 z"
+          id="path1"
+          style="fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.836419;stroke-opacity:1"/>
+</svg>

cockatrice/resources/icons/mana/C.svg

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="169.33115mm"
+   height="169.59981mm"
+   viewBox="0 0 169.33115 169.59981"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="C.svg"
+   inkscape:export-xdpi="96.000015"
+   inkscape:export-ydpi="96.000015"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   sodipodi:docname="colorless.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.71535494"
+     inkscape:cx="397.00572"
+     inkscape:cy="536.09751"
+     inkscape:window-width="1853"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:page
+       x="0"
+       y="0"
+       width="169.33115"
+       height="169.59981"
+       id="page2"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-20.334425,-63.700102)">
+    <ellipse
+       style="fill:#cccccc;stroke:#000000;stroke-width:0.165333;stroke-linecap:round"
+       id="path1"
+       cx="-30.617094"
+       cy="179.22736"
+       transform="matrix(0.70654605,-0.70766707,0.70654608,0.70766704,0,0)"
+       rx="84.650612"
+       ry="84.65062" />
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:14.5003;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none"
+       id="rect1"
+       width="84.683701"
+       height="84.683769"
+       x="-221.60611"
+       y="-73.174698"
+       ry="0.084683768"
+       transform="matrix(-0.7073973,-0.70681615,0.7073973,-0.70681615,0,0)" />
+  </g>
+</svg>

cockatrice/resources/icons/mana/G.svg

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        width="169.34801mm"
+        height="169.34801mm"
+        viewBox="0 0 600 600"
+        version="1.1"
+        id="svg1"
+        sodipodi:docname="B.svg"
+        inkscape:export-filename="U.svg"
+        inkscape:export-xdpi="96"
+        inkscape:export-ydpi="96"
+        xmlns="http://www.w3.org/2000/svg">
+    <defs
+            id="defs1"/>
+    <sodipodi:namedview
+            id="namedview1"
+            pagecolor="#505050"
+            bordercolor="#eeeeee"
+            borderopacity="1"
+            inkscape:showpageshadow="0"
+            inkscape:pageopacity="0"
+            inkscape:pagecheckerboard="0"
+            inkscape:deskcolor="#505050"
+            inkscape:document-units="mm">
+        <inkscape:page
+                x="0"
+                y="0"
+                width="600"
+                height="600"
+                id="page2"
+                margin="0"
+                bleed="0"/>
+    </sodipodi:namedview>
+    <path
+            id="Selection"
+            fill="none"
+            stroke="#000000"
+            stroke-width="1"
+            d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
+            style="display:inline;fill:#5f9f56;fill-opacity:1"/>
+    <path
+            d="m 488.52401,428.04591 -80.36527,-83.50228 h 30.81218 c 9.06362,0 17.08104,-4.61393 20.90363,-12.05153 3.82262,-7.41912 2.56521,-15.92714 -3.29949,-22.19282 l -78.59482,-83.87142 h 29.06188 c 9.15413,0 17.40291,-4.93688 20.98411,-12.55902 3.54092,-7.50219 1.87106,-16.23169 -4.26525,-22.22053 L 312.83499,83.240199 c -6.06588,-5.951919 -17.38282,-5.951919 -23.45873,0 L 178.44019,191.64831 c -6.13629,5.98884 -7.79612,14.71834 -4.26523,22.22053 3.58119,7.62214 11.84001,12.55902 20.99414,12.55902 h 29.06189 l -78.60489,83.88987 c -5.84454,6.25645 -7.10199,14.75525 -3.28944,22.18361 3.82262,7.42836 11.82996,12.04229 20.90363,12.04229 h 30.81222 l -80.36527,83.50228 c -6.03569,6.26567 -7.40379,14.84754 -3.58117,22.38663 3.7723,7.42839 12.07138,12.22682 21.13497,12.22682 h 129.63669 c 0,0 -36.12127,66.38546 0,62.75824 h 80.45578 c 33.50708,5.78651 0,-62.75824 0,-62.75824 h 129.63668 c 9.06361,0 17.36266,-4.79843 21.13499,-12.22682 3.82262,-7.53909 2.45452,-16.12096 -3.58117,-22.38663 z"
+            id="ENVIR"
+            style="fill:#3f6e3a;fill-opacity:1;stroke:#000000;stroke-width:1.09833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+</svg>

cockatrice/resources/icons/mana/R.svg

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        width="169.34801mm"
+        height="169.34801mm"
+        viewBox="0 0 600 600"
+        version="1.1"
+        id="svg1"
+        sodipodi:docname="B.svg"
+        inkscape:export-filename="B.svg"
+        inkscape:export-xdpi="96"
+        inkscape:export-ydpi="96"
+        xmlns="http://www.w3.org/2000/svg">
+    <defs
+            id="defs1"/>
+    <sodipodi:namedview
+            id="namedview1"
+            pagecolor="#505050"
+            bordercolor="#eeeeee"
+            borderopacity="1"
+            inkscape:showpageshadow="0"
+            inkscape:pageopacity="0"
+            inkscape:pagecheckerboard="0"
+            inkscape:deskcolor="#505050"
+            inkscape:document-units="mm">
+        <inkscape:page
+                x="0"
+                y="0"
+                width="600"
+                height="600"
+                id="page2"
+                margin="0"
+                bleed="0"/>
+    </sodipodi:namedview>
+    <path
+            id="Selection"
+            fill="none"
+            stroke="#000000"
+            stroke-width="1"
+            d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
+            style="display:inline;fill:#c95e46;fill-opacity:1"/>
+    <path
+            style="display:inline;fill:#7e3525;fill-opacity:1;stroke:#000000;stroke-width:0.999129;stroke-dasharray:none;stroke-opacity:1"
+            d="m 278.25473,537.27772 c -22.36635,-1.29637 -48.78648,-8.31223 -69.74195,-18.51997 -47.30139,-23.04123 -75.19872,-59.72004 -85.45343,-112.35234 -2.77041,-14.21911 -2.51753,-48.32296 0.4755,-64.1246 4.84373,-25.57244 17.23939,-55.03329 30.65191,-72.85059 3.74877,-4.97991 16.33133,-18.11906 30.23479,-31.57223 13.09764,-12.67346 26.64745,-26.67202 30.11069,-31.10792 16.66894,-21.35045 26.46602,-44.71272 29.68313,-70.78286 1.93489,-15.67951 0.37962,-45.867231 -3.5802,-69.491071 -0.58906,-3.51428 0.36584,-3.52724 11.47726,-0.15583 36.51454,11.0792 67.37028,34.791071 89.32423,68.643431 9.96686,15.36862 20.07787,39.31263 24.78919,58.70364 2.23257,9.18886 2.53252,44.73878 0.46396,54.98571 -0.75708,3.75024 -1.10086,7.09425 -0.76396,7.43114 1.5021,1.5021 14.63666,-6.65479 21.98002,-13.65016 10.59844,-10.09621 14.32693,-17.61354 15.94714,-32.15254 l 1.16788,-10.47988 3.4626,3.95724 c 26.80954,30.6392 41.75268,56.11528 54.11775,92.26358 11.02075,32.21825 14.93902,62.79297 12.47422,97.33768 -1.88493,26.41774 -10.16486,50.6958 -24.95555,73.17369 -6.31625,9.59901 -30.86306,34.05172 -40.40914,40.25423 -23.44452,15.23295 -50.15355,25.25695 -77.26806,28.99903 -12.48732,1.72336 -38.04339,2.42637 -54.18798,1.49062 z m 48.34948,-30.34196 c 30.78066,-8.0491 53.53846,-30.12825 59.69792,-57.9177 2.48916,-11.23027 2.26087,-34.25269 -0.43747,-44.11787 -5.3998,-19.74181 -9.72931,-26.61651 -30.6237,-48.62658 -16.92925,-17.8332 -21.73398,-24.64464 -25.45673,-36.0889 -2.38622,-7.33554 -2.63126,-9.53814 -2.57644,-23.15876 0.0334,-8.27872 0.486,-17.4607 1.00593,-20.40441 0.75887,-4.29636 0.66928,-5.45812 -0.45409,-5.88919 -2.12997,-0.81736 -16.25071,4.45522 -21.90917,8.1807 -25.69349,16.91641 -42.62753,52.30879 -40.22917,84.07948 0.39046,5.17228 0.2831,8.79277 -0.26071,8.79277 -1.78935,0 -13.49435,-13.46378 -15.34792,-17.65406 -1.03171,-2.33236 -2.15967,-6.42651 -2.50657,-9.09812 -1.00143,-7.71233 -1.60778,-8.14619 -5.46339,-3.90915 -13.31687,14.63425 -24.58113,35.69359 -29.53283,55.21379 -11.75615,46.34414 2.14731,84.38956 37.55813,102.77397 16.56338,8.59931 29.2427,11.25369 51.26679,10.73261 12.58064,-0.29766 17.41119,-0.85366 25.26942,-2.90858 z"
+            id="path8"/>
+</svg>

cockatrice/resources/icons/mana/U.svg

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        width="169.34801mm"
+        height="169.34801mm"
+        viewBox="0 0 600 600"
+        version="1.1"
+        id="svg1"
+        sodipodi:docname="U.svg"
+        inkscape:export-filename="U.png"
+        inkscape:export-xdpi="96"
+        inkscape:export-ydpi="96"
+        xmlns="http://www.w3.org/2000/svg">
+    <defs
+            id="defs1"/>
+    <sodipodi:namedview
+            id="namedview1"
+            pagecolor="#505050"
+            bordercolor="#eeeeee"
+            borderopacity="1"
+            inkscape:showpageshadow="0"
+            inkscape:pageopacity="0"
+            inkscape:pagecheckerboard="0"
+            inkscape:deskcolor="#505050"
+            inkscape:document-units="mm">
+        <inkscape:page
+                x="0"
+                y="0"
+                width="600"
+                height="600"
+                id="page2"
+                margin="0"
+                bleed="0"/>
+    </sodipodi:namedview>
+    <path
+            id="Selection"
+            fill="none"
+            stroke="#000000"
+            stroke-width="1"
+            d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
+            style="display:inline;fill:#4a8fd8;fill-opacity:1"/>
+    <path
+            style="display:inline;fill:#3266af;fill-opacity:1;stroke:#000000;stroke-width:1.06525;stroke-opacity:1"
+            d="m 275.20608,536.5693 c -58.69596,-9.5447 -107.01545,-50.69962 -125.66779,-107.0344 -9.25532,-27.95342 -10.39669,-58.82111 -3.22092,-87.1088 5.31307,-20.94475 9.06296,-28.00552 81.87785,-154.17 38.54798,-66.79109 70.40461,-121.77997 70.79251,-122.19751 1.00535,-1.08215 140.3595,240.63696 145.26785,251.97682 8.6735,20.03855 12.6923,39.82747 12.6923,62.49805 0,44.25387 -16.70161,83.24077 -48.85852,114.0514 -21.46938,20.57055 -45.69209,33.39124 -76.46586,40.47213 -12.83139,2.95245 -42.64639,3.75165 -56.41742,1.51231 z"
+            id="path2"
+            sodipodi:nodetypes="ssssssssss"/>
+</svg>

cockatrice/resources/icons/mana/W.svg

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+        width="169.34801mm"
+        height="169.34801mm"
+        viewBox="0 0 600 600"
+        version="1.1"
+        id="svg1"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        inkscape:export-xdpi="96"
+        inkscape:export-ydpi="96"
+        sodipodi:docname="W.svg"
+        inkscape:export-filename="W.png"
+        xmlns="http://www.w3.org/2000/svg">
+    <defs
+            id="defs1"/>
+    <sodipodi:namedview
+            id="namedview1"
+            pagecolor="#505050"
+            bordercolor="#eeeeee"
+            borderopacity="1"
+            inkscape:showpageshadow="0"
+            inkscape:pageopacity="0"
+            inkscape:pagecheckerboard="0"
+            inkscape:deskcolor="#505050"
+            inkscape:document-units="mm">
+        <inkscape:page
+                x="0"
+                y="0"
+                width="600"
+                height="600"
+                id="page2"
+                margin="0"
+                bleed="0"/>
+    </sodipodi:namedview>
+    <path
+            id="Selection"
+            fill="none"
+            stroke="#000000"
+            stroke-width="1"
+            d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
+            style="display:inline;fill:#ffefb3;fill-opacity:1"/>
+    <path
+            id="circle8"
+            d="M 387.28106,302.711 A 85.962512,85.962512 0 0 1 301.31852,388.67353 85.962512,85.962512 0 0 1 215.35597,302.711 85.962512,85.962512 0 0 1 301.31852,216.74844 85.962512,85.962512 0 0 1 387.28106,302.711 Z M 191.75349,358.6114 143.05798,460.97151 245.4181,412.27601 A 121.73882,121.73882 0 0 1 191.75349,358.6114 Z M 178.33753,302.711 c 0,-13.16763 2.23687,-25.83857 5.96271,-38.01232 L 77.71657,302.711 184.30024,340.7233 a 119.25435,119.25435 0 0 1 -5.96271,-38.0123 z m 178.8814,109.56501 102.36011,48.6955 -48.6955,-102.36011 a 121.73882,121.73882 0 0 1 -53.66461,53.66461 z m -55.90041,13.41595 c -13.16762,0 -26.0869,-2.23687 -38.01232,-5.9627 l 38.01232,106.58368 38.01231,-106.58368 a 119.25435,119.25435 0 0 1 -38.01231,5.9627 z m 109.56502,-178.88139 48.6955,-102.36012 -102.36011,48.69551 a 122.98106,122.98106 0 0 1 53.66461,53.66461 z M 245.66643,193.14596 143.30658,144.45045 192.00209,246.81057 a 121.73882,121.73882 0 0 1 53.66434,-53.66461 z M 524.92046,302.711 418.33679,264.69868 a 119.25435,119.25435 0 0 1 0,76.02462 z M 301.31852,179.73 c 13.16761,0 26.0869,2.23688 38.01231,5.96271 L 301.31852,79.109036 263.3062,185.69271 A 119.25435,119.25435 0 0 1 301.31852,179.73 Z"
+            style="fill:#b4a35e;fill-opacity:1;stroke:#000000;stroke-width:1.09833;stroke-dasharray:none;stroke-opacity:1"/>
+</svg>

cockatrice/resources/icons/pen_to_square.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M535.6 85.7C513.7 63.8 478.3 63.8 456.4 85.7L432 110.1L529.9 208L554.3 183.6C576.2 161.7 576.2 126.3 554.3 104.4L535.6 85.7zM236.4 305.7C230.3 311.8 225.6 319.3 222.9 327.6L193.3 416.4C190.4 425 192.7 434.5 199.1 441C205.5 447.5 215 449.7 223.7 446.8L312.5 417.2C320.7 414.5 328.2 409.8 334.4 403.7L496 241.9L398.1 144L236.4 305.7zM160 128C107 128 64 171 64 224L64 480C64 533 107 576 160 576L416 576C469 576 512 533 512 480L512 384C512 366.3 497.7 352 480 352C462.3 352 448 366.3 448 384L448 480C448 497.7 433.7 512 416 512L160 512C142.3 512 128 497.7 128 480L128 224C128 206.3 142.3 192 160 192L256 192C273.7 192 288 177.7 288 160C288 142.3 273.7 128 256 128L160 128z"/></svg>

cockatrice/resources/icons/pin.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="64" height="64">
+  <g transform="matrix(0 1 -1 0 99.465813 0)" opacity="0.7">
+    <path fill="#000000" fill-rule="evenodd" clip-rule="evenodd"
+    stroke="#ffffff"
+          stroke-width="4"
+          stroke-linejoin="round"
+          stroke-linecap="round"
+          d="M65.5 62
+             L78 49
+             C73.5 44.5 69.5 42 63 44
+             L45 31 C47 25 46 22 41.5 18
+             L19 41.5
+             C23 45.5 25 46.5 31 45
+             L44 62.5
+             C42.3 69 45 73.5 49 78
+             L61.5 65.5
+             L84 87
+             L87 87
+             L87.5 86.5
+             L87.5 83.5 Z" />
+  </g>
+</svg>
+

cockatrice/resources/icons/reload.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+     viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
+    <g><path d="M586.9,373.6l95.6-84.4c-49.6-39.2-129.4-79.1-198.2-79.1c-134.9,0-248.2,90.5-280.2,212.8L10.6,374.5C64.4,168.3,255.2,15.8,482.5,15.8c126.7,0,258.8,63.7,345.4,141.4l90.8-80.1L990,479.6L586.9,373.6z M317.5,710.8c49.6,39.2,129.4,79.1,198.2,79.1c134.9,0,248.2-90.5,280.2-212.8l193.5,48.5c-53.7,206.2-244.6,358.7-471.9,358.7c-126.7,0-258.8-63.7-345.4-141.4l-90.8,80.1L10,520.4l403.1,106L317.5,710.8z"/></g>
+</svg>

cockatrice/resources/icons/rename.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+    <path transform="scale(50)" d="m17 16h4v-8h-4" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
+    <path transform="scale(50)" d="m12 8h-9v8h9" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
+    <path transform="scale(50)" d="m6 12h5" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
+    <path transform="scale(50)" d="m20 4h-2c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h2" fill="none" stroke="#000"
+          stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2"/>
+    <path transform="scale(50)" d="m12 20h2c1.1 0 2-0.9 2-2v-12c0-1.1-0.9-2-2-2h-2" fill="none" stroke="#000"
+          stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2"/>
+</svg>

cockatrice/resources/icons/scale_balanced.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M384 96L512 96C529.7 96 544 110.3 544 128C544 145.7 529.7 160 512 160L398.4 160C393.2 185.8 375.5 207.1 352 217.3L352 512L512 512C529.7 512 544 526.3 544 544C544 561.7 529.7 576 512 576L128 576C110.3 576 96 561.7 96 544C96 526.3 110.3 512 128 512L288 512L288 217.3C264.5 207 246.8 185.7 241.6 160L128 160C110.3 160 96 145.7 96 128C96 110.3 110.3 96 128 96L256 96C270.6 76.6 293.8 64 320 64C346.2 64 369.4 76.6 384 96zM439.6 384L584.4 384L512 259.8L439.6 384zM512 480C449.1 480 396.8 446 386 401.1C383.4 390.1 387 378.8 392.7 369L487.9 205.8C492.9 197.2 502.1 192 512 192C521.9 192 531.1 197.3 536.1 205.8L631.3 369C637 378.8 640.6 390.1 638 401.1C627.2 445.9 574.9 480 512 480zM126.8 259.8L54.4 384L199.3 384L126.8 259.8zM.9 401.1C-1.7 390.1 1.9 378.8 7.6 369L102.8 205.8C107.8 197.2 117 192 126.9 192C136.8 192 146 197.3 151 205.8L246.2 369C251.9 378.8 255.5 390.1 252.9 401.1C242.1 445.9 189.8 480 126.9 480C64 480 11.7 446 .9 401.1z"/></svg>

cockatrice/resources/icons/scroll.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M32 176C32 134.5 63.6 100.4 104 96.4L104 96L384 96C437 96 480 139 480 192L480 368L304 368C264.2 368 232 400.2 232 440L232 500C232 524.3 212.3 544 188 544C163.7 544 144 524.3 144 500L144 272L80 272C53.5 272 32 250.5 32 224L32 176zM268.8 544C275.9 530.9 280 515.9 280 500L280 440C280 426.7 290.7 416 304 416L552 416C565.3 416 576 426.7 576 440L576 464C576 508.2 540.2 544 496 544L268.8 544zM112 144C94.3 144 80 158.3 80 176L80 224L144 224L144 176C144 158.3 129.7 144 112 144z"/></svg>

cockatrice/resources/icons/share.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
+<svg height="800"
+     width="800"
+     version="1.1"
+     id="_x32_"
+     viewBox="0 0 512 512"
+     xml:space="preserve"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg">
+    <defs id="defs1"/>
+    <style type="text/css"
+           id="style1">
+	.st0{fill:#64C0FF;stroke:black;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1}
+</style>
+    <g id="g1"
+       transform="matrix(0.87097097,0,0,1.0008579,38.609049,-0.21963163)"
+       style="stroke-width:3.42738;stroke-dasharray:none">
+	<path class="st0"
+          d="M 512,255.995 277.045,65.394 v 103.574 c -17.255,0 -36.408,0 -57.542,0 -208.59,0 -249.35,153.44 -201.394,266.128 9.586,-103.098 142.053,-100.701 237.358,-100.701 7.247,0 14.446,0 21.578,0 v 112.211 z"
+          id="path1"
+          style="stroke-width:20;stroke:#000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+</g>
+</svg>

cockatrice/resources/icons/sort_arrow_down.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M278.6 438.6L182.6 534.6C170.1 547.1 149.8 547.1 137.3 534.6L41.3 438.6C28.8 426.1 28.8 405.8 41.3 393.3C53.8 380.8 74.1 380.8 86.6 393.3L128 434.7L128 128C128 110.3 142.3 96 160 96C177.7 96 192 110.3 192 128L192 434.7L233.4 393.3C245.9 380.8 266.2 380.8 278.7 393.3C291.2 405.8 291.2 426.1 278.7 438.6zM352 544C334.3 544 320 529.7 320 512C320 494.3 334.3 480 352 480L384 480C401.7 480 416 494.3 416 512C416 529.7 401.7 544 384 544L352 544zM352 416C334.3 416 320 401.7 320 384C320 366.3 334.3 352 352 352L448 352C465.7 352 480 366.3 480 384C480 401.7 465.7 416 448 416L352 416zM352 288C334.3 288 320 273.7 320 256C320 238.3 334.3 224 352 224L512 224C529.7 224 544 238.3 544 256C544 273.7 529.7 288 512 288L352 288zM352 160C334.3 160 320 145.7 320 128C320 110.3 334.3 96 352 96L576 96C593.7 96 608 110.3 608 128C608 145.7 593.7 160 576 160L352 160z"/></svg>

cockatrice/resources/tips/tips_of_the_day.xml

@@ -1,25 +1,27 @@
 <tips>
 	<tip>
 		<title>Tip of the Day</title>
-        <text>Tip of the Day is a new feature to Cockatrice that allows users to get information about the newest features of the program and some of the most commonly asked questions!</text>
+		<text>Tip of the Day is a feature to Cockatrice that allows users to get information about the newest features of the program and some of the most commonly asked questions!
+Check back in with major updates for new tips to be added or old tips to be updated as features are added or expanded upon!
+		</text>
 		<image>tip_of_the_day.png</image>
-        <date>2018-03-01</date>
+		<date>2025-02-10</date>
 	</tip>
 	<tip>
-        <title>Suggesting New Tips</title>
+		<title>Join the Community</title>
-        <text>You can suggest new Tips of the Day by reaching out to the development team on &lt;a href="https://discord.gg/3Z9yzmA"&gt;Discord&lt;/a&gt;!</text>
+		<text>You can join the community to find games, interact with other players, suggest new 'Tips of the Day' and provide user feedback to the development or support teams on &lt;a href="https://discord.gg/3Z9yzmA"&gt;Discord&lt;/a&gt;!</text>
 		<image>discord.png</image>
-        <date>2023-10-18</date>
+		<date>2025-02-09</date>
 	</tip>
 	<tip>
-        <title>Reporting Bugs</title>
+		<title>Reporting Bugs and Requesting Features</title>
-        <text>If you encounter a bug while using Cockatrice, you can report the bug to the development team via &lt;a href="https://github.com/cockatrice/cockatrice/issues"&gt;GitHub&lt;a&gt;</text>
+		<text>If you encounter a bug while using Cockatrice, you can report the bug to and request the feature from the development team via &lt;a href="https://github.com/cockatrice/cockatrice/issues"&gt;GitHub&lt;a&gt;</text>
 		<image>github_logo.png</image>
-        <date>2018-03-01</date>
+		<date>2025-02-09</date>
 	</tip>
 	<tip>
 		<title>FAQ/Troubleshooting Wiki</title>
-        <text>You can find answers to the most common questions and some helpful Cockatrice toubleshooting over on the &lt;a href="https://github.com/cockatrice/cockatrice/wiki"&gt;GitHub wiki&lt;a&gt;</text>
+		<text>You can find answers to the most common questions and some helpful Cockatrice troubleshooting over on the &lt;a href="https://github.com/cockatrice/cockatrice/wiki"&gt;GitHub wiki&lt;a&gt;</text>
 		<image>cockatrice_wiki.png</image>
 		<date>2018-03-01</date>
 	</tip>
@@ -29,21 +31,79 @@
 		<image>cockatrice_register.png</image>
 		<date>2018-03-01</date>
 	</tip>
+	<tip>
+		<title>Filtering Games</title>
+		<text>Don't see an open game or want to see a smaller selection? Use the Game Filters to change your horizon!</text>
+		<image>filter_games.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Common Shortcuts</title>
+		<text>You can find a full list of default shortcuts &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"&gt;on the wiki&lt;/a&gt; or in Settings -> Shortcuts, but a short list:
+&lt;ul&gt;
+&lt;li&gt;Roll a die: CMD/CTRL + I&lt;/li&gt;
+&lt;li&gt;Mulligan: CMD/CTRL + M&lt;/li&gt;
+&lt;li&gt;Draw 1 / X card(s): CMD/CTRL + D / E&lt;/li&gt;
+&lt;li&gt;Undo a draw: CMD/CTRL + SHIFT + D&lt;/li&gt;
+&lt;li&gt;View Library / Sideboard: F3 / CMD/CTRL + F3&lt;/li&gt;
+&lt;li&gt;Change Life: CMD/CTRL + L&lt;/li&gt;
+&lt;li&gt;Show Card Info: Middle Mouse Click&lt;/li&gt;
+&lt;/ul&gt;
+All shortcuts can be customized via Cockatrice -> Settings -> Shortcuts!
+		</text>
+		<image>shortcuts.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Power and Toughness</title>
+		<text>You can add and subtract to a creature's stats.
+With a card selected, with the following keybindings:
+
+&lt;ul&gt;
+&lt;li&gt;Set P/T to any value: CTRL + P&lt;/li&gt;
+&lt;li&gt;+1 or -1 to both to P/T: CMD/CTRL + ALT + '+' or '-'&lt;/li&gt;
+&lt;li&gt;+1 or -1 to Power Only: CMD/CTRL + '+' or '-'&lt;/li&gt;
+&lt;li&gt;+1 or -1 to Toughness Only: ALT + '+' or '-'&lt;/li&gt;
+&lt;li&gt;Set P/T to Default: CMD/CTRL + ALT + 0&lt;/li&gt;
+&lt;/ul&gt;
+All shortcuts can be customized via Cockatrice -> Settings -> Shortcuts!
+		</text>
+		<image>setpt.png</image>
+		<date>2025-02-09</date>
+	</tip>
 	<tip>
 		<title>Drawing Arrows</title>
 		<text>You can draw arrows of different color by holding a combination of keys!
-            Right Click: Red Arrow
+
-            Shift + Right Click: Green Arrow
+&lt;ul&gt;
-            Alt + Right Click: Blue Arrow
+&lt;li&gt;Right Click: Red Arrow&lt;/li&gt;
-            Cmd + Right Click: Yellow Arrow
+&lt;li&gt;SHIFT + Right Click: Green Arrow&lt;/li&gt;
+&lt;li&gt;ALT + Right Click: Blue Arrow&lt;/li&gt;
+&lt;li&gt;CMD/CTRL + Right Click: Yellow Arrow&lt;/li&gt;
+&lt;/ul&gt;
 		</text>
 		<image>arrows.png</image>
 		<date>2018-03-01</date>
 	</tip>
 	<tip>
-        <title>Filtering Games</title>
+		<title>General Etiquette</title>
-        <text>Don't see all the active games? Want to see a smaller selection? Use the Game Filters to change your horizon</text>
+		<text>When playing on Cockatrice there are general "rules of engagement" for a better play experience for all players.
-        <image>filter_games.png</image>
+The following are some of the expectations a player should reasonably expect for how to operate smooth and enjoyable games:
+&lt;ul&gt;
+&lt;li&gt;Have a "Rule 0" conversation pre-game with your fellow players on the expectations of the game including deck strength, house rules (e.g. no take backs and "may is not must"), etc.&lt;/li&gt;
+&lt;li&gt;When rolling your die for turn order, it is often best to create a token with the text of your roll (using CTRL + T and typing the number into "Name") and then tap this token when created to show that you have resolved your mulligans and are ready to start the game.&lt;/li&gt;
+&lt;li&gt;Use the phases and steps trackers on the left of the client to show others where in the turn you are and announce when moving between them. (Double Click for the action of this button)&lt;/li&gt;
+&lt;li&gt;When your turn is over leave it on your end step and DO NOT HIT PASS. Allow other players to respond if they can, and then if not, let the next player pass to themselves.&lt;/li&gt;
+&lt;li&gt;Please treat others kindly and respect as per &lt;a href="https://cockatrice.us/terms.php"&gt;our Terms of Service&lt;/a&gt;.&lt;/li&gt;
+&lt;/ul&gt;
+		</text>
+		<image>token.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>Flip of the Coin</title>
+		<text>You can flip a coin instead of rolling a die by rolling a 2 sided die instead!</text>
+		<image>coin_flip.png</image>
 		<date>2018-03-01</date>
 	</tip>
 	<tip>
@@ -53,36 +113,33 @@
 		<date>2018-03-01</date>
 	</tip>
 	<tip>
-        <title>Common Shortcuts</title>
+		<title>Player Icon Key</title>
-        <text>You can find a full list of shortcuts &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"&gt;on the wiki&lt;/a&gt;, but a short list:
+		<text>Besides your name is a player icon, this is a key for what they mean:
-            &lt;br&gt;Roll a die: CTRL + I
+&lt;ul&gt;
-            &lt;br&gt;Mulligan: CTRL + M
+&lt;li&gt;Flag: Country of Origin Player Selected&lt;/li&gt;
-            &lt;br&gt;Draw a card: CTRL + D
+&lt;li&gt;Purple Heart: Donator (&lt;a href="https://cockatrice.us/donate"&gt;Help support us and donate here!&lt;/a&gt;)&lt;/li&gt;
-            &lt;br&gt;Undo a draw: CTRL + SHIFT + D
+&lt;li&gt;Gold Star: VIP (Special Admin Given Role)&lt;/li&gt;
-            &lt;br&gt;View Sideboard: CTRL + F3
+&lt;li&gt;Brown Gavel (Hammer): Judge / Rule's Lawyer&lt;/li&gt;
-            &lt;br&gt;Change Life: CTRL + L
+&lt;li&gt;Black/White Pawn: Moderator (Support for Client Issues)&lt;/li&gt;
-            &lt;br&gt;All shortcuts can be customized via Settings->Shortcuts!
+&lt;li&gt;Red: Administrator (Sever Operators)&lt;/li&gt;
+&lt;/ul&gt;
 		</text>
-        <image>shortcuts.png</image>
+		<image>pawns.png</image>
-        <date>2018-03-01</date>
+		<date>2025-02-09</date>
 	</tip>
 	<tip>
 		<title>Changing Themes</title>
-        <text>Did you know Cockatrice has custom themes? You can either &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Themes"&gt;create one yourself&lt;/a&gt; or use one of the several pre-loaded ones! Go to Settings->Appearance and try them out!</text>
+		<text>Did you know Cockatrice has custom themes? You can either &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Themes"&gt;create one yourself&lt;/a&gt; or use one of the several preloaded ones! Go to Settings->Appearance and try them out!</text>
 		<image>themes.png</image>
 		<date>2018-03-01</date>
 	</tip>
-    <tip>
-        <title>Flip of the Coin</title>
-        <text>You can flip a coin instead of rolling a die by rolling a 2 sided die instead!</text>
-        <image>coin_flip.png</image>
-        <date>2018-03-01</date>
-    </tip>
 	<tip>
 		<title>Face Down Cards</title>
-        <text>You can hold Shift while dragging or clicking on a card to have it enter play face down</text>
+		<text>You can hold Shift while dragging or clicking on a card to have it enter play face down.
+You can also hold CTRL + SHIFT and click and drag from your library to move bottom card face down as well!
+		</text>
 		<image>face_down.png</image>
-        <date>2018-03-01</date>
+		<date>2025-02-09</date>
 	</tip>
 	<tip>
 		<title>Counter expressions</title>
@@ -91,9 +148,75 @@
 		<date>2019-02-02</date>
 	</tip>
 	<tip>
-        <title>Power and Toughness</title>
+		<title>Select Multiple Cards</title>
-        <text>You can add and subtract to a creature's stats.&lt;br&gt;With a card selected, set the power and toughness ( default: ctrl + p ) and enter +3/-1 to increase power by three while decreasing toughness by one.&lt;br&gt;You can also reset it to the original value ( default: ctrl + alt + 0 ).</text>
+		<text>You can click and drag in any zone in order to highlight all cards within the created box.
-        <image>setpt.png</image>
+You can also hold CMD/CTRL and clik or click and drag to maintain other previously selected cards while adding others!
-        <date>2019-03-02</date>
+You can move, alter and attach multiple highlighted cards at the same time!
+Other useful multi-select keybindings:
+&lt;ul&gt;
+&lt;li&gt;Select All Cards in Zone: CMD/CTRL + A&lt;/li&gt;
+&lt;li&gt;Select All Cards in Column: CMD/CTRL + SHIFT + C&lt;/li&gt;
+&lt;li&gt;Select All Cards in Row: CMD/CTRL + SHIFT + X&lt;/li&gt;
+&lt;/ul&gt;
+		</text>
+		<image>highlight_cards.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Auto Cascade and Search Parameters</title>
+		<text>You can use the default keybind of CMD/CTRL + SHIFT + Y in order to perform auto cascade or similar effects from your library using Scryfall search syntax.
+If you are unfamiliar with the syntax you may find it by opening a deck in deck editor and clicking the "i" next to the search bar in order to pull up a list of syntax commands.
+This same syntax can be used in the deck editor search bar as well to help you find the best cards for your decks!
+		</text>
+		<image>syntax_help.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Visual Deck Storage and Tags</title>
+		<text>You can now view your saved decks visually with integrated folder,tags and filter support!
+Pro Tip: If you want to use emoji's press WinKey + '.' or CTRL + CMD + SPACE on Windows or Mac respectively!
+		</text>
+		<image>visual_deck_tags.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Card Selector And Card Preferences</title>
+		<text>Cockatrice's deck editor now has the ability for players to bling out their decks by selecting the arts for cards on a per-card basis!
+You can also have multiple printings of the same card in your deck if you so choose!
+Not only that, other players will see the arts you have chosen by default!
+If you want to disable this feature for other players: Settings -> Appearance -> Select "Override all card art with personal set preference"
+		</text>
+		<image>card_select.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>EDHREC Integration</title>
+		<text>We now have in-client integration for EDHREC, which allows you to right-click on any card name in the deck editor in order to bring up the contextual menu for the card.</text>
+		<image>edhrec.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>Add Cards to Deck</title>
+		<text>You can now right-click anywhere on a card in any card info view in order to add it to any decks you have open in your tabs.</text>
+		<image>add_card.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>Update Client and Card Database</title>
+		<text>You can update your client by going to Help and selecting whichever you wish to update.
+Client Update: Updates the client (if available) for new features, fixes and changes.
+Card Update: Updates card sources for spoilers and new card printings.
+Updating your card sources can often fix issues of cards not working or displaying properly, if not, go to Cockatrice -> Settings -> Card Sources -> Update Spoilers
+		</text>
+		<image>updates.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>Expand Card View Window</title>
+		<text>Double click on the title bar of the card view window to expand it! Double click again to shrink it back down.
+			You can configure the initial and expanded heights of the window in the settings, under "Appearance".
+		</text>
+		<image>expand_card_view.png</image>
+		<date>2025-02-27</date>
 	</tip>
 </tips>

cockatrice/resources/usericons/pawn_donator_double.svg

@@ -350,11 +350,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="right" />
+       id="left" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
+       id="right"
        inkscape:connector-curvature="0" />
     <path
        style="display:inline;fill:url(#linearGradient3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.77952756;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"

cockatrice/resources/usericons/pawn_judge_double.svg

@@ -321,11 +321,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="right" />
+       id="left" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
+       id="right"
        inkscape:connector-curvature="0" />
     <path
        d="m 46.656521,12.167234 18.055171,18.054184 a 6.6081919,6.6078288 0 0 1 -0.126303,9.352065 6.6804126,6.6800456 0 0 1 -8.233169,1.011048 l -7.944268,7.943843 6.463762,6.445343 a 6.9331851,6.9328042 0 0 1 5.741536,2.022073 l 28.057729,28.092294 a 6.9962797,6.9958953 0 0 1 -9.894222,9.893685 L 50.719018,66.907526 A 7.0595711,7.0591833 0 0 1 49.18433,59.270613 l -5.741527,-5.741238 -7.944298,7.943843 A 6.716523,6.7161541 0 0 1 25.134866,69.832263 L 7.079684,51.778091 a 6.716523,6.7161541 0 0 1 8.39566,-10.345064 L 36.31101,20.59853 a 6.716523,6.7161541 0 0 1 10.345612,-8.431329 z"

cockatrice/resources/usericons/pawn_vip_double.svg

@@ -340,11 +340,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="right" />
+       id="left" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
+       id="right"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
@@ -363,6 +363,6 @@
        d="m 38.011063,984.77381 -10.143601,-5.23583 -10.063711,5.38779 1.845023,-11.2651 -8.233948,-7.90624 11.283888,-1.72639 4.974851,-10.27411 5.128803,10.19813 11.308575,1.55649 -8.114112,8.02918 z"
        inkscape:transform-center-x="0.094945927"
        inkscape:transform-center-y="-3.9764964"
-       transform="matrix(2.3768784,0,0,2.4799382,-15.920285,-1400.1716)" />
+       transform="matrix(-2.3768784,0,0,2.4799382,115.920285,-1400.1716)" />
   </g>
 </svg>

cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp

@@ -0,0 +1,587 @@
+#include "remote_connection_controller.h"
+
+#include "../../settings/cache_settings.h"
+#include "../interface/widgets/dialogs/dlg_connect.h"
+#include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h"
+#include "../interface/widgets/dialogs/dlg_forgot_password_request.h"
+#include "../interface/widgets/dialogs/dlg_forgot_password_reset.h"
+#include "../interface/widgets/dialogs/dlg_register.h"
+#include "../interface/widgets/utility/get_text_with_max.h"
+
+#include <QDateTime>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QThread>
+#include <libcockatrice/network/client/remote/remote_client.h>
+#include <libcockatrice/protocol/pb/response.pb.h>
+
+ConnectionController::ConnectionController(QWidget *dialogParent, QObject *parent)
+    : QObject(parent), dialogParent(dialogParent)
+{
+    remoteClient = new RemoteClient(nullptr, &SettingsCache::instance());
+
+    clientThread = new QThread(this);
+    remoteClient->moveToThread(clientThread);
+    clientThread->start();
+
+    wireClientSignals();
+}
+
+ConnectionController::~ConnectionController()
+{
+    remoteClient->deleteLater();
+    clientThread->wait();
+}
+
+void ConnectionController::wireClientSignals()
+{
+    connect(remoteClient, &RemoteClient::connectionClosedEventReceived, this,
+            &ConnectionController::onConnectionClosedEvent);
+
+    connect(remoteClient, &RemoteClient::serverShutdownEventReceived, this,
+            &ConnectionController::onServerShutdownEvent);
+
+    connect(remoteClient, &RemoteClient::statusChanged, this, &ConnectionController::onStatusChanged);
+
+    connect(remoteClient, &RemoteClient::userInfoChanged, this, &ConnectionController::onUserInfoReceived,
+            Qt::BlockingQueuedConnection);
+
+    connect(remoteClient, &RemoteClient::loginError, this,
+            [this](Response::ResponseCode r, QString rs, quint32 et, QList<QString> mf) {
+                onLoginError(static_cast<int>(r), rs, et, mf);
+            });
+
+    connect(remoteClient, &RemoteClient::registerError, this,
+            [this](Response::ResponseCode r, QString rs, quint32 et) { onRegisterError(static_cast<int>(r), rs, et); });
+
+    connect(remoteClient, &RemoteClient::activateError, this, &ConnectionController::onActivateError);
+    connect(remoteClient, &RemoteClient::socketError, this, &ConnectionController::onSocketError);
+    connect(remoteClient, &RemoteClient::serverTimeout, this, &ConnectionController::onServerTimeout);
+
+    connect(remoteClient, &RemoteClient::protocolVersionMismatch, this,
+            &ConnectionController::onProtocolVersionMismatch);
+
+    connect(remoteClient, &RemoteClient::registerAccepted, this, &ConnectionController::onRegisterAccepted);
+
+    connect(remoteClient, &RemoteClient::registerAcceptedNeedsActivate, this,
+            &ConnectionController::onRegisterAcceptedNeedsActivate);
+
+    connect(remoteClient, &RemoteClient::activateAccepted, this, &ConnectionController::onActivateAccepted);
+
+    connect(remoteClient, &RemoteClient::notifyUserAboutUpdate, this, &ConnectionController::onNotifyUserAboutUpdate);
+
+    connect(remoteClient, &RemoteClient::sigForgotPasswordSuccess, this,
+            &ConnectionController::onForgotPasswordSuccess);
+
+    connect(remoteClient, &RemoteClient::sigForgotPasswordError, this, &ConnectionController::onForgotPasswordError);
+
+    connect(remoteClient, &RemoteClient::sigPromptForForgotPasswordReset, this,
+            &ConnectionController::onPromptForgotPasswordReset);
+
+    connect(remoteClient, &RemoteClient::sigPromptForForgotPasswordChallenge, this,
+            &ConnectionController::onPromptForgotPasswordChallenge);
+}
+
+void ConnectionController::connectToServer()
+{
+    dlgConnect = new DlgConnect(dialogParent);
+    connect(dlgConnect, &DlgConnect::sigStartForgotPasswordRequest, this, &ConnectionController::forgotPasswordRequest);
+
+    if (dlgConnect->exec()) {
+        remoteClient->connectToServer(dlgConnect->getHost(), static_cast<unsigned int>(dlgConnect->getPort()),
+                                      dlgConnect->getPlayerName(), dlgConnect->getPassword());
+    }
+}
+
+void ConnectionController::connectToServerDirect(const QString &host,
+                                                 unsigned int port,
+                                                 const QString &playerName,
+                                                 const QString &password)
+{
+    remoteClient->connectToServer(host, port, playerName, password);
+}
+
+void ConnectionController::disconnectFromServer()
+{
+    remoteClient->disconnectFromServer();
+}
+
+void ConnectionController::registerToServer()
+{
+    DlgRegister dlg(dialogParent);
+    if (dlg.exec()) {
+        remoteClient->registerToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()), dlg.getPlayerName(),
+                                       dlg.getPassword(), dlg.getEmail(), dlg.getCountry(), dlg.getRealName());
+    }
+}
+
+void ConnectionController::forgotPasswordRequest()
+{
+    DlgForgotPasswordRequest dlg(dialogParent);
+    if (dlg.exec()) {
+        remoteClient->requestForgotPasswordToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
+                                                    dlg.getPlayerName());
+    }
+}
+
+void ConnectionController::onConnectionClosedEvent(const Event_ConnectionClosed &event)
+{
+    remoteClient->disconnectFromServer();
+
+    QString reasonStr;
+    switch (event.reason()) {
+        case Event_ConnectionClosed::USER_LIMIT_REACHED: {
+            reasonStr = tr("The server has reached its maximum user capacity, please check back later.");
+            break;
+        }
+        case Event_ConnectionClosed::TOO_MANY_CONNECTIONS: {
+            reasonStr = tr("There are too many concurrent connections from your address.");
+            break;
+        }
+        case Event_ConnectionClosed::BANNED: {
+            reasonStr = tr("Banned by moderator");
+            if (event.has_end_time()) {
+                reasonStr.append(
+                    "\n" + tr("Expected end time: %1").arg(QDateTime::fromSecsSinceEpoch(event.end_time()).toString()));
+            } else {
+                reasonStr.append("\n" + tr("This ban lasts indefinitely."));
+            }
+            if (event.has_reason_str()) {
+                reasonStr.append("\n\n" + QString::fromStdString(event.reason_str()));
+            }
+            break;
+        }
+        case Event_ConnectionClosed::SERVER_SHUTDOWN: {
+            reasonStr = tr("Scheduled server shutdown.");
+            break;
+        }
+        case Event_ConnectionClosed::USERNAMEINVALID: {
+            reasonStr = tr("Invalid username.");
+            break;
+        }
+        case Event_ConnectionClosed::LOGGEDINELSEWERE: {
+            reasonStr = tr("You have been logged out due to logging in at another location.");
+            break;
+        }
+        default:
+            reasonStr = QString::fromStdString(event.reason_str());
+    }
+
+    QMessageBox::critical(dialogParent, tr("Connection closed"),
+                          tr("The server has terminated your connection.\nReason: %1").arg(reasonStr));
+}
+
+void ConnectionController::onServerShutdownEvent(const Event_ServerShutdown &event)
+{
+    serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running "
+                                                   "games will be lost.\nReason for shutdown: %1",
+                                                   "", event.minutes())
+                                                    .arg(QString::fromStdString(event.reason())));
+    serverShutdownMessageBox.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64));
+    serverShutdownMessageBox.setText(tr("Scheduled server shutdown"));
+    serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal);
+    serverShutdownMessageBox.setVisible(true);
+}
+
+void ConnectionController::onStatusChanged(ClientStatus status)
+{
+    // Update the window title first, then let MainWindow handle its own UI
+    // state via the forwarded signal
+    updateWindowTitle();
+    emit statusChanged(status);
+
+    // TabSupervisor::stop() needs calling on disconnect; start() is driven by
+    // onUserInfoReceived → tabSupervisorStartRequested.
+    if (status == StatusDisconnected) {
+        emit tabSupervisorStopRequested();
+    }
+}
+
+void ConnectionController::onUserInfoReceived(const ServerInfo_User &info)
+{
+    emit tabSupervisorStartRequested(info);
+}
+
+void ConnectionController::onLoginError(int r,
+                                        QString reasonStr,
+                                        quint32 endTime,
+                                        const QList<QString> &missingFeatures)
+{
+    switch (static_cast<Response::ResponseCode>(r)) {
+        case Response::RespClientUpdateRequired: {
+            QString formatted = "Missing Features: ";
+            for (int i = 0; i < missingFeatures.size(); ++i) {
+                formatted.append(QString("\n     %1").arg(QChar(0x2022)) + " " + missingFeatures.value(i));
+            }
+
+            QMessageBox msgBox(dialogParent);
+            msgBox.setIcon(QMessageBox::Critical);
+            msgBox.setWindowTitle(tr("Failed Login"));
+            msgBox.setText(tr("Your client seems to be missing features this server requires for connection.") +
+                           "\n\n" + tr("To update your client, go to 'Help -> Check for Client Updates'."));
+            msgBox.setDetailedText(formatted);
+            msgBox.exec();
+            break;
+        }
+
+        case Response::RespWrongPassword: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("Incorrect username or password. "
+                                     "Please check your authentication information and try again."));
+            break;
+        }
+
+        case Response::RespWouldOverwriteOldSession: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("There is already an active session using this user name.\n"
+                                     "Please close that session first and re-login."));
+            break;
+        }
+
+        case Response::RespUserIsBanned: {
+            QString bannedStr =
+                endTime ? tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString())
+                        : tr("You are banned indefinitely.");
+            if (!reasonStr.isEmpty()) {
+                bannedStr.append("\n\n" + reasonStr);
+            }
+            QMessageBox::critical(dialogParent, tr("Error"), bannedStr);
+            break;
+        }
+
+        case Response::RespUsernameInvalid: {
+            QMessageBox::critical(dialogParent, tr("Error"), extractInvalidUsernameMessage(reasonStr));
+            break;
+        }
+
+        case Response::RespRegistrationRequired: {
+            if (QMessageBox::question(dialogParent, tr("Error"),
+                                      tr("This server requires user registration. Do you want to register now?"),
+                                      QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+                registerToServer();
+            }
+            return; // don't re-prompt connect
+        }
+
+        case Response::RespClientIdRequired: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("This server requires client IDs. Your client is either failing to generate an "
+                                     "ID or you are running a modified client.\n"
+                                     "Please close and reopen your client to try again."));
+            break;
+        }
+
+        case Response::RespContextError: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("An internal error has occurred, please close and reopen Cockatrice before "
+                                     "trying again.\nIf the error persists, ensure you are running the latest "
+                                     "version of the software and if needed contact the software developers."));
+            break;
+        }
+
+        case Response::RespAccountNotActivated: {
+            bool ok = false;
+            QString token =
+                getTextWithMax(dialogParent, tr("Account activation"),
+                               tr("Your account has not been activated yet.\n"
+                                  "You need to provide the activation token received in the activation email."),
+                               QLineEdit::Normal, QString(), &ok);
+
+            if (ok && !token.isEmpty()) {
+                remoteClient->activateToServer(token);
+                return;
+            }
+            remoteClient->disconnectFromServer();
+            return;
+        }
+
+        case Response::RespServerFull: {
+            QMessageBox::critical(dialogParent, tr("Server Full"),
+                                  tr("The server has reached its maximum user capacity, please check back later."));
+            break;
+        }
+
+        default: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("Unknown login error: %1").arg(r) +
+                                      tr("\nThis usually means that your client version is out of date, and the server "
+                                         "sent a reply your client doesn't understand."));
+            break;
+        }
+    }
+
+    // Re-open the connect dialog after any handled error
+    connectToServer();
+}
+
+void ConnectionController::onRegisterError(int r, QString reasonStr, quint32 endTime)
+{
+    switch (static_cast<Response::ResponseCode>(r)) {
+        case Response::RespRegistrationDisabled: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"),
+                                  tr("Registration is currently disabled on this server"));
+            break;
+        }
+        case Response::RespUserAlreadyExists: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"),
+                                  tr("There is already an existing account with the same user name."));
+            break;
+        }
+        case Response::RespEmailRequiredToRegister: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"),
+                                  tr("It's mandatory to specify a valid email address when registering."));
+            break;
+        }
+        case Response::RespEmailBlackListed: {
+            if (reasonStr.isEmpty()) {
+                reasonStr =
+                    "The email address provider used during registration has been blocked from use on this server.";
+            }
+            QMessageBox::critical(dialogParent, tr("Registration denied"), reasonStr);
+            break;
+        }
+        case Response::RespTooManyRequests: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"),
+                                  tr("It appears you are attempting to register a new account on this server yet you "
+                                     "already have an account registered with the email provided. This server "
+                                     "restricts the number of accounts a user can register per address. Please "
+                                     "contact the server operator for further assistance or to obtain your "
+                                     "credential information."));
+            break;
+        }
+        case Response::RespPasswordTooShort: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"), tr("Password too short."));
+            break;
+        }
+        case Response::RespUserIsBanned: {
+            QString bannedStr =
+                endTime ? tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString())
+                        : tr("You are banned indefinitely.");
+            if (!reasonStr.isEmpty()) {
+                bannedStr.append("\n\n" + reasonStr);
+            }
+            QMessageBox::critical(dialogParent, tr("Error"), bannedStr);
+            break;
+        }
+        case Response::RespUsernameInvalid: {
+            QMessageBox::critical(dialogParent, tr("Error"), extractInvalidUsernameMessage(reasonStr));
+            break;
+        }
+        case Response::RespRegistrationFailed: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("Registration failed for a technical problem on the server."));
+            break;
+        }
+        case Response::RespNotConnected: {
+            QMessageBox::critical(dialogParent, tr("Error"), tr("The connection to the server has been lost."));
+            break;
+        }
+        default: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("Unknown registration error: %1").arg(r) +
+                                      tr("\nThis usually means that your client version is out of date, and the server "
+                                         "sent a reply your client doesn't understand."));
+            break;
+        }
+    }
+
+    registerToServer();
+}
+
+void ConnectionController::onActivateError()
+{
+    QMessageBox::critical(dialogParent, tr("Error"), tr("Account activation failed"));
+    remoteClient->disconnectFromServer();
+    connectToServer();
+}
+
+void ConnectionController::onSocketError(const QString &errorStr)
+{
+    QMessageBox::critical(dialogParent, tr("Error"), tr("Socket error: %1").arg(errorStr));
+    connectToServer();
+}
+
+void ConnectionController::onServerTimeout()
+{
+    QMessageBox::critical(dialogParent, tr("Error"), tr("Server timeout"));
+    connectToServer();
+}
+
+void ConnectionController::onProtocolVersionMismatch(int localVersion, int remoteVersion)
+{
+    if (localVersion > remoteVersion) {
+        QMessageBox::critical(dialogParent, tr("Error"),
+                              tr("You are trying to connect to an obsolete server. Please downgrade your Cockatrice "
+                                 "version or connect to a suitable server.\n"
+                                 "Local version is %1, remote version is %2.")
+                                  .arg(localVersion)
+                                  .arg(remoteVersion));
+    } else {
+        QMessageBox::critical(dialogParent, tr("Error"),
+                              tr("Your Cockatrice client is obsolete. Please update your Cockatrice version.\n"
+                                 "Local version is %1, remote version is %2.")
+                                  .arg(localVersion)
+                                  .arg(remoteVersion));
+    }
+}
+
+void ConnectionController::onRegisterAccepted()
+{
+    QMessageBox::information(dialogParent, tr("Success"), tr("Registration accepted.\nWill now login."));
+}
+
+void ConnectionController::onRegisterAcceptedNeedsActivate()
+{
+    // Server will send activation email; nothing to display here.
+}
+
+void ConnectionController::onActivateAccepted()
+{
+    QMessageBox::information(dialogParent, tr("Success"), tr("Account activation accepted.\nWill now login."));
+}
+
+void ConnectionController::onNotifyUserAboutUpdate()
+{
+    QMessageBox::information(
+        dialogParent, tr("Information"),
+        tr("This server supports additional features that your client doesn't have.\n"
+           "This is most likely not a problem, but this message might mean there is a new version of "
+           "Cockatrice available or this server is running a custom or pre-release version.\n\n"
+           "To update your client, go to Help -> Check for Updates."));
+}
+
+void ConnectionController::onForgotPasswordSuccess()
+{
+    QMessageBox::information(
+        dialogParent, tr("Reset Password"),
+        tr("Your password has been reset successfully, you can now log in using the new credentials."));
+    SettingsCache::instance().servers().setFPHostName("");
+    SettingsCache::instance().servers().setFPPort("");
+    SettingsCache::instance().servers().setFPPlayerName("");
+}
+
+void ConnectionController::onForgotPasswordError()
+{
+    QMessageBox::warning(
+        dialogParent, tr("Reset Password"),
+        tr("Failed to reset user account password, please contact the server operator to reset your password."));
+    SettingsCache::instance().servers().setFPHostName("");
+    SettingsCache::instance().servers().setFPPort("");
+    SettingsCache::instance().servers().setFPPlayerName("");
+}
+
+void ConnectionController::onPromptForgotPasswordReset()
+{
+    QMessageBox::information(dialogParent, tr("Reset Password"),
+                             tr("Activation request received, please check your email for an activation token."));
+    DlgForgotPasswordReset dlg(dialogParent);
+    if (dlg.exec()) {
+        remoteClient->submitForgotPasswordResetToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
+                                                        dlg.getPlayerName(), dlg.getToken(), dlg.getPassword());
+    }
+}
+
+void ConnectionController::onPromptForgotPasswordChallenge()
+{
+    DlgForgotPasswordChallenge dlg(dialogParent);
+    if (dlg.exec()) {
+        remoteClient->submitForgotPasswordChallengeToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
+                                                            dlg.getPlayerName(), dlg.getEmail());
+    }
+}
+
+void ConnectionController::updateWindowTitle()
+{
+    const QString appName = QStringLiteral("Cockatrice");
+    QString title;
+
+    switch (remoteClient->getStatus()) {
+        case StatusConnecting: {
+            title = appName + " - " + tr("Connecting to %1...").arg(remoteClient->peerName());
+            break;
+        }
+        case StatusRegistering: {
+            title = appName + " - " +
+                    tr("Registering to %1 as %2...").arg(remoteClient->peerName()).arg(remoteClient->getUserName());
+            break;
+        }
+        case StatusDisconnected: {
+            title = appName + " - " + tr("Disconnected");
+            break;
+        }
+        case StatusLoggingIn: {
+            title = appName + " - " + tr("Connected, logging in at %1").arg(remoteClient->peerName());
+            break;
+        }
+        case StatusLoggedIn: {
+            title = remoteClient->getUserName() + "@" + remoteClient->peerName();
+            break;
+        }
+        case StatusRequestingForgotPassword:
+        case StatusSubmitForgotPasswordChallenge:
+        case StatusSubmitForgotPasswordReset:
+            title = appName + " - " +
+                    tr("Requesting forgotten password to %1 as %2...")
+                        .arg(remoteClient->peerName())
+                        .arg(remoteClient->getUserName());
+            break;
+        default:
+            title = appName;
+    }
+
+    emit windowTitleChanged(title);
+}
+
+// static
+QString ConnectionController::extractInvalidUsernameMessage(QString &in)
+{
+    QString out = tr("Invalid username.") + "<br/>";
+    QStringList rules = in.split(QChar('|'));
+
+    if (rules.size() == 7 || rules.size() == 9) {
+        out += tr("Your username must respect these rules:") + "<ul>";
+
+        out += "<li>" + tr("is %1 - %2 characters long").arg(rules.at(0)).arg(rules.at(1)) + "</li>";
+        out += "<li>" + tr("can %1 contain lowercase characters").arg((rules.at(2).toInt() > 0) ? "" : tr("NOT")) +
+               "</li>";
+        out += "<li>" + tr("can %1 contain uppercase characters").arg((rules.at(3).toInt() > 0) ? "" : tr("NOT")) +
+               "</li>";
+        out +=
+            "<li>" + tr("can %1 contain numeric characters").arg((rules.at(4).toInt() > 0) ? "" : tr("NOT")) + "</li>";
+
+        if (rules.at(6).size() > 0) {
+            out += "<li>" + tr("can contain the following punctuation: %1").arg(rules.at(6).toHtmlEscaped()) + "</li>";
+        }
+
+        out += "<li>" +
+               tr("first character can %1 be a punctuation mark").arg((rules.at(5).toInt() > 0) ? "" : tr("NOT")) +
+               "</li>";
+
+        if (rules.size() == 9) {
+            if (rules.at(7).size() > 0) {
+                QString words = rules.at(7).toHtmlEscaped();
+                if (words.startsWith("\n")) {
+                    out += tr("no unacceptable language as specified by these server rules:",
+                              "note that the following lines will not be translated");
+                    for (QString &line : words.split("\n", Qt::SkipEmptyParts)) {
+                        out += "<li>" + line + "</li>";
+                    }
+                } else {
+                    out += "<li>" + tr("can not contain any of the following words: %1").arg(words) + "</li>";
+                }
+            }
+
+            if (rules.at(8).size() > 0) {
+                out += "<li>" +
+                       tr("can not match any of the following expressions: %1").arg(rules.at(8).toHtmlEscaped()) +
+                       "</li>";
+            }
+        }
+
+        out += "</ul>";
+    } else {
+        out += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username.");
+    }
+
+    return out;
+}