Merge pull request #1178 from isanae/2_3_0

Merge 2.3.1 changes

.clang-format

@@ -1,41 +0,0 @@
----
-# We'll use defaults from the LLVM style, but with 4 columns indentation.
-BasedOnStyle: LLVM
-IndentWidth: 2
----
-Language: Cpp
-DeriveLineEnding: false
-UseCRLF: true
-DerivePointerAlignment: false
-PointerAlignment: Left
-AlignConsecutiveAssignments: true
-AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLambdasOnASingleLine: Empty
-AlwaysBreakTemplateDeclarations: Yes
-AccessModifierOffset: -2
-AlignTrailingComments: true
-SpacesBeforeTrailingComments: 2
-NamespaceIndentation: Inner
-MaxEmptyLinesToKeep: 1
-BreakBeforeBraces: Custom
-BraceWrapping:
-  AfterCaseLabel: false
-  AfterClass: true
-  AfterControlStatement: false
-  AfterEnum: true
-  AfterFunction: true
-  AfterNamespace: true
-  AfterStruct: true
-  AfterUnion: true
-  AfterExternBlock: true
-  BeforeCatch: false
-  BeforeElse: false
-  BeforeLambdaBody: false
-  BeforeWhile: false
-  IndentBraces: false
-  SplitEmptyFunction: false
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: true
-ColumnLimit: 88
-ForEachMacros: ['Q_FOREACH', 'foreach']

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-d13f6bb870cdda71257f665367be8ef9fca86255
-86bb01ba9eac879d3685c439ac9da0028bc4bc80

.gitattributes

@@ -1,7 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.cpp text eol=crlf
-*.h text eol=crlf

.github/ISSUE_TEMPLATE/game-support-request.md

@@ -1,27 +0,0 @@
----
-name: Game support Request
-about: Request support for a new game
-title: Add support for game [GAME NAME]
-labels: 'Feature Request, additional games support, area: mo2 game plugins'
-assignees: ''
-
----
-
-**This template is useful to add basic support using https://github.com/ModOrganizer2/modorganizer-basic_games.**
-
-**If you are vaguely familiar with programming you can try following the instructions on that link to get something working yourself. If you have trouble with that please fill in this template.**
-
-**Please provide the following information for the game (remove the optional lines you do not use):**
-
-- **Name:** Name of the game
-- **Short name:** Name of the game in Nexus URL (e.g. skyrimse for Skyrim SE).
-- **Nexus ID [optional]:** ID of the game on Nexus (you can usually find this in Nexus URL).
-- **Executable:** Name of the main executable for the game (relative to the game folder).
-- **Launcher [optional]:** Name of the game launcher (relative to the game folder).
-- **Data path:** Path to the data folder of the game (relative to the game folder). Please note that the Virtual Files System often does not work for top level dlls or exe files.
-- **Documents path:** Path to folder containing INI files, etc., for the game (usually under "My Games", or the game folder itself).
-- **Saves directory [optional]:** Path to the folder containing save games (this default to the path above).
-- **Save extension [optional]:** Extension of the saves
-- **Steam ID [optional]:** ID of the game on Steam (if the game is on Steam).
-
-**Provide additional details regarding the game that could be required for the plugin.**

