diff --git a/Texturing/MergeTextures2/build/merge_textures/Analysis-00.toc b/Texturing/MergeTextures2/build/merge_textures/Analysis-00.toc
index d568622..8753716 100644
--- a/Texturing/MergeTextures2/build/merge_textures/Analysis-00.toc
+++ b/Texturing/MergeTextures2/build/merge_textures/Analysis-00.toc
@@ -17,21 +17,21 @@
[('pyi_rth_inspect',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_inspect.py',
'PYSOURCE'),
- ('pyi_rth_pkgres',
- 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgres.py',
+ ('pyi_rth_pkgutil',
+ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgutil.py',
'PYSOURCE'),
('pyi_rth_multiprocessing',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py',
'PYSOURCE'),
+ ('pyi_rth_pkgres',
+ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgres.py',
+ 'PYSOURCE'),
('pyi_rth_pywintypes',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\rthooks\\pyi_rth_pywintypes.py',
'PYSOURCE'),
('pyi_rth_pythoncom',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\rthooks\\pyi_rth_pythoncom.py',
'PYSOURCE'),
- ('pyi_rth_pkgutil',
- 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgutil.py',
- 'PYSOURCE'),
('pyi_rth_setuptools',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_setuptools.py',
'PYSOURCE'),
@@ -59,10 +59,6 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\importlib\\metadata\\__init__.py',
'PYMODULE'),
- ('typing',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\typing.py',
- 'PYMODULE'),
('importlib.metadata._itertools',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\importlib\\metadata\\_itertools.py',
@@ -969,174 +965,6 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\distutils\\_msvccompiler.py',
'PYMODULE'),
- ('concurrent.futures',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\futures\\__init__.py',
- 'PYMODULE'),
- ('concurrent.futures.thread',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\futures\\thread.py',
- 'PYMODULE'),
- ('concurrent.futures.process',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\futures\\process.py',
- 'PYMODULE'),
- ('multiprocessing.synchronize',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\synchronize.py',
- 'PYMODULE'),
- ('multiprocessing.heap',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\heap.py',
- 'PYMODULE'),
- ('multiprocessing.resource_tracker',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\resource_tracker.py',
- 'PYMODULE'),
- ('multiprocessing.spawn',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\spawn.py',
- 'PYMODULE'),
- ('runpy',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\runpy.py',
- 'PYMODULE'),
- ('multiprocessing.util',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\util.py',
- 'PYMODULE'),
- ('multiprocessing.forkserver',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\forkserver.py',
- 'PYMODULE'),
- ('multiprocessing.process',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\process.py',
- 'PYMODULE'),
- ('multiprocessing.context',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\context.py',
- 'PYMODULE'),
- ('multiprocessing.popen_spawn_win32',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\popen_spawn_win32.py',
- 'PYMODULE'),
- ('multiprocessing.popen_forkserver',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\popen_forkserver.py',
- 'PYMODULE'),
- ('multiprocessing.popen_spawn_posix',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\popen_spawn_posix.py',
- 'PYMODULE'),
- ('multiprocessing.popen_fork',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\popen_fork.py',
- 'PYMODULE'),
- ('multiprocessing.sharedctypes',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\sharedctypes.py',
- 'PYMODULE'),
- ('multiprocessing.pool',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\pool.py',
- 'PYMODULE'),
- ('multiprocessing.dummy',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\dummy\\__init__.py',
- 'PYMODULE'),
- ('multiprocessing.dummy.connection',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\dummy\\connection.py',
- 'PYMODULE'),
- ('multiprocessing.managers',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\managers.py',
- 'PYMODULE'),
- ('multiprocessing.shared_memory',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\shared_memory.py',
- 'PYMODULE'),
- ('secrets',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\secrets.py',
- 'PYMODULE'),
- ('multiprocessing.reduction',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\reduction.py',
- 'PYMODULE'),
- ('multiprocessing.resource_sharer',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\resource_sharer.py',
- 'PYMODULE'),
- ('multiprocessing.queues',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\queues.py',
- 'PYMODULE'),
- ('multiprocessing.connection',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\connection.py',
- 'PYMODULE'),
- ('xmlrpc.client',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xmlrpc\\client.py',
- 'PYMODULE'),
- ('xmlrpc',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xmlrpc\\__init__.py',
- 'PYMODULE'),
- ('xmlrpc.server',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xmlrpc\\server.py',
- 'PYMODULE'),
- ('xml.parsers.expat',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\parsers\\expat.py',
- 'PYMODULE'),
- ('xml.parsers',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\parsers\\__init__.py',
- 'PYMODULE'),
- ('xml',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\__init__.py',
- 'PYMODULE'),
- ('xml.sax.expatreader',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\expatreader.py',
- 'PYMODULE'),
- ('xml.sax.saxutils',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\saxutils.py',
- 'PYMODULE'),
- ('xml.sax',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\__init__.py',
- 'PYMODULE'),
- ('xml.sax.handler',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\handler.py',
- 'PYMODULE'),
- ('xml.sax._exceptions',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\_exceptions.py',
- 'PYMODULE'),
- ('xml.sax.xmlreader',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\xmlreader.py',
- 'PYMODULE'),
- ('multiprocessing',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\__init__.py',
- 'PYMODULE'),
- ('concurrent.futures._base',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\futures\\_base.py',
- 'PYMODULE'),
- ('concurrent',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\__init__.py',
- 'PYMODULE'),
('setuptools._distutils.command.build_clib',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools\\_distutils\\command\\build_clib.py',
@@ -1560,6 +1388,10 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\pdb.py',
'PYMODULE'),
+ ('runpy',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\runpy.py',
+ 'PYMODULE'),
('code',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\code.py',
@@ -2159,6 +1991,42 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\plistlib.py',
'PYMODULE'),
+ ('xml.parsers.expat',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\parsers\\expat.py',
+ 'PYMODULE'),
+ ('xml.parsers',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\parsers\\__init__.py',
+ 'PYMODULE'),
+ ('xml',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\__init__.py',
+ 'PYMODULE'),
+ ('xml.sax.expatreader',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\expatreader.py',
+ 'PYMODULE'),
+ ('xml.sax.saxutils',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\saxutils.py',
+ 'PYMODULE'),
+ ('xml.sax',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\__init__.py',
+ 'PYMODULE'),
+ ('xml.sax.handler',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\handler.py',
+ 'PYMODULE'),
+ ('xml.sax._exceptions',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\_exceptions.py',
+ 'PYMODULE'),
+ ('xml.sax.xmlreader',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xml\\sax\\xmlreader.py',
+ 'PYMODULE'),
('setuptools.config.pyprojecttoml',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools\\config\\pyprojecttoml.py',
@@ -2259,20 +2127,152 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\_distutils_hack\\override.py',
'PYMODULE'),
+ ('multiprocessing.popen_forkserver',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\popen_forkserver.py',
+ 'PYMODULE'),
+ ('multiprocessing.connection',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\connection.py',
+ 'PYMODULE'),
+ ('multiprocessing.resource_sharer',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\resource_sharer.py',
+ 'PYMODULE'),
+ ('multiprocessing.process',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\process.py',
+ 'PYMODULE'),
+ ('xmlrpc.client',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xmlrpc\\client.py',
+ 'PYMODULE'),
+ ('xmlrpc',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xmlrpc\\__init__.py',
+ 'PYMODULE'),
+ ('xmlrpc.server',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\xmlrpc\\server.py',
+ 'PYMODULE'),
+ ('multiprocessing.util',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\util.py',
+ 'PYMODULE'),
+ ('multiprocessing.resource_tracker',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\resource_tracker.py',
+ 'PYMODULE'),
+ ('multiprocessing.popen_fork',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\popen_fork.py',
+ 'PYMODULE'),
+ ('multiprocessing.forkserver',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\forkserver.py',
+ 'PYMODULE'),
+ ('multiprocessing.context',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\context.py',
+ 'PYMODULE'),
+ ('multiprocessing.sharedctypes',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\sharedctypes.py',
+ 'PYMODULE'),
+ ('multiprocessing.heap',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\heap.py',
+ 'PYMODULE'),
+ ('multiprocessing.pool',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\pool.py',
+ 'PYMODULE'),
+ ('multiprocessing.dummy',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\dummy\\__init__.py',
+ 'PYMODULE'),
+ ('multiprocessing.dummy.connection',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\dummy\\connection.py',
+ 'PYMODULE'),
+ ('multiprocessing.queues',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\queues.py',
+ 'PYMODULE'),
+ ('multiprocessing.synchronize',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\synchronize.py',
+ 'PYMODULE'),
+ ('multiprocessing.managers',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\managers.py',
+ 'PYMODULE'),
+ ('multiprocessing.shared_memory',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\shared_memory.py',
+ 'PYMODULE'),
+ ('secrets',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\secrets.py',
+ 'PYMODULE'),
+ ('multiprocessing.reduction',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\reduction.py',
+ 'PYMODULE'),
+ ('multiprocessing.popen_spawn_posix',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\popen_spawn_posix.py',
+ 'PYMODULE'),
+ ('multiprocessing.popen_spawn_win32',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\popen_spawn_win32.py',
+ 'PYMODULE'),
+ ('multiprocessing.spawn',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\spawn.py',
+ 'PYMODULE'),
+ ('multiprocessing',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\__init__.py',
+ 'PYMODULE'),
('_pyi_rth_utils',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\fake-modules\\_pyi_rth_utils\\__init__.py',
'PYMODULE'),
- ('_py_abc',
+ ('stringprep',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\_py_abc.py',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\stringprep.py',
'PYMODULE'),
('tracemalloc',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\tracemalloc.py',
'PYMODULE'),
- ('stringprep',
+ ('_py_abc',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\stringprep.py',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\_py_abc.py',
+ 'PYMODULE'),
+ ('typing',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\typing.py',
+ 'PYMODULE'),
+ ('concurrent.futures',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\futures\\__init__.py',
+ 'PYMODULE'),
+ ('concurrent.futures.thread',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\futures\\thread.py',
+ 'PYMODULE'),
+ ('concurrent.futures.process',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\futures\\process.py',
+ 'PYMODULE'),
+ ('concurrent.futures._base',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\futures\\_base.py',
+ 'PYMODULE'),
+ ('concurrent',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\concurrent\\__init__.py',
'PYMODULE'),
('PIL.Image',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PIL\\Image.py',
@@ -3098,14 +3098,6 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_queue.pyd',
'EXTENSION'),
- ('_multiprocessing.pyd',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_multiprocessing.pyd',
- 'EXTENSION'),
- ('pyexpat.pyd',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\pyexpat.pyd',
- 'EXTENSION'),
('_overlapped.pyd',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_overlapped.pyd',
@@ -3129,6 +3121,14 @@
('win32\\_win32sysloader.pyd',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\win32\\_win32sysloader.pyd',
'EXTENSION'),
+ ('pyexpat.pyd',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\pyexpat.pyd',
+ 'EXTENSION'),
+ ('_multiprocessing.pyd',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_multiprocessing.pyd',
+ 'EXTENSION'),
('PIL\\_webp.cp310-win_amd64.pyd',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PIL\\_webp.cp310-win_amd64.pyd',
'EXTENSION'),
@@ -3232,21 +3232,25 @@
'E:\\Arma Reforger '
'Work\\1960-utils\\Texturing\\MergeTextures2\\build\\merge_textures\\base_library.zip',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\LICENSE',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\WHEEL',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
'DATA'),
- ('setuptools-65.5.0.dist-info\\RECORD',
+ ('setuptools-65.5.0.dist-info\\top_level.txt',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
'DATA'),
('setuptools-65.5.0.dist-info\\METADATA',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\METADATA',
'DATA'),
- ('setuptools-65.5.0.dist-info\\LICENSE',
+ ('setuptools-65.5.0.dist-info\\REQUESTED',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
'DATA'),
('setuptools-65.5.0.dist-info\\entry_points.txt',
'C:\\Program '
@@ -3256,11 +3260,7 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\INSTALLER',
'DATA'),
- ('setuptools-65.5.0.dist-info\\top_level.txt',
+ ('setuptools-65.5.0.dist-info\\RECORD',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\REQUESTED',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
'DATA')])
diff --git a/Texturing/MergeTextures2/build/merge_textures/EXE-00.toc b/Texturing/MergeTextures2/build/merge_textures/EXE-00.toc
index a927799..2813861 100644
--- a/Texturing/MergeTextures2/build/merge_textures/EXE-00.toc
+++ b/Texturing/MergeTextures2/build/merge_textures/EXE-00.toc
@@ -64,21 +64,21 @@
('pyi_rth_inspect',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_inspect.py',
'PYSOURCE'),
- ('pyi_rth_pkgres',
- 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgres.py',
+ ('pyi_rth_pkgutil',
+ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgutil.py',
'PYSOURCE'),
('pyi_rth_multiprocessing',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py',
'PYSOURCE'),
+ ('pyi_rth_pkgres',
+ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgres.py',
+ 'PYSOURCE'),
('pyi_rth_pywintypes',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\rthooks\\pyi_rth_pywintypes.py',
'PYSOURCE'),
('pyi_rth_pythoncom',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\rthooks\\pyi_rth_pythoncom.py',
'PYSOURCE'),
- ('pyi_rth_pkgutil',
- 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgutil.py',
- 'PYSOURCE'),
('pyi_rth_setuptools',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_setuptools.py',
'PYSOURCE'),
@@ -145,14 +145,6 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_queue.pyd',
'EXTENSION'),
- ('_multiprocessing.pyd',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_multiprocessing.pyd',
- 'EXTENSION'),
- ('pyexpat.pyd',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\pyexpat.pyd',
- 'EXTENSION'),
('_overlapped.pyd',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_overlapped.pyd',
@@ -176,6 +168,14 @@
('win32\\_win32sysloader.pyd',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\win32\\_win32sysloader.pyd',
'EXTENSION'),
+ ('pyexpat.pyd',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\pyexpat.pyd',
+ 'EXTENSION'),
+ ('_multiprocessing.pyd',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_multiprocessing.pyd',
+ 'EXTENSION'),
('PIL\\_webp.cp310-win_amd64.pyd',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PIL\\_webp.cp310-win_amd64.pyd',
'EXTENSION'),
@@ -277,21 +277,25 @@
'E:\\Arma Reforger '
'Work\\1960-utils\\Texturing\\MergeTextures2\\build\\merge_textures\\base_library.zip',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\LICENSE',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\WHEEL',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
'DATA'),
- ('setuptools-65.5.0.dist-info\\RECORD',
+ ('setuptools-65.5.0.dist-info\\top_level.txt',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
'DATA'),
('setuptools-65.5.0.dist-info\\METADATA',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\METADATA',
'DATA'),
- ('setuptools-65.5.0.dist-info\\LICENSE',
+ ('setuptools-65.5.0.dist-info\\REQUESTED',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
'DATA'),
('setuptools-65.5.0.dist-info\\entry_points.txt',
'C:\\Program '
@@ -301,18 +305,14 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\INSTALLER',
'DATA'),
- ('setuptools-65.5.0.dist-info\\top_level.txt',
+ ('setuptools-65.5.0.dist-info\\RECORD',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\REQUESTED',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
'DATA')],
[],
False,
False,
- 1737832798,
+ 1743968683,
[('run.exe',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\bootloader\\Windows-64bit-intel\\run.exe',
'EXECUTABLE')],
diff --git a/Texturing/MergeTextures2/build/merge_textures/PKG-00.toc b/Texturing/MergeTextures2/build/merge_textures/PKG-00.toc
index 9414756..a0a028e 100644
--- a/Texturing/MergeTextures2/build/merge_textures/PKG-00.toc
+++ b/Texturing/MergeTextures2/build/merge_textures/PKG-00.toc
@@ -40,21 +40,21 @@
('pyi_rth_inspect',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_inspect.py',
'PYSOURCE'),
- ('pyi_rth_pkgres',
- 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgres.py',
+ ('pyi_rth_pkgutil',
+ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgutil.py',
'PYSOURCE'),
('pyi_rth_multiprocessing',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py',
'PYSOURCE'),
+ ('pyi_rth_pkgres',
+ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgres.py',
+ 'PYSOURCE'),
('pyi_rth_pywintypes',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\rthooks\\pyi_rth_pywintypes.py',
'PYSOURCE'),
('pyi_rth_pythoncom',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\rthooks\\pyi_rth_pythoncom.py',
'PYSOURCE'),
- ('pyi_rth_pkgutil',
- 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgutil.py',
- 'PYSOURCE'),
('pyi_rth_setuptools',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_setuptools.py',
'PYSOURCE'),
@@ -121,14 +121,6 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_queue.pyd',
'EXTENSION'),
- ('_multiprocessing.pyd',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_multiprocessing.pyd',
- 'EXTENSION'),
- ('pyexpat.pyd',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\pyexpat.pyd',
- 'EXTENSION'),
('_overlapped.pyd',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_overlapped.pyd',
@@ -152,6 +144,14 @@
('win32\\_win32sysloader.pyd',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\win32\\_win32sysloader.pyd',
'EXTENSION'),
+ ('pyexpat.pyd',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\pyexpat.pyd',
+ 'EXTENSION'),
+ ('_multiprocessing.pyd',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\_multiprocessing.pyd',
+ 'EXTENSION'),
('PIL\\_webp.cp310-win_amd64.pyd',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PIL\\_webp.cp310-win_amd64.pyd',
'EXTENSION'),
@@ -253,21 +253,25 @@
'E:\\Arma Reforger '
'Work\\1960-utils\\Texturing\\MergeTextures2\\build\\merge_textures\\base_library.zip',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\LICENSE',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\WHEEL',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
'DATA'),
- ('setuptools-65.5.0.dist-info\\RECORD',
+ ('setuptools-65.5.0.dist-info\\top_level.txt',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
'DATA'),
('setuptools-65.5.0.dist-info\\METADATA',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\METADATA',
'DATA'),
- ('setuptools-65.5.0.dist-info\\LICENSE',
+ ('setuptools-65.5.0.dist-info\\REQUESTED',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
'DATA'),
('setuptools-65.5.0.dist-info\\entry_points.txt',
'C:\\Program '
@@ -277,13 +281,9 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\INSTALLER',
'DATA'),
- ('setuptools-65.5.0.dist-info\\top_level.txt',
+ ('setuptools-65.5.0.dist-info\\RECORD',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\REQUESTED',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
'DATA')],
'python310.dll',
False,
diff --git a/Texturing/MergeTextures2/build/merge_textures/merge_textures.pkg b/Texturing/MergeTextures2/build/merge_textures/merge_textures.pkg
index f60b624..aafbc47 100644
Binary files a/Texturing/MergeTextures2/build/merge_textures/merge_textures.pkg and b/Texturing/MergeTextures2/build/merge_textures/merge_textures.pkg differ
diff --git a/Texturing/MergeTextures2/build/merge_textures/warn-merge_textures.txt b/Texturing/MergeTextures2/build/merge_textures/warn-merge_textures.txt
index 16f2b69..4f242a9 100644
--- a/Texturing/MergeTextures2/build/merge_textures/warn-merge_textures.txt
+++ b/Texturing/MergeTextures2/build/merge_textures/warn-merge_textures.txt
@@ -38,14 +38,6 @@ missing module named System - imported by pyreadline3.clipboard.ironpython_clipb
missing module named console - imported by pyreadline3.console.ansi (conditional)
missing module named clr - imported by pyreadline3.clipboard.ironpython_clipboard (top-level), pyreadline3.console.ironpython_console (top-level)
missing module named IronPythonConsole - imported by pyreadline3.console.ironpython_console (top-level)
-missing module named _posixshmem - imported by multiprocessing.resource_tracker (conditional), multiprocessing.shared_memory (conditional)
-missing module named multiprocessing.set_start_method - imported by multiprocessing (top-level), multiprocessing.spawn (top-level)
-missing module named multiprocessing.get_start_method - imported by multiprocessing (top-level), multiprocessing.spawn (top-level)
-missing module named multiprocessing.get_context - imported by multiprocessing (top-level), multiprocessing.pool (top-level), multiprocessing.managers (top-level), multiprocessing.sharedctypes (top-level)
-missing module named multiprocessing.TimeoutError - imported by multiprocessing (top-level), multiprocessing.pool (top-level)
-missing module named java - imported by xml.sax._exceptions (conditional)
-missing module named multiprocessing.BufferTooShort - imported by multiprocessing (top-level), multiprocessing.connection (top-level)
-missing module named multiprocessing.AuthenticationError - imported by multiprocessing (top-level), multiprocessing.connection (top-level)
missing module named asyncio.DefaultEventLoopPolicy - imported by asyncio (delayed, conditional), asyncio.events (delayed, conditional)
missing module named pyparsing.Word - imported by pyparsing (delayed), pyparsing.unicode (delayed)
missing module named railroad - imported by pkg_resources._vendor.pyparsing.diagram (top-level), pyparsing.diagram (top-level), setuptools._vendor.pyparsing.diagram (top-level)
@@ -71,11 +63,19 @@ missing module named 'win32com.gen_py' - imported by win32com (conditional, opti
missing module named pkg_resources.extern.packaging - imported by pkg_resources.extern (top-level), pkg_resources (top-level)
missing module named pkg_resources.extern.appdirs - imported by pkg_resources.extern (top-level), pkg_resources (top-level)
missing module named 'pkg_resources.extern.jaraco' - imported by pkg_resources (top-level), pkg_resources._vendor.jaraco.text (top-level)
+missing module named java - imported by xml.sax._exceptions (conditional)
missing module named trove_classifiers - imported by setuptools.config._validate_pyproject.formats (optional)
missing module named 'setuptools.extern.packaging.specifiers' - imported by setuptools.config.setupcfg (top-level), setuptools.config._apply_pyprojecttoml (delayed)
missing module named 'setuptools.extern.packaging.requirements' - imported by setuptools.config.setupcfg (top-level)
missing module named importlib_metadata - imported by setuptools._importlib (delayed, optional)
-missing module named pyimod02_importers - imported by C:\Users\Niklas\AppData\Local\Packages\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\LocalCache\local-packages\Python310\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgres.py (delayed), C:\Users\Niklas\AppData\Local\Packages\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\LocalCache\local-packages\Python310\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgutil.py (delayed)
+missing module named pyimod02_importers - imported by C:\Users\Niklas\AppData\Local\Packages\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\LocalCache\local-packages\Python310\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgutil.py (delayed), C:\Users\Niklas\AppData\Local\Packages\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\LocalCache\local-packages\Python310\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgres.py (delayed)
+missing module named multiprocessing.BufferTooShort - imported by multiprocessing (top-level), multiprocessing.connection (top-level)
+missing module named multiprocessing.AuthenticationError - imported by multiprocessing (top-level), multiprocessing.connection (top-level)
+missing module named _posixshmem - imported by multiprocessing.resource_tracker (conditional), multiprocessing.shared_memory (conditional)
+missing module named multiprocessing.get_context - imported by multiprocessing (top-level), multiprocessing.pool (top-level), multiprocessing.managers (top-level), multiprocessing.sharedctypes (top-level)
+missing module named multiprocessing.TimeoutError - imported by multiprocessing (top-level), multiprocessing.pool (top-level)
+missing module named multiprocessing.set_start_method - imported by multiprocessing (top-level), multiprocessing.spawn (top-level)
+missing module named multiprocessing.get_start_method - imported by multiprocessing (top-level), multiprocessing.spawn (top-level)
missing module named olefile - imported by PIL.FpxImagePlugin (top-level), PIL.MicImagePlugin (top-level)
missing module named dummy_threading - imported by psutil._compat (optional)
missing module named _dummy_thread - imported by cffi.lock (conditional, optional), numpy.core.arrayprint (optional)
diff --git a/Texturing/MergeTextures2/build/merge_textures/xref-merge_textures.html b/Texturing/MergeTextures2/build/merge_textures/xref-merge_textures.html
index 745a6ca..6de9d74 100644
--- a/Texturing/MergeTextures2/build/merge_textures/xref-merge_textures.html
+++ b/Texturing/MergeTextures2/build/merge_textures/xref-merge_textures.html
@@ -26,6 +26,7 @@ imports:
• codecs
• collections
• collections.abc
+ • concurrent.futures
• copyreg
• encodings
• encodings.aliases
@@ -178,6 +179,7 @@ imports:
• time
• traceback
• types
+ • typing
• warnings
• weakref
@@ -5906,6 +5908,7 @@ imported by:
• concurrent.futures.process
• concurrent.futures.thread
• distutils.command.build_ext
+ • merge_textures.py
• setuptools._distutils.command.build_ext
@@ -29589,6 +29592,7 @@ imported by:
• jinja2.visitor
• markupsafe
• markupsafe._native
+ • merge_textures.py
• numpy._typing
• numpy._typing._array_like
• numpy._typing._char_codes
diff --git a/Texturing/MergeTextures2/dist/merge_textures.exe b/Texturing/MergeTextures2/dist/merge_textures.exe
index 379bb8a..4a2e131 100644
Binary files a/Texturing/MergeTextures2/dist/merge_textures.exe and b/Texturing/MergeTextures2/dist/merge_textures.exe differ
diff --git a/Texturing/MergeTextures2/merge_textures.py b/Texturing/MergeTextures2/merge_textures.py
index 34804b3..7f4bada 100644
--- a/Texturing/MergeTextures2/merge_textures.py
+++ b/Texturing/MergeTextures2/merge_textures.py
@@ -2,6 +2,8 @@ import os
import sys
from PIL import Image # type: ignore
import time
+import concurrent.futures
+from typing import Dict, List, Optional, Tuple
# Define suffix lists for BaseColor, Normal, RMA/ORM
BASECOLOR_SUFFIXES = ['_alb.', '_albedo.', '_bc.', '_basecolor.', '_b.']
@@ -44,6 +46,25 @@ def get_material_name(filename):
# Return the base_name without the suffix for output naming
return base_name.rsplit('_', 1)[0] # Split only at the last underscore
+def convert_single_material(material_data: Tuple[str, Dict[str, str]], output_folder: str) -> Tuple[bool, str]:
+ """Convert a single material to BCR/NMO format"""
+ material, files = material_data
+ basecolor_file = files.get('BaseColor')
+ normal_file = files.get('Normal')
+ rma_file = files.get('RMA')
+ orm_file = files.get('ORM')
+ emissive_file = files.get('Emissive')
+ opacity_file = files.get('Opacity')
+ mask_file = files.get('Mask')
+
+ try:
+ if convert_to_bcr_nmo(material, basecolor_file, normal_file, rma_file, orm_file, emissive_file, opacity_file, mask_file, output_folder):
+ return True, f"{material}: Successfully converted."
+ else:
+ return False, f"Skipping {material}: input file sizes do not match."
+ except Exception as e:
+ return False, f"Error processing {material}: {str(e)}"
+
def process_textures(input_files):
""" Main function to process all textures in a folder and convert to BCR/NMO """
textures = {}
@@ -62,46 +83,53 @@ def process_textures(input_files):
base_path = os.path.dirname(input_files[0])
output_folder = os.path.join(base_path, 'merged')
os.makedirs(output_folder, exist_ok=True)
-
+
material_count = len(textures)
print(f"Detected {material_count} Materials to process.")
+ # Check for required textures and filter out incomplete materials
+ valid_materials = {}
failed_converts = 0
-
- # Process each material group
- for index, (material, files) in enumerate(textures.items()):
- basecolor_file = files.get('BaseColor')
- normal_file = files.get('Normal')
- rma_file = files.get('RMA')
- orm_file = files.get('ORM')
- emissive_file = files.get('Emissive')
- opacity_file = files.get('Opacity')
- mask_file = files.get('Mask')
-
+
+ for material, files in textures.items():
missing_files = []
-
- # Check for required textures
- if not basecolor_file:
+ if not files.get('BaseColor'):
missing_files.append('BaseColor')
- if not normal_file:
+ if not files.get('Normal'):
missing_files.append('Normal')
- if not (rma_file or orm_file):
+ if not (files.get('RMA') or files.get('ORM')):
missing_files.append('RMA or ORM')
- # Report missing files if any
if missing_files:
- print(f"({index + 1}/{material_count}) Skipping {material}: missing {', '.join(missing_files)}")
+ print(f"Skipping {material}: missing {', '.join(missing_files)}")
failed_converts += 1
else:
- # Convert to BCR/NMO format and track success or failure
-
- if convert_to_bcr_nmo(material, basecolor_file, normal_file, rma_file, orm_file, emissive_file, opacity_file, mask_file, output_folder):
- print(f"({index + 1}/{material_count}) {material}: Successfully converted.")
- else:
- failed_converts += 1 # Increment counter here if conversion fails
- print(f"({index + 1}/{material_count}) Skipping {material}: input file sizes do not match.")
-
- print(f"+++{material_count - failed_converts} of {material_count} materials successfully converted+++")
+ valid_materials[material] = files
+
+ # Process materials in parallel
+ success_count = 0
+ with concurrent.futures.ThreadPoolExecutor() as executor:
+ # Submit all materials for processing
+ future_to_material = {
+ executor.submit(convert_single_material, (material, files), output_folder): material
+ for material, files in valid_materials.items()
+ }
+
+ # Process results as they complete
+ for future in concurrent.futures.as_completed(future_to_material):
+ material = future_to_material[future]
+ try:
+ success, message = future.result()
+ if success:
+ success_count += 1
+ else:
+ failed_converts += 1
+ print(message)
+ except Exception as e:
+ failed_converts += 1
+ print(f"Error processing {material}: {str(e)}")
+
+ print(f"+++{success_count} of {material_count} materials successfully converted+++")
time.sleep(3)
def convert_to_bcr_nmo(material, basecolor_file, normal_file, rma_file, orm_file, emissive_file, opacity_file, mask_file, output_folder):
@@ -115,32 +143,41 @@ def convert_to_bcr_nmo(material, basecolor_file, normal_file, rma_file, orm_file
return False
# BCR conversion
bcr_img = Image.merge('RGBA', (basecolor_img.split()[0], basecolor_img.split()[1], basecolor_img.split()[2], rma_img.split()[0])) # Use Roughness (Alpha from RMA/ORM)
- bcr_img.save(os.path.join(output_folder, f"{material}_BCR.png"))
+ bcr_img.save(os.path.join(output_folder, f"{material}_BCR.tga"))
# NMO conversion
nmo_img = Image.merge('RGBA', (normal_img.split()[0], normal_img.split()[1], rma_img.split()[1], rma_img.split()[2])) # Use Metallic, AO from RMA/ORM
- nmo_img.save(os.path.join(output_folder, f"{material}_NMO.png"))
+ nmo_img.save(os.path.join(output_folder, f"{material}_NMO.tga"))
elif orm_file:
rma_img = Image.open(orm_file).convert('RGBA')
if not (basecolor_img.size == normal_img.size == rma_img.size):
return False
# BCR conversion
bcr_img = Image.merge('RGBA', (basecolor_img.split()[0], basecolor_img.split()[1], basecolor_img.split()[2], rma_img.split()[1])) # Use Roughness (Alpha from RMA/ORM)
- bcr_img.save(os.path.join(output_folder, f"{material}_BCR.png"))
+ bcr_img.save(os.path.join(output_folder, f"{material}_BCR.tga"))
# NMO conversion
nmo_img = Image.merge('RGBA', (normal_img.split()[0], normal_img.split()[1], rma_img.split()[2], rma_img.split()[0])) # Use Metallic, AO from RMA/ORM
- nmo_img.save(os.path.join(output_folder, f"{material}_NMO.png"))
+ nmo_img.save(os.path.join(output_folder, f"{material}_NMO.tga"))
# Optionally handle emissive and opacity maps
if emissive_file:
- emissive_img = Image.open(emissive_file).convert('RGB')
- emissive_img.save(os.path.join(output_folder, f"{material}_EM.png"))
+ emissive_img = Image.open(emissive_file)
+ # Preserve original color mode instead of forcing RGB
+ if emissive_img.mode != 'RGBA':
+ emissive_img = emissive_img.convert('RGBA')
+ emissive_img.save(os.path.join(output_folder, f"{material}_EM.tga"))
if opacity_file:
- opacity_img = Image.open(opacity_file).convert('L')
- opacity_img.save(os.path.join(output_folder, f"{material}_OP.png"))
+ opacity_img = Image.open(opacity_file)
+ # Preserve original color mode instead of forcing grayscale
+ if opacity_img.mode != 'RGBA':
+ opacity_img = opacity_img.convert('RGBA')
+ opacity_img.save(os.path.join(output_folder, f"{material}_OP.tga"))
if mask_file:
- mask_img = Image.open(mask_file).convert('L')
- mask_img.save(os.path.join(output_folder, f"{material}_MASK.png"))
+ mask_img = Image.open(mask_file)
+ # Preserve original color mode instead of forcing grayscale
+ if mask_img.mode != 'RGBA':
+ mask_img = mask_img.convert('RGBA')
+ mask_img.save(os.path.join(output_folder, f"{material}_MASK.tga"))
return True
if __name__ == "__main__":
diff --git a/Texturing/OptimizeTextures/build/optimize_textures/Analysis-00.toc b/Texturing/OptimizeTextures/build/optimize_textures/Analysis-00.toc
index f732e68..57f84fb 100644
--- a/Texturing/OptimizeTextures/build/optimize_textures/Analysis-00.toc
+++ b/Texturing/OptimizeTextures/build/optimize_textures/Analysis-00.toc
@@ -2247,6 +2247,10 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\multiprocessing\\dummy\\connection.py',
'PYMODULE'),
+ ('tracemalloc',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\tracemalloc.py',
+ 'PYMODULE'),
('_py_abc',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\_py_abc.py',
@@ -2255,10 +2259,6 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\stringprep.py',
'PYMODULE'),
- ('tracemalloc',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\tracemalloc.py',
- 'PYMODULE'),
('threading',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\threading.py',
@@ -3249,17 +3249,9 @@
'E:\\Arma Reforger '
'Work\\1960-utils\\Texturing\\OptimizeTextures\\build\\optimize_textures\\base_library.zip',
'DATA'),
- ('setuptools-65.5.0.dist-info\\RECORD',
+ ('setuptools-65.5.0.dist-info\\entry_points.txt',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\top_level.txt',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\WHEEL',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\entry_points.txt',
'DATA'),
('setuptools-65.5.0.dist-info\\INSTALLER',
'C:\\Program '
@@ -3269,15 +3261,23 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\WHEEL',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\METADATA',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\METADATA',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\top_level.txt',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
+ 'DATA'),
+ ('setuptools-65.5.0.dist-info\\RECORD',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\LICENSE',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\entry_points.txt',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\entry_points.txt',
'DATA')])
diff --git a/Texturing/OptimizeTextures/build/optimize_textures/EXE-00.toc b/Texturing/OptimizeTextures/build/optimize_textures/EXE-00.toc
index 9421aab..81b1734 100644
--- a/Texturing/OptimizeTextures/build/optimize_textures/EXE-00.toc
+++ b/Texturing/OptimizeTextures/build/optimize_textures/EXE-00.toc
@@ -281,17 +281,9 @@
'E:\\Arma Reforger '
'Work\\1960-utils\\Texturing\\OptimizeTextures\\build\\optimize_textures\\base_library.zip',
'DATA'),
- ('setuptools-65.5.0.dist-info\\RECORD',
+ ('setuptools-65.5.0.dist-info\\entry_points.txt',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\top_level.txt',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\WHEEL',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\entry_points.txt',
'DATA'),
('setuptools-65.5.0.dist-info\\INSTALLER',
'C:\\Program '
@@ -301,22 +293,30 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\WHEEL',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\METADATA',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\METADATA',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\top_level.txt',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
+ 'DATA'),
+ ('setuptools-65.5.0.dist-info\\RECORD',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\LICENSE',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\entry_points.txt',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\entry_points.txt',
'DATA')],
[],
False,
False,
- 1743962768,
+ 1743968769,
[('run.exe',
'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\bootloader\\Windows-64bit-intel\\run.exe',
'EXECUTABLE')],
diff --git a/Texturing/OptimizeTextures/build/optimize_textures/PKG-00.toc b/Texturing/OptimizeTextures/build/optimize_textures/PKG-00.toc
index aa5fde2..4994393 100644
--- a/Texturing/OptimizeTextures/build/optimize_textures/PKG-00.toc
+++ b/Texturing/OptimizeTextures/build/optimize_textures/PKG-00.toc
@@ -257,17 +257,9 @@
'E:\\Arma Reforger '
'Work\\1960-utils\\Texturing\\OptimizeTextures\\build\\optimize_textures\\base_library.zip',
'DATA'),
- ('setuptools-65.5.0.dist-info\\RECORD',
+ ('setuptools-65.5.0.dist-info\\entry_points.txt',
'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\top_level.txt',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\WHEEL',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\entry_points.txt',
'DATA'),
('setuptools-65.5.0.dist-info\\INSTALLER',
'C:\\Program '
@@ -277,17 +269,25 @@
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\REQUESTED',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\WHEEL',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\METADATA',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\METADATA',
'DATA'),
+ ('setuptools-65.5.0.dist-info\\top_level.txt',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt',
+ 'DATA'),
+ ('setuptools-65.5.0.dist-info\\RECORD',
+ 'C:\\Program '
+ 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD',
+ 'DATA'),
('setuptools-65.5.0.dist-info\\LICENSE',
'C:\\Program '
'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE',
- 'DATA'),
- ('setuptools-65.5.0.dist-info\\entry_points.txt',
- 'C:\\Program '
- 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\site-packages\\setuptools-65.5.0.dist-info\\entry_points.txt',
'DATA')],
'python310.dll',
False,
diff --git a/Texturing/OptimizeTextures/build/optimize_textures/base_library.zip b/Texturing/OptimizeTextures/build/optimize_textures/base_library.zip
index 2c5d5de..a6b9d38 100644
Binary files a/Texturing/OptimizeTextures/build/optimize_textures/base_library.zip and b/Texturing/OptimizeTextures/build/optimize_textures/base_library.zip differ
diff --git a/Texturing/OptimizeTextures/build/optimize_textures/optimize_textures.pkg b/Texturing/OptimizeTextures/build/optimize_textures/optimize_textures.pkg
index afc73a7..4ef4ea2 100644
Binary files a/Texturing/OptimizeTextures/build/optimize_textures/optimize_textures.pkg and b/Texturing/OptimizeTextures/build/optimize_textures/optimize_textures.pkg differ
diff --git a/Texturing/OptimizeTextures/dist/optimize_textures.exe b/Texturing/OptimizeTextures/dist/optimize_textures.exe
index 415dcd7..d31f2eb 100644
Binary files a/Texturing/OptimizeTextures/dist/optimize_textures.exe and b/Texturing/OptimizeTextures/dist/optimize_textures.exe differ
diff --git a/Texturing/OptimizeTextures/optimize_textures.py b/Texturing/OptimizeTextures/optimize_textures.py
index 575c8ff..5ca5c19 100644
--- a/Texturing/OptimizeTextures/optimize_textures.py
+++ b/Texturing/OptimizeTextures/optimize_textures.py
@@ -58,8 +58,8 @@ def process_image(args):
output_filename = os.path.splitext(os.path.basename(input_path))[0] + '.tga'
output_path = os.path.join(export_dir, output_filename)
- # Save as TGA format with RLE compression
- resizedTex.save(output_path, format='TGA', rle=True)
+ # Save as TGA format
+ resizedTex.save(output_path, format='TGA')
# Print appropriate message based on whether the file was resized
if was_resized: