Develop

[tronyx]

By submitting this pull request, I confirm the following:
Please fill in any appropriate check-boxes, e.g: [X]

• I have read and understood the contributors guide, as well as this entire template.
• I have made only one major change in my proposed changes.
• I have commented my proposed changes within the code.
• I have tested my proposed changes, and have included unit tests where possible.
• I am willing to help maintain this change if there are issues with it later.
• I give this submission freely and claim no ownership.

---

What does this PR aim to accomplish?:
A detailed description, screenshots (if necessary), as well as links to any relevant GitHub issues
Merge dev which contains a lot of updates

How does this PR accomplish the above?:
A detailed description (such as a changelog) and screenshots (if necessary) of the implemented fix
By merging

What documentation changes (if any) are needed to support this PR?:
A detailed list of any necessary changes
Already done

---

• You must follow the template instructions. Failure to do so will result in your pull request being closed.
• Please respect that Tronitor is developed by volunteers, IE: me, who can only reply in their spare time.