1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

4682 Commits

Author SHA1 Message Date
Seggan
23efd62c49 Added crash helmet listener and research 2020-10-03 16:31:27 -04:00
Seggan
9e0485e526 Added crash helmet 2020-10-03 16:21:39 -04:00
TheBusyBiscuit
35b2e2b66c
Merge pull request #2379 from svr333/AddTalismanOfTheHastier
Add Talisman of the Caveman
2020-10-03 21:14:26 +02:00
TheBusyBiscuit
ada6ce775c
[CI skip] Updated changelog 2020-10-03 21:13:46 +02:00
Senne Van Rompaey
4c0bd29cfa
Add empty line in lore
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2020-10-03 20:56:28 +02:00
Senne Van Rompaey
06bf6229fa Update lore with correct chance 2020-10-03 20:43:31 +02:00
Senne Van Rompaey
2c47a786b8 Narrow talisman down to only ores 2020-10-03 20:27:20 +02:00
Senne Van Rompaey
d70f4df845 Update lore of talisman 2020-10-03 20:06:46 +02:00
Senne Van Rompaey
aba43c5365 Buff chance to 50% 2020-10-03 20:06:18 +02:00
TheBusyBiscuit
57a2704ac5
[CI skip] Updated github docs links 2020-10-03 19:25:41 +02:00
Senne Van Rompaey
ee9b0e90ad Chance.ToLowerCase() 2020-10-03 19:05:07 +02:00
Senne Van Rompaey
178fc6eb22 Rename Hastier to Caveman 2020-10-03 16:52:49 +02:00
Senne Van Rompaey
7a366aa5ce Change haste amplifier to 2 2020-10-03 15:15:01 +02:00
TheBusyBiscuit
b3c4dc9051
[CI skip] Merge pull request #2380 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.6.0
2020-10-03 14:07:54 +02:00
Renovate Bot
ce5b797420
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.6.0 2020-10-02 22:32:44 +00:00
Senne Van Rompaey
7301ca834f Add event listener to BreakBlockEvent for Hastier talisman 2020-10-02 22:04:53 +02:00
Senne Van Rompaey
357f325792 Add message entry for hastier talisman 2020-10-02 22:04:21 +02:00
Senne Van Rompaey
4692bce343 Add entry to researches_en 2020-10-02 21:53:53 +02:00
Senne Van Rompaey
90d0019cb6 Add chance and proper duration 2020-10-02 21:53:27 +02:00
Senne Van Rompaey
add31a38e0 Set up research for TALISMAN_HASTIER 2020-10-02 21:34:52 +02:00
Senne Van Rompaey
a00e640a6c Add Talisman of the Hastier 2020-10-02 19:53:01 +02:00
TheBusyBiscuit
8c850cf181
Merge pull request #2371 from poma123/feature/sf-cheat-seasonal-categories
Added seasonal categories to the Cheat Sheet
2020-10-01 21:05:40 +02:00
TheBusyBiscuit
815b5ce5c2
[CI skip] Updated changelog 2020-10-01 21:04:12 +02:00
poma123
af3156a43b Requested changes 2020-10-01 21:01:37 +02:00
poma123
48b78a8af4 Requested changes 2020-10-01 20:58:09 +02:00
poma123
2cf0ca8188 Added javadocs and nullability annotations 2020-10-01 20:49:54 +02:00
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
poma123
3948031dec Requested changes 2020-10-01 18:06:07 +02:00
poma123
affab6ab80 Revert changes 2020-10-01 17:52:26 +02: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
poma123
a1c973a817 Requested changes 2020-09-30 22:13:41 +02:00
poma123
1175bbca40 Added seasonal categories to the Cheat Sheet 2020-09-30 21:35:06 +02: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