1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Commit Graph

4652 Commits

Author SHA1 Message Date
TheBusyBiscuit
a8f1bfa706
Merge pull request #2374 from andrefpoliveira/fix-issue-2351
Update GrapplingHookListener
2020-10-01 20:45:32 +02:00
TheBusyBiscuit
501394bd08
[CI skip] Updated changelog 2020-10-01 20:45:25 +02:00
TheBusyBiscuit
7d5c34a8c6
Merge pull request #2376 from Chlorophytus/master fixes #2360
Attempt to fix bug #2360
2020-10-01 20:28:51 +02:00
TheBusyBiscuit
2e4f5d565f
[CI skip] Updated changelog 2020-10-01 20:28:28 +02:00
Roland Metivier
bfc221a7a5
Replace w/break instead 2020-10-01 12:52:16 -05:00
Roland Metivier
b327c55b5f
Remove redundant return statements 2020-10-01 12:49:05 -05:00
Roland Metivier
a074e7cc17
Fix formatting 2020-10-01 12:32:17 -05:00
Roland Metivier
cbc48584bc
Attempt to fix bug #2360 2020-10-01 11:28:29 -05:00
BuildTools
c86e59b626 Removed redundance 2020-10-01 11:55:30 +01:00
BuildTools
85ebe5322b Item verification 2020-10-01 11:50:55 +01:00
BuildTools
b6391160a7 Fixed Import 2020-10-01 11:21:03 +01:00
TheBusyBiscuit
6238b57080
Merge pull request #2370 from poma123/fix/necrotic-skull
Made Necrotic Skull unplaceable
2020-10-01 11:01:19 +02:00
TheBusyBiscuit
2263c26d2c
[CI skip] Updated changelog 2020-10-01 11:00:51 +02:00
BuildTools
60c71fe560 Fixed Import 2020-10-01 09:40:19 +01:00
BuildTools
618698fa07 Update GrapplingHookListener 2020-10-01 09:28:26 +01:00
TheBusyBiscuit
4c41650d4a
Merge pull request #2368 from poma123/fix/goldpan
Fixed GoldPan entity interaction
2020-09-30 20:29:21 +02:00
TheBusyBiscuit
9dcd4193f2
[CI skip] Updated changelog 2020-09-30 20:29:14 +02:00
poma123
5f7efbd5a6 Made Necrotic Skull unplaceable 2020-09-30 20:14:26 +02:00
poma123
e852837764 Added EntityInteractHandler cancellation 2020-09-30 19:57:54 +02:00
TheBusyBiscuit
fda74388a6 [CI skip] Internal changes to custom model data 2020-09-30 11:59:55 +02:00
TheBusyBiscuit
20de967306 Improvements to block ticking 2020-09-29 20:38:41 +02:00
TheBusyBiscuit
e7097e2c2b [CI skip] Reduced technical debt, refactoring and improved documentation 2020-09-29 20:19:38 +02:00
TheBusyBiscuit
d97d6b27a2
Merge pull request #2363 from poma123/fix/magical-zombie-pills fixes #2359
Magical Zombie Pills place fix
2020-09-29 15:52:29 +02:00
TheBusyBiscuit
fd1a30be82
[Ci skip] Updated change log 2020-09-29 15:51:59 +02:00
poma123
362299c650 Sorted imports 2020-09-29 15:26:20 +02:00
poma123
57a80ed8a6 Requested changes 2020-09-29 15:24:45 +02:00
poma123
dc318217aa Added Javadocs 2020-09-29 15:24:17 +02:00
poma123
56ba9f7496 Added event cancellation 2020-09-29 15:07:17 +02:00
TheBusyBiscuit
839d408105 [CI skip] Updated discord invite urls 2020-09-28 21:59:18 +02:00
TheBusyBiscuit
395713cd52
Merge pull request #2354 from LinoxGH/patch-6
Possibly fixed #2353
2020-09-28 15:53:26 +02:00
TheBusyBiscuit
35b25636d4
[CI skip] Updated changelog 2020-09-28 15:53:09 +02:00
TheBusyBiscuit
2e2083e847
[CI skip] Added CONTRIBUTING.md to CODEOWNERS 2020-09-28 15:52:32 +02:00
TheBusyBiscuit
b36bc379ed
[CI skip] Created CODEOWNERS file 2020-09-28 15:46:46 +02:00
TheBusyBiscuit
db52f1dfee [CI skip] Updated sonarcloud links 2020-09-27 22:34:17 +02:00
TheBusyBiscuit
abd23406de [CI skip] Moved CONTRIBUTING.md to root directory 2020-09-27 21:54:44 +02:00
LinoxGH
fdd3dbbb4e
Update AbstractCargoNode.java 2020-09-27 21:41:25 +03:00
TheBusyBiscuit
89ff9d8dc2
Merge pull request #2348 from flaxeneel2/grapplinghooks
Pull request for an additional customizable option in grappling hooks
2020-09-27 20:13:57 +02:00
TheBusyBiscuit
1bca830cb0
[CI skip] Updated changelog 2020-09-27 20:13:38 +02:00
flaxeneel2
a82680b9fa commenting fixes 2020-09-27 21:16:28 +04:00
flaxeneel2
518f3c2ebc Made requested changes
[+] Used a better name for the boolean
[+] replaced Boolean with primitive boolean
[+] Used pascal naming system
2020-09-27 16:54:35 +04:00
TheBusyBiscuit
dc551907d2
Merge pull request #2350 from TheSilentPro/backpack-changes
Separate player-only and no-permission messages
2020-09-27 00:00:11 +02:00
TheBusyBiscuit
17e324fc88
Merge pull request #2347 from OmerBenGera/patch-1
Fixed CargoNetworkTask not checking for other slots before dropping i…
2020-09-26 22:54:59 +02:00
TheSilentPro
b41c60934e Fix code consistency 2020-09-26 22:06:23 +02:00
TheBusyBiscuit
75da0b883a
Refactored code 2020-09-26 22:05:47 +02:00
TheBusyBiscuit
b79597bf07
[CI skip] Merge pull request #2349 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.00
2020-09-26 22:01:10 +02:00
TheSilentPro
4966d3ad4c Separate player-only and no-permission messages 2020-09-26 21:53:09 +02:00
Renovate Bot
678061d08f
Update dependency com.konghq:unirest-java to v3.11.00 2020-09-26 17:28:09 +00:00
flaxeneel2
87eb9cb75e final commit
[+] desired feature fully implemented
[+] set the default value to false
[+] now added option does not mess with despawn-seconds
[+] added keepinv boolean to the functions
2020-09-26 20:53:36 +04:00
Ome_R
4d49e1ec8f
Fixed CargoNetworkTask not checking for other slots before dropping items on ground 2020-09-26 17:39:20 +03:00
flaxeneel2
eac3117547 Grappling hook edit
[+] Added a setting to allow the grappling hook to stay in inventory instead of being dropped on the floor on use
2020-09-26 17:27:35 +04:00