Merge pull request #148 from azerothcore/master

update

.github/README.md

@@ -82,7 +82,8 @@ You can check the [authors](https://github.com/azerothcore/azerothcore-wotlk/blo
 
 ## License
 
-- The AzerothCore source code is released under the [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
+- The new AzerothCore source components are released under the [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.en.html)
+- The old sources based on MaNGOS/TrinityCore are released under the [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
 
 It's important to note that AzerothCore is not an official Blizzard Entertainment product, and it is not affiliated with or endorsed by World of Warcraft or Blizzard Entertainment. AzerothCore does not in any case sponsor nor support illegal public servers. If you use this project to run an illegal public server and not for testing and learning it is your own personal choice.
 

.github/workflows/codestyle.yml

@@ -14,7 +14,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     name: C++
-    if: github.repository == 'azerothcore/azerothcore-wotlk' && !github.event.pull_request.draft
+    if: github.repository == 'mod-playerbots/azerothcore-wotlk' && !github.event.pull_request.draft
     steps:
       - uses: actions/checkout@v4
       - name: Setup python

.github/workflows/core-build-nopch.yml

@@ -10,7 +10,14 @@ on:
       - synchronize
 
 concurrency:
-  group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
+  # One concurrency group per workflow + ref.
+  #
+  # - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
+  #   in-progress runs for the same PR.
+  # - When a PR is merged, a push to the target branch starts a new group,
+  #   canceling any still-running PR CI.
+  # - Branch pushes are isolated by ref.
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 permissions:
@@ -37,7 +44,7 @@ jobs:
               CXX: g++-14
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }}-${{ matrix.compiler.CC }}-nopch
-    if: github.repository == 'azerothcore/azerothcore-wotlk' && !github.event.pull_request.draft
+    if: github.repository == 'mod-playerbots/azerothcore-wotlk' && !github.event.pull_request.draft
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/linux-build

.github/workflows/core-build-pch.yml

@@ -10,7 +10,14 @@ on:
       - synchronize
 
 concurrency:
-  group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
+  # One concurrency group per workflow + ref.
+  #
+  # - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
+  #   in-progress runs for the same PR.
+  # - When a PR is merged, a push to the target branch starts a new group,
+  #   canceling any still-running PR CI.
+  # - Branch pushes are isolated by ref.
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 permissions:
@@ -32,8 +39,10 @@ jobs:
               CC: clang-18
               CXX: clang++-18
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }}-${{ matrix.compiler.CC }}-pch
-    if: github.repository == 'azerothcore/azerothcore-wotlk' && !github.event.pull_request.draft
+    name: ${{ matrix.os }}-${{ matrix.compiler }}-pch
+    env:
+      COMPILER: ${{ matrix.compiler }}
+    if: github.repository == 'mod-playerbots/azerothcore-wotlk' && !github.event.pull_request.draft
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/linux-build

.github/workflows/core-build-playerbots.yml

@@ -0,0 +1,100 @@
+# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
+# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
+name: ubuntu-build
+
+on:
+  push:
+    branches: [ "Playerbot" ]
+  pull_request:
+    branches: [ "Playerbot" ]
+
+jobs:
+  build:
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
+      fail-fast: false
+      matrix:
+        # the result of the matrix will be the combination of all attributes, so we get os*compiler builds
+        include:
+          - os: ubuntu-22.04
+            c_compiler: clang
+            cpp_compiler: clang++
+            build_type: Release
+          - os: ubuntu-22.04
+            c_compiler: gcc
+            cpp_compiler: g++
+            build_type: Release
+          - os: ubuntu-24.04
+            c_compiler: gcc
+            cpp_compiler: g++
+            build_type: Release
+            
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }}-${{ matrix.cpp_compiler }}
+
+    steps:
+    - name: Checkout AzerothCore
+      uses: actions/checkout@v3
+
+    - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+        
+    # - name: Clone Playerbot Module
+    #   run: git clone --depth=1 --branch=master https://github.com/mod-playerbots/mod-playerbots.git modules/mod-playerbots
+
+    - name: Checkout Playerbot Module
+      uses: actions/checkout@v3
+      with:
+        repository: 'mod-playerbots/mod-playerbots'
+        #ref: 'feature/core_update_10_2025' #used on core merge conflicts builds
+        path: 'modules/mod-playerbots'
+    
+    - name: Install Requirements
+      run: sudo apt-get update && sudo apt-get install git cmake make gcc g++ clang libmysqlclient-dev libssl-dev libbz2-dev libreadline-dev libncurses-dev mysql-server libboost-all-dev
+      
+    # - name: Cache
+    #   uses: actions/cache@v3
+    #   with:
+    #     path: var/ccache
+    #     key: ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}:${{ github.sha }}
+    #     restore-keys: |
+    #       ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}
+    #       ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules
+            
+    # - name: Configure OS
+    #   run: source ./acore.sh install-deps
+    #   env:
+    #     CONTINUOUS_INTEGRATION: true
+        
+    # - name: Create conf/config.sh
+    #   run: source ./apps/ci/ci-conf-core.sh
+      
+    # - name: Process pending sql
+    #   run: bash bin/acore-db-pendings
+      
+    # - name: Build
+    #   run: source ./apps/ci/ci-compile.sh
+        
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: >
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -S ${{ github.workspace }}
+
+    - name: Build
+      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+
+    # - name: Test
+    #   working-directory: ${{ steps.strings.outputs.build-output-dir }}
+    #   # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+    #   # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+    #   run: ctest --build-config ${{ matrix.build_type }}

