refactor(server): Update VNyanNet Server version to 1.4 and change API key in Dockerfile

Changes:
- Updated download link for VNyanNet Server from Itch.io to point to version 1.4
- Changed the environment variable `VNYAN_VERSION` to reflect the updated server version (from 1.3 to 1.4)
- Removed old commented out code related to the previous server version (v1.3)
- Added the API key back into the Dockerfile for the new VNyanNet Server download link

Note: The changes are specific to the Dockerfile and do not affect the rest of the project, unless the Dockerfile is used elsewhere.

Author: NekoSuneVR

Dockerfile

@@ -11,17 +11,14 @@ RUN dpkg --add-architecture i386 && \
 
 WORKDIR /server
 
-<<<<<<< HEAD
-# Download VNyanNet Server (1.3) from Itch.io
+# Download VNyanNet Server (1.4) from Itch.io
 # Note: this follows redirects and uses the Itch.io filename automatically.
 RUN wget --content-disposition -O VNyanNetServer.zip "https://drive.nekosunevr.co.uk/public.php/dav/files/p7xjS2TpD6St7wN/VNyanNetServer-1.4.zip" || echo "Please provide manual download link if private."
 
 # Extract and clean up
 RUN if [ -f VNyanNetServer.zip ]; then unzip VNyanNetServer.zip; fi
-=======
-ENV VNYAN_VERSION=1.3
->>>>>>> c4d4b2dfe3d30d2b4d5e99f0e3450f4c2bcaf27d
 
+ENV VNYAN_VERSION=1.4
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh