Merge branch 'development' into unstable-quests

# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/managers/ResinManager.java
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java
#	src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
#	src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
#	src/main/java/emu/grasscutter/utils/Crypto.java

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 ## Description
 
 Please carefully read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md) before making any pull requests.
-And, **Do not make a pull request to merge into stable unless it is a hotfix. Use the development branch instead.**
+
 ## Issues fixed by this PR
 
 <!--- Put the links of issues that may be fixed by this PR here (if any). -->
@@ -19,4 +19,4 @@ And, **Do not make a pull request to merge into stable unless it is a hotfix. Us
 - [ ] My code follows the style guidelines of this project
 - [ ] My pull request is unique and no other pull requests have been opened for these changes
 - [ ] I have read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md)
-- [ ] I am responsible for any copyright issues with my code if it occurs in the future.
+- [ ] I am responsible for any copyright issues with my code if it occurs in the future.