.github/workflows/core-build.yml

@@ -0,0 +1,99 @@
+# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
+# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
+name: ubuntu-build
+
+on:
+  push:
+    branches: [ "Playerbot" ]
+  pull_request:
+    branches: [ "Playerbot" ]
+
+jobs:
+  build:
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
+      fail-fast: false
+      matrix:
+        # the result of the matrix will be the combination of all attributes, so we get os*compiler builds
+        include:
+          - os: ubuntu-22.04
+            c_compiler: clang
+            cpp_compiler: clang++
+            build_type: Release
+          - os: ubuntu-22.04
+            c_compiler: gcc
+            cpp_compiler: g++
+            build_type: Release
+          - os: ubuntu-24.04
+            c_compiler: gcc
+            cpp_compiler: g++
+            build_type: Release
+            
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }}-${{ matrix.cpp_compiler }}
+
+    steps:
+    - name: Checkout AzerothCore
+      uses: actions/checkout@v3
+
+    - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+        
+    # - name: Clone Playerbot Module
+    #   run: git clone --depth=1 --branch=master https://github.com/mod-playerbots/mod-playerbots.git modules/mod-playerbots
+
+    # - name: Checkout Playerbot Module
+    #   uses: actions/checkout@v3
+    #   with:
+    #     repository: 'mod-playerbots/mod-playerbots'
+    #     path: 'modules/mod-playerbots'
+    
+    - name: Install Requirements
+      run: sudo apt-get update && sudo apt-get install git cmake make gcc g++ clang libmysqlclient-dev libssl-dev libbz2-dev libreadline-dev libncurses-dev mysql-server libboost-all-dev
+      
+    # - name: Cache
+    #   uses: actions/cache@v3
+    #   with:
+    #     path: var/ccache
+    #     key: ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}:${{ github.sha }}
+    #     restore-keys: |
+    #       ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}
+    #       ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules
+            
+    # - name: Configure OS
+    #   run: source ./acore.sh install-deps
+    #   env:
+    #     CONTINUOUS_INTEGRATION: true
+        
+    # - name: Create conf/config.sh
+    #   run: source ./apps/ci/ci-conf-core.sh
+      
+    # - name: Process pending sql
+    #   run: bash bin/acore-db-pendings
+      
+    # - name: Build
+    #   run: source ./apps/ci/ci-compile.sh
+        
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: >
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -S ${{ github.workspace }}
+
+    - name: Build
+      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+
+    # - name: Test
+    #   working-directory: ${{ steps.strings.outputs.build-output-dir }}
+    #   # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+    #   # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+    #   run: ctest --build-config ${{ matrix.build_type }}

.github/workflows/core_modules_build.yml

@@ -24,7 +24,14 @@ permissions:
   contents: read
 
 concurrency:
-  group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
+  # One concurrency group per workflow + ref.
+  #
+  # - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
+  #   in-progress runs for the same PR.
+  # - When a PR is merged, a push to the target branch starts a new group,
+  #   canceling any still-running PR CI.
+  # - Branch pushes are isolated by ref.
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -39,7 +46,7 @@ jobs:
               CXX: clang++-18
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }}-${{ matrix.compiler.CC }}-nopch-modules
-    if: github.repository == 'azerothcore/azerothcore-wotlk' && !github.event.pull_request.draft
+    if: github.repository == 'mod-playerbots/azerothcore-wotlk' && !github.event.pull_request.draft
     steps:
       - uses: actions/checkout@v4
         # This script installs a general list of modules to compile with

.github/workflows/dashboard-ci.yml

