Update repository configuration and resolve master merge conflicts by th3w1zard1 · Pull Request #272 · OpenKotOR/PyKotor

th3w1zard1 · 2026-05-24T13:11:05Z

Description

This PR updates repository configuration, contributor conventions, and development environment setup files, and also resolves the branch's merge conflicts against master by merging the latest base branch into bleeding-edge.

These changes improve repository structure, contributor onboarding, and automation guidance while keeping the PR branch mergeable.

Type of Change

🐛 Bug fix (non-breaking change which fixes an issue)
✨ New feature (non-breaking change which adds functionality)
💥 Breaking change (fix or feature that would cause existing functionality to not work as expected)
📚 Documentation update
🔧 Refactoring (no functional changes)
⚡ Performance improvement
✅ Test addition or update
🔨 Build system or CI changes
🎨 Code style changes (formatting, renaming, etc.)

Package(s) Affected

Changes Made

Added a comprehensive .cursorrules file covering contributor and AI-agent workflow expectations.
Updated .env to standardize PYTHONPATH, K1_PATH, and K2_PATH.
Added .cursor/worktrees.json for OS-specific and generic worktree setup flows.
Added .github/CODEOWNERS to define ownership for repository areas and configuration.
Updated .cursorignore to better match repository structure.
Removed the obsolete .archivist/config.json.
Merged the latest master branch into bleeding-edge to resolve PR merge conflicts and restore branch mergeability.

Testing

I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes
I have tested this manually
I have tested on multiple Python versions (3.8+)
I have tested on multiple operating systems (if applicable)

Test Results

- git diff --check: passed
- Verified the merge completed cleanly with no remaining unmerged paths
- Targeted pytest execution could not be run in this sandbox because pytest was not installed

Checklist

My code follows the project's style guidelines
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes
Any dependent changes have been merged and published

Related Issues

Screenshots (if applicable)

N/A

Additional Notes

The merge conflict resolution was completed by merging origin/master into bleeding-edge and keeping the PR branch's intended conflicting changes where required.

refactor: Integrate Panda3D and fix OpenGL-related errors in scene.py ```

…develop

- Included additional extensions for enhanced Qt development support. - Added extensions for AI coding assistance and code syncing features. - Improved the overall functionality and user experience in the development environment.

…structure - Updated the 'swizzle' and 'deswizzle' methods to use clearer parameter formatting. - Enhanced documentation for both methods, providing detailed parameter descriptions. - Improved the organization of the 'swizzle_offset' and 'deswizzle_offset' functions for better readability. - Added type hints for variables to enhance code readability and maintainability. - Removed unnecessary comments and dead code to streamline the implementation. - Updated the 'TPCBinaryWriter' class to include clearer documentation on the file structure. - Improved the handling of dimensions and mipmap generation logic in the 'TPC' class. - Removed a large block of unused JavaScript code that was left in the repository.

- Removed several unused extensions from the list of recommended extensions. - Updated Python formatting and linting configurations, including line length adjustments. - Added new settings for 'ruff', 'black', and 'isort' to enhance code style consistency. - Modified 'pyright' settings for improved type checking and analysis. - Adjusted testing configurations to include new patterns for exclusions.

- This change cleans up the list of extensions by removing an unnecessary entry. - The removal may help in reducing clutter and improving clarity in the configuration.

This reverts commit f6a8f9b.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Resolved all merge conflicts by preferring bleeding-edge over master: - Kept deletions from bleeding-edge (modify/delete conflicts) - Used bleeding-edge version for all content conflicts (UU) - Used bleeding-edge version for add/add conflicts (AA) - Resolved file location conflicts in favor of bleeding-edge structure

Incorporated relevant commits from NickHugi/PyKotor:master: - Performance optimizations for Module Designer loading - Module designer performance/controls improvements - Error handling for 2da row limits - Updated .gitignore for utility updater script Resolved conflicts by: - Keeping .cursorrules (deleted in upstream) - Keeping deletions of scene.py and dlg.py from bleeding-edge - Merging performance improvements from upstream - Adding update.py to .gitignore

Remove leftover conflict markers that blocked Forward Commits to Bleeding-Edge from checking out the branch after master merges.

th3w1zard1 · 2026-05-24T13:11:39Z

@copilot resolve the merge conflicts in this pull request

* docs(plans): add bleeding-edge gitmodules fix plan Record plan 020 for resolving merge conflict markers on bleeding-edge and mark plan 019 completed after PR #268 merge. * docs(plans): record post-merge verification for plan 019 Add verification table for PR #268 merge and pending PyPI regression run. * docs(plans): finalize pypi regression post-268 verification * docs(plans): record bleeding-edge gitmodules closeout verification Document R1-R4 evidence: fix f15e476 on origin/bleeding-edge, parse validation, and forward-commits re-run status.

Agent-Logs-Url: https://github.com/OpenKotOR/PyKotor/sessions/d80c584a-c16d-4b6c-8e9d-2f6a9dd199d8 Co-authored-by: th3w1zard1 <2219836+th3w1zard1@users.noreply.github.com>

Copilot · 2026-05-24T14:54:11Z

@copilot resolve the merge conflicts in this pull request

Fixed in e1b1959.

github-advanced-security

CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

Land Last CI check section and plan 056 verification table; add AGENTS defer rule when ci-status-only matches checkpoint.

chatgpt-codex-connector · 2026-05-28T00:37:06Z

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

th3w1zard1 · 2026-05-28T00:37:06Z

@copilot resolve the merge conflicts in this pull request

Copilot · 2026-05-28T08:58:04Z

@copilot resolve the merge conflicts in this pull request

Fixed in b2c7c47.

+            self.ignoring_updates = False
+
+
+class DLGLinkSync(DLGLink):


+            return True
+
+
+class CrashDialog(PythonQFileDialog):


th3w1zard1 and others added 30 commits October 10, 2024 18:14

```python

