Merge branch 'main' into main

Author: Commandcracker

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 ### Please confirm this pull request meets the following requirements:
 
 - [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/main/CONTRIBUTING.md>.
-- [ ] I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).
+- [ ] I am not the sole author or employee of a company who created the topic or collection I'm changing.
 
 ### Which change are you proposing?
 

CONTRIBUTING.md

@@ -98,7 +98,7 @@ This repository includes [a list of the most-used GitHub topics that don't yet h
 
 ## Guidelines
 
-* Avoid conflicts of interest. Maintainers of a project cannot add a topic or collection for their own project. If a topic is popular enough to warrant inclusion, someone else will add or improve it.
+* Avoid conflicts of interest. These should be of general community interest, not a marketing vehicle for a product or a personal prorject. If you are a direct employee of a company creating the project, or the createor and sole maintainer, it's unlikely to be accepted.
 
 ## Running tests
 

collections/game-engines/index.md

@@ -23,7 +23,7 @@ items:
  - WhitestormJS/whs.js
  - wellcaffeinated/PhysicsJS
  - playcanvas/engine
- - cocos2d/cocos2d-html5
+ - cocos/cocos-engine
  - craftyjs/Crafty
  - pixijs/pixijs
  - renpy/renpy
@@ -38,7 +38,6 @@ items:
  - amethyst/amethyst
  - orx/orx
  - nCine/nCine
- - cocos/cocos-engine
  - love2d/love
  - coronalabs/corona
  - hajimehoshi/ebiten