mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
4,879 Commits 1 Branch 0 Tags 64 MiB
b0b5c5a47f
Commit Graph

4879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sfiguz7
87dedf3492 Swapped order as it makes more sense + consistency 2020-10-05 17:17:16 +02:00
Sfiguz7
cff403a7b9 Added blackstone and basalt to crucible's recipes 2020-10-05 17:15:53 +02:00
Senne Van Rompaey
8675e96e75
Add space 
Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>
 2020-10-05 17:11:56 +02:00
Seggan
58e2b9ab3b Added default annonation 2020-10-05 11:01:58 -04:00
Seggan
bb24bdd837 Merge remote-tracking branch 'upstream/master' 2020-10-05 10:55:26 -04:00
svr333
0e57d94d61 Add Sticks recipe to Table Saw 2020-10-05 16:28:23 +02:00
svr333
b3ca362df2 Add DisplayRecipes 2020-10-05 16:06:19 +02:00
Seggan
51dd53cae1 Moved elytra cap to magical gadgets 2020-10-05 10:01:38 -04:00
svr333
d64fe94b50 Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans 2020-10-05 15:58:32 +02:00
svr333
0a19f76787 Use PigZombie over Entity 2020-10-05 15:56:54 +02:00
svr333
b8c2c97766 Add missing import 2020-10-05 15:43:24 +02:00
svr333
6c568bd7d1 Fix imports 2020-10-05 15:38:21 +02:00
svr333
8d3f432158 Use instanceof 2020-10-05 15:37:45 +02:00
svr333
3ca6e612cc Add @nonnull 2020-10-05 15:33:48 +02:00
svr333
ab5251021a Fix compile error 2020-10-05 15:30:23 +02:00
svr333
e65341eb0b Add newline 2020-10-05 15:29:02 +02:00
svr333
a2fb390a8e Extra code to separate methods 2020-10-05 15:28:43 +02:00
svr333
a01d33fea3 Refactor 2020-10-05 15:25:11 +02:00
TheBusyBiscuit
d60aeb05b8
[CI skip] Updated MockBukkit to 0.10.2 2020-10-05 15:07:04 +02:00
svr333
21bf7cf607 Refactor slightly 2020-10-05 15:00:21 +02:00
svr333
ab92df7693 Fix imports 2020-10-05 14:58:53 +02:00
svr333
e1488c0811 Add Zombified piglin conversion 2020-10-05 14:56:40 +02:00
svr333
5ec63f632f Update lore 2020-10-05 14:20:44 +02:00
TheBusyBiscuit
9c96ee1785
[CI skip] Merge pull request #2392 from comrade-om/updating-wiki-json 
updated wiki.json
 2020-10-05 13:05:10 +02:00
TheBusyBiscuit
1dc9aee488
[CI skip] Updated MockBukkit to 0.10.1 2020-10-05 13:02:05 +02:00
svr333
e240fa1b64 Refactor onPlayerDeath 2020-10-05 12:31:55 +02:00
svr333
961f442733 Update recipe for wise_talisman 2020-10-05 12:18:42 +02:00
svr333
64e39abc62 Update resurrected talisman message 2020-10-05 12:13:46 +02:00
Senne Van Rompaey
133705e287
Use SlimefunPlugin.runSync over scheduler 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-05 12:11:00 +02:00
svr333
0e1dba507d Remove redundant .getPlayer()'s 2020-10-05 12:07:16 +02:00
svr333
e08b4b1f17 Refactor onExperienceReceive 2020-10-05 12:05:53 +02:00
TheBusyBiscuit
904a9b1ef0 [CI skip] Updated to MockBukit 0.10.0 2020-10-05 10:01:46 +02:00
Om Uparkar
bf625c3371 corrected spelling mistakes and stuff in wiki.json 2020-10-05 11:55:53 +05:30
Seggan
7f1bddb759 Merge branch 'text_revisions' 2020-10-04 22:05:22 -04:00
Seggan
3dcd5942aa Changed some linguistic things (Biscuit needs to be an English professor) 2020-10-04 22:03:48 -04:00
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
svr333
d5d7960a56 Add missing brackets 2020-10-04 21:00:53 +02:00
svr333
49578b7b51 Fix grammar 2020-10-04 20:59:52 +02:00
Senne Van Rompaey
207d69a09b Uppercase talisman 2020-10-04 20:56:34 +02:00
Senne Van Rompaey
b5b62bc48c Fix imports 2020-10-04 20:56:13 +02: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
Senne Van Rompaey
a1d5d474fc Remove unused scheduler var 2020-10-04 20:35:41 +02:00
Senne Van Rompaey
f5e5484697 Remove unnecessary import 2020-10-04 20:33:42 +02:00