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

1228 Commits

Author SHA1 Message Date
TheBusyBiscuit
8bbdc37130 Refactored Climbing Picks and added Tags 2020-10-04 02:28:59 +02:00
TheBusyBiscuit
0e6fc92e28
Merge branch 'master' into tags 2020-10-04 00:46:37 +02:00
TheBusyBiscuit
de17060070
Merge pull request #2383 from LinoxGH/SfGuideEvent
Added SlimefunGuideOpenEvent.
2020-10-04 00:40:15 +02:00
TheBusyBiscuit
87196ef3b9
Merge pull request #2385 from Mooy1/master
Speed can affect enchanter/disenchanter times, fixed pom typo
2020-10-04 00:40:01 +02:00
LinoxGH
dbe8755e4a
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2020-10-04 01:04:41 +03:00
Mooy1
e33c70e189 removed accidental space 2020-10-03 16:33:29 -05:00
Mooy1
766d0bbc53 Speed can affect enchanter/disenchanter times, fixed pom typo 2020-10-03 16:27:54 -05:00
LinoxGH
ca76411c40
Update SlimefunGuideListener.java 2020-10-04 00:26:29 +03:00
LinoxGH
2ed707b3b3
Update SlimefunGuideOpenEvent.java 2020-10-04 00:25:27 +03:00
LinoxGH
f7c3a5b052
Did some more requestes changes. 2020-10-04 00:09:52 +03:00
LinoxGH
4316f83a00
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2020-10-04 00:06:20 +03:00
LinoxGH
0e530fe13a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2020-10-04 00:06:13 +03:00
LinoxGH
fc999ae60d
Update SlimefunGuideListener.java 2020-10-03 23:57:27 +03:00
LinoxGH
41fc987083
Did more requested changes. 2020-10-03 23:56:51 +03:00
LinoxGH
a222295b03
Did a requested change. 2020-10-03 23:39:06 +03:00
TheBusyBiscuit
e1a8c6f52e Added caveman talisman tag 2020-10-03 22:21:01 +02:00
LinoxGH
5e038d1cc8
And this is the last build error. Hopefully... 2020-10-03 23:20:51 +03:00
LinoxGH
6d887b8abf
Fixed some build errors. 2020-10-03 23:17:09 +03:00
LinoxGH
869051b093
Merge branch 'master' into SfGuideEvent 2020-10-03 23:09:25 +03:00
LinoxGH
2cfbaf3ca6
Added GuideOpenEvent. 2020-10-03 23:05:23 +03:00
TheBusyBiscuit
6b3ae3b1cf
Merge branch 'master' into tags 2020-10-03 22:05:13 +02:00
LinoxGH
d72a60aed1
Added GuideOpenEvent. 2020-10-03 23:04:39 +03:00
TheBusyBiscuit
9ccdfa4655
Merge pull request #2378 from svr333/AddAllCaratGoldsToOreCrusher
Add remaining carat golds to ore crusher
2020-10-03 22:03:40 +02:00
poma123
3ec39ec16a
Merge branch 'master' into tags 2020-10-03 21:46:28 +02:00
TheBusyBiscuit
b6a3b38294
Merge pull request #2377 from poma123/fix/cartography-table fixes #2357
Cartography Table fix
2020-10-03 21:29:26 +02:00
poma123
b1a07c0337
Minor improvements 2020-10-03 21:18:36 +02:00
poma123
cb97a89f98
Added a separate version check 2020-10-03 21:12:01 +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
Senne Van Rompaey
ee9b0e90ad Chance.ToLowerCase() 2020-10-03 19:05:07 +02:00
Senne Van Rompaey
b9750917a6 Rebalance yield results 2020-10-03 17:02:36 +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
Senne Van Rompaey
7301ca834f Add event listener to BreakBlockEvent for Hastier talisman 2020-10-02 22:04: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
poma123
59c1683295 Added version check 2020-10-02 14:38:57 +02:00
Senne Van Rompaey
642abb78c8 Add remaining carat golds to ore crusher 2020-10-02 14:33:36 +02:00
poma123
93fc7ff3ab Formatting 2020-10-01 22:13:47 +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
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
LinoxGH
50e48ed87c
Merge branch 'master' into tags 2020-10-01 21:42:50 +03:00
Roland Metivier
bfc221a7a5
Replace w/break instead 2020-10-01 12:52:16 -05:00