Skip to content

Commit 51d45be

Browse files
authored
Merge branch 'minor-next' into feat/anvil
2 parents 947c8a0 + ac7b5b3 commit 51d45be

File tree

367 files changed

+10883
-4659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+10883
-4659
lines changed

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @pmmp/server-developers

.github/ISSUE_TEMPLATE/api-change-request.md

-19
This file was deleted.

.github/ISSUE_TEMPLATE/bug-report.yml

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Bug report
2+
description: Report a feature of PocketMine-MP not working as expected
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
## Plugin information
8+
9+
> [!IMPORTANT]
10+
> It's strongly recommended to test for bugs without plugins before reporting an issue.
11+
> This helps avoid wasting maintainers' time on bugs that are not actually caused by PocketMine-MP.
12+
>
13+
> If you're not sure whether a plugin might be causing your issue, please seek help on our [Discord](https://discord.gg/bmSAZBG) before writing an issue.
14+
15+
- type: dropdown
16+
attributes:
17+
label: Plugin information
18+
options:
19+
- "I haven't tested without plugins"
20+
- Bug happens without plugins
21+
- Bug only happens with certain plugins (describe below)
22+
validations:
23+
required: true
24+
25+
- type: markdown
26+
attributes:
27+
value: |
28+
## Bug description
29+
30+
> [!TIP]
31+
> Helpful information to include:
32+
> - Steps to reproduce the issue
33+
> - Error backtraces
34+
> - Crashdumps
35+
> - Plugin code that triggers the issue
36+
> - List of installed plugins (use /plugins)
37+
38+
> [!IMPORTANT]
39+
> **Steps to reproduce are critical to finding the cause of the problem!**
40+
> Without reproducing steps, the issue will probably not be solvable and may be closed.
41+
42+
- type: textarea
43+
attributes:
44+
label: Problem description
45+
description: Describe the problem, and how you encountered it
46+
placeholder: e.g. Steps to reproduce the issue
47+
validations:
48+
required: true
49+
- type: textarea
50+
attributes:
51+
label: Expected behaviour
52+
description: What did you expect to happen?
53+
validations:
54+
required: true
55+
56+
- type: markdown
57+
attributes:
58+
value: |
59+
## Version, OS and game info
60+
61+
- type: input
62+
attributes:
63+
label: PocketMine-MP version
64+
placeholder: Use the /version command in PocketMine-MP
65+
validations:
66+
required: true
67+
- type: input
68+
attributes:
69+
label: PHP version
70+
placeholder: Use the /version command in PocketMine-MP
71+
validations:
72+
required: true
73+
- type: input
74+
attributes:
75+
label: Server OS
76+
placeholder: Use the /version command in PocketMine-MP
77+
validations:
78+
required: true
79+
- type: input
80+
attributes:
81+
label: Game version (if applicable)
82+
placeholder: e.g. Android, iOS, Windows, Xbox, PS4, Switch
83+
validations:
84+
required: false

.github/ISSUE_TEMPLATE/bug_report.md

-37
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ contact_links:
33
- name: Help & support on Discord
44
url: https://discord.gg/bmSAZBG
55
about: We don't accept support requests on the issue tracker. Please try asking on Discord instead.
6-
- name: Help & support on forums
7-
url: https://forums.pmmp.io
8-
about: We don't accept support requests on the issue tracker. Please try asking on forums instead.
96
- name: Documentation
107
url: https://pmmp.rtfd.io
118
about: PocketMine-MP documentation

.github/ISSUE_TEMPLATE/crash.md

-16
This file was deleted.