.github/ISSUE_TEMPLATE/issue-report.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 ## The problem:
-Briefly describe the issue you are experiencing. Tell us what you were trying to do and what happened instead. Remember, this is _not_ a place to ask questions. For that, go to our [Discord server](https://discord.gg/ewUVAqyrQX).
+Briefly describe the issue you are experiencing. Tell us what you were trying to do and what happened instead. Remember, this is _not_ a place to ask questions. For that, go to our [discord channel](https://discord.gg/5tCqt6V)
 
 
 ## To Reproduce:
@@ -20,7 +20,7 @@ Steps to reproduce the behavior:
 ## Environment:
 
 * Mod Organizer Version that exhibits the issue:
-* Last Mod Organizer Version that did not exhibit the issue (if applicable):
+* Last Mod Organizer Verison that did not exhibit the issue (if applicable):
 * Desktop OS/version used to run Mod Organizer:
 
 ## Details:

.github/workflows/build.yml

@@ -1,33 +0,0 @@
-name: Build ModOrganizer 2
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-env:
-  VCPKG_BINARY_SOURCES: clear;x-azblob,${{ vars.AZ_BLOB_VCPKG_URL }},${{ secrets.AZ_BLOB_SAS }},readwrite
-
-jobs:
-  build:
-    runs-on: windows-2022
-    steps:
-      - name: Build ModOrganizer
-        id: build-modorganizer
-        uses: ModOrganizer2/build-with-mob-action@master
-        with:
-          qt-modules: qtpositioning qtwebchannel qtwebengine qtwebsockets
-          mo2-dependencies: usvfs uibase bsatk esptk archive lootcli
-
-      - name: Install ModOrganizer
-        shell: pwsh
-        run: |
-          cmake --install vsbuild --config RelWithDebInfo
-        working-directory: ./build/${{ github.event.repository.name }}
-
-      - name: Package ModOrganizer
-        uses: actions/upload-artifact@master
-        with:
-          name: modorganizer
-          path: ./install/bin

.github/workflows/linting.yml

@@ -1,17 +0,0 @@
-name: Lint ModOrganizer 2
-
-on:
-  push:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Check format
-        uses: ModOrganizer2/check-formatting-action@master
-        with:
-          check-path: "."
-          exclude-regex: "third-party"

.hgignore

@@ -0,0 +1,46 @@
+syntax: glob
+scons_configure.py
+scons-ModOrganizer-*
+ModOrganizer-build-desktop*
+outputd/*
+output/*
+build-ModOrganizer-*
+source/NCC/*/bin
+source/NCC/*/obj
+source/NCC/bin
+*.orig
+source/plugins/proxyPython/build
+staging/*
+source - Copy/*
+ModOrganizer-build-*
+pdbs/*
+source/NCC/BossDummy.x/*
+*.ts
+staging_prepare/*
+staging_trans/*
+tools/python_zip/*
+Makefile
+html
+*.vcxproj
+*.pdb
+*.dll
+*.exp
+*.tlog
+*.user
+*.obj
+*.suo
+*.sln
+*.log
+*.filters
+*.lib
+source/organizer/resources/contents/icons
+source/plugins/build-*
+*/GeneratedFiles/*
+translations/*
+source/LocalPaths.pri
+source/*/Win32/Debug/*
+source/plugins/*/Win32/Debug/*
+*~
+syntax: regexp
+Makefile\.(Debug|Release)
+source/.*/debug/.*

.pre-commit-config.yaml

@@ -1,20 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
-    hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-merge-conflict
-      - id: check-case-conflict
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.5
-    hooks:
-    - id: clang-format
-      'types_or': [c++, c]
-
-ci:
-  autofix_commit_msg: "[pre-commit.ci] Auto fixes from pre-commit.com hooks."
-  autofix_prs: true
-  autoupdate_commit_msg: "[pre-commit.ci] Pre-commit autoupdate."
-  autoupdate_schedule: quarterly
-  submodules: false

CMakeLists.txt

@@ -1,23 +1,20 @@
 cmake_minimum_required(VERSION 3.16)
 
-# TODO: clean include directives
-set(MO2_CMAKE_DEPRECATED_UIBASE_INCLUDE ON)
-
 project(organizer)
+set(project_type exe)
+set(executable_name ModOrganizer)
+set(enable_warnings OFF)
 
-find_package(mo2-cmake CONFIG REQUIRED)
-
-# if MO2_INSTALL_IS_BIN is set, this means that we should install directly into the
-# installation prefix, without the bin/ subfolder, typically for a standalone build
-# to update an existing install
-if (MO2_INSTALL_IS_BIN)
-	set(_bin ".")
+# appveyor does not build modorganizer in its standard location, so use
+# DEPENDENCIES_DIR to find cmake_common
+if(DEFINED DEPENDENCIES_DIR)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake)
 else()
-	set(_bin bin)
+	include(../cmake_common/project.cmake)
 endif()
 
+set(additional_translations ${uibase_path}/src)
+
 add_subdirectory(src)
 
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT organizer)
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION ${_bin})
+install(FILES dump_running_process.bat DESTINATION bin)

CMakePresets.json

