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

4831 Commits

Author SHA1 Message Date
Seggan
d6df2ea00c Added crash protection type 2020-10-04 21:59:10 -04:00
Om Uparkar
12038c2c96 updated wiki.json 2020-10-05 03:35:03 +05:30
Seggan
8bbef4c911 Did some requested changes 2020-10-04 16:08:42 -04:00
TheBusyBiscuit
4af3833118
[CI skip] Removed trailing spaces from workflow 2020-10-04 21:11:10 +02:00
Seggan
f87a1d3660 Added research check 2020-10-04 15:07:11 -04:00
TheBusyBiscuit
67bf85e5f8 [CI skip] Added Wiki schema validation 2020-10-04 21:02:33 +02:00
Seggan
107125802c Forgot to change id. Reverted back to setDamage() 2020-10-04 15:02:21 -04:00
Seggan
1dbdd077ec Updated recipe 2020-10-04 14:43:30 -04:00
Seggan
70be1c38d0 Did requested changes 2020-10-04 14:42:50 -04:00
TheBusyBiscuit
4a7367d6ec
[CI skip] Merge pull request #2386 from b10n1k/fix_dublicate_var
Define a constant instead of duplicating "backpacks."
2020-10-04 12:14:25 +02:00
b10n1k
91a5b56947 Define a constant instead of duplicating "backpacks." 2020-10-04 12:09:04 +02:00
TheBusyBiscuit
37a16496ab
[CI skip] Merge pull request #2387 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.7.0
2020-10-04 11:50:05 +02:00
Renovate Bot
f55ebc663f
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.7.0 2020-10-04 09:47:32 +00: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
TheBusyBiscuit
e83e194784
[CI skip] Updated changelog 2020-10-04 00:39:31 +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
Seggan
d9aceea4d6 Changed recipe 2020-10-03 17:27:22 -04: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
Seggan
99e0c542ae Moved crash helmet item declaration 2020-10-03 17:22:03 -04:00
Seggan
b540bc05bc Crash helmet now works 2020-10-03 17:20:29 -04: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
TheBusyBiscuit
33c8744478
[CI skip] Added maven default goals 2020-10-03 22:45:58 +02:00
LinoxGH
a222295b03
Did a requested change. 2020-10-03 23:39:06 +03:00
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
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
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
TheBusyBiscuit
a2cb2eb324
[CI skip] Updated changelog 2020-10-03 22:03:30 +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
TheBusyBiscuit
49b0ec6a9e
[CI skip] Updated changelog 2020-10-03 21:29:13 +02:00
poma123
b1a07c0337
Minor improvements 2020-10-03 21:18:36 +02: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
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