Skip to content

Commit

Permalink
Merge branch 'master' into kotlin
Browse files Browse the repository at this point in the history
# Conflicts:
#	howto-dapp/src/main/java/de/timolia/howto/models/Rank.java
  • Loading branch information
Lennart Lösche committed Jul 6, 2023
2 parents 372263f + b57855f commit 44f8d86
Show file tree
Hide file tree
Showing 3 changed files with 181 additions and 79 deletions.
16 changes: 8 additions & 8 deletions docs/bans.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ Please note that private messages, party messages and friend broadcasts are not
You can report this kind of message with a screenshot or video of the complete Minecraft window on tour https://i.imgur.com/5LWmybt.png or in-game via `/reportevidence <username> <evidence>`.


| Command | Function |
| ------- | -------- |
| Command | Function |
|---------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------|
| `/report <username>`, `/rp`, `/chatreport`, `/chatrp`, `/chatlog`, `/cl`, `/livereport`, `/liverp`, `/teamingreport`, `/teamrp` | Lets you select a category and creates a report |
| `/reportjnr <ID>` | Creates a report of a Jump and Run in JumpWorld |
| `/reportbugusing <username> <description>` | Creates a report about bugusing |
| `/reportevidence <username> <evidence>` | Creates a report with evidence |
| `/reportinfo <ID>` | Shows you the details of a report |
| `/reports [page]` | Opens an overview of your reports |
| `/reportstats` | Displays the success rate of your reports |
| `/reportjnr <ID>` | Creates a report of a Jump and Run in JumpWorld |
| `/reportbugusing <username> <description>` | Creates a report about bugusing |
| `/reportevidence <username> <evidence>` | Creates a report with evidence |
| `/reportinfo <ID>` | Shows you the details of a report |
| `/reports [page]` | Opens an overview of your reports |
| `/reportstats` | Displays the success rate of your reports |

### Reporting players on our Discord
In case a player who violated our rules went offline before a team member could spectate them, you can report the player on our [Discord](https://timolia.de/discord) with video evidence.
Expand Down
2 changes: 1 addition & 1 deletion docs/games/jumpworld.de.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ In JumpWorld können verschiedenste Jump and Runs gespielt, aber auch selbst erb
Täglich wird ein Parcours zum Jump and Run des Tages gekürt.
Um Tagessieger zu werden:

- veröffentlicht von 20 Uhr Tag X-4 bis 20 Uhr Tag X-1
- veröffentlicht von 20 Uhr Tag X-7 bis 20 Uhr Tag X-1
- geschafft von mindestens 10% aller Spieler, die es versucht haben
- mindestens 25 Bewertungen
- besser bewertet als alle anderen, die auch die Kriterien erfüllen
Expand Down
Loading

0 comments on commit 44f8d86

Please sign in to comment.