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

Added /slimefun drop command #2515

Closed
wants to merge 8 commits into from
Closed

Added /slimefun drop command #2515

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dcf7cc7
Added drop command
NCBPFluffyBear Oct 28, 2020
af1f47e
Added unit test
NCBPFluffyBear Oct 28, 2020
dac01ac
Docs
NCBPFluffyBear Oct 28, 2020
ba6006d
Merge branch 'master' into sf-drop
poma123 Oct 31, 2020
62dcf19
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into s…
NCBPFluffyBear Nov 2, 2020
cbcd67f
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into s…
NCBPFluffyBear Dec 16, 2020
cec3de2
Did changes
NCBPFluffyBear Dec 16, 2020
523290c
Merge remote-tracking branch 'origin/sf-drop' into sf-drop
NCBPFluffyBear Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into s… 
…f-drop

� Conflicts:
�	src/main/resources/languages/messages_en.yml
  • Loading branch information
@NCBPFluffyBear
NCBPFluffyBear committed Nov 2, 2020
commit 62dcf1959c3a96007a1f3ab114b84858be72f04e
1 change: 1 addition & 0 deletions src/main/resources/languages/messages_en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ messages:
invalid-amount: '&4%amount% &cis not a valid amount : it must be higher than 0!'
given-item: '&bYou have been given &a%amount% &7"%item%&7"'
give-item: '&bYou have given %player% &a%amount% &7"%item%&7"'
invalid-research: '&4%research% &cis not a valid Research!'
drop-item: '&a%amount% &7"%item%&7" &bhas been dropped at &a%world%&7: &a%x%&7, &a%y%&7, &a%z%'
not-valid-research: '&4%research% &cis not a valid Research!'
give-research: '&bYou have given %player% the Research &7"%research%&7"'
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.