diff --git a/docs/changes_log/changes_log.rst b/docs/changes_log/changes_log.rst index 5409e103a..4cd293ad3 100644 --- a/docs/changes_log/changes_log.rst +++ b/docs/changes_log/changes_log.rst @@ -12,12 +12,12 @@ If Afanasy **network protocol changed**, it became incompatible with old one. You can upgrade only one client or server for changes. +.. _changes-log-latest: + v3.3.0 ====== -*Not released* - -2022.06.28 +2022.07.25 - AfRender can send to server `GPU resources <../afanasy/render.html#gpu-string>`_: utilization, temperature, memory total and used. @@ -58,8 +58,6 @@ v3.3.0 - AfServer and job block with no task crash fixed. The crash was very rare, another block with tasks should follow a block without tasks. -.. _changes-log-latest: - v3.2.2 ====== diff --git a/docs/conf.py b/docs/conf.py index a0d1e1747..6e9c560d6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,16 +44,16 @@ # General information about the project. project = u'CGRU - AFANASY' -copyright = u'2021, CGRU Team' +copyright = u'2022, CGRU Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '3.2' +version = '3.3' # The full version, including alpha/beta/rc tags. -release = '3.2.0' +release = '3.3.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/configuration/configuration.rst b/docs/configuration/configuration.rst index 6489010eb..efdfcf158 100644 --- a/docs/configuration/configuration.rst +++ b/docs/configuration/configuration.rst @@ -128,6 +128,6 @@ Set ``CGRU_[PARAM_NAME]`` environment variable. For example to setup console to Python API will take environment overrides too. Config Path Override ----------------- +-------------------- You can override the path to a custom config file using the ``CGRU_CUSTOM_CONFIG`` environment variable. This will be loaded last, but before ``~/.cgru/config.json`` diff --git a/docs/downloads/downloads.rst b/docs/downloads/downloads.rst index 9f5741a31..c262b85d0 100644 --- a/docs/downloads/downloads.rst +++ b/docs/downloads/downloads.rst @@ -16,7 +16,7 @@ MS Windows ZIP Archive: -https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.windows.zip/download +https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.windows.zip 64Bit, Python 3.9.6, PySide2, Qt 5.15.2, MSVC 2019. @@ -24,33 +24,33 @@ https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.windows.zip/downloa Linux ===== - -- AltLinux 10 (Simply Linux) +.. + - AltLinux 10 (Simply Linux) https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.alt10.0_x86_64.tar.gz/download - CentOS 7 (RHEL) - https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.CentOS-7_x86_64.tar.gz/download - -- Debian 10 - https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.debian10_amd64.tar.gz/download + https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.CentOS-7_x86_64.tar.gz - Debian 11 - https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.debian11_amd64.tar.gz/download + https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.debian11_amd64.tar.gz -- Fedora 35 - https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.Fedora-35_x86_64.tar.gz/download +- Fedora 36 + https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.Fedora-36_x86_64.tar.gz -- Open SUSE 15.3 - https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.openSUSE-15.3_x86_64.tar.gz/download +- Open SUSE 15.4 + https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.openSUSE-15.4_x86_64.tar.gz -- Rocky Linux 8.5 (RHEL) - https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.Rocky-8.5_x86_64.tar.gz/download +- Rocky Linux 8.6 (RHEL) + https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.Rocky-8.6_x86_64.tar.gz -- Ubuntu 18.04 LTS - https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.ubuntu18.04_amd64.tar.gz/download +- Rocky Linux 9.0 (RHEL) + https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.Rocky-9.0_x86_64.tar.gz - Ubuntu 20.04 LTS - https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.ubuntu20.04_amd64.tar.gz/download + https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.ubuntu20.04_amd64.tar.gz + +- Ubuntu 22.04 LTS + https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.ubuntu22.04_amd64.tar.gz *All binaries (packages) are 64 bit.* @@ -68,7 +68,7 @@ Sources Latest release snapshot: -https://sourceforge.net/projects/cgru/files/3.2.2/cgru.3.2.2.zip/download +https://sourceforge.net/projects/cgru/files/3.3.0/cgru.3.3.0.zip Repository: diff --git a/software_setup/setup_blender.sh b/software_setup/setup_blender.sh index 07ffbb117..faade465a 100755 --- a/software_setup/setup_blender.sh +++ b/software_setup/setup_blender.sh @@ -11,6 +11,9 @@ if [ -z "$BLENDER_LOCATION" ]; then else export BLENDER_LOCATION="/usr/bin" fi + if [ -x "/snap/blender/current" ]; then + export BLENDER_LOCATION="/snap/bin" + fi fi export BLENDER_CGRU_PATH="${CGRU_LOCATION}/plugins/blender"