.github/ISSUE_TEMPLATE/crash.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Crash
2+
description: Report a crash in PocketMine-MP (not plugins)
3+
title: Server crashed
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
> [!TIP]
9+
> Submit crashdump `.log` files to the [Crash Archive](https://crash.pmmp.io/submit).
10+
> If you can't submit the crashdump to the Crash Archive, paste it on a site like [GitHub Gist](https://gist.github.com) or [Pastebin](https://pastebin.com).
11+
12+
> [!CAUTION]
13+
> DON'T paste the crashdump data directly into an issue.
14+
15+
- type: input
16+
id: crashdump-url
17+
attributes:
18+
label: Link to crashdump
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
attributes:
24+
label: Additional comments (optional)
25+
description: Any other information that might help us solve the problem
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Feature addition, change, or removal
2+
description: Propose adding new features, or changing/removing existing ones
3+
body:
4+
- type: textarea
5+
attributes:
6+
label: Problem description
7+
description: Explain why a change is needed
8+
validations:
9+
required: true
10+
- type: textarea
11+
attributes:
12+
label: Proposed solution
13+
description: Describe what changes you think should be made
14+
validations:
15+
required: true
16+
- type: textarea
17+
attributes:
18+
label: "Alternative solutions or workarounds"
19+
description: "Describe other ways you've explored to achieve your goal"

.github/PULL_REQUEST_TEMPLATE.md

+10-21
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,32 @@
1-
## Introduction
1+
<!-- Summarize your PR here. Keep it short and simple. -->
22
<!-- Explain existing problems or why this pull request is necessary -->
33

4-
### Relevant issues
5-
<!-- List relevant issues here -->
4+
### Related issues & PRs
65
<!--
7-
86
* Fixes #1
9-
* Fixes #2
10-
7+
* Related to #2
118
-->
129

1310
## Changes
1411
### API changes
1512
<!-- Any additions to the API that should be documented in release notes? -->
13+
<!-- If not, you can delete this section -->
1614

1715
### Behavioural changes
1816
<!-- Any change in how the server behaves, or its performance? -->
17+
<!-- If not, you can delete this section -->
1918

2019
## Backwards compatibility
2120
<!-- Any possible backwards incompatible changes? How are they solved, or how can they be solved? -->
21+
<!-- If not, you can delete this section -->
2222

2323
## Follow-up
2424
<!-- Suggest any actions to be done before/after merging this pull request -->
25-
<!--
26-
27-
Requires translations:
28-
29-
| Name | Value in eng.ini |
30-
| :--: | :---: |
31-
| `foo.bar` | `Foo bar` |
32-
33-
-->
25+
<!-- For example, future changes that this PR lays the groundwork for -->
3426

3527
## Tests
3628
<!--
37-
PRs which have not been tested MUST be marked as draft.
29+
If this PR affects gameplay or user experience in some way, it must be manually tested.
30+
Include any screenshots or videos of manual testing here.
31+
Any test plugin code should also be pasted here if it can't be adapted to a PHPUnit test.
3832
-->
39-
I tested this PR by doing the following (tick all that apply):
40-
- [ ] Writing PHPUnit tests (commit these in the `tests/phpunit` folder)
41-
- [ ] Playtesting using a Minecraft client (provide screenshots or a video)
42-
- [ ] Writing a test plugin (provide the code and sample output)
43-
- [ ] Other (provide details)

.github/dependabot.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,7 @@ updates:
3737
- package-ecosystem: github-actions
3838
directory: "/"
3939
schedule:
40-
interval: weekly
40+
interval: monthly
41+
groups:
42+
github-actions:
43+
patterns: ["*"]

.github/workflows/build-docker-image.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: echo NAME=$(echo "${GITHUB_REPOSITORY,,}") >> $GITHUB_OUTPUT
5454

5555
- name: Build image for tag
56-
uses: docker/build-push-action@v6.6.1
56+
uses: docker/build-push-action@v6.15.0
5757
with:
5858
push: true
5959
context: ./pocketmine-mp
@@ -66,7 +66,7 @@ jobs:
6666
6767
- name: Build image for major tag
6868
if: steps.channel.outputs.CHANNEL == 'stable'
69-
uses: docker/build-push-action@v6.6.1
69+
uses: docker/build-push-action@v6.15.0
7070
with:
7171
push: true
7272
context: ./pocketmine-mp
@@ -79,7 +79,7 @@ jobs:
7979
8080
- name: Build image for minor tag
8181
if: steps.channel.outputs.CHANNEL == 'stable'
82-
uses: docker/build-push-action@v6.6.1
82+
uses: docker/build-push-action@v6.15.0
8383
with:
8484
push: true
8585
context: ./pocketmine-mp
@@ -92,7 +92,7 @@ jobs:
9292
9393
- name: Build image for latest tag
9494
if: steps.channel.outputs.CHANNEL == 'stable'
95-
uses: docker/build-push-action@v6.6.1
95+
uses: docker/build-push-action@v6.15.0
9696
with:
9797
push: true
9898
context: ./pocketmine-mp

.github/workflows/discord-release-notify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414

1515
- name: Setup PHP and tools
16-
uses: shivammathur/setup-php@2.31.1
16+
uses: shivammathur/setup-php@2.32.0
1717
with:
1818
php-version: 8.2
1919

0 commit comments

Comments
 (0)