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.

Sign up for GitHub

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

Jump to bottom

[CI Skip] Allow server owners to fully customize sounds #2844

Merged
merged 30 commits into from
Jun 29, 2023
Merged

[CI Skip] Allow server owners to fully customize sounds #2844

merged 30 commits into from
Jun 29, 2023

Commits on Feb 26, 2021

  1. First draft for the sound service

    @TheBusyBiscuit
    TheBusyBiscuit committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    18cb30c View commit details
    Browse the repository at this point in the history

  2. Added a lot more sounds to the new system

    @TheBusyBiscuit
    TheBusyBiscuit committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    f0beda9 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2021

  1. Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git in… 

    …to feature/sound-manager
    @TheBusyBiscuit
    TheBusyBiscuit committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    f3c43f7 View commit details
    Browse the repository at this point in the history

  2. Added even more sounds to the new system.

    @TheBusyBiscuit
    TheBusyBiscuit committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    84fc597 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git in… 

    …to feature/sound-manager
    @TheBusyBiscuit
    TheBusyBiscuit committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    5dce733 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 

    feature/sound-manager

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/IronGolemAssembler.java
    @TheBusyBiscuit
    TheBusyBiscuit committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    f783ffe View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    e0a58a5 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.md

    @TheBusyBiscuit
    TheBusyBiscuit committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    038a74f View commit details
    Browse the repository at this point in the history

  3. Re-enabled Unit Test

    @TheBusyBiscuit
    TheBusyBiscuit committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    f85c970 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    85745c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2021

  1. Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 

    feature/sound-manager

Conflicts:
	CHANGELOG.md
    @TheBusyBiscuit
    TheBusyBiscuit committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    1a45f61 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    ab04118 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 

    feature/sound-manager

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java
    @TheBusyBiscuit
    TheBusyBiscuit committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    dcc3afe View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Apr 24, 2021
    Configuration menu
    Copy the full SHA
    2790db1 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    2d18bb4 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    1ca3ec3 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    d550d88 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed May 25, 2021
    Configuration menu
    Copy the full SHA
    c9f0140 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    f27ba85 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.md

    @TheBusyBiscuit
    TheBusyBiscuit committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    2dbace3 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    a7ff271 View commit details
    Browse the repository at this point in the history

  2. Some more work on this

    @TheBusyBiscuit
    TheBusyBiscuit committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    ef8b174 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    1a9cfbf View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2022

  1. Merge branch 'master' into feature/sound-manager 

    And resolve conflicts
    @svr333
    svr333 committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    9840491 View commit details
    Browse the repository at this point in the history

  2. Resolve build errors

    @svr333
    svr333 committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    8acff6a View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. Merge branch 'master' into feature/sound-manager

    @TheBusyBiscuit
    TheBusyBiscuit committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    05569fd View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Merge branch 'master' into feature/sound-manager

    @WalshyDev
    WalshyDev committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    f98ffe9 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Merge branch 'master' into feature/sound-manager

    @WalshyDev
    WalshyDev committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    ec4cfe3 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.md

    @WalshyDev
    WalshyDev committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    f9e7f26 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Merge branch 'master' into feature/sound-manager

    @WalshyDev
    WalshyDev committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    43bdd9f View commit details
    Browse the repository at this point in the history