Merge remote-tracking branch 'upstream/wiki' into PTMPlaceholdersapi

Browse Source

Fix of merge conflict for PlayTimeManager pull request

...

This commit is contained in:

TheGabro

2026-04-17 17:10:55 +02:00

parent a4cfc6d074 c444813d22

commit 9caab36cb2

21 changed files with 2338 additions and 382 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

7371

docs/users/placeholder-list/minecraft.md Normal file

File diff suppressed because it is too large Load Diff