Add note to README to redirect to mob.

Update Trosski stylesheets

README.md

@@ -1,4 +1,9 @@
-[![Python Check status](https://ci.appveyor.com/api/projects/status/ev4wj7qmscr5b09d?svg=true)](https://ci.appveyor.com/project/Modorganizer2/modorganizer-umbrella)
+<!-- [![Python Check status](https://ci.appveyor.com/api/projects/status/ev4wj7qmscr5b09d?svg=true)](https://ci.appveyor.com/project/Modorganizer2/modorganizer-umbrella) -->
+[![No Maintenance Intended](https://unmaintained.tech/badge.svg)](https://unmaintained.tech/)
+
+> Tthis repository is archived and obsolete, see
+> https://github.com/ModOrganizer2/mob if you want to build ModOrganizer2.
+
 
 # modorganizer-umbrella
 An umbrella- (super-) project for [modorganizer](https://github.com/Modorganizer2/modorganizer).

config.py

@@ -88,9 +88,9 @@ config = {
     'grep_version': '3.3',
     'icu_version': '68',
     'icu_version_minor': '2',
-    'loot_version': '0.16.1',
-    'loot_commit': 'gd8c9b98',
-    'loot_branch': '0.16.1',
+    'loot_version': '0.17.1',
+    'loot_commit': 'ge670605',
+    'loot_branch': '0.17.1',
     'lz4_version': '1.9.3',
     'lz4_version_minor': '', # leave empty if no patch version (1.2.3.x)
     'nasm_version': '2.15.05',
@@ -127,7 +127,10 @@ config = {
     'paper-automata_version': '2.2',
     'paper-mono_version': '2.1',
     '1809-dark-mode_version': '2.0',
-    'ModOrganizer_Style_Morrowind_version': '1.0',
+    'ModOrganizer_Style_Morrowind_version': '1.1',
+    'Mod-Organizer-2-Skyrim-Stylesheet_version': '1.1',
+    'ModOrganizer_Style_Fallout3_version': '1.1',
+    'Mod-Organizer2-Fallout-4-Stylesheet_version': '1.1',
 
     #the usvfs version below will only be used if
     'usvfs_version': 'v0.4.8',

makefile.uni.py

@@ -66,6 +66,9 @@ for author, git_path, path, branch, dependencies, Build in [
     (config['Main_Author'], "modorganizer-game_oblivion", "game_oblivion", config['Build_Branch'], ["Qt5", "modorganizer-uibase",
                                                                                                    "modorganizer-game_gamebryo",
                                                                                                    "modorganizer-game_features"], True),
+    (config['Main_Author'], "modorganizer-game_nehrim", "game_nehrim", config['Build_Branch'], ["Qt5", "modorganizer-uibase",
+                                                                                                "modorganizer-game_gamebryo",
+                                                                                                "modorganizer-game_features"], True),
     (config['Main_Author'], "modorganizer-game_fallout3", "game_fallout3", config['Build_Branch'], ["Qt5", "modorganizer-uibase",
                                                                                                    "modorganizer-game_gamebryo",
                                                                                                    "modorganizer-game_features"], True),
@@ -147,7 +150,7 @@ for author, git_path, path, branch, dependencies, Build in [
                                                 "#define VER_FILEVERSION_STR.*\n",
                                                 "#define VER_FILEVERSION_STR \"{}\"\n"
                                                 .format(config['override_build_version']))
- 
+
         #begin build
         vs_cmake_step = cmake.CMakeVS().arguments(cmake_param).install()
 
@@ -232,12 +235,12 @@ def copy_licenses(context):
         sip_path = os.path.join(build_path, "sip-{}".format(config['sip_version']))
     shutil.copy(os.path.join(sip_path, "LICENSE"), os.path.join(license_path, "sip.txt"))
     shutil.copy(os.path.join(sip_path, "LICENSE-GPL2"), os.path.join(license_path, "GPL-v2.0.txt"))
+    # license path is different in the prebuilt archive
     if config['Appveyor_Build']:
-        shutil.copy(os.path.join(build_path, "modorganizer_super", "lootcli", "build", "src", "external", "src", "cpptoml", "LICENSE"), os.path.join(license_path, "cpptoml.txt"))
         shutil.copy(os.path.join(build_path, "python-{}{}".format(config['python_version'], config['python_version_minor']),"Licenses","Python","LICENSE"), os.path.join(license_path, "python.txt"))
     else:
-        shutil.copy(os.path.join(build_path, "modorganizer_super", "lootcli", "vsbuild", "src", "external", "src", "cpptoml", "LICENSE"), os.path.join(license_path, "cpptoml.txt"))
         shutil.copy(os.path.join(build_path, "python-{}{}".format(config['python_version'], config['python_version_minor']),"LICENSE"), os.path.join(license_path, "python.txt"))
+    shutil.copy(os.path.join(build_path, "modorganizer_super", "lootcli", "vsbuild", "src", "external", "src", "cpptoml", "LICENSE"), os.path.join(license_path, "cpptoml.txt"))
     shutil.copy(os.path.join(build_path, "openssl-{}".format(config['openssl_version']), "LICENSE"), os.path.join(license_path, "openssl.txt"))
 
     shutil.copy(os.path.join(build_path, "boost_{}".format(boost_tag_version.replace(".", "_")), "LICENSE_1_0.txt"), os.path.join(license_path, "boost.txt"))

targets.md

@@ -50,6 +50,8 @@ modorganizer-game_gamebryo
 
 modorganizer-game_oblivion
 
+modorganizer-game_nehrim
+
 modorganizer-game_fallout3
 
 modorganizer-game_fallout4

unibuild/projects/googletest.py

@@ -22,5 +22,5 @@ from unibuild.modules import cmake, github, build
 
 Project("GTest") \
   .depend(cmake.CMake().arguments(["-DCMAKE_BUILD_TYPE={0}".format(config["build_type"])])
-    .depend(github.Source("google", "googletest", "master")))
+    .depend(github.Source("google", "googletest", "main")))
       #.depend(github.Source("google", "googletest", "release-{}".format(googletest_version))))

unibuild/projects/stylesheets.py

@@ -61,4 +61,7 @@ create_stylesheet_project("6788-00", "paper-light-and-dark", version_prefix="v")
 create_stylesheet_project("6788-00", "paper-automata", "Paper-Automata", version_prefix="v")
 create_stylesheet_project("6788-00", "paper-mono", "Paper-Mono", version_prefix="v")
 create_stylesheet_project("6788-00", "1809-dark-mode", version_prefix="v")
-create_stylesheet_project("Trosski", "ModOrganizer_Style_Morrowind", "Transparent-Style-Morrowind")
+create_stylesheet_project("Trosski", "ModOrganizer_Style_Morrowind", "Morrowind-MO2-Stylesheet")
+create_stylesheet_project("Trosski", "Mod-Organizer-2-Skyrim-Stylesheet", "Skyrim-MO2-Stylesheet", version_prefix="v")
+create_stylesheet_project("Trosski", "ModOrganizer_Style_Fallout3", "Fallout3-MO2-Stylesheet", version_prefix="v")
+create_stylesheet_project("Trosski", "Mod-Organizer2-Fallout-4-Stylesheet", "Fallout4-MO2-Stylesheet", version_prefix="v")