Cacodemon345 · OBattler · Jan 19, 2026 · Dec 23, 2025 · Dec 23, 2025 · Dec 23, 2025
diff --git a/.ci/AppImageBuilder.yml b/.ci/AppImageBuilder.yml
@@ -46,11 +46,6 @@ AppDir:
     - libedit2 # if (CLI:BOOL=ON|QT:BOOL=OFF)
     - libevdev2 # if QT:BOOL=ON
     - libfreetype6
-    - libgbm1 # if QT:BOOL=ON
-    - libgl1 # if QT:BOOL=ON
-    - libgles2 # if QT:BOOL=ON
-    - libglvnd0 # if QT:BOOL=ON
-    - libglx0 # if QT:BOOL=ON
     - libgomp1
     - libgs9
     - libpng16-16

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -281,16 +281,12 @@ pipeline {
 															dir(dynarecNames[dynarec]) {
 																dir("$os - $archName") {
 																	ret = runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} ${osFlags[os]} $buildFlags")
-																	if (presets.size() == 1)
-																		writeFile file: '.forcedir', text: ''
 																}
-																if ((osArchs.size() == 1) && (thisOsArchs.size() == 1))
-																	writeFile file: '.forcedir', text: ''
 															}
 
 															if (ret == 0) {
 																/* Archive resulting artifacts. */
-																archiveArtifacts artifacts: "**/$packageName*, **/.forcedir", defaultExcludes: false
+																archiveArtifacts artifacts: "**/$packageName*", defaultExcludes: false
 															} else {
 																/* Fail this stage. */
 																failStage()

diff --git a/.ci/build.sh b/.ci/build.sh
@@ -880,6 +880,31 @@ then
 	exit 5
 fi
 
+# Download assets if we're making a release build.
+if grep -qiE "^BUILD_TYPE:[^=]+=release" build/CMakeCache.txt 2> /dev/null
+then
+	git_repo=$(git remote get-url origin 2> /dev/null)
+	if [ "$CI" = "true" ]
+	then
+		# Backup strategy when running under Jenkins.
+		[ -z "$git_repo" ] && git_repo=$GIT_URL
+	fi
+	if [ -n "$git_repo" ]
+	then
+		echo [-] Downloading assets
+		cd archive_tmp
+		if ! git clone --depth 1 "$(dirname "$git_repo")/assets.git" assets
+		then
+			echo [!] Assets download failed
+			exit 7
+		fi
+		# Remove dot directories (including .git) and top level files.
+		rm -rf assets/.* 2> /dev/null
+		rm -f assets/* 2> /dev/null
+		cd ..
+	fi
+fi
+
 # Archive the executable and its dependencies.
 # The executable should always be archived last for the check after this block.
 status=0
@@ -902,7 +927,7 @@ then
 	[ ! -e "archive_tmp/discord_game_sdk.dll" ] && echo [!] No Discord Game SDK for architecture [$arch_discord]
 
 	# Archive XAudio2 DLL if required.
-	grep -q "OPENAL:BOOL=ON" build/CMakeCache.txt || cp -p "/home/$project/dll$arch/xaudio2"* archive_tmp/
+	grep -qiE "^OPENAL:BOOL=ON" build/CMakeCache.txt || cp -p "/home/$project/dll$arch/xaudio2"* archive_tmp/
 
 	# Archive executable, while also stripping it if requested.
 	if [ $strip -ne 0 ]
@@ -971,6 +996,14 @@ then
 			done
 		fi
 
+		# Archive assets.
+		if [ -d archive_tmp/assets ]
+		then
+			data_dir="$(echo "archive_tmp/"*".app/Contents")"
+			mkdir -p "$data_dir/Resources"
+			mv archive_tmp/assets "$data_dir/Resources/assets"
+		fi
+
 		# Sign app bundle, unless we're in an universal build.
 		[ $skip_archive -eq 0 ] && codesign --force --deep $(mac_signidentity) -o runtime --entitlements src/mac/entitlements.plist --timestamp "archive_tmp/"*".app"
 	elif [ "$BUILD_TAG" = "precondition" ]
@@ -982,7 +1015,7 @@ else
 	cwd_root="$(pwd)"
 	check_buildtag "libs.$arch_deb"
 
-	if grep -q "OPENAL:BOOL=ON" build/CMakeCache.txt
+	if grep -qiE "^OPENAL:BOOL=ON" build/CMakeCache.txt
 	then
 		# Build openal-soft 1.23.1 manually to fix audio issues. This is a temporary
 		# workaround until a newer version of openal-soft trickles down to Debian repos.
@@ -1133,6 +1166,14 @@ else
 	done
 	project_icon=$(find "$icon_base/"[0-9]*x[0-9]*/* -type f -name '*.png' -o -name '*.svg' | head -1 | grep -oP '/\K([^/]+)(?=\.[^\.]+$)')
 
