Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve conditional waiting and shutdown handling #2269

Merged
merged 9 commits into from
Jan 28, 2023

Commits on Sep 28, 2022

  1. Configuration menu
    Copy the full SHA
    17e94db View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ed7754b View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. Merge remote-tracking branch 'origin/master' into patch-condvar

    # Conflicts:
    #	src/main/java/net/dv8tion/jda/internal/JDAImpl.java
    MinnDevelopment committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    2c2d5dd View commit details
    Browse the repository at this point in the history
  2. Add awaitShutdown

    MinnDevelopment committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    fd9f30b View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. Add timeunit support

    MinnDevelopment committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    e572a6c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dacaf98 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0168278 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8a8ea77 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Merge remote-tracking branch 'origin/master' into patch-condvar

    # Conflicts:
    #	src/main/java/net/dv8tion/jda/internal/audio/AudioConnection.java
    MinnDevelopment committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    0eefba5 View commit details
    Browse the repository at this point in the history