@@ -16,7 +16,14 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
+  # One concurrency group per workflow + ref.
+  #
+  # - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
+  #   in-progress runs for the same PR.
+  # - When a PR is merged, a push to the target branch starts a new group,
+  #   canceling any still-running PR CI.
+  # - Branch pushes are isolated by ref.
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 permissions:

.github/workflows/docker_build.yml

@@ -9,20 +9,27 @@ on:
       - synchronize
 
 concurrency:
-  group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
+  # One concurrency group per workflow + ref.
+  #
+  # - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
+  #   in-progress runs for the same PR.
+  # - When a PR is merged, a push to the target branch starts a new group,
+  #   canceling any still-running PR CI.
+  # - Branch pushes are isolated by ref.
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
   COMPOSE_DOCKER_CLI_BUILD: 1
   DOCKER_BUILDKIT: 1
   RUNNING_ON_PRIMARY_BRANCH: |
-    ${{ (github.repository == 'azerothcore/azerothcore-wotlk' && github.ref_name == 'master') && 'true' || 'false' }}
+    ${{ (github.repository == 'mod-playerbots/azerothcore-wotlk' && github.ref_name == 'master') && 'true' || 'false' }}
 
 jobs:
   build-containers:
     runs-on: "ubuntu-latest"
     if: |
-      github.repository == 'azerothcore/azerothcore-wotlk'
+      github.repository == 'mod-playerbots/azerothcore-wotlk'
       && !github.event.pull_request.draft
       && (github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build')
     steps:

.github/workflows/macos_build.yml

@@ -1,12 +1,9 @@
 name: macos-build
 on:
   push:
-    branches:
-      - 'master'
+    branches: [ "Playerbot" ]
   pull_request:
-    types:
-      - labeled
-      - synchronize
+    branches: [ "Playerbot" ]
 
 concurrency:
   group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
@@ -25,10 +22,6 @@ jobs:
           - macos-14
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }}
-    if: |
-      github.repository == 'azerothcore/azerothcore-wotlk'
-      && !github.event.pull_request.draft
-      && (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build')
     steps:
       - uses: actions/checkout@v4
       - name: Cache

.github/workflows/tools_build.yml

@@ -9,7 +9,14 @@ on:
       - synchronize
 
 concurrency:
-  group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
+  # One concurrency group per workflow + ref.
+  #
+  # - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
+  #   in-progress runs for the same PR.
+  # - When a PR is merged, a push to the target branch starts a new group,
+  #   canceling any still-running PR CI.
+  # - Branch pushes are isolated by ref.
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -25,9 +32,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }}-${{ matrix.compiler.CC }}
     if: |