+	# Archive assets.
+	if [ -d archive_tmp/assets ]
+	then
+		data_dir="archive_tmp/usr/local/share/$project"
+		mkdir -p "$data_dir"
+		mv archive_tmp/assets "$data_dir/assets"
+	fi
+
 	# Archive executable, while also stripping it if requested.
 	mkdir -p archive_tmp/usr/local/bin
 	if [ $strip -ne 0 ]

diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml
@@ -65,7 +65,7 @@ jobs:
           - arch: x86_64
             toolchain: ./cmake/flags-gcc-x86_64.cmake
             slug: -x86_64
-            runner: macos-13
+            runner: macos-15-intel
           - arch: arm64
             toolchain: ./cmake/llvm-macos-aarch64.cmake
             slug: -arm64

diff --git a/.github/workflows/codeql_macos.yml b/.github/workflows/codeql_macos.yml
@@ -79,7 +79,7 @@ jobs:
           - arch: x86_64
             toolchain: ./cmake/flags-gcc-x86_64.cmake
             slug: -x86_64
-            runner: macos-13
+            runner: macos-15-intel
 #          - arch: arm64
 #            toolchain: ./cmake/llvm-macos-aarch64.cmake
 #            slug: -arm64

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 6.0
+    VERSION 5.4
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)
@@ -184,7 +184,6 @@ cmake_dependent_option(PCL            "Generic PCL5e Printer"
 cmake_dependent_option(SIO_DETECT     "Super I/O Detection Helper"               ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(WACOM          "Wacom Input Devices"                      ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(XL24           "ATI VGA Wonder XL24 (ATI-28800-6)"        ON    "DEV_BRANCH"  OFF)
-cmake_dependent_option(NETSWITCH      "Network Switch Support"                   ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(VFIO           "Virtual Function I/O"                     ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(SOFTMODEM      "AC'97 Softmodem"                          ON    "DEV_BRANCH"  OFF)
 
@@ -224,7 +223,7 @@ if(NOT EMU_BUILD_NUM)
     set(EMU_BUILD_NUM 0)
 endif()
 if(NOT EMU_COPYRIGHT_YEAR)
-    set(EMU_COPYRIGHT_YEAR 2025)
+    set(EMU_COPYRIGHT_YEAR 2026)
 endif()
 
 # Libasan

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,30 @@
+# Code of Conduct
+In order for everyone to enjoy their time contributing to 86Box or otherwise being a part of the community, we kindly ask you to review and follow the below rules.
+
+## 1. No illegal activity or GitHub ToS violations
+- 1.1. Do not distribute malware for non-research purposes. Post samples in a clearly named encrypted archive.
+- 1.2. Posting old software is allowed if at least 10 years old and out of support.
+- 1.3. Do not post NSFW content (defined at the staff's discretion).
+- 1.4. Do not do anything forbidden by the law or the Discord or GitHub Terms of Service.
+
+## 2. No offensive or disruptive behavior or harassment
+- 2.1. No gate-keeping. We aim to accommodate and welcome people of all different opinions and knowledge levels to this community.
+- 2.2. You may speak any language but provide a summary in English so that we can understand what you are saying and use English when requested.
+- 2.3. Do not retroactively delete messages or do major edits unless you posted something by mistake.
+- 2.4. Do not antagonize, defame, demean, blackmail, impersonate, dox others, bring outside drama, use intentionally offensive profile aspects, or otherwise post messages to start a fight (eg. platform wars). Discuss or debate the idea, not the person.
+- 2.5. Do not backseat moderate, spam, flood, unsolicitedly ping people, advertise without permission, or evade blocks.
+- 2.6. Do not speak on behalf of the project unless you are a team member. This includes all messages which could reasonably be understood as being an official position. Ask a team member if you're unsure about your message.
+- 2.7. Decisions by higher-ranked users supersede those by lower-ranked users. This applies to moderation **and** emulator development. Rank and seniority must be earned.
+- 2.8. Do not engage in political discussions.
+- 2.9. Ignoring essential communication from team members does not exempt you from possible actions against you. Seniority must be earned.
+
+## 3. Moderation and appeal protocol
+- 3.1. Rule violations are punished at the team's discretion, taking all circumstances into account.
+- 3.2. Rules enforcement must be equal, impartial, and not retroactive or politically motivated.
+- 3.3. Everyone is innocent until proven guilty.
+- 3.4. Unless there is an emergency, urgent action is otherwise warranted, or a user is participating with the express purpose of violating our rules, the team shall deliberate before taking action in order to reach consensus and avoid team conflicts.
+
+## 4. Do not insist on requests or suggestions
+- 4.1. You may politely request something from us; if rejected, you are going to be told why and what to do to have it reconsidered.
+- 4.2. Follow the contribution requirements listed on the GitHub readme.
+- 4.3. Follow proper procedure (eg. for pull requests or bug reports).
diff --git a/README.md b/README.md
@@ -2,7 +2,10 @@
 =====
 
 [![Build Status](https://ci.86box.net/job/86Box/badge/icon)](https://ci.86box.net/job/86Box/)
-[![License](https://img.shields.io/github/license/86Box/86Box)](COPYING) [![Latest release](https://img.shields.io/github/release/86Box/86Box.svg)](https://github.com/86Box/86Box/releases) [![Downloads](https://img.shields.io/github/downloads/86Box/86Box/total.svg)](https://github.com/86Box/86Box/releases)
+[![License](https://img.shields.io/github/license/86Box/86Box)](COPYING)
+[![Latest release](https://img.shields.io/github/release/86Box/86Box.svg)](https://github.com/86Box/86Box/releases)
+[![Downloads](https://img.shields.io/github/downloads/86Box/86Box/total.svg)](https://github.com/86Box/86Box/releases)
+[![Translation status](https://weblate.86box.net/widget/86box/86box/language-badge.svg)](https://weblate.86box.net/engage/86box/)
 
 **86Box** is a low level x86 emulator that runs older operating systems and software designed for IBM PC systems and compatibles from 1981 through fairly recent system designs based on the PCI bus.
 
@@ -53,6 +56,14 @@ We operate an IRC channel and a Discord server for discussing 86Box, its develop
 
 [![Visit our Discord server](https://discordapp.com/api/guilds/262614059009048590/embed.png)](https://discord.gg/QXK9XTv)
 
+[Forum: SoftHistory](https://forum.softhistory.org/)
+
+[Wiki: SoftHistory](https://wiki.softhistory.org/)
+
+[Twitter: @86BoxEmulator](https://twitter.com/86BoxEmulator)
+
+[YouTube: 86Box](https://youtube.com/c/86Box)
+
 Contributions
 -------------
 
@@ -74,6 +85,5 @@ Donations
 
 We do not charge you for the emulator but donations are still welcome:
 <https://paypal.me/86Box>.
-
 You can also support the project on Patreon:
 <https://www.patreon.com/86box>.
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-86box (6.0) UNRELEASED; urgency=medium
+86box (5.4) UNRELEASED; urgency=medium
 
   * Bump release.
 
- -- Jasmine Iwanek <jriwanek@gmail.com>  Sun, 26 Oct 2025 17:41:47 +0100
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Tue, 23 Dec 2025 00:27:45 +0100