1393022

refactor: Integrate Panda3D and fix OpenGL-related errors in scene.py ```

refactor: Remove OpenGL-specific function calls and adjust model loading

60c6c97

various cleanup

88a3e19

Add test results, prepare README

0679e2b

Update README.md status badges.

5fb5904

fixes/chanes

4abb58a

Refactor: Update Qt imports and usage for PyQt6 compatibility

a198c9b

fix nsseditor

7d4f4a7

fix/cleanup/refactor slightly

788d3a6

the end of the tunnel is in sight

15fa09d

largescale implementations

2610627

implement most of tpc, get py3.13 working, cleanup

1564cd8

Add test results, prepare README

88c86bc

Update README.md status badges.

5144038

Add test results, prepare README

c802667

Update README.md status badges.

30a589a

Add test results, prepare README

5984dda

Update README.md status badges.

7b05d33

largescale refactors pt 2

9fb49e6

divide a few large files into smaller ones.

e0d8502

see last

f5d4013

Update extensions.json

9b4a736

test vs code's commit...?

19def57

test commit

580c398

tweak recommended extensions

811c659

Merge branch 'develop' of https://github.com/th3w1zard1/PyKotor into …

0e140c6

…develop

chore: remove 'shan.code-settings-sync' from the extensions list

89f0a21

- This change cleans up the list of extensions by removing an unnecessary entry. - The removal may help in reducing clutter and improving clarity in the configuration.

th3w1zard1 and others added 11 commits December 2, 2025 20:40

Revert "Update Libraries/PyKotor/src/pykotor/common/misc.py"

80023b7

This reverts commit f6a8f9b.

Update .github/workflows/publish_pykotor.yml

25cd458

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update Engines/PyKotorEngine/tests/__init__.py

48b5571

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update .github/workflows/verify-pypi-regression.yml

27a9de2

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update .github/workflows/run_and_report_pytests.yml

09229cd

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Initial plan (#51)

5b51bce

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Merge conflict resolution: prefer bleeding-edge over master

8c478a9

test

2f93409

fix(repo): resolve .gitmodules merge conflict on bleeding-edge

f15e476

Remove leftover conflict markers that blocked Forward Commits to Bleeding-Edge from checking out the branch after master merges.

Copilot started work on behalf of th3w1zard1 May 24, 2026 13:11 View session

github-code-quality Bot found potential problems May 24, 2026

View reviewed changes

Copilot finished work on behalf of th3w1zard1 May 24, 2026 14:52

Resolve remaining merge conflict markers

e1b1959

Agent-Logs-Url: https://github.com/OpenKotOR/PyKotor/sessions/d80c584a-c16d-4b6c-8e9d-2f6a9dd199d8 Co-authored-by: th3w1zard1 <2219836+th3w1zard1@users.noreply.github.com>

github-code-quality Bot found potential problems May 25, 2026

View reviewed changes

Comment thread Tools/HoloGenerator/web/src/App.tsx Fixed

Comment thread Tools/HoloGenerator/web/src/__tests__/useHistory.test.ts Fixed

github-advanced-security AI found potential problems May 25, 2026

View reviewed changes

docs(agents): complete plan 056 solution doc drift (plan 057) (#306)

6c7d4f0

Land Last CI check section and plan 056 verification table; add AGENTS defer rule when ci-status-only matches checkpoint.

th3w1zard1 marked this pull request as ready for review May 28, 2026 00:37

Copilot started work on behalf of th3w1zard1 May 28, 2026 00:37 View session

Copilot finished work on behalf of th3w1zard1 May 28, 2026 05:52

Merge origin/master into bleeding-edge

b2c7c47

Copilot AI changed the title ~~Update README with test results and status badges~~ Update repository configuration and resolve master merge conflicts May 28, 2026

github-code-quality Bot found potential problems May 28, 2026

View reviewed changes

Comment thread Libraries/PyKotor/src/pykotor/engine/graphics/gui/editors/dlg/model.py

self.ignoring_updates = False

class DLGLinkSync(DLGLink):

Comment thread tests/test_utility/test_qfiledialog2.py

return True

class CrashDialog(PythonQFileDialog):

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update repository configuration and resolve master merge conflicts#272

Update repository configuration and resolve master merge conflicts#272
th3w1zard1 wants to merge 281 commits into
masterfrom
bleeding-edge

th3w1zard1 commented May 24, 2026 •

edited by Copilot AI

Loading

Uh oh!

th3w1zard1 commented May 24, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented May 24, 2026

Uh oh!

Uh oh!

Uh oh!

github-advanced-security AI left a comment

Uh oh!

chatgpt-codex-connector Bot commented May 28, 2026

Uh oh!

th3w1zard1 commented May 28, 2026

Uh oh!

Copilot AI commented May 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

th3w1zard1 commented May 24, 2026 • edited by Copilot AI Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of Change

Package(s) Affected

Changes Made

Testing

Test Results

Checklist

Related Issues

Screenshots (if applicable)

Additional Notes

Uh oh!

th3w1zard1 commented May 24, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented May 24, 2026

Uh oh!

Uh oh!

Uh oh!

github-advanced-security AI left a comment

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot commented May 28, 2026

Uh oh!

th3w1zard1 commented May 28, 2026

Uh oh!

Copilot AI commented May 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

th3w1zard1 commented May 24, 2026 •

edited by Copilot AI

Loading