Skip to content

Commit

Permalink
Merge pull request #47 from DiscordBot-PMMP/development-pm4
Browse files Browse the repository at this point in the history
PocketMine 4.0 Support
  • Loading branch information
JaxkDev authored Dec 2, 2021
2 parents 92b83ef + 4a15a7c commit 3fbeb57
Show file tree
Hide file tree
Showing 163 changed files with 1,988 additions and 777 deletions.
2 changes: 1 addition & 1 deletion .idea/discord.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/fileTemplates/includes/PHP File Header.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 33 additions & 2 deletions .idea/inspectionProfiles/Project_Default.xml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"autoload": {
"psr-4": {
"JaxkDev\\DiscordBot\\": "src/JaxkDev/DiscordBot"
"JaxkDev\\DiscordBot\\": "src"
}
},
"repositories": [
Expand All @@ -21,12 +21,12 @@
}
],
"require": {
"php": "^7.4||^8.0.3",
"php": "^8.0.3",
"team-reflex/discord-php": "v6.0.2",
"react/promise": "v2.x-dev#c2525d2de231f0a4e565647f9a8f06b521ca658b"
},
"require-dev": {
"phpstan/phpstan": "^0.12.82",
"pocketmine/pocketmine-mp": "^3"
"phpstan/phpstan": "^1.2",
"pocketmine/pocketmine-mp": "^4"
}
}
Loading

0 comments on commit 3fbeb57

Please sign in to comment.