-      github.repository == 'azerothcore/azerothcore-wotlk'
-      && !github.event.pull_request.draft
-      && (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build')
+      github.repository == 'mod-playerbots/azerothcore-wotlk' && !github.event.pull_request.draft
+      && (
+        contains(github.event.pull_request.labels.*.name, 'run-build')
+        || github.event.label.name == 'run-build'
+      )
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/linux-build

.github/workflows/windows_build.yml

@@ -1,15 +1,19 @@
 name: windows-build
 on:
   push:
-    branches:
-      - 'master'
+    branches: [ "Playerbot" ]
   pull_request:
-    types:
-      - labeled
-      - synchronize
+    branches: [ "Playerbot" ]
 
 concurrency:
-  group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
+  # One concurrency group per workflow + ref.
+  #
+  # - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
+  #   in-progress runs for the same PR.
+  # - When a PR is merged, a push to the target branch starts a new group,
+  #   canceling any still-running PR CI.
+  # - Branch pushes are isolated by ref.
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -22,10 +26,6 @@ jobs:
     name: ${{ matrix.os }}
     env:
       BOOST_ROOT: C:\local\boost_1_82_0
-    if: |
-      github.repository == 'azerothcore/azerothcore-wotlk'
-      && !github.event.pull_request.draft
-      && (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build')
     steps:
       - uses: actions/checkout@v4
       - name: ccache

.gitignore

@@ -58,6 +58,8 @@ CMakeLists.txt.user
 #
 /.settings/
 /.externalToolBuilders/*
+/.vs
+/out
 # exclude in all levels
 nbproject/
 .sync.ffs_db
@@ -102,3 +104,5 @@ local.properties
 #  !modules/yourmodule
 #
 # ==================
+.cache
+compile_commands.json

acore.json

@@ -1,5 +1,5 @@
 {
     "name":  "azerothcore-wotlk",
-    "version":  "14.0.0-dev",
+    "version":  "15.0.0-dev",
     "license":  "GPL2"
 }

apps/ci/mac/ci-compile.sh

@@ -22,8 +22,7 @@ if [ ! -d "$mysql_include_path" ]; then
 fi
 
 time cmake ../../../ \
--DTOOLS=1 \
--DBUILD_TESTING=1 \
+-DTOOLS_BUILD=all \
 -DSCRIPTS=static \
 -DCMAKE_BUILD_TYPE=Release \
 -DMYSQL_ADD_INCLUDE_PATH=$mysql_include_path \
@@ -33,9 +32,6 @@ time cmake ../../../ \
 -DOPENSSL_INCLUDE_DIR="$OPENSSL_ROOT_DIR/include" \
 -DOPENSSL_SSL_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libssl.dylib" \
 -DOPENSSL_CRYPTO_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libcrypto.dylib" \
--DWITH_WARNINGS=1 \
--DCMAKE_C_FLAGS="-Werror" \
--DCMAKE_CXX_FLAGS="-Werror" \
 -DCMAKE_C_COMPILER_LAUNCHER=ccache \
 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 -DUSE_SCRIPTPCH=0 \

apps/config-merger/README.md

@@ -1,22 +1,66 @@
-# ==== PHP merger (index.php + merge.php) ====
+# AzerothCore Config Merger
 
-This is a PHP script for merging a new .dist file with your existing .conf file (worldserver.conf.dist and authserver.conf.dist)
+This directory contains configuration file merger tools to help update your AzerothCore server and module configurations with new options from distribution files.
 
-It uses sessions so it is multi user safe, it adds any options that are removed to the bottom of the file commented out, just in case it removes something it shouldn't.
-If you add your custom patch configs below "# Custom" they will be copied exactly as they are.
+**Available Options:** PHP and Python versions (**Python recommended for new users**)
 
-Your new config will be found under $basedir/session_id/newconfig.conf.merge
+## Purpose
 
-If you do not run a PHP server on your machiene you can read this guide on ["How to execute PHP code using command line?"](https://www.geeksforgeeks.org/how-to-execute-php-code-using-command-line/) on geeksforgeeks.org.
+The config merger tools help you update your existing configuration files (`.conf`) to include new options that have been added to the distribution files (`.conf.dist`). Distribution files always contain the most recent configuration changes and new options, while your personal config files may be missing these updates. These tools will:
 
-```
-php -S localhost:port -t E:\Azerothcore-wotlk\apps\config-merger\
+- Compare your existing config files with the latest distribution files
+- Show you new configuration options that are missing from your files  
+- Allow you to selectively add new options to your configs
+- Create automatic backups before making any changes
+- Support authserver.conf, worldserver.conf, and all module configs
+
+## Available Versions
+
+### PHP Version
+
+**Requirements:**
+- PHP 5.6 or higher
+- **Requires a web server** (Apache, Nginx, IIS, etc.) to function
+- No additional libraries required (uses built-in PHP functions only)
+
+**Features:**
+- Web-based interface
+- Configuration file parsing and merging
+- Browser-accessible configuration management
+
+**Usage:**
+- Deploy to web server with PHP support (can be local - XAMPP, WAMP, or built-in PHP server)
+- Access via web browser
+- Follow web interface instructions
+
+### Python Version (Recommended)
+
+**Requirements:**
+- Python 3.6 or higher
+- No additional setup required beyond installing Python
+- No additional libraries required (uses built-in modules only)
+
+**Features:**
+- Interactive menu-driven interface
+- Support for server configs (authserver.conf, worldserver.conf)
+- Support for module configs with bulk or selective updates
+- Automatic backup creation with timestamps
+- Cross-platform compatibility (Windows, Linux, macOS, and others)
+- Can be run via command line or by double-clicking the .py file
+
+**Usage:**
+```bash
+# Via command line
+cd /path/to/configs
+python config_merger.py
+
+# Or double-click config_merger.py to open in terminal
 ```
 
-Change port to an available port to use. i.e 8000
+## Installation
 
-Then go to your browser and type:
+When building AzerothCore with the `TOOL_CONFIG_MERGER` CMake option enabled, **only the Python version** will be automatically copied to your configs directory during the build process. The PHP version must be manually deployed to a web server.
 
-```
-localhost:8000/index.php
-```
+## Support
+
+Both versions provide the same core functionality for merging configuration files. Choose the version that best fits your environment and preferences. Python is recommended for most users due to its simplicity and no web server requirement.

apps/config-merger/php/README.md

@@ -0,0 +1,22 @@
+# ==== PHP merger (index.php + merge.php) ====
+
+This is a PHP script for merging a new .dist file with your existing .conf file (worldserver.conf.dist and authserver.conf.dist)
+
+It uses sessions so it is multi user safe, it adds any options that are removed to the bottom of the file commented out, just in case it removes something it shouldn't.
+If you add your custom patch configs below "# Custom" they will be copied exactly as they are.
+
+Your new config will be found under $basedir/session_id/newconfig.conf.merge
+
+If you do not run a PHP server on your machine you can read this guide on ["How to execute PHP code using command line?"](https://www.geeksforgeeks.org/how-to-execute-php-code-using-command-line/) on geeksforgeeks.org.
+
+```
+php -S localhost:port -t E:\Azerothcore-wotlk\apps\config-merger\php\
+```
+
+Change port to an available port to use. i.e 8000
+
+Then go to your browser and type:
+
+```
+localhost:8000/index.php
+```

apps/config-merger/python/README.md

@@ -0,0 +1,148 @@
+# AzerothCore Config Updater/Merger - Python Version
+
+A command-line tool to update your AzerothCore configuration files with new options from distribution files.
+
+> [!NOTE]  
+> Based on and modified from [@BoiseComputer](https://github.com/BoiseComputer) (Brian Aldridge)'s [update_module_confs](https://github.com/Brian-Aldridge/update_module_confs) project to meet AzerothCore's needs
+
+## Overview
+
+This tool compares your existing configuration files (`.conf`) with the latest distribution files (`.conf.dist`) and helps you add new configuration options that may have been introduced in updates. It ensures your configs stay up-to-date while preserving your custom settings.
+
+## Features
+
+- **Interactive Menu System** - Easy-to-use numbered menu options
+- **Server Config Support** - Update authserver.conf and worldserver.conf
+- **Module Config Support** - Update all or selected module configurations
+- **Automatic Backups** - If you choose a valid option and there are changes, a timestamped backup is created before any changes are made (e.g. `filename(d11_m12_y2025_14h_30m_45s).bak`)
+- **Selective Updates** - Choose which new config options to add (y/n prompts)
+- **Safe Operation** - Only creates backups and makes changes when new options are found
+
+## How to Use
+
+### Interactive Mode (Default)
+
+1. **Run the script** in your configs directory:
+   ```bash
+   python config_merger.py
+   ```
+   Or simply **double-click** the `config_merger.py` file to run it directly.
+
+2. **Specify configs path** (or press Enter for current directory):
+   ```
+   Enter the path to your configs folder (default: .) which means current folder:
+   ```
+
+3. **Choose from the menu**:
+   ```
+   AzerothCore Config Updater/Merger (v. 1)
+   --------------------------
+   1 - Update Auth Config
+   2 - Update World Config  
+   3 - Update Auth and World Configs
+   4 - Update All Modules Configs
+   5 - Update Modules (Selection) Configs
+   0 - Quit
+   ```
+
+### Command Line Interface (CLI)
+
+For automation and scripting, you can use CLI mode:
+
+```bash
+python config_merger.py [config_dir] [target] [options]
+```
+
+**Arguments:**
+- `config_dir` (optional): Path to configs directory (default: current directory)
+- `target` (optional): What to update:
+  - `auth` - Update authserver.conf only
+  - `world` - Update worldserver.conf only  
+  - `both` - Update both server configs
+  - `modules` - Update all module configs
+  - `modules-select` - Interactive module selection
+
+**Options:**
+- `-y, --yes`: Skip prompts and auto-add all new config options (default: prompt for each option)
+- `--version`: Show version information
+
+**Examples:**
+```bash
+# Interactive mode (default)
+python config_merger.py
+
+# Update auth config with prompts
+python config_merger.py . auth
+
+# Update both configs automatically (no prompts)
+python config_merger.py /path/to/configs both -y
+
+# Update all modules with confirmation
+python config_merger.py . modules
+```
+
+## Menu Options Explained
+
+- **Option 1**: Updates only `authserver.conf` from `authserver.conf.dist`
+- **Option 2**: Updates only `worldserver.conf` from `worldserver.conf.dist`  
+- **Option 3**: Updates both server config files
+- **Option 4**: Automatically processes all module config files in the `modules/` folder
+- **Option 5**: Shows you a list of available modules and lets you select specific ones to update
+- **Option 0**: Exit the program
+
+## Interactive Process
+
+For each missing configuration option found, the tool will:
+
+1. **Show you the option** with its comments and default value
+2. **Ask for confirmation**: `Add [option_name] to config? (y/n):`
+3. **Add or skip** based on your choice
+4. **Create backup** (before any changes are made) only if you choose a valid option and there are changes (format: `filename(d11_m12_y2025_14h_30m_45s).bak`)
+
+## Example Session
+
+```
+Processing worldserver.conf ...
+  Backup created: worldserver.conf(d11_m12_y2025_14h_30m_45s).bak
+
+# New feature for XP rates
+XP.Rate = 1
+  Add XP.Rate to config? (y/n): y
+    Added XP.Rate.
+
+# Database connection pool size  
+Database.PoolSize = 5
+  Add Database.PoolSize to config? (y/n): n
+    Skipped Database.PoolSize.
+```
+
+## Requirements
+
+- Python 3.6 or higher
+- No additional libraries needed (uses built-in modules only)
+
+## File Structure Expected
+
+```
+configs/
+├── config_merger.py        (this script)
+├── authserver.conf.dist
+├── authserver.conf
+├── worldserver.conf.dist
+├── worldserver.conf
+└── modules/
+    ├── mod_example.conf.dist
+    ├── mod_example.conf
+    └── ...
+```
+
+## License
+
+This file is part of the AzerothCore Project. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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, see <http://www.gnu.org/licenses/>.
+
+**Note:** Original code portions were licensed under the MIT License by Brian Aldridge (https://github.com/BoiseComputer)  
+Original project: https://github.com/Brian-Aldridge/update_module_confs

apps/config-merger/python/config_merger.py

@@ -0,0 +1,276 @@
+# Version 1
+# Based and modified from: https://github.com/Brian-Aldridge/update_module_confs 
+#
+# This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the 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, see <http://www.gnu.org/licenses/>.
+#
+# Original code portions licensed under MIT License by Brian Aldridge (https://github.com/BoiseComputer)
+# Original project: https://github.com/Brian-Aldridge/update_module_confs
+
+VERSION = "1"
+
+import os
+import shutil
+import argparse
+import sys
+from datetime import datetime
+
+def find_modules(folder):
+    dist_files = []
+    try:
+        files = os.listdir(folder)
+    except (OSError, IOError) as e:
+        print(f"[ERROR] Could not list directory '{folder}': {e}")
+        return []
+    for file in files:
+        if file.endswith('.conf.dist'):
+            dist_files.append(file)
+    return sorted(dist_files)
+
+def prompt_module_selection(dist_files):
+    print("Found the following modules:")
+    for idx, fname in enumerate(dist_files, 1):
+        print(f"  {idx}. {fname}")
+    nums = input("Enter numbers of modules to update (comma-separated): ").strip()
+    raw_inputs = [x.strip() for x in nums.split(",") if x.strip()]
+    indices = []
+    invalid = []
+    for x in raw_inputs:
+        if not x.isdigit():
+            invalid.append(f"'{x}' (not a number)")
+            continue
+        idx = int(x)
+        if 0 < idx <= len(dist_files):
+            indices.append(idx-1)
+        else:
+            invalid.append(f"'{x}' (out of range, must be 1-{len(dist_files)})")
+    if invalid:
+        print("Invalid input:")
+        for msg in invalid:
+            print(f"  {msg}")
+    if not indices:
+        print("No valid module numbers were entered.")
+        return []
+    selected = [dist_files[i] for i in indices]
+    return selected
+
+def backup_file(filepath):
+    timestamp = datetime.now().strftime("d%d_m%m_y%Y_%Hh_%Mm_%Ss")
+    bakpath = f"{filepath}({timestamp}).bak"
+    try:
+        shutil.copy2(filepath, bakpath)
+        print(f"  Backup created: {bakpath}")
+    except (OSError, IOError) as e:
+        print(f"[ERROR] Failed to create backup '{bakpath}': {e}")
+        return False
+    return True
+
+def parse_conf(filepath):
+    # Returns a dict of key: (line, [preceding_comments])
+    try:
+        with open(filepath, encoding="utf-8") as f:
+            lines = f.readlines()
+    except (OSError, IOError) as e:
+        print(f"[ERROR] Failed to read config file '{filepath}': {e}")
+        return None
+    conf = {}
+    comments = []
+    for line in lines:
+        stripped = line.strip()
+        if not stripped or stripped.startswith("#"):
+            comments.append(line)
+            continue
+        if stripped.startswith("[") and stripped.endswith("]"):
+            # Ignore [headers of configs]
+            comments.clear()
+            continue
+        if stripped.count("=") == 1:
+            key, value = [s.strip() for s in stripped.split("=", 1)]
+            if '#' in value:
+                value = value.split('#', 1)[0].rstrip()
+            if key:
+                conf[key] = (f"{key} = {value}\n", comments.copy())
+                comments.clear()
+            continue
+    return conf
+
+def find_missing_keys(dist_conf, user_conf):
+    missing = {}
+    for key, (line, comments) in dist_conf.items():
+        if key not in user_conf:
+            missing[key] = (line, comments)
+    return missing
+
+def update_conf(dist_path, conf_path, skip_prompts=False):
+    if not os.path.exists(conf_path):
+        print(f"  User config {conf_path} does not exist, skipping.")
+        return False
+    dist_conf = parse_conf(dist_path)
+    user_conf = parse_conf(conf_path)
+    missing = find_missing_keys(dist_conf, user_conf)
+    if not missing:
+        print("  No new config options to add.")
+        return False
+    updated = False
+    lines_to_add = []
+    for key, (line, comments) in missing.items():
+        if skip_prompts:
+            lines_to_add.append((comments, line, key))
+        else:
+            print("\n" + "".join(comments if comments else []) + line, end="")
+            add = input(f"  Add {key} to config? (y/n): ").strip().lower()
+            if add in ("", "y", "yes"):
+                lines_to_add.append((comments, line, key))
+            else:
+                print(f"    Skipped {key}.")
+    if lines_to_add:
+        backup_file(conf_path)
+        # Write using system's default line ending to avoid mixing CRLF and LF in the config file
+        newline = os.linesep.encode('utf-8')
+        with open(conf_path, "ab") as f:
+            for comments, line, key in lines_to_add:
+                if comments:
+                    for c in comments:
+                        f.write(c.rstrip('\r\n').encode('utf-8') + newline)
+                f.write(line.rstrip('\r\n').encode('utf-8') + newline)
+                print(f"    Added {key}.")
+        updated = True
+    return updated
+
+def update_server_config(config_name, config_dir, skip_prompts=False):
+    dist_path = os.path.join(config_dir, f"{config_name}.conf.dist")
+    conf_path = os.path.join(config_dir, f"{config_name}.conf")
+    
+    if not os.path.exists(dist_path):
+        print(f"  Distribution config {dist_path} does not exist, skipping.")
+        return False
+    
+    print(f"\nProcessing {config_name}.conf ...")
+    return update_conf(dist_path, conf_path, skip_prompts)
+
+def update_modules(config_dir, selected_only=False, skip_prompts=False):
+    modules_dir = os.path.join(config_dir, "modules")
+    if not os.path.exists(modules_dir):
+        print(f"  Modules directory {modules_dir} does not exist, skipping.")
+        return
+    
+    dist_files = find_modules(modules_dir)
+    if not dist_files:
+        print("  No .conf.dist files found in modules folder.")
+        return
+    
+    if selected_only:
+        selected = prompt_module_selection(dist_files)
+        if not selected:
+            print("  No modules selected.")
+            return
+    else:
+        selected = dist_files
+    
+    for dist_fname in selected:
+        module = dist_fname[:-5]  # Removes ".dist"
+        conf_fname = module  # e.g., mod_x.conf
+        dist_path = os.path.join(modules_dir, dist_fname)
+        conf_path = os.path.join(modules_dir, conf_fname)
+        print(f"\nProcessing {conf_fname} ...")
+        update_conf(dist_path, conf_path, skip_prompts)
+
+def show_main_menu():
+    print(f"\nAzerothCore Config Updater/Merger (v. {VERSION})")
+    print("--------------------------")
+    print("1 - Update Auth Config")
+    print("2 - Update World Config")
+    print("3 - Update Auth and World Configs")
+    print("4 - Update All Modules Configs")
+    print("5 - Update Modules (Selection) Configs")
+    print("0 - Quit")
+    return input("Select an option: ").strip()
+
+def parse_args():
+    parser = argparse.ArgumentParser(description='AzerothCore Config Updater/Merger')
+    parser.add_argument('config_dir', nargs='?', default='.', 
+                      help='Path to configs directory (default: current directory)')
+    parser.add_argument('target', nargs='?',
+                      choices=['auth', 'world', 'both', 'modules', 'modules-select'],
+                      help='What to update: auth, world, both, modules, modules-select')
+    parser.add_argument('-y', '--yes', action='store_true',
+                      help='Automatically answer yes to all prompts')
+    parser.add_argument('--version', action='version', version=f'%(prog)s {VERSION}')
+    return parser.parse_args()
+
+def main():
+    args = parse_args()
+    
+    # If no target specified, run interactive mode
+    if args.target is None:
+        print(f"AzerothCore Config Updater/Merger (v. {VERSION})")
+        print("==========================")
+        config_dir = input("Enter the path to your configs folder (Default / Empty will use the folder where this script is located): ").strip()
+        if not config_dir:
+            config_dir = "."
+        
+        if not os.path.isdir(config_dir):
+            print("Provided path is not a valid directory.")
+            return
+        
+        while True:
+            choice = show_main_menu()
+            
+            if choice == "1":
+                update_server_config("authserver", config_dir)
+            elif choice == "2":
+                update_server_config("worldserver", config_dir)
+            elif choice == "3":
+                update_server_config("authserver", config_dir)
+                update_server_config("worldserver", config_dir)
+            elif choice == "4":
+                update_modules(config_dir, selected_only=False)
+            elif choice == "5":
+                update_modules(config_dir, selected_only=True)
+            elif choice == "0":
+                print("Goodbye!")
+                break
+            else:
+                print("Invalid selection. Please try again.")
+    else:
+        # CLI mode
+        config_dir = args.config_dir
+        
+        if not os.path.isdir(config_dir):
+            print(f"Error: Directory '{config_dir}' does not exist.")
+            sys.exit(1)
+        
+        print(f"AzerothCore Config Updater/Merger (v. {VERSION}) - CLI Mode")
+        print(f"Config directory: {os.path.abspath(config_dir)}")
+        print(f"Target: {args.target}")
+        if args.yes:
+            print("Skip prompts: Yes")
+        
+        if args.target == 'auth':
+            update_server_config("authserver", config_dir, args.yes)
+        elif args.target == 'world':
+            update_server_config("worldserver", config_dir, args.yes)
+        elif args.target == 'both':
+            update_server_config("authserver", config_dir, args.yes)
+            update_server_config("worldserver", config_dir, args.yes)
+        elif args.target == 'modules':
+            update_modules(config_dir, selected_only=False, skip_prompts=args.yes)
+        elif args.target == 'modules-select':
+            if args.yes:
+                print("Warning: --yes flag ignored for modules-select (requires interactive selection)")
+            update_modules(config_dir, selected_only=True, skip_prompts=False)
+
+if __name__ == "__main__":
+    main()

apps/installer/includes/os_configs/debian.sh

@@ -31,8 +31,16 @@ $SUDO apt-get install -y gdbserver gdb unzip curl \
 
 VAR_PATH="$CURRENT_PATH/../../../../var"
 
-# run noninteractive install for MYSQL 8.4 LTS
-wget https://dev.mysql.com/get/mysql-apt-config_0.8.35-1_all.deb -P "$VAR_PATH"
-DEBIAN_FRONTEND="noninteractive" $SUDO dpkg -i "$VAR_PATH/mysql-apt-config_0.8.35-1_all.deb"
-$SUDO apt-get update
-DEBIAN_FRONTEND="noninteractive" $SUDO apt-get install -y mysql-server libmysqlclient-dev
+# run noninteractive install for MYSQL
+# Version
+MYSQL_APT_CONFIG_VERSION=0.8.36-1
+# # # # #
+mkdir -p "$VAR_PATH/mysqlpackages" && cd "$VAR_PATH/mysqlpackages"
+# Download
+wget "https://dev.mysql.com/get/mysql-apt-config_${MYSQL_APT_CONFIG_VERSION}_all.deb"
+# Install
+sudo DEBIAN_FRONTEND="noninteractive" dpkg -i ./mysql-apt-config_${MYSQL_APT_CONFIG_VERSION}_all.deb
+sudo apt update
+sudo DEBIAN_FRONTEND="noninteractive" apt install -y mysql-server libmysqlclient-dev
+# Cleanup
+rm -v mysql-apt-config_${MYSQL_APT_CONFIG_VERSION}_all* && unset MYSQL_APT_CONFIG_VERSION

conf/dist/config.cmake

@@ -106,6 +106,7 @@ option(WITH_DYNAMIC_LINKING "Enable dynamic library linking."
 option(WITH_STRICT_DATABASE_TYPE_CHECKS "Enable strict checking of database field value accessors" 0)
 option(WITHOUT_METRICS     "Disable metrics reporting (i.e. InfluxDB and Grafana)"       0)
 option(WITH_DETAILED_METRICS  "Enable detailed metrics reporting (i.e. time each session takes to update)" 0)
+option(TOOL_CONFIG_MERGER     "Install the Python config merger tool alongside config files" 0)
 
 CheckApplicationsBuildList()
 CheckToolsBuildList()