mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
4,822 Commits 1 Branch 0 Tags 64 MiB
7c030c736f
Commit Graph

4822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
svr333
7c030c736f Refactor (still build errors) 2020-10-08 18:21:00 +02:00
svr333
82716dd808 Fix resurrected_talisman lore 2020-10-08 15:30:25 +02:00
svr333
73cbbc3b54 Improve recipes of new Talismans 2020-10-08 15:29:46 +02:00
svr333
b722dc2a00 Update lore 2020-10-08 00:20:35 +02:00
svr333
d17d21b7ed Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans 2020-10-07 17:04:31 +02:00
svr333
a6a29509c7 Fix remaining issues 2020-10-07 17:02:42 +02:00
TheBusyBiscuit
273d95ed9c
Delete settings.json 2020-10-07 16:51:52 +02:00
svr333
5e39920e59 Remove static's 2020-10-07 16:45:34 +02:00
svr333
9be590459a Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans 2020-10-07 16:43:20 +02:00
svr333
79d652bb70 Add .factorypath and .vscode folder 2020-10-07 16:42:53 +02:00
Senne Van Rompaey
085ad2cd6b
Merge branch 'master' into MoreTalismans 2020-10-07 16:06:32 +02:00
svr333
a5998773e3 Fix build error 2020-10-07 16:04:02 +02:00
TheBusyBiscuit
80c4242dd7
Merge pull request #2384 from Seggan/master 
Added Elytra Cap
 2020-10-07 16:01:45 +02:00
TheBusyBiscuit
7b179239e4
[CI skip] Updated changelog 2020-10-07 16:01:19 +02:00
svr333
3747ba4afa Remove second consumeItem 2020-10-07 15:59:33 +02:00
svr333
a9b8f608ff Attempt to make it work 2020-10-07 15:54:32 +02:00
TheBusyBiscuit
942cb8e1e1
Merge pull request #2404 from Sfiguz7/master 
Fixes #2403
 2020-10-07 14:30:10 +02:00
TheBusyBiscuit
c33f73d2fe
[CI skip] Updated changelog 2020-10-07 14:30:01 +02:00
Sfiguz7
91a7d9eacd Why u do dis IntelliJ >:( 2020-10-07 13:37:32 +02:00
Sfiguz7
46dca73e04 Forgot to clean crucible changes off 2020-10-07 13:36:11 +02:00
Sfiguz7
f8be447821 Fixes #2403 2020-10-07 13:32:10 +02:00
Sfiguz7
51d0ac0417 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-10-07 13:06:45 +02:00
svr333
8ff3b31bf6 Create tryFind method 2020-10-07 12:03:45 +02:00
svr333
db7e39ff10 Fix requested changes 2020-10-07 00:06:32 +02:00
svr333
2eddaef88c Fix comments 2020-10-07 00:00:22 +02:00
Seggan
1ccd4c14ac More changes... 2020-10-06 15:41:14 -04:00
Seggan
960d53840a Moved import 2020-10-06 15:39:15 -04:00
Seggan
20aa5d49dc Merged ifs 2020-10-06 15:34:37 -04:00
Seggan
d1ede58f85 More requested changes... 2020-10-06 15:12:35 -04:00
TheBusyBiscuit
d09a7e0f93 Fixes #2391 2020-10-06 21:05:39 +02:00
TheBusyBiscuit
07c84af3b5 Added NotConfigurable attribute 2020-10-06 21:01:18 +02:00
TheBusyBiscuit
f98d048b55 [CI skip] Reduced technical debt 2020-10-06 20:20:02 +02:00
svr333
a9ce3c1f3e Try to implement requested feature for RessurectedTalisman 2020-10-06 15:34:18 +02:00
Seggan
db6295616e Did more requested changes 2020-10-05 17:05:05 -04:00
Seggan
a4dc1428bc Changed protection check (untested) 2020-10-05 17:02:09 -04:00
Seggan
4b3e31a8c7 Renamed listener 2020-10-05 16:56:25 -04:00
TheBusyBiscuit
cdff86fdd6
Merge pull request #2394 from svr333/ImproveMagicalZombiePills 
Improve magical zombie pills
 2020-10-05 22:50:47 +02:00
TheBusyBiscuit
b26924bf81
[CI skip] Updated changelog 2020-10-05 22:50:32 +02:00
svr333
d5caaaa13e Add base for ResurrectedTalisman 2020-10-05 22:46:53 +02:00
svr333
7eb680fa58 Remove redundant new line 2020-10-05 20:15:11 +02:00
svr333
997dce8970 Extract to method && remove redundant if statement 2020-10-05 20:07:56 +02:00
Senne Van Rompaey
94c5068cc2
Move version check 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-05 20:03:50 +02:00
svr333
51de095404 Add ResurrectedTalisman class 2020-10-05 19:55:27 +02:00
svr333
868a7e566b Change else if to else 2020-10-05 19:34:26 +02:00
svr333
b237d076bf Add version check 2020-10-05 19:34:00 +02:00
svr333
fe50d96270 Remove empty line 2020-10-05 18:38:58 +02:00
Sfiguz7
1d1adf9b3e Added mc version check 2020-10-05 17:25:57 +02:00
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
Seggan
58e2b9ab3b Added default annonation 2020-10-05 11:01:58 -04:00