Merge remote-tracking branch 'origin/develop' into develop

Author: RizonFTW

games/rockstar/fivem/entrypoint.sh

@@ -38,7 +38,7 @@ Text="${GREEN}[STARTUP]${NC}"
 export TXHOST_GAME_NAME=${TXHOST_GAME_NAME:-"fivem"}
 export TXHOST_DATA_PATH=${TXHOST_DATA_PATH:-"/home/container/txData"}
 export TXHOST_INTERFACE=${TXHOST_INTERFACE:-"0.0.0.0"}
-export TXHOST_TXA_PORT=${TXHOST_TXA_PORT:-"${TXADMIN_PORT:-40120}"}
+export TXHOST_TXA_PORT=${TXHOST_TXA_PORT:-40120}
 export TXHOST_FXS_PORT=${TXHOST_FXS_PORT:-30120}
 export TXHOST_DEFAULT_CFXKEY=${TXHOST_DEFAULT_CFXKEY:-"${FIVEM_LICENSE}"}
 export TXHOST_MAX_SLOTS=${TXHOST_MAX_SLOTS:-"${MAX_PLAYERS}"}

games/rockstar/fivem/recipe.json

@@ -121,7 +121,7 @@
         {
             "name": "txAdmin Port",
             "description": "The port for the txAdmin panel.",
-            "env_variable": "TXADMIN_PORT",
+            "env_variable": "TXHOST_TXA_PORT",
             "default_value": "40120",
             "user_viewable": true,
             "user_editable": true,