@@ -1,71 +0,0 @@
-{
-  "configurePresets": [
-    {
-      "errors": {
-        "deprecated": true
-      },
-      "hidden": true,
-      "name": "cmake-dev",
-      "warnings": {
-        "deprecated": true,
-        "dev": true
-      }
-    },
-    {
-      "cacheVariables": {
-        "VCPKG_MANIFEST_NO_DEFAULT_FEATURES": {
-          "type": "BOOL",
-          "value": "ON"
-        }
-      },
-      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-      "hidden": true,
-      "name": "vcpkg"
-    },
-    {
-      "binaryDir": "${sourceDir}/vsbuild",
-      "architecture": {
-        "strategy": "set",
-        "value": "x64"
-      },
-      "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4",
-        "VCPKG_TARGET_TRIPLET": {
-          "type": "STRING",
-          "value": "x64-windows-static-md"
-        }
-      },
-      "generator": "Visual Studio 17 2022",
-      "inherits": ["cmake-dev", "vcpkg"],
-      "name": "vs2022-windows",
-      "toolset": "v143"
-    },
-    {
-      "cacheVariables": {
-        "VCPKG_MANIFEST_FEATURES": {
-          "type": "STRING",
-          "value": "standalone"
-        },
-        "MO2_INSTALL_IS_BIN": {
-          "type": "BOOL",
-          "value": "ON"
-        }
-      },
-      "inherits": "vs2022-windows",
-      "name": "vs2022-windows-standalone"
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "vs2022-windows",
-      "resolvePackageReferences": "on",
-      "configurePreset": "vs2022-windows"
-    },
-    {
-      "name": "vs2022-windows-standalone",
-      "resolvePackageReferences": "on",
-      "configurePreset": "vs2022-windows-standalone"
-    }
-  ],
-  "version": 4
-}

LICENSE

@@ -671,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

appveyor.yml

@@ -0,0 +1,69 @@
+version: dev-appveyor{build}
+skip_branch_with_pr: true
+image: Visual Studio 2019
+init:
+- ps: >-
+    # define build version depending on nightly or normal build
+
+    if($env:APPVEYOR_SCHEDULED_BUILD -eq 'True'){
+        $timestamp= Get-Date -Format "ddMMyyyy-HHmm"
+        Update-AppveyorBuild -Version "$($env:MO_VERSION)$($env:VER_STUB_NIGHTLY)$timestamp"
+    } else {
+        Update-AppveyorBuild -Version "$($env:MO_VERSION)$($env:VER_STUB_NORMAL)$($env:APPVEYOR_BUILD_NUMBER)"
+    }
+
+    Write-Host Build version set to: $env:APPVEYOR_BUILD_VERSION
+environment:
+  WEBHOOK_URL:
+    secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1VaKiI9iefpxhBavJ6Al6CzIZvQ+3pxnLqjmNgA7cDc22wcj2kB4hSG5qhbTI8wGa8jLQ5L65nuRZ3vrIqghBz9G3GLglgZkg6eqH9r3Kqc6UzcpCGzxxPOqm550nRcIiUU=
+  MO_VERSION: 2.3.0
+  VER_STUB_NORMAL: dev-appveyor
+  VER_STUB_NIGHTLY: dev-nightly-
+build_script:
+- cmd: >-
+    REM Maintenance comments:
+
+    REM APPVEYOR_BUILD_FOLDER= "c:\projects\modorganizer-slug"
+
+    REM -Need to update py3 version used to invoke unimake.py once in a while.
+
+    REM -Need update MO_VERSION env variable after each release.
+
+    REM -Always clones umbrella master
+
+    REM -Will checkout all the branches matching the one that triggered the build on the main repo.
+
+    REM End comments.
+
+
+    git clone --depth=1 https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null
+
+
+    mkdir %APPVEYOR_BUILD_FOLDER%\modorganizer-build -type directory
+
+
+    cd c:\projects\modorganizer-umbrella
+
+
+    C:\Python38-x64\python.exe unimake.py -d %APPVEYOR_BUILD_FOLDER%\modorganizer-build -s Appveyor_Build=True -s Feature_Branch=%APPVEYOR_REPO_BRANCH% -s override_build_version=%APPVEYOR_BUILD_VERSION%
+test: off
+artifacts:
+- path: '\modorganizer-build\install\bin'
+  name: Mod.Organizer-$(APPVEYOR_BUILD_VERSION)
+- path: '\modorganizer-build\install\pdb'
+  name: PDBs-Mod.Organizer-$(APPVEYOR_BUILD_VERSION)
+deploy: off
+on_success:
+- ps: >-
+    Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+
+    Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+
+    ./send.ps1 success $env:WEBHOOK_URL
+on_failure:
+- ps: >-
+    Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+
+    Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+
+    ./send.ps1 failure $env:WEBHOOK_URL

