Skip to content

Commit

Permalink
Merge branch 'develop' into fix/present
Browse files Browse the repository at this point in the history
  • Loading branch information
KisaragiEffective committed Aug 7, 2021
2 parents 95f68c2 + 14f24b1 commit e5929ca
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ services:
volumes:
- spigot_a:/spigot/
ports:
- 25566:25565
- 7091:7091
- "25566:25565"
- "7091:7091"
environment:
- JMX_PORT=7091
- JMX_BINDING=0.0.0.0
Expand All @@ -47,8 +47,8 @@ services:
volumes:
- spigot_b:/spigot/
ports:
- 25567:25565
- 7092:7091
- "25567:25565"
- "7092:7091"
environment:
- JMX_PORT=7091
- JMX_BINDING=0.0.0.0
Expand All @@ -68,7 +68,7 @@ services:
context: .
dockerfile: ./docker/bungeecord/Dockerfile
ports:
- 25565:25577
- "25565:25577"
networks:
- seichi
environment:
Expand All @@ -84,7 +84,7 @@ services:
context: .
dockerfile: ./docker/bungeecord/Dockerfile
ports:
- 25564:25577
- "25564:25577"
networks:
- seichi
environment:
Expand All @@ -108,7 +108,7 @@ services:
networks:
- seichi
ports:
- 8080:80
- "8080:80"
depends_on:
- db
redis:
Expand All @@ -131,4 +131,4 @@ services:
volumes:
- db-data:/var/lib/mysql
ports:
- 3306:3306
- "3306:3306"
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ class PresentCommand(implicit val ioOnMainThread: OnMinecraftServerThread[IO]) {

object ListSubCommand {
val help: EchoExecutor = EchoExecutor(MessageEffect(List(
"/present list",
" 全てのプレゼントを表示します",
"/present list <ページ数>",
" 全てのプレゼントをページに分けて表示します",
)))

/**
Expand Down

0 comments on commit e5929ca

Please sign in to comment.