# Conflicts: # .github/workflows/github.yml # launcher/modManager/cmodlist.cpp # lib/CModHandler.cpp # lib/CModHandler.h