dump_running_process.bat

@@ -1,2 +1,2 @@
 pushd "%~dp0"
-start ModOrganizer.exe crashdump
+start ModOrganizer.exe --crashdump

mappings.imp

@@ -0,0 +1,30 @@
+[
+
+# for boost???
+# These are probably correct but might need a revisit as if you look at the boost documentation pages, it
+# can give you huge lists of alternate includes...
+    { symbol: [ "BOOST_FOREACH",                            "private", "<boost/foreach.hpp>", "public" ] },
+
+    { include: [ "@\"boost/bind/.*\"",                      "private", "<boost/bind.hpp>", "public" ] },
+    { include: [ "@\"boost/algorithm/string/.*\"",          "private", "<boost/algorithm/string.hpp>", "public" ] },
+    { include: [ "@\"boost/assign/.*\"",                    "private", "<boost/assign.hpp>", "public" ] },
+    { include: [ "@\"boost/filesystem/.*\"",                "private", "<boost/filesystem.hpp>", "public" ] },
+    { include: [ "@\"boost/format/.*\"",                    "private", "<boost/format.hpp>", "public" ] },
+    { include: [ "@\"boost/function/.*\"",                  "private", "<boost/function.hpp>", "public" ] },
+    { include: [ "@\"boost/local/.*\"",                     "private", "<boost/locale.hpp>", "public" ] },
+    { include: [ "@\"boost/python/.*\"",                    "private", "<boost/python.hpp>", "public" ] },
+    { include: [ "@\"boost/signals2/.*\"",                  "private", "<boost/signals2.hpp>", "public" ] },
+    { include: [ "\"boost/smart_ptr/scoped_array.hpp\"",    "private", "<boost/scoped_array.hpp>", "public" ] },
+    { include: [ "\"boost/smart_ptr/shared_ptr.hpp\"",      "private", "<boost/shared_ptr.hpp>", "public" ] },
+    # this appears to be excessive
+    #{ include: [ "@\"boost/thread/.*\"",                    "private", "<boost/thread.hpp>", "public" ] },
+
+# And this is specific to us
+    { include: [ "\"appconfig.inc\"", "private", "\"appconfig.h\"", "public" ] },
+
+]
+
+# Ones I don't yet know how to deal with
+#include "boost/fusion/container/vector/vector10_fwd.hpp"  // for fusion
+#include "boost/iterator/iterator_facade.hpp"  // for operator!=
+#include "boost/iterator/iterator_facade.hpp"

modorganizer.natvis

@@ -8,102 +8,5 @@ file={m_wsFile}
  loaded={m_loaded}
  expanded={m_expanded}
 }}</DisplayString></Type>
-	<Type Name="QFileInfoPrivate">
-		<DisplayString Condition="0 == this">&lt;null&gt;</DisplayString>
-		<DisplayString>{fileEntry}</DisplayString>
-		<StringView>fileEntry</StringView>
-		<Expand>
-			<Item Name="QSharedData">*((Qt5Core.dll!QSharedData *) this)</Item>
-			<Item Name="fileEntry">fileEntry</Item>
-			<!--
-        <Item Name="metaData">metaData</Item>
-        <Item Name="fileListsInitialized">fileListsInitialized</Item>
-        <Item Name="fileEngine">fileEngine</Item>
-        <Item Name="fileNames">fileNames</Item>
-        <Item Name="fileOwners">fileOwners</Item>
-        <Item Name="cachedFlags">cachedFlags</Item>
-        <Item Name="isDefaultConstructed">isDefaultConstructed</Item>
-        <Item Name="cache_enabled">cache_enabled</Item>
-        <Item Name="fileFlags">fileFlags</Item>
-        <Item Name="fileSize">fileSize</Item>
-        <Item Name="fileTimes">fileTimes</Item>
-        -->
-		</Expand>
-	</Type>
 
