From 3f55cd0830298fa43cfa9fcb3645b126f69a138c Mon Sep 17 00:00:00 2001
From: hakasapl <hakan@sapl.me>
Date: Sat, 27 Jul 2024 21:35:08 -0400
Subject: [PATCH] fixing merge bug fixes

---
 cfg/default.json                              | 38 +++++++++----------
 .../ParallaxGenDirectory.cpp                  |  6 +--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/cfg/default.json b/cfg/default.json
index d5b10a6..a590aee 100644
--- a/cfg/default.json
+++ b/cfg/default.json
@@ -2,45 +2,45 @@
     "parallax_lookup": {
         "archive_blocklist": [],
         "allowlist": [
-            "textures/**/*"
-        ]
+            "textures/**"
+        ],
+        "blocklist": []
     },
     "complexmaterial_lookup": {
         "archive_blocklist": [
             "Skyrim - Textures*"
         ],
         "allowlist": [
-            "textures/**/*"
+            "textures/**"
         ],
         "blocklist": []
     },
     "truepbr_cfg_lookup": {
         "archive_blocklist": [],
         "allowlist": [
-            "pbrnifpatcher/**/*"
+            "pbrnifpatcher/**"
         ],
         "blocklist": []
     },
     "nif_lookup": {
         "archive_blocklist": [],
         "allowlist": [
-            "meshes/**/*"
+            "meshes/**"
         ],
         "blocklist": [
-            "**/actors/**/*",
-            "**/armor/**/*",
-		    "**/cameras/**/*",
-		    "**/decals/**/*",
-		    "**/dyndolod/**/*",
-		    "**/effects/**/*",
-		    "**/interface/**/*",
-		    "**/loadscreenart/**/*",
-            "**/lod/**/*",
-		    "**/magic/**/*",
-		    "**/markers/**/*",
-		    "**/mps/**/*",
-		    "**/sky/**/*",
-		    "**/water/**/*"
+            "**/actors/**",
+		    "**/cameras/**",
+		    "**/decals/**",
+		    "**/dyndolod/**",
+		    "**/effects/**",
+		    "**/interface/**",
+		    "**/loadscreenart/**",
+            "**/lod/**",
+		    "**/magic/**",
+		    "**/markers/**",
+		    "**/mps/**",
+		    "**/sky/**",
+		    "**/water/**"
         ]
     }
 }
diff --git a/src/ParallaxGenDirectory/ParallaxGenDirectory.cpp b/src/ParallaxGenDirectory/ParallaxGenDirectory.cpp
index 75e3004..3c5b5df 100644
--- a/src/ParallaxGenDirectory/ParallaxGenDirectory.cpp
+++ b/src/ParallaxGenDirectory/ParallaxGenDirectory.cpp
@@ -88,7 +88,7 @@ void ParallaxGenDirectory::findTruePBRConfigs()
 	// Find True PBR configs
 	spdlog::info("Finding TruePBR configs");
   
-  // get relevant lists
+  	// get relevant lists
 	vector<wstring> truepbr_allowlist = jsonArrayToWString(PG_config["truepbr_cfg_lookup"]["allowlist"]);
 	vector<wstring> truepbr_blocklist = jsonArrayToWString(PG_config["truepbr_cfg_lookup"]["blocklist"]);
 	vector<wstring> truepbr_archive_blocklist = jsonArrayToWString(PG_config["truepbr_cfg_lookup"]["archive_blocklist"]);
@@ -122,7 +122,7 @@ void ParallaxGenDirectory::findTruePBRConfigs()
 		}
 		catch (nlohmann::json::parse_error& e) {
 			spdlog::error(L"Unable to parse TruePBR config file {}: {}", config.wstring(), convertToWstring(e.what()));
-      continue;
+      		continue;
 		}
 	}
   
@@ -154,7 +154,7 @@ void ParallaxGenDirectory::loadPGConfig(bool load_default)
 		}
 	}
   
-  // Loop through each element in JSON
+  	// Loop through each element in JSON
 	replaceForwardSlashes(PG_config);
 }