From da0e48bd02bddbba9207f41c46ff22fd9d0e68df Mon Sep 17 00:00:00 2001
From: LocalIdentity <LocalIdentity@users.noreply.github.com>
Date: Wed, 17 Dec 2025 23:30:22 +0000
Subject: [PATCH 1/2] Apply changes from
 https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1638

---
 src/Export/Classes/GGPKData.lua     |  2 +-
 src/Export/Classes/GGPKData.lua.rej | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 src/Export/Classes/GGPKData.lua.rej

diff --git a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua
index 5454633361..3a72ffc977 100644
--- a/src/Export/Classes/GGPKData.lua
+++ b/src/Export/Classes/GGPKData.lua
@@ -36,7 +36,7 @@ local GGPKClass = newClass("GGPKData", function(self, path, datPath, reExport)
 		self.oozPath = datPath:match("\\$") and datPath or (datPath .. "\\")
 	else
 		self.path = path
-		self.oozPath = io.popen("cd"):read('*l'):gsub('\r?', '') .. "\\ggpk\\"
+		self.oozPath = GetWorkDir() .. "\\ggpk\\"
 		self:CleanDir(reExport)
 		self:ExtractFiles(reExport)
 	end
diff --git a/src/Export/Classes/GGPKData.lua.rej b/src/Export/Classes/GGPKData.lua.rej
new file mode 100644
index 0000000000..ca6812c9b6
--- /dev/null
+++ b/src/Export/Classes/GGPKData.lua.rej
@@ -0,0 +1,29 @@
+diff a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua	(rejected hunks)
+@@ -126,14 +126,13 @@ function GGPKClass:ExtractList(listToExtract, cache, useRegex)
+ end
+ 
+ function GGPKClass:AddDat64Files()
+-	local datFiles = scanDir(self.oozPath .. "Data\\Balance\\", '%w+%.datc64$')
+-	for _, f in ipairs(datFiles) do
++	local datFiles = self:GetNeededFiles()
++	for _, fname in ipairs(datFiles) do
+ 		local record = { }
+-		record.name = f
+-		local rawFile = io.open(self.oozPath .. "Data\\Balance\\" .. f, 'rb')
++		record.name = fname:match("([^/\\]+)$") .. "c64"
++		local rawFile = io.open(self.oozPath .. fname:gsub("/", "\\") .. "c64", 'rb')
+ 		record.data = rawFile:read("*all")
+ 		rawFile:close()
+-		--ConPrintf("FILENAME: %s", fname)
+ 		t_insert(self.dat, record)
+ 	end
+ end
+@@ -163,6 +162,8 @@ function GGPKClass:GetNeededFiles()
+ 		"Data/Balance/ModFamily.dat",
+ 		"Data/Balance/ModSellPriceTypes.dat",
+ 		"Data/Balance/ModEffectStats.dat",
++		"Data/Balance/ModDomains.dat",
++		"Data/Balance/ModGenerationTypes.dat",
+ 		"Data/Balance/ActiveSkills.dat",
+ 		"Data/Balance/ActiveSkillType.dat",
+ 		"Data/Balance/AlternateSkillTargetingBehaviours.dat",

From f1cb3787cf240d4349d29a79480b1dc7b18507f5 Mon Sep 17 00:00:00 2001
From: LocalIdentity <localidentity2@gmail.com>
Date: Thu, 18 Dec 2025 10:35:12 +1100
Subject: [PATCH 2/2] Fix merge conflict

---
 src/Export/Classes/GGPKData.lua     |  9 ++++-----
 src/Export/Classes/GGPKData.lua.rej | 29 -----------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 src/Export/Classes/GGPKData.lua.rej

diff --git a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua
index 3a72ffc977..c56c4c4c17 100644
--- a/src/Export/Classes/GGPKData.lua
+++ b/src/Export/Classes/GGPKData.lua
@@ -125,14 +125,13 @@ function GGPKClass:ExtractList(listToExtract, cache, useRegex)
 end
 
 function GGPKClass:AddDat64Files()
-	local datFiles = scanDir(self.oozPath .. "Data\\", '%w+%.datc64$')
-	for _, f in ipairs(datFiles) do
+	local datFiles = self:GetNeededFiles()
+	for _, fname in ipairs(datFiles) do
 		local record = { }
-		record.name = f
-		local rawFile = io.open(self.oozPath .. "Data\\" .. f, 'rb')
+		record.name = fname:match("([^/\\]+)$") .. "c64"
+		local rawFile = io.open(self.oozPath .. fname:gsub("/", "\\") .. "c64", 'rb')
 		record.data = rawFile:read("*all")
 		rawFile:close()
-		--ConPrintf("FILENAME: %s", fname)
 		t_insert(self.dat, record)
 	end
 end
diff --git a/src/Export/Classes/GGPKData.lua.rej b/src/Export/Classes/GGPKData.lua.rej
deleted file mode 100644
index ca6812c9b6..0000000000
--- a/src/Export/Classes/GGPKData.lua.rej
+++ /dev/null
@@ -1,29 +0,0 @@
-diff a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua	(rejected hunks)
-@@ -126,14 +126,13 @@ function GGPKClass:ExtractList(listToExtract, cache, useRegex)
- end
- 
- function GGPKClass:AddDat64Files()
--	local datFiles = scanDir(self.oozPath .. "Data\\Balance\\", '%w+%.datc64$')
--	for _, f in ipairs(datFiles) do
-+	local datFiles = self:GetNeededFiles()
-+	for _, fname in ipairs(datFiles) do
- 		local record = { }
--		record.name = f
--		local rawFile = io.open(self.oozPath .. "Data\\Balance\\" .. f, 'rb')
-+		record.name = fname:match("([^/\\]+)$") .. "c64"
-+		local rawFile = io.open(self.oozPath .. fname:gsub("/", "\\") .. "c64", 'rb')
- 		record.data = rawFile:read("*all")
- 		rawFile:close()
--		--ConPrintf("FILENAME: %s", fname)
- 		t_insert(self.dat, record)
- 	end
- end
-@@ -163,6 +162,8 @@ function GGPKClass:GetNeededFiles()
- 		"Data/Balance/ModFamily.dat",
- 		"Data/Balance/ModSellPriceTypes.dat",
- 		"Data/Balance/ModEffectStats.dat",
-+		"Data/Balance/ModDomains.dat",
-+		"Data/Balance/ModGenerationTypes.dat",
- 		"Data/Balance/ActiveSkills.dat",
- 		"Data/Balance/ActiveSkillType.dat",
- 		"Data/Balance/AlternateSkillTargetingBehaviours.dat",