-
-	<Type Name="QFileInfo">
-		<DisplayString>{*((Qt5Core.dll!QFileInfoPrivate *) d_ptr.d)}</DisplayString>
-		<StringView>*((Qt5Core.dll!QFileInfoPrivate *) d_ptr.d)</StringView>
-		<Expand>
-			<Item Name="QFileInfoPrivate">*((Qt5Core.dll!QFileInfoPrivate *) d_ptr.d)</Item>
-		</Expand>
-	</Type>
-
-
-	<Type Name="QFileSystemEntry">
-		<DisplayString Condition="0 == this">&lt;null&gt;</DisplayString>
-		<DisplayString>{m_filePath}</DisplayString>
-		<StringView>m_filePath</StringView>
-		<!--
-    <Expand>
-        <Item Name="m_filePath">m_filePath</Item>
-        <Item Name="m_nativeFilePath">m_nativeFilePath</Item>
-        <Item Name="m_lastSeparator">m_lastSeparator</Item>
-        <Item Name="m_firstDotInFileName">m_firstDotInFileName</Item>
-        <Item Name="m_lastDotInFileName">m_lastDotInFileName</Item>
-    </Expand>
-    -->
-	</Type>
-
-
-	<Type Name="QDirPrivate">
-		<DisplayString Condition="0 == this">&lt;null&gt;</DisplayString>
-		<DisplayString>{dirEntry}</DisplayString>
-		<StringView>dirEntry</StringView>
-		<Expand>
-			<Item Name="QSharedData">*((Qt5Core.dll!QSharedData *) this)</Item>
-			<Item Name="dirEntry">dirEntry</Item>
-			<Item Name="nameFilters">nameFilters</Item>
-			<Item Name="absoluteDirEntry">absoluteDirEntry</Item>
-			<!--
-        <Item Name="metaData">metaData</Item>
-        <Item Name="fileListsInitialized">fileListsInitialized</Item>
-        <Item Name="fileEngine">fileEngine</Item>
-        <Item Name="files">files</Item>
-        <Item Name="fileInfos">fileInfos</Item>
-        <Item Name="sort">sort</Item>
-        <Item Name="filters">filters</Item>
-        -->
-		</Expand>
-	</Type>
-
-
-	<Type Name="QDir">
-		<DisplayString>{*((Qt5Core.dll!QDirPrivate *) d_ptr.d)}</DisplayString>
-		<StringView>*((Qt5Core.dll!QDirPrivate *) d_ptr.d)</StringView>
-		<Expand>
-			<Item Name="QDirPrivate">*((Qt5Core.dll!QDirPrivate *) d_ptr.d)</Item>
-		</Expand>
-	</Type>
-
-
-	<Type Name="QFilePrivate">
-		<DisplayString Condition="0 == this">&lt;null&gt;</DisplayString>
-		<DisplayString>{fileName}</DisplayString>
-		<StringView>fileName</StringView>
-		<Expand>
-			<Item Name="QFileDevice">*((Qt5Core.dll!QFileDevice *) this)</Item>
-			<Item Name="fileName">fileName</Item>
-		</Expand>
-	</Type>
-
-
-	<Type Name="QFile">
-		<DisplayString>{*((Qt5Core.dll!QFilePrivate *) d_ptr.d)}</DisplayString>
-		<StringView>*((Qt5Core.dll!QFilePrivate *) d_ptr.d)</StringView>
-		<Expand>
-			<Item Name="QFilePrivate">*((Qt5Core.dll!QFilePrivate *) d_ptr.d)</Item>
-		</Expand>
-	</Type>
 </AutoVisualizer>

readme.md

@@ -12,17 +12,17 @@ The project took up speed again after a few more coders showed up in late 2017,
 ## Help Wanted!
 Mod Organizer 2 is an open project in the hands of the community, there are problems that need to be solved and things that could be added. MO2 really needs developers and if you have the programming skills and some free time you can really improve the experience of the modding community.
 
-To have more information, please join the open MO2 Development Discord server: [Mod Organizer 2](https://discord.gg/ewUVAqyrQX)
-If you want to help translate MO2 to your language you should join the Discord server too and head to the #translation channel.
-To setup a development environment on your machine, there is the [mob project](https://github.com/modorganizer2/mob) that handles that.
-If you want to submit your code changes, please use a good formatting style like the default one in Visual Studio.
+To have more information, please join the open MO2 Development discord server :* [ModOrganizerDevs](https://discord.gg/vD2ZbfX)
+If you want to help translate MO2 to your language you should join the discord server too and head to the #translation channel.
+To setup a development environment on your machine, there is the [umbrella project](https://github.com/Modorganizer2/modorganizer-umbrella) that handles that.
+If you want to submit your code changes, please use a good formating style like the default one in Visual Studio.
 
 Through the work of a few people of the community MO2 has come quite far, now it needs some more of those people to go further.
 
 ## Reporting Issues:
-Issues should be reported to the GitHub page or on the open discord server: [Mod Organizer 2](https://discord.gg/ewUVAqyrQX). Here is also where dev builds are tested, bugs are reported and investigated, suggestions are discussed and a lot more.
+Issues should be reported to the GitHub page or on the open discord server: [ModOrganizerDevs](https://discord.gg/vD2ZbfX). Here is also where dev builds are tested, bugs are reported and investigated, suggestions are discussed and a lot more.
 
-Credits to Tannin, LePresidente, Silarn, erasmux, AL12, LostDragonist, AnyOldName3, isa, Holt59, Project579, przester, Qudix, RJ, Jonathan Feenstra and many others for the development.
+Credits to Tannin, LePresidente, Silarn, erasmux, AL12, LostDragonist, AnyOldName3 and many others for the development.
 
 ## Download Location
 
@@ -35,11 +35,11 @@ Credits to Tannin, LePresidente, Silarn, erasmux, AL12, LostDragonist, AnyOldNam
 
 ## Building
 
-Please refer to [Modorganizer2/mob](https://github.com/modorganizer2/mob) for build instructions.
+Please refer to [Modorganizer2/modorganizer-umbrella](https://github.com/Modorganizer2/modorganizer-umbrella) for build instructions.
 
 ## Other Repositories
 
-MO2 consists of multiple repositories on GitHub. The mob project will download them automatically as required. They should however also be buildable individually.
+MO2 consists of multiple repositories on github. The Umbrella project will download them automatically as required. They should however also be buildable individually.
 Here is a complete list:
 
 * https://github.com/LePresidente/cpython-1
@@ -47,7 +47,6 @@ Here is a complete list:
 * https://github.com/ModOrganizer2/githubpp
 * https://github.com/ModOrganizer2/modorganizer
 * https://github.com/ModOrganizer2/modorganizer-archive
-* https://github.com/ModOrganizer2/modorganizer-basic_games
 * https://github.com/ModOrganizer2/modorganizer-bsatk
 * https://github.com/ModOrganizer2/modorganizer-bsa_extractor
 * https://github.com/ModOrganizer2/modorganizer-check_fnis
@@ -67,16 +66,12 @@ Here is a complete list:
 * https://github.com/ModOrganizer2/modorganizer-game_skyrim
 * https://github.com/ModOrganizer2/modorganizer-game_skyrimSE
 * https://github.com/ModOrganizer2/modorganizer-game_skyrimVR
-* https://github.com/ModOrganizer2/modorganizer-game_starfield
 * https://github.com/ModOrganizer2/modorganizer-game_ttw
 * https://github.com/ModOrganizer2/modorganizer-installer_bain
-* https://github.com/ModOrganizer2/modorganizer-installer_wizard
 * https://github.com/ModOrganizer2/modorganizer-installer_bundle
 * https://github.com/ModOrganizer2/modorganizer-installer_fomod
-* https://github.com/ModOrganizer2/modorganizer-installer_fomod_csharp
 * https://github.com/ModOrganizer2/modorganizer-installer_manual
 * https://github.com/ModOrganizer2/modorganizer-installer_ncc
-* https://github.com/ModOrganizer2/modorganizer-installer_omod
 * https://github.com/ModOrganizer2/modorganizer-installer_quick
 * https://github.com/ModOrganizer2/modorganizer-lootcli
 * https://github.com/ModOrganizer2/modorganizer-NCC