mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-20 07:54:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'submodule-conflict-stable' into submodule-conflict-master

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-02-01 22:13:43 +00:00
commit aad1a3400f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -10,3 +10,6 @@
[submodule "build/php"]
path = build/php
url = https://github.com/pmmp/php-build-scripts.git
[submodule "src/pocketmine/resources/vanilla"]
path = src/pocketmine/resources/vanilla
url = https://github.com/pmmp/BedrockData.git

1
src/pocketmine/resources/vanilla Submodule

@ -0,0 +1 @@
Subproject commit cc132c80dd9d76a44e4b0a360e85e8e28bba8956