mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
6,238 Commits 1 Branch 0 Tags 64 MiB
f4bded9491
Commit Graph

2332 Commits

Author SHA1 Message Date
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
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
poma123
30603d9bf5 Added an EventHandler for Cartography Table 2020-10-01 19:12:09 +02: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
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
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
TheBusyBiscuit
775275c661
Merge branch 'master' into performance/cobblestone 2020-09-29 20:59:10 +02:00
TheBusyBiscuit
20de967306 Improvements to block ticking 2020-09-29 20:38:41 +02:00
TheBusyBiscuit
e7097e2c2b [CI skip] Reduced technical debt, refactoring and improved documentation 2020-09-29 20:19:38 +02:00
TheBusyBiscuit
277ecb4a29
Merge branch 'master' into tags 2020-09-29 18:57:38 +02:00
poma123
362299c650 Sorted imports 2020-09-29 15:26:20 +02:00
poma123
57a80ed8a6 Requested changes 2020-09-29 15:24:45 +02:00
poma123
dc318217aa Added Javadocs 2020-09-29 15:24:17 +02:00
poma123
56ba9f7496 Added event cancellation 2020-09-29 15:07:17 +02:00
TheBusyBiscuit
839d408105 [CI skip] Updated discord invite urls 2020-09-28 21:59:18 +02:00
TheBusyBiscuit
362b7bda63
Merge branch 'master' into tags 2020-09-28 16:01:30 +02:00
TheBusyBiscuit
395713cd52
Merge pull request #2354 from LinoxGH/patch-6 
Possibly fixed #2353
 2020-09-28 15:53:26 +02:00
TheBusyBiscuit
a674a38f2a
Merge branch 'master' into tags 2020-09-28 15:07:29 +02:00
LinoxGH
fdd3dbbb4e
Update AbstractCargoNode.java 2020-09-27 21:41:25 +03:00
TheBusyBiscuit
89ff9d8dc2
Merge pull request #2348 from flaxeneel2/grapplinghooks 
Pull request for an additional customizable option in grappling hooks
 2020-09-27 20:13:57 +02:00
flaxeneel2
a82680b9fa commenting fixes 2020-09-27 21:16:28 +04:00
flaxeneel2
518f3c2ebc Made requested changes 
[+] Used a better name for the boolean
[+] replaced Boolean with primitive boolean
[+] Used pascal naming system
 2020-09-27 16:54:35 +04:00
TheBusyBiscuit
dc551907d2
Merge pull request #2350 from TheSilentPro/backpack-changes 
Separate player-only and no-permission messages
 2020-09-27 00:00:11 +02:00
TheSilentPro
b41c60934e Fix code consistency 2020-09-26 22:06:23 +02:00
TheBusyBiscuit
75da0b883a
Refactored code 2020-09-26 22:05:47 +02:00
TheSilentPro
4966d3ad4c Separate player-only and no-permission messages 2020-09-26 21:53:09 +02:00
flaxeneel2
87eb9cb75e final commit 
[+] desired feature fully implemented
[+] set the default value to false
[+] now added option does not mess with despawn-seconds
[+] added keepinv boolean to the functions
 2020-09-26 20:53:36 +04:00
Ome_R
4d49e1ec8f
Fixed CargoNetworkTask not checking for other slots before dropping items on ground 2020-09-26 17:39:20 +03:00
flaxeneel2
eac3117547 Grappling hook edit 
[+] Added a setting to allow the grappling hook to stay in inventory instead of being dropped on the floor on use
 2020-09-26 17:27:35 +04:00
TheBusyBiscuit
8568ba300a Small performance optimization and deprecated an old class 2020-09-25 09:46:02 +02:00
TheBusyBiscuit
c0190bfa2d
Merge pull request #2334 from poma123/develop/generator-events 
Added AsyncReactorProcessCompleteEvent and AsyncGeneratorProcessCompleteEvent
 2020-09-23 17:17:25 +02:00
TheBusyBiscuit
99e46fcb2a [CI skip] Relocated and documented two methods 2020-09-22 19:39:06 +02:00
TheBusyBiscuit
dd11cd0f30 [CI skip] Removed redundant interface 2020-09-22 18:38:40 +02:00
TheBusyBiscuit
a439722062 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-09-22 18:37:41 +02:00
TheBusyBiscuit
4c530a4813
Merge branch 'master' into tags 2020-09-22 15:37:03 +02:00
TheBusyBiscuit
d35ee992ae [CI skip] Added another Unit Test 2020-09-21 23:54:21 +02:00
Panda.com
c8d22fa381 did requested changes 2020-09-21 22:32:04 +02:00
Panda.com
b7def0f58d Added materials to CoalGenerator 2020-09-21 22:14:22 +02:00
TheBusyBiscuit
d4c26f20f0
Merge branch 'master' into beeArmor 2020-09-21 15:59:56 +02:00
TheBusyBiscuit
4412b40709
Merge branch 'master' into tags 2020-09-21 15:59:08 +02:00
TheBusyBiscuit
f3b5581a11
Merge pull request #2336 from Seggan/master 
Added Energized Capacitor (From Discord suggestion)
 2020-09-21 15:47:23 +02:00
TheBusyBiscuit
2f37c2b8b7
Merge branch 'master' into tags 2020-09-21 13:24:44 +02:00
TheBusyBiscuit
5cd1d99b70 Fixes #2322 2020-09-21 13:23:14 +02:00
TheBusyBiscuit
9dfd43fda6 Fixed Climbing Pick having no animation in creative mode 2020-09-21 13:14:56 +02:00
TheBusyBiscuit
cdc495e62b Fixes #2325 2020-09-21 13:09:45 +02:00
TheBusyBiscuit
0227e0cc30 [CI skip] Reduced technical debt 2020-09-21 12:51:13 +02:00
Seggan
cbafa4c59c Moved some code and changed energized capacitor recipe 2020-09-20 20:15:32 -04:00
Seggan
5857b85199 Added research text 2020-09-20 12:52:16 -04:00
Seggan
55a384ab87 Made energized capacitor tier 3 (Did I miss any code?) 2020-09-20 12:16:56 -04:00
Seggan
641def8481 Added Energized Capacitor (From Discord suggestion) 2020-09-19 21:43:52 -04:00
poma123
8592051f87 Requested changes 2020-09-19 18:58:38 +02:00
TheBusyBiscuit
749bb972a3 [CI skip] Added a few more annotations 2020-09-19 11:51:02 +02:00
TheBusyBiscuit
23bf314905 Added fluid-sensitive tag 2020-09-19 11:39:35 +02:00
TheBusyBiscuit
9547d51db2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
 2020-09-19 11:35:41 +02:00
poma123
24a97c59d8 Refactoring 2020-09-19 10:37:33 +02:00
poma123
b98cdcf7d8 Added AsyncReactorProcessCompleteEvent 2020-09-19 10:37:06 +02:00
poma123
fa1aad7bf8 Added AsyncGeneratorProcessCompleteEvent 2020-09-19 10:36:27 +02:00
TheBusyBiscuit
917bcce636 Fixed an issue with ChestTerminal 2020-09-18 10:48:36 +02:00
LinoxGH
cf5a6e0cca
Oops forgot an import. 2020-09-17 15:17:53 +03:00
LinoxGH
a63f3eb886
Some refactoring and optimizations. 2020-09-17 15:16:24 +03:00
LinoxGH
2bad759178
Fixed a little issue. 2020-09-16 21:54:23 +03:00
LinoxGH
d40b6199e9
Shhh noone needs to know about this. 2020-09-16 21:25:04 +03:00
LinoxGH
ad1bfc052c
Refactoring, requested changes and lots of improvement. 2020-09-16 21:16:47 +03:00
TheBusyBiscuit
2b062da47a Default changed to false 2020-09-15 19:44:01 +02:00
TheBusyBiscuit
1a7de82c45 Added Unit Tests 2020-09-15 19:42:52 +02:00
TheBusyBiscuit
2810019dbe Visual improvements + config setting for event calling 2020-09-15 12:08:30 +02:00
TheBusyBiscuit
eeff9411a3 Implemented this for androids 2020-09-15 11:09:15 +02:00
TheBusyBiscuit
816e9004ca Added the enum 2020-09-15 10:58:28 +02:00
Daniel Walsh
07f5687b9f
Merge pull request #2323 from LinoxGH/patch-3 2020-09-13 22:33:13 +01:00
LinoxGH
19b95331d6
Added fire tag. 2020-09-13 23:55:16 +03:00
LinoxGH
45da395418
Did a requested change. 2020-09-13 23:41:16 +03:00
LinoxGH
2c0c298dfc
Did a requested change. 2020-09-13 23:36:20 +03:00
LinoxGH
4414b3f29b
Fixed indentation. 2020-09-13 23:35:14 +03:00
LinoxGH
8a91cdbfc2
Code formatting. 2020-09-13 23:32:32 +03:00
Panda.com
5b217246b6 fixed issue 2020-09-13 17:48:48 +02:00
TheBusyBiscuit
1e408665a7 [Ci skip] Removed deprecated method 2020-09-13 12:32:30 +02:00
TheBusyBiscuit
b14f0b76c0 Added unbreakable tag 2020-09-13 12:00:45 +02:00
TheBusyBiscuit
a770378025 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-13 11:57:11 +02:00
TheBusyBiscuit
7b10410a70 [Ci skip] A small change 2020-09-13 11:38:04 +02:00
LinoxGH
cff18a32df
Fixed missing import. 2020-09-12 17:34:32 +03:00
LinoxGH
35e0d44b0b
Some refactoring and added a material check. 2020-09-12 17:21:03 +03:00
Silent
03f7e64107 Fixed colors & functionality of cheat sheet 2020-09-12 15:19:07 +02:00
poma123
5112fd25fa Fixed merge conflicts 2020-09-12 13:02:12 +02:00
poma123
12b32b0856 Merge remote-tracking branch 'upstream/master' into pr/1909 2020-09-12 12:27:24 +02:00
TheBusyBiscuit
8f95cb4f84
[CI skip] Merge pull request #2311 from poma123/fix/typos 
Fixed some typos
 2020-09-11 20:48:20 +02:00
poma123
acd26b68dd We can use useable anyway 2020-09-11 20:29:23 +02:00
poma123
be5f793695 Fixed a bunch of typos 2020-09-11 20:02:17 +02:00
TheBusyBiscuit
e2c021d270
Merge pull request #2310 from LinoxGH/patch-3 
Changed the used sound categories.
 2020-09-11 19:52:48 +02:00
LinoxGH
0177ee13dd
Changed the used SoundCategory. 2020-09-11 20:29:28 +03:00
LinoxGH
ca20594032
Added changed the used SoundCategory. 2020-09-11 20:27:38 +03:00
TheBusyBiscuit
ff9a6f7a3e Fixed Unit Tests 2020-09-11 10:44:00 +02:00
TheBusyBiscuit
ed66ee9b79 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
 2020-09-11 10:33:02 +02:00
NCBPFluffyBear
37c0ce4ce0 Organized imports 2020-09-10 23:52:19 -05:00
TheBusyBiscuit
74edbe499c Fixes #2238 2020-09-11 00:07:26 +02:00
NCBPFluffyBear
57f52f62c6 Did requested changes 2020-09-10 16:27:50 -05:00
NCBPFluffyBear
6b95ed0293 Added Charge Command 2020-09-10 16:02:03 -05:00
TheBusyBiscuit
6fd90bde4f Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-10 16:19:23 +02:00
poma123
d22f7f31d8 Renamed to AsyncMachineProcessCompleteEvent 2020-09-10 14:36:41 +02:00
poma123
6e4ad1345f
This has to be async 2020-09-10 13:58:58 +02:00
TheBusyBiscuit
6c7af43574
Merge pull request #2304 from poma123/develop/machine-process-complete-event 
MachineProcessCompleteEvent
 2020-09-10 12:16:35 +02:00
TheBusyBiscuit
8a3165e9ba Fixed some tags and added glass 2020-09-10 00:33:47 +02:00
TheBusyBiscuit
00e71904b2
Merge pull request #2305 from LinoxGH/patch-3 
Edited markDirty() to clean connectorCache
 2020-09-09 23:33:06 +02:00
LinoxGH
1b80c698c5
Fixed a typo. 2020-09-09 21:36:29 +03:00
LinoxGH
6d6359ce26
Improved the code. 2020-09-09 16:50:04 +03:00
TheBusyBiscuit
9655761ab1 Micro-optimizations Walshy would be proud of 2020-09-09 15:43:44 +02:00
TheBusyBiscuit
035e35a067 Implemented tags in more occurences 2020-09-09 15:34:58 +02:00
poma123
8f34365aaa Removed redundant annotations 2020-09-09 14:51:21 +02:00
poma123
87543ccb83 Fixed javadocs 2020-09-09 14:35:17 +02:00
poma123
a4eb852b19 Added annotations 2020-09-09 14:34:01 +02:00
poma123
25bd60fd0e Fixed a typo 2020-09-09 14:26:01 +02:00
poma123
274c5ada2f Minor improvement 2020-09-09 14:25:47 +02:00
poma123
e628ad2685 Added MachineProcessCompleteEvent 2020-09-09 14:25:20 +02:00
TheBusyBiscuit
f2eeadb24b [CI skip] Some minor changes 2020-09-09 13:18:43 +02:00
TheBusyBiscuit
7fdf10cc8b Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
 2020-09-08 12:37:25 +02:00
TheBusyBiscuit
3a5c1ee22b [CI skip] Removed deprecated class 2020-09-08 12:22:57 +02:00
TheBusyBiscuit
23143cd576
Merge pull request #2297 from LinoxGH/patch-2 
Possibly fixes #2296.
 2020-09-08 12:06:57 +02:00
TheBusyBiscuit
fe22c5e9ed Fixes #2300 (and deprecated bStats) 2020-09-08 12:06:12 +02:00
Daniel Walsh
53dea5e195 Some good old micro-optimisations 2020-09-07 22:38:23 +01:00
LinoxGH
956d8ed078
Did the requested changes. 2020-09-07 18:47:51 +03:00
TheBusyBiscuit
81a8732f41 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-07 13:06:50 +02:00
TheBusyBiscuit
3220a124aa Added more Unit Tests 2020-09-07 12:41:04 +02:00
LinoxGH
cdd7dc9232
Forgot to change a small part. 2020-09-07 13:38:12 +03:00
LinoxGH
7cd2e53bf1
Possibly fixes #2296. 2020-09-07 13:22:59 +03:00
TheBusyBiscuit
5b72faddc3 Implemented tags 2020-09-07 11:08:39 +02:00
TheBusyBiscuit
b09c4af900 Added documentation 2020-09-07 03:12:31 +02:00
TheBusyBiscuit
06498e3f63 Added Unit Test and loop detection 2020-09-07 01:13:25 +02:00
TheBusyBiscuit
773996617d Added Tags 2020-09-07 00:31:26 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
Ome_R
490db0d719
Fixed teleporters not functioning if the teleport event is cancelled 2020-09-06 12:22:37 +03:00
TheBusyBiscuit
be5f1ed8ee
Merge pull request #2285 from NCBPFluffyBear/multitool-offhand-fix 
Multitool offhand hunger consumption fix
 2020-09-05 22:15:47 +02:00
FluffyBear
6e33549006 Got rid of the extra imports 2020-09-05 15:11:29 -05:00
FluffyBear
069b183b68 Changed it back 2020-09-05 15:11:08 -05:00
FluffyBear
c9fd33318e Did changes 2020-09-05 11:12:14 -05:00
TheBusyBiscuit
2791da3796 A bit redundant 2020-09-05 15:01:26 +02:00
TheBusyBiscuit
ec9133cf8a Small improvements 2020-09-05 14:45:42 +02:00
TheBusyBiscuit
8061df9b5e [CI skip] More nullability annotations 2020-09-05 13:56:56 +02:00
FluffyBear
6f49044998 Applied fix 2020-09-04 10:20:11 -05:00
FluffyBear
6ac3c9698b Fixed dual wielding problem with shears 2020-09-04 09:29:08 -05:00
TheBusyBiscuit
0c3cb5db37
[CI skip] Updated it once again 2020-09-04 10:02:20 +02:00
TheBusyBiscuit
deb9e0c711
[CI skip] Updated translator list 2020-09-04 09:57:34 +02:00
FluffyBear
cf1c58dd8b Got rid of charge command from this branch 2020-09-04 00:54:06 -05:00
FluffyBear
90309dabe1 Fixed multitools consuming hunger when used in offhand 2020-09-04 00:46:26 -05:00
FluffyBear
649d4797c9
Merge pull request #1 from TheBusyBiscuit/master 
Update to latest
 2020-09-04 00:40:03 -05:00
TheBusyBiscuit
26f9e5f7c6 More annotations and refactoring 2020-09-03 17:19:24 +02:00
TheBusyBiscuit
dd9962d3e2 Small improvement, many annotations 2020-09-03 12:24:49 +02:00
TheBusyBiscuit
f4869991ca Moved Nether goo to the appropriate package (+ more annotations) 2020-09-02 14:47:32 +02:00
TheBusyBiscuit
4ce4388218 [CI skip] More annotations :o 2020-09-02 13:53:10 +02:00
TheBusyBiscuit
c5630791c0 Added item break sound to some tools 2020-09-02 12:19:18 +02:00
TheBusyBiscuit
3b28545714 Little tweak 2020-09-02 12:08:36 +02:00
TheBusyBiscuit
f1515edae9 Fixed Synthetic Shulker Shells missing 2020-09-02 12:07:16 +02:00
TheBusyBiscuit
8a6e00a402 Even more annotations 2020-09-02 11:53:42 +02:00
TheBusyBiscuit
71322d95a8 More annotations 2020-09-02 11:27:53 +02:00
TheBusyBiscuit
486253973c Renamed to Villager Rune 2020-09-02 11:16:45 +02:00
TheBusyBiscuit
eb9837953c
Delete RangedItemSetting.java 2020-09-02 11:13:16 +02:00
TheBusyBiscuit
7da5b9ad35
Merge branch 'master' into experimental 2020-09-02 10:34:13 +02:00
TheBusyBiscuit
f4091e931b Refactoring and some annotations 2020-09-02 10:31:35 +02:00
TheBusyBiscuit
35c1fa6a23 Fixes #2275 2020-09-01 22:38:22 +02:00
BuildTools
c091c7992f Removed redundancies, added javadocs, fixed formatting 2020-08-31 18:50:35 -05:00
BuildTools
16ea468c38 Added command to charge items 2020-08-31 15:31:09 -05:00
TheBusyBiscuit
4a6068b078 Refactoring 2020-08-31 20:38:01 +02:00
TheBusyBiscuit
93ff508603 More refactoring 2020-08-31 20:37:24 +02:00
TheBusyBiscuit
759946f5c3 [Ci skip] Reduced technical debt 2020-08-31 20:18:35 +02:00
TheBusyBiscuit
3d22e42bef
Merge pull request #2270 from LinoxGH/master 
Fixes #2265 <Tested>
 2020-08-31 19:56:05 +02:00
TheBusyBiscuit
8073b5dafb Fixes #2266 2020-08-31 19:49:25 +02:00
LinoxGH
6dba662d4b
Merge branch 'master' into master 2020-08-31 20:34:15 +03:00
TheBusyBiscuit
68b9a0aed8 Fixes #2269 (+ refactoring) 2020-08-31 19:08:15 +02:00
LinoxGH
d95049db27
Did the requested change. 2020-08-31 19:13:23 +03:00
LinoxGH
f740cc7850
Did the requested change. 2020-08-31 19:04:23 +03:00
LinoxGH
fa01e82179
Did the requested changes. 2020-08-31 18:51:21 +03:00
LinoxGH
e2c93c54e5
Fixes #2265 <Tested> 2020-08-31 17:28:26 +03:00
LinoxGH
918edbeeb1
Fixed the javadocs. 2020-08-30 18:42:57 +03:00
LinoxGH
305dd57b39
Did the requested change. 2020-08-30 18:25:08 +03:00
LinoxGH
dffc5758e2
Fixed compilation error. 2020-08-30 18:21:50 +03:00
LinoxGH
3d0c642477
Added an additional check for Wind Staff 2020-08-30 18:14:39 +03:00
LinoxGH
cdb6eeab96
Did the requested changes. 2020-08-30 18:13:45 +03:00
LinoxGH
e0914af6d9
Fixes #2263 2020-08-30 17:53:39 +03:00
TheBusyBiscuit
6b4f914784 Some more refactoring 2020-08-29 14:20:33 +02:00
TheBusyBiscuit
e3f7e68468 Fixed a merging issue 2020-08-29 14:09:41 +02:00
TheBusyBiscuit
dc233997ae
Merge branch 'master' into refactoring/block-energy 2020-08-29 12:47:50 +02:00
TheBusyBiscuit
ac5d5521ce Fixes #2260 2020-08-28 23:35:11 +02:00
TheBusyBiscuit
ec6f48e374 [CI skip] Refactoring 2020-08-28 23:35:05 +02:00
TheBusyBiscuit
5bef6a9ec8 Fixes #2257 2020-08-28 23:18:43 +02:00
TheBusyBiscuit
9d740436a7
Merge branch 'master' into experimental 2020-08-28 20:53:20 +02:00
TheBusyBiscuit
83b66232fa Fixes #2251 2020-08-28 20:03:45 +02:00
LinoxGH
f371a5fda6
Fixed a stupid issue and added some docs. 2020-08-27 20:53:13 +03:00
LinoxGH
8c1cccc390
Forgot about imports. 2020-08-27 20:33:01 +03:00
LinoxGH
fd665843a0
Did requested changes. 2020-08-27 20:20:13 +03:00
LinoxGH
53abf76a35
Fixed Fluid Pump dupe. 2020-08-27 20:08:02 +03:00
TheBusyBiscuit
f97935b5c7
Deleted unused class 2020-08-27 14:29:02 +02:00
TheBusyBiscuit
fcbae02a4b Fixs #2208 2020-08-27 14:16:09 +02:00
TheBusyBiscuit
4232caf17a [CI skip] Reduced technical debt 2020-08-27 13:16:38 +02:00
TheBusyBiscuit
b9b3d7f504 [CI skip] Removed deprecated class 2020-08-27 13:00:36 +02:00
TheBusyBiscuit
4dab0c5b47 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy 2020-08-26 17:51:43 +02:00
TheBusyBiscuit
3bc943bdb2 Little bit of refactoring 2020-08-26 14:33:40 +02:00
TheBusyBiscuit
c8ab9e8568 Fixes #1022 2020-08-26 14:31:51 +02:00
TheBusyBiscuit
6e6a953009 Fixes #2249 2020-08-26 12:47:08 +02:00
TheBusyBiscuit
dba52edc47 Merge branch 'master' into experimental 2020-08-24 21:12:38 +02:00
TheBusyBiscuit
4bc22ab106 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
 2020-08-24 21:12:04 +02:00
TheBusyBiscuit
ecde46616a Climbing Pick no longer causes fall damage 2020-08-24 20:59:01 +02:00
TheBusyBiscuit
89a5db2593 Fixed Unit Tests for Climbing Pick 2020-08-24 20:45:45 +02:00
TheBusyBiscuit
9e92f64222 Added damageable setting 2020-08-24 20:35:35 +02:00
TheBusyBiscuit
8c2038634f Fixed dual wielding climbing picks and added messages 2020-08-24 20:31:54 +02:00
TheBusyBiscuit
b81959e7a0 Added dual-wielding to the Climbing Pick 2020-08-24 20:19:24 +02:00
TheBusyBiscuit
076ae6532b Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-24 18:12:31 +02:00
poma123
7b7c6350c6 Fixed android script editor menu hotkey glitch 2020-08-24 15:30:51 +02:00
TheBusyBiscuit
605862b400 Improved consistency and reduced redundancy 2020-08-24 14:26:11 +02:00
TheBusyBiscuit
a2b2478394
Update EnergyNet.java 2020-08-24 02:18:32 +02:00
TheBusyBiscuit
d998f3ec8c
Merge branch 'master' into refactoring/block-energy 2020-08-24 02:11:59 +02:00
TheBusyBiscuit
155092a321 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
Conflicts:
	pom.xml
 2020-08-23 17:57:13 +02:00
TheBusyBiscuit
f51a19777f [CI skip] Added more Unit tests 2020-08-23 17:56:38 +02:00
Sfiguz7
89fdf45d28 I said, fixed extra indentation 2020-08-23 17:50:31 +02:00
Sfiguz7
44451d6244 Fixed extra indentation 2020-08-23 17:49:44 +02:00
Sfiguz7
813200b29c Made requested changes 2020-08-23 15:36:10 +02:00
Sfiguz7
bdd2adc21e Cleared unused imports I forgot to delete 2020-08-23 13:56:39 +02:00
Sfiguz7
eb66f3e183 Added option to drop excess items on /sf give 2020-08-23 13:54:51 +02:00
TheBusyBiscuit
ec95797cbf Fixes #2240 2020-08-22 02:38:17 +02:00
TheBusyBiscuit
b36e3e41a8 Reduced technical debt 2020-08-22 02:36:36 +02:00
TheBusyBiscuit
e839ece670 Reduced technical debt 2020-08-22 00:57:44 +02:00
TheBusyBiscuit
95655dc6fc A few fixes and performance improvements 2020-08-21 15:19:08 +02:00
TheBusyBiscuit
167326292d Maybe fixes #1951 (+ performance improvements) 2020-08-20 23:25:43 +02:00
TheBusyBiscuit
29092b87c9
Merge branch 'experimental' into IcePick 2020-08-20 22:56:09 +02:00
TheBusyBiscuit
d8d4811974 Merged Nitwit Rune and Shulker Shell PRs 2020-08-20 18:20:25 +02:00
TheBusyBiscuit
65021f7615
Merge branch 'rune' into ShulkerShell 2020-08-20 17:33:27 +02:00
TheBusyBiscuit
88be3e79ff
Merge branch 'master' into refactoring/block-energy 2020-08-20 16:55:35 +02:00
LinoxGH
73d623a0fd
Github Web and its indent issues. 2020-08-20 14:39:31 +03:00
LinoxGH
37bacaa8cb
Apparently SlimefunPlugin.instance is private now. 2020-08-20 14:30:21 +03:00
LinoxGH
bf3b04a4c5
Oops sorry for this silly mistake 2020-08-20 14:19:48 +03:00
LinoxGH
0946b88cd1
Fixed symbol name issues in ClimbingPick.java 2020-08-20 14:11:46 +03:00
LinoxGH
a54e8623d3
Merge branch 'master' into ShulkerShell 2020-08-20 12:21:50 +03:00
LinoxGH
5f78e7a854
Merge branch 'master' into IcePick 2020-08-20 11:43:14 +03:00
TheBusyBiscuit
9787cf734b Renamed to Nitwit Rune 2020-08-19 14:31:07 +02:00
TheBusyBiscuit
b1abf7bb99 Fixed categories 2020-08-19 14:12:51 +02:00
TheBusyBiscuit
8c5d15e311 Increased Bartering chance 2020-08-19 14:11:33 +02:00
TheBusyBiscuit
66fa277014 A few additional changes 2020-08-19 14:07:42 +02:00
TheBusyBiscuit
57b3f06aa6
Merge pull request #2220 from dniym/NitwitRune 
Added Rune of Unemployment
 2020-08-19 13:58:16 +02:00
TheBusyBiscuit
aa22e7c9b2 [CI skip] A bit of refactoring and documentation 2020-08-19 13:54:46 +02:00
dniym
e13e7e1400
Update RuneOfUnemployment.java 
made requested changes
 2020-08-18 15:30:12 -04:00
TheBusyBiscuit
9d4d2060ba [CI skip] Added a few more strings to translation files 2020-08-18 14:45:51 +02:00
TheBusyBiscuit
6be0709aea Fixes #2138 2020-08-18 14:18:44 +02:00
TheBusyBiscuit
8e8a87fce6 Fixed ChestTerminal timings showing up as cargo nodes 2020-08-17 17:31:15 +02:00
TheBusyBiscuit
fb47574fe8
Added poma's requested change 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2020-08-17 16:27:26 +02:00
TheBusyBiscuit
a10813036b
Added poma's suggested change 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2020-08-17 13:30:18 +02:00
TheBusyBiscuit
0f73b62658
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:30:03 +02:00
TheBusyBiscuit
07c62d5932
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:29:54 +02:00
TheBusyBiscuit
33f6f039ec
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:29:44 +02:00
TheBusyBiscuit
d4953dd029 [CI skip] Added more Unit Tests 2020-08-17 13:00:22 +02:00
TheBusyBiscuit
1bba2efa3e [CI skip] Added more unit tests 2020-08-17 02:23:28 +02:00
TheBusyBiscuit
7a31c88ce9 Fixes #2207 2020-08-17 00:32:18 +02:00
TheBusyBiscuit
c98fe74ea9
Merge branch 'master' into NitwitRune 2020-08-17 00:25:18 +02:00
dniym
42e4b1620d
Update SlimefunItemSetup.java 
Fixed merge conflict 2
 2020-08-16 13:52:09 -04:00
dniym
45b63a149b
Update HeadTexture.java 
Resolved Merge Conflict 1
 2020-08-16 13:45:18 -04:00
dniym
b22bdb55ff Made requested changes 2020-08-16 13:33:36 -04:00
TheBusyBiscuit
2a8abcbdbf Fixed unit tests, also improved test coverage 2020-08-16 15:57:09 +02:00
TheBusyBiscuit
037e8d83df Small performance improvement, also reduced technical debt a bit 2020-08-16 15:49:47 +02:00
TheBusyBiscuit
eb5b2678e0 Fixes #2077 2020-08-14 01:46:05 +02:00
dniym
644878c534 Made Requested Changes 2020-08-13 16:21:18 -04:00
TheBusyBiscuit
c0d18c5c89 Fixes #2217 2020-08-13 21:13:19 +02:00
dniym
a33cfdb12d added a check for jobless villagers 2020-08-12 16:08:15 -04:00
dniym
a1be08034b made requested changes 2020-08-12 16:04:35 -04:00
dniym
b27059240b Added Rune of Unemployment 
Approved Suggestion: #284 - Vitamin_CE#9804
 2020-08-11 20:58:17 -04:00
TheBusyBiscuit
923b59c6e7 [CI skip] Reduced technical debt 2020-08-11 16:28:52 +02:00
TheBusyBiscuit
e406481b98 [CI skip] Replaced the last tabs with spaces 2020-08-11 16:23:31 +02:00
TheBusyBiscuit
1aaedf0825 [CI skip] Added more Unit Tests 2020-08-11 11:17:08 +02:00
TheBusyBiscuit
485a80f6ef Fixes #2209 2020-08-09 11:41:15 +02:00
TheBusyBiscuit
66f4c48b4b Fixes #2205 2020-08-09 11:33:48 +02:00
TheBusyBiscuit
7de9dd6683 Industrial Miners can now also mine Gilded Blackstone 2020-08-08 12:51:26 +02:00
TheBusyBiscuit
9f49dd3981 Reduced technical debt 2020-08-08 12:47:39 +02:00
TheBusyBiscuit
c08eadcaae Small performance improvement 2020-08-08 00:48:09 +02:00
TheBusyBiscuit
bffbb488ba [CI skip] Added Unit Tests for Piglins 2020-08-08 00:45:01 +02:00
poma123
c2fa590aa1
Requested changes 2020-08-07 22:43:58 +02:00
poma123
6ab196a03d
Requested changes 2020-08-07 22:04:15 +02:00
poma123
87f8e7ae8c
Fixed Industrial Miner debris issue 2020-08-07 21:46:59 +02:00
TheBusyBiscuit
9b21c1ade1
Merge pull request #2202 from dniym/elecPressSand 
Elec press sand
 2020-08-07 19:10:11 +02:00
dniym
1fde84a4c7 Approved Suggestion #272 - AutoBio#8746 2020-08-06 21:08:59 -04:00
TheBusyBiscuit
9de72881ab [CI skip] Fixed some URLs 2020-08-07 00:31:09 +02:00
TheBusyBiscuit
d55a546c42 Fixes #2168 2020-08-06 16:24:41 +02:00
TheBusyBiscuit
8d7d157503 Improved documentation 2020-08-06 00:54:49 +02:00
TheBusyBiscuit
ef01c85888 Some refactoring, requested changes 2020-08-06 00:30:33 +02:00
TheBusyBiscuit
46a01c368f
Merge pull request #2192 from poma123/fix/brewing 
Fixed prevent Slimefun items from being added to a Brewing Stand
 2020-08-05 16:49:54 +02:00
TheBusyBiscuit
32849ca563
Merge branch 'master' into refactoring/block-energy 2020-08-05 16:45:34 +02:00
TheBusyBiscuit
7c3599c862 [CI skip] Reduced technical debt 2020-08-05 16:44:43 +02:00
TheBusyBiscuit
c168497e79 [CI skip] Reduced technical debt 2020-08-05 13:31:35 +02:00
poma123
9454c890ea Refactoring 2020-08-05 13:02:35 +02:00
poma123
6de4130d05 Fixed prevention when brewing with slimefun items 2020-08-05 12:41:48 +02:00
TheBusyBiscuit
f50d1d2faa Big performance improvements to Enhanced Furnaces when using Paper 2020-08-04 20:15:21 +02:00
TheBusyBiscuit
c56ebe9c23
Merge branch 'master' into IcePick 2020-08-04 19:12:00 +02:00
TheBusyBiscuit
18036aa181
Added a new entry to SlimefunItems.java 2020-08-04 19:07:00 +02:00
TheBusyBiscuit
f8a988261f
Fixed typo 2020-08-04 19:03:20 +02:00
TheBusyBiscuit
3adb634d8b
Make it not override the vanilla item anymore 2020-08-04 19:02:53 +02:00
TheBusyBiscuit
f9e9a7c491
Updated research id to not break compatibility 2020-08-04 19:00:38 +02:00
TheBusyBiscuit
06f64725d9 Improved performance for idling Enhanced Furnaces on Paper 2020-08-04 18:00:31 +02:00
TheBusyBiscuit
35684b60fc Optimized performance for rainbow blocks 2020-08-04 17:59:41 +02:00
TheBusyBiscuit
d80fdac23b Fixed debug fish 2020-08-04 15:49:58 +02:00
TheBusyBiscuit
b6ba6ce754 Updated all electric machines 2020-08-04 15:43:00 +02:00
TheBusyBiscuit
bc387ee47a Updated EnergyNet code 2020-08-04 13:50:22 +02:00
TheBusyBiscuit
368d2f5798 Move block energy code to EnergyNetComponent 2020-08-04 13:29:45 +02:00
TheBusyBiscuit
8faf505999
Mark Korean as done 2020-08-04 12:50:48 +02:00
TheBusyBiscuit
e870f82afd Added piglin bartering to translation files 2020-08-04 12:40:08 +02:00
TheBusyBiscuit
8a9dfe25a8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 12:30:30 +02:00
TheBusyBiscuit
dbed8b55d9
[CI skip] Merge pull request #2136 from dniym/PiglinDropsFgithub 
Piglin drops fgithub
 2020-08-04 12:25:26 +02:00
TheBusyBiscuit
0ff5fc7251 Small performance improvements for miner talismans 2020-08-04 10:19:24 +02:00
TheBusyBiscuit
eecdb61223 Fixed compilation 2020-08-04 09:53:50 +02:00
TheBusyBiscuit
04a71a2408 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-04 09:52:59 +02:00
TheBusyBiscuit
7cc795f30e One more change 2020-08-04 09:52:53 +02:00
TheBusyBiscuit
54aa45d1d2
Merge branch 'master' into cleanup/blockplacing 2020-08-04 09:47:51 +02:00
TheBusyBiscuit
484c7a22ec Fixes #2180 2020-08-04 09:46:35 +02:00
TheBusyBiscuit
f409b869ae Small performance optimization for bows 2020-08-04 09:46:04 +02:00
TheBusyBiscuit
137e91ad12
Fixes #2181 2020-08-04 01:16:20 +02:00
TheBusyBiscuit
8f289dcdbe Fixes #2181 2020-08-04 01:15:14 +02:00
TheBusyBiscuit
56b78eac61 Fixes #2183 2020-08-04 00:58:43 +02:00
TheBusyBiscuit
cafa66b1a8 Fixes #2184 2020-08-04 00:48:23 +02:00
TheBusyBiscuit
012a0a7df9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
 2020-08-03 17:28:17 +02:00
TheBusyBiscuit
d8f5992282 Fixes #2103 2020-08-03 17:25:27 +02:00
TheBusyBiscuit
8d1e427409 A few more changes 2020-08-03 00:30:58 +02:00
dniym
17f84bcffd
Update PiglinBarterDrop.java 
done
 2020-08-02 17:44:57 -04:00
dniym
ecb3a354ff
Update PiglinBarterDrop.java 
fixed
 2020-08-02 17:44:11 -04:00
dniym
9287e1098d
Update PiglinListener.java 
fixed
 2020-08-02 17:43:26 -04:00
TheBusyBiscuit
1aeba31a96 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
 2020-08-02 23:15:05 +02:00
dniym
21305ddfdb
Update PiglinListener.java 
fixed a compile error
 2020-08-02 16:37:19 -04:00
dniym
9edc082230
Update PiglinBarterDrop.java 2020-08-02 16:29:08 -04:00
dniym
c2376b90b3
Update PiglinListener.java 
made requested changes.
 2020-08-02 16:25:39 -04:00
Lleyton Gray
43838d7270
Applying suggestion 
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
 2020-08-02 13:07:55 -07:00
TheBusyBiscuit
1389085932 Fixed Reinforced Spawners 2020-08-02 22:01:32 +02:00
Lleyton Gray
3703aaa993
Add ItemSetting for toggling mining of Ancient Debris. 
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
 2020-08-02 12:52:16 -07:00
TheBusyBiscuit
d20650855c Fixes #2179 2020-08-02 21:45:58 +02:00
TheBusyBiscuit
b26f2a1ca8 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-02 21:37:03 +02:00
TheBusyBiscuit
a0b9579514 Added ToolUseHandler 2020-08-02 21:36:49 +02:00
lleyton
4c2b6bd1e7
Merge pull request #1 from TheBusyBiscuit/master 
Sync Upstream with Fork
 2020-08-02 12:18:47 -07:00
dniym
eed7b873c7
Update PiglinBarterDrop.java 
made requested changes
 2020-08-02 11:46:46 -04:00
dniym
8305729cfb
Update RandomMobDrop.java 
made requested changes.
 2020-08-02 11:45:19 -04:00
TheBusyBiscuit
6608c3c5d7
Merge branch 'master' into cleanup/blockplacing 2020-08-02 17:43:08 +02:00
TheBusyBiscuit
f32280a4ce Fixes #2176 2020-08-02 17:39:09 +02:00
TheBusyBiscuit
6573a60016 Another commit full of cleanup stuff 2020-08-02 15:16:21 +02:00
TheBusyBiscuit
23d730cd7a Some more refactoring 2020-08-02 14:04:24 +02:00
TheBusyBiscuit
bf65b310aa Fixes #2147 2020-08-02 13:55:58 +02:00
TheBusyBiscuit
34b82d7a6f Fixes #2164 2020-08-02 13:55:31 +02:00
TheBusyBiscuit
e52d062ef5 Reduced technical debt and clutter 2020-08-02 11:22:00 +02:00
Lleyton Gray
fadb31feb1
Allow Ancient Debris to be mined by Industrial Miners 2020-08-01 20:47:43 -07:00
TheBusyBiscuit
a472097798 Fixed androids rotating to the wrong side 2020-08-01 16:16:15 +02:00
TheBusyBiscuit
72a3f59d4b Removed a deprecated method 2020-08-01 15:56:14 +02:00
TheBusyBiscuit
6580e82606 Removed deprecated things 2020-08-01 12:31:05 +02:00
TheBusyBiscuit
c510a8708c Performance improvements for androids 2020-08-01 12:25:47 +02:00
TheBusyBiscuit
76362b2acb Fixes #2166 2020-08-01 00:17:43 +02:00
TheBusyBiscuit
2fc18aed0a Fixes #2162 2020-07-31 20:24:58 +02:00
TheBusyBiscuit
e380f8b972 Fixes #2165 2020-07-31 20:18:51 +02:00
TheBusyBiscuit
446191d4bf Fixes #2156 2020-07-31 20:14:48 +02:00
dniym
80ee551ca2 Made requested changes. 2020-07-30 20:14:14 -04:00
TheBusyBiscuit
df4f316675 Minor change 2020-07-31 01:39:10 +02:00
TheBusyBiscuit
90685edae6 Added a permission node for the debug fish 2020-07-31 01:32:43 +02:00
TheBusyBiscuit
dcb00dff20 [CI skip] Reduced technical debt 2020-07-31 01:08:23 +02:00
TheBusyBiscuit
2f05b9e4f8 Various fixes and performance improvements, mainly for talismans 2020-07-30 17:20:21 +02:00
TheBusyBiscuit
0412a2aec1 Fixes #2151 2020-07-30 10:23:44 +02:00
TheBusyBiscuit
ce18519808 Re-added conditional github warning messages 2020-07-29 23:21:41 +02:00
TheBusyBiscuit
ac4cfd3d68 Fixes #2145 2020-07-29 21:57:08 +02:00
TheBusyBiscuit
5a1b868c91 Fixed Metrics 2020-07-29 13:13:48 +02:00
TheBusyBiscuit
eb8e689d2c Fixes #2143 2020-07-29 13:03:52 +02:00
TheBusyBiscuit
8f2dc7cebc [Ci skip] Fixed formatting 2020-07-29 12:39:04 +02:00
TheBusyBiscuit
2c3343ac5f [Ci skip] Fixed Metrics? 2020-07-29 12:37:16 +02:00
dniym
4f5c1f6760 made requested changes 2020-07-26 12:06:06 -04:00
dniym
260a6f4f61 forgot one 2020-07-26 10:51:18 -04:00
dniym
65f8519805 made requested changes 2020-07-26 10:49:41 -04:00
dniym
ba8aafe312 made requested changes 2020-07-26 10:20:17 -04:00
TheBusyBiscuit
63569fac57 Reduced technical debt and refactored a bit 2020-07-26 13:03:33 +02:00
dniym
22a0623485 fixed formatting 2020-07-25 20:41:27 -04:00
dniym
9093e292a1 Rebased and re-commital of Piglin barter recipe addition. 2020-07-25 20:38:15 -04:00
poma123
0d11d5ae89 Requested changes 2020-07-26 00:33:33 +02:00
poma123
b8d399a92c World-changing fix 2020-07-26 00:22:58 +02:00
poma123
ea2795d5b7 Implemented requested changes 2020-07-26 00:20:59 +02:00
TheBusyBiscuit
3ef6e2066a
Fixed a typo 2020-07-25 23:15:24 +02:00
TheBusyBiscuit
9435dfa2f2 Reduced technical debt and fixed a small issue 2020-07-25 15:29:45 +02:00
TheBusyBiscuit
447012efdf Don't consume zombie pills in creative 2020-07-25 15:02:51 +02:00
TheBusyBiscuit
dc854326ff Added sound effects to the Iron Golem Assembler 2020-07-25 14:59:53 +02:00
TheBusyBiscuit
e92e95c59e Fixed Enchantment Rune 2020-07-25 14:57:05 +02:00
TheBusyBiscuit
c3ab3a6ecc Fixed Enttiy Assemblers 2020-07-25 14:45:57 +02:00
TheBusyBiscuit
f15efd6cc2 Iron Golems require Carved Pumpkins 2020-07-25 14:42:29 +02:00
TheBusyBiscuit
107957a805 Fixed lore 2020-07-25 14:41:15 +02:00
TheBusyBiscuit
88604ee432 Fixed Iron Golem Assembler spawning Withers :o 2020-07-25 14:37:04 +02:00
TheBusyBiscuit
92ca696140 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
 2020-07-25 14:27:12 +02:00
TheBusyBiscuit
42c57f8907 [CI skip] Small change 2020-07-25 14:19:09 +02:00
TheBusyBiscuit
ebce279cf2
Merge pull request #2121 from poma123/patch-2 fixes #2097 
Fixed piglin SlimefunItem pickup
 2020-07-25 13:56:58 +02:00
poma123
dde3ec26ba Requested changes 2020-07-25 13:51:10 +02:00
poma123
a323b09e38 Fixed a tremendous mistake 2020-07-25 13:41:11 +02:00
poma123
5ff93b75e0 Added PiglinListener 2020-07-25 13:37:04 +02:00
poma123
a6d69ee9d6 Requested changes 2020-07-25 12:31:52 +02:00
TheBusyBiscuit
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
poma123
17a68ddcf5 Removed unnecessary Zombified Piglin check 2020-07-25 12:19:02 +02:00
poma123
9fb79c8622 Fixed piglin SlimefunItem pickup 2020-07-25 12:04:22 +02:00
TheBusyBiscuit
abc47af565 Fixed exception handling 2020-07-24 19:11:38 +02:00
LinoxGH
8481f0cde3
Merge branch 'experimental' into ShulkerShell 2020-07-24 19:42:12 +03:00
LinoxGH
3b17874ea2
Merge branch 'experimental' into IcePick 2020-07-24 19:39:59 +03:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
TheBusyBiscuit
47be5f16ce [CI skip] Refactoring, also removed more deprecated things 2020-07-24 16:33:09 +02:00
TheBusyBiscuit
388300f25b
Merge pull request #2117 from kylehassall27/CrushCompressedCoal 
Add recipes to crush compressed carbon into carbon and carbon into coal
 2020-07-24 16:15:59 +02:00
TheBusyBiscuit
d69ef1effb
Merge pull request #2107 from WalshyDev/feature/metrics-module 
Metrics!
 2020-07-24 16:06:53 +02:00
KykyRocks1
dca5348aae Added recipes to crush compressed carbon into carbon and carbon into coal 2020-07-23 15:56:44 -04:00
TheBusyBiscuit
1f7b75b823 Added Iron Golem Assembler (experimental) 2020-07-23 12:02:53 +02:00
Daniel Walsh
b13776d729 Final changes 2020-07-23 10:37:23 +01:00
Daniel Walsh
6f92bd6c28 Requested changes 2020-07-23 09:51:35 +01:00
TheBusyBiscuit
ee62a9b004 Optimized Enhanced Furnaces for Paper and fixes #1894 2020-07-23 01:23:03 +02:00
TheBusyBiscuit
916fb554d0 Fixes #2086 2020-07-23 00:52:59 +02:00
Daniel Walsh
d547d61151 Requested changes 2020-07-22 20:45:55 +01:00
TheBusyBiscuit
ba4282c3e7
[CI skip] Merge pull request #2109 from WalshyDev/change/some-small-changes 
Fix some regex, finals and replace isPresent with ifPresent
 2020-07-22 21:23:20 +02:00
TheBusyBiscuit
8c867c09b6 [CI skip] Some documentation 2020-07-22 21:17:25 +02:00
TheBusyBiscuit
31e4cfa29b
Merge branch 'master' into feature/metrics-module 2020-07-22 20:43:39 +02:00
Daniel Walsh
5e3eccfaa4 Fix some regex, finals and replace isPresent with ifPresent 2020-07-22 18:06:42 +01:00
TheBusyBiscuit
d2754f06fc [CI skip] A bit refactoring 2020-07-22 18:11:43 +02:00
Daniel Walsh
2646eba615 Small change 2020-07-21 14:51:04 +01:00
Daniel Walsh
52a3cbae41 Merge master 2020-07-21 13:57:40 +01:00
Poma123
5fa4e8b083
Added BONE_BLOCK to GrindStone 2020-07-21 13:51:08 +02:00
TheBusyBiscuit
f1e650b28c
Merge branch 'master' into experimental 2020-07-21 10:18:34 +02:00
TheBusyBiscuit
6eebb79314 Fixed 2020-07-21 09:56:29 +02:00
Daniel Walsh
58dbbd8944 Better handling of downloaded files, typo fix and small changes 2020-07-21 08:47:36 +01:00
Daniel Walsh
d31a293486 Requested changes 2020-07-20 16:04:49 +01:00
Daniel Walsh
d252e5a2b5 final final final small thing 2020-07-20 15:51:32 +01:00
Daniel Walsh
4d61a7db51 Reshade stupid bStats 2020-07-20 15:47:22 +01:00
Daniel Walsh
8da64ab308 Moved the metric class 2020-07-20 15:35:31 +01:00
Daniel Walsh
50f034b3e3 Documentation 2020-07-20 15:31:32 +01:00
TheBusyBiscuit
29b26ed327 Made requested changes 2020-07-20 16:30:20 +02:00
Daniel Walsh
fb40bffdce Small change 2020-07-20 15:17:24 +01:00
Daniel Walsh
55041e81b1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/metrics-module 2020-07-20 15:15:39 +01:00
Daniel Walsh
67db0ce59e Oh baby, this is a big one 2020-07-20 15:15:21 +01:00
TheBusyBiscuit
397f194029 Fixed two synchronization issues 2020-07-20 13:08:13 +02:00
TheBusyBiscuit
fd10f2ea4c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into paper 2020-07-20 12:48:25 +02:00
TheBusyBiscuit
eb9466c41d Added a research for the Tape Measure (experimental) 2020-07-20 12:47:13 +02:00
TheBusyBiscuit
4e0df92b56 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
 2020-07-20 12:46:12 +02:00
TheBusyBiscuit
613bcd86b8 Fixes #2093 2020-07-20 12:43:05 +02:00
TheBusyBiscuit
f4c0c9f905 Minor changes 2020-07-20 10:49:59 +02:00
TheBusyBiscuit
64b59e3a02 Spigot is now called "Spigot" 2020-07-20 03:05:49 +02:00
TheBusyBiscuit
c1d6021216 Optimized teleportations 2020-07-20 02:31:58 +02:00
TheBusyBiscuit
045cdf1090 Added performance improvements for Block States 2020-07-20 02:22:24 +02:00
TheBusyBiscuit
ae780a69bb Added PaperLib 2020-07-20 01:51:14 +02:00
TheBusyBiscuit
14e062810b Fixes #2075 2020-07-19 10:53:09 +02:00
TheBusyBiscuit
8042deb591 Some small improvements 2020-07-19 10:31:12 +02:00
TheBusyBiscuit
c78e3c3959 Performance improvements for cargo (when ChestTerminals is installed) 2020-07-16 22:41:36 +02:00
TheBusyBiscuit
75ca7f1d4b Cargo performance improvement 2020-07-15 23:49:44 +02:00
TheBusyBiscuit
52efb03305 Relocated a class 2020-07-15 19:52:29 +02:00
TheBusyBiscuit
3455c70d58 More refactoring 2020-07-15 19:19:38 +02:00
TheBusyBiscuit
52dd7e9705 Refactoring 2020-07-15 18:50:26 +02:00
TheBusyBiscuit
d26eed4534 Removed redundant check 2020-07-15 18:46:17 +02:00
TheBusyBiscuit
72e1cc33bb Minor change 2020-07-15 18:23:57 +02:00
TheBusyBiscuit
eaaf0c5c01 Another performance improvement to Energy networks 2020-07-15 18:23:21 +02:00
TheBusyBiscuit
f14ec8dc99 Missed one line 2020-07-15 13:20:47 +02:00
TheBusyBiscuit
45c01df9dc Updated to latest Spigot API methods 2020-07-15 13:19:51 +02:00
TheBusyBiscuit
c574337318 Reworked Energy Providers (Generators) 2020-07-15 13:17:27 +02:00
TheBusyBiscuit
0735eaad83 [CI skip] Removed more deprecated code 2020-07-14 13:19:04 +02:00
TheBusyBiscuit
572d3dceec
Merge branch 'experimental' into ShulkerShell 2020-07-13 17:05:39 +02:00
TheBusyBiscuit
50c579b7d6 Added a Tape Measure to the experimental branch 2020-07-13 11:55:59 +02:00
TheBusyBiscuit
f5db4bf695 Merge branch 'master' 2020-07-13 10:42:47 +02:00
TheBusyBiscuit
5c159b4247 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
 2020-07-13 10:41:53 +02:00
TheBusyBiscuit
0f7318a749 [CI skip] Removed deprecated classes 2020-07-13 10:36:16 +02:00
TheBusyBiscuit
9af908300f Fixed a NullPointerException for Error-Reports for generators 2020-07-12 13:19:16 +02:00
TheBusyBiscuit
058f34879a Moved the Soulbound Backpack to "Magical Gadgets" 2020-07-10 18:02:51 +02:00
TheBusyBiscuit
8fd0afd8bd Fixes #2081 2020-07-09 18:35:48 +02:00
TheBusyBiscuit
6d3e4ca96b Added a missing annotation 2020-07-09 13:59:16 +02:00
TheBusyBiscuit
4dcc73bbf8 Fixed javadocs 2020-07-09 13:58:04 +02:00
TheBusyBiscuit
c9c760836e Another class relocation 2020-07-09 12:43:26 +02:00
TheBusyBiscuit
c2b0121a07 More refactoring 2020-07-08 13:32:19 +02:00
TheBusyBiscuit
c516cab263 Some refactoring and small optimizations 2020-07-08 11:26:44 +02:00
TheBusyBiscuit
0984afb3c6 Post-PR refactoring 2020-07-07 10:54:32 +02:00
TheBusyBiscuit
f304406aa8
[CI skip] Merge pull request #2071 from dniym/ChanceDrop 
Added Chance Drop for MOB_DROP recipe items. References #980
 2020-07-07 10:28:51 +02:00
dniym
367dd8c914 Negated isDroppedFromGolems 2020-07-06 22:28:41 -04:00
dniym
371b283d21 Replaced Tabs with Spaces as requested 2020-07-06 19:19:13 -04:00
TheBusyBiscuit
afd63a1f51 Small performance optimization for large Cargo networks 2020-07-06 22:04:32 +02:00
LinoxGH
ca2c068e7a
Merge branch 'experimental' into IcePick 2020-07-06 20:13:18 +03:00
dniym
43b48b4b3d Made Requested Changes 2020-07-05 16:54:27 -04:00
dniym
96b4394d7f Made requested changes 2020-07-05 16:45:08 -04:00
dniym
b3f801d84e Made requested changes 2020-07-05 12:35:40 -04:00
TheBusyBiscuit
613dc7b328
Merge branch 'master' into experimental 2020-07-05 16:54:06 +02:00
dniym
645d73d0ef Made requested changes. 2020-07-05 10:40:07 -04:00
TheBusyBiscuit
b243f128de Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-05 15:07:32 +02:00
TheBusyBiscuit
098304a1c4 Implemented a texture cache for contributors 2020-07-05 15:07:28 +02:00
TheBusyBiscuit
3408fcf11f Updated assets 2020-07-05 14:39:28 +02:00
TheBusyBiscuit
e3a920826d One more change 2020-07-05 13:30:13 +02:00
TheBusyBiscuit
6a950fe8d6 Fixed lore 2020-07-05 13:06:13 +02:00
TheBusyBiscuit
b01254eb9d Added Reinforced Cloth 2020-07-05 13:01:17 +02:00
TheBusyBiscuit
74cf035709 Fixed a NullPointerException 2020-07-05 12:13:03 +02:00
TheBusyBiscuit
9426ebb2e9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
 2020-07-05 12:08:30 +02:00
TheBusyBiscuit
88dfdfa560 Small improvement to Cargo performance 2020-07-05 12:04:40 +02:00
TheBusyBiscuit
4edc557547 Fixed an issue where moving Androids got stuck 2020-07-05 11:46:20 +02:00
TheBusyBiscuit
7d901744fd Small improvement 2020-07-04 19:15:13 +02:00
TheBusyBiscuit
5a19b18633 Thunderstorms now count as night for Solar Generators (+ other stuff) 2020-07-04 19:04:29 +02:00
dniym
27149ee514 Fixed formatting error 2020-07-04 09:42:17 -04:00
dniym
aca5b6efc5 Removed unused import 2020-07-04 09:39:13 -04:00
dniym
f80bada54b Made Requested Changes 2020-07-04 09:36:29 -04:00
dniym
1ddd763dbf Added Chance Drop for MOB_DROP recipe items. References #980 
Added interface for ChanceDrop items

Added a check for chance drop items in the EntityDeathListener

Adjusted circuit board to have a 75% chance rather than 100% chance
 2020-07-03 23:19:19 -04:00
TheBusyBiscuit
768e4f1021 Massive performance improvements to Rainbow Glass Panes 2020-07-03 17:43:10 +02:00
TheBusyBiscuit
06b14836dd Added plugins summary to /sf timings 2020-07-03 14:47:51 +02:00
TheBusyBiscuit
4ddea8f7ae Small performance improvement 2020-07-02 20:41:40 +02:00
TheBusyBiscuit
172a2c47fb Added a directional cache to Cargo Nodes, should improve performance 2020-07-02 18:04:26 +02:00
TheBusyBiscuit
8cbaf14d2e Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into feature/profiler

Conflicts:
	CHANGELOG.md
 2020-07-02 11:51:38 +02:00
TheBusyBiscuit
cfefa393a6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-02 11:50:25 +02:00
TheBusyBiscuit
548e3586ae Fixes #2066 2020-07-02 11:50:07 +02:00
TheBusyBiscuit
697b173359 Refactoring 2020-07-02 11:26:38 +02:00
TheBusyBiscuit
ef7624dde9 Performance improvement for ChestTerminal 2020-07-01 20:39:01 +02:00
TheBusyBiscuit
1016b5fc76 Added better summaries, ratings + more performance improvements 2020-07-01 18:20:34 +02:00
LinoxGH
0e9c1a6ccf Removed a redundant import. 2020-07-01 10:33:25 +03:00
LinoxGH
7bf31d600e Did the requested change. 2020-07-01 10:31:06 +03:00
LinoxGH
9100dfe6f3 Minor refactoring and more documentation. 2020-06-30 23:38:21 +03:00
TheBusyBiscuit
a4197fe5dd A couple of performance and memory optimizations 2020-06-30 21:31:55 +02:00
TheBusyBiscuit
d82b66a842 Added a better profiler 2020-06-30 19:36:55 +02:00
TheBusyBiscuit
0aa99df8c2 Performance optimization 2020-06-30 16:44:50 +02:00
LinoxGH
12176a9ae7
Merge branch 'experimental' into IcePick 2020-06-30 13:09:02 +03:00
TheBusyBiscuit
527ffdd742 Added Gilded Blackstone recipe to the Ore Crusher 2020-06-30 02:12:40 +02:00
TheBusyBiscuit
cb7cc4402f Refactoring 2020-06-30 01:33:13 +02:00
TheBusyBiscuit
30c87b2256
Merge pull request #2046 from LinoxGH/EnchRune 
Enchantment Rune
 2020-06-30 01:23:20 +02:00
TheBusyBiscuit
6f1a2b82b5 Added runtime deprecation warnings for Addon Creators 2020-06-29 17:12:54 +02:00
TheBusyBiscuit
3415a124c7 A bunch of refactoring 2020-06-29 15:47:51 +02:00
TheBusyBiscuit
3713940512 Prevent Spigot from breaking everything... 2020-06-29 15:19:20 +02:00
LinoxGH
b6112e2728
Did a requested change. 2020-06-29 14:45:27 +03:00
TheBusyBiscuit
fe63637281 Removed unused folder 2020-06-29 13:04:36 +02:00
TheBusyBiscuit
4f2bb90f15 [CI skip] Slight refactoring 2020-06-29 12:10:45 +02:00
TheBusyBiscuit
acd8278889
Merge pull request #2045 from LinoxGH/ExplosiveBowChange 
Explosive Bow Area of Effect
 2020-06-29 11:46:44 +02:00
LinoxGH
942bf436bb Did another requested change. 2020-06-29 10:02:54 +03:00
TheBusyBiscuit
7f7ed6861e Fixes #1959 and other Grappling hook-related issues 2020-06-29 03:04:31 +02:00
LinoxGH
833b2d3943 Did another requested change. 2020-06-29 01:11:01 +03:00
LinoxGH
28b5d545da Did some requested change. 2020-06-29 00:56:38 +03:00
LinoxGH
5c7accbbe8 Did the requested changes + a fix. 2020-06-28 23:46:09 +03:00
LinoxGH
27ba744fe5 Fixed a little bug. 2020-06-28 22:09:04 +03:00
LinoxGH
e55e2690e7 Did the requested changes. 2020-06-28 22:06:35 +03:00
LinoxGH
005d4c04cc Did the requested changes. 2020-06-28 18:53:12 +03:00
TheBusyBiscuit
c63f4bf8af
Merge pull request #2057 from LinoxGH/HazmatSuitBees 
Added Bee Protection to Hazmat Suit.
 2020-06-28 17:12:10 +02:00
LinoxGH
ef1735985e Did the requested changes, enabled and fixed JUnit test. 2020-06-28 16:42:46 +03:00
LinoxGH
64debe70de Fixed the build errors. 2020-06-28 14:49:20 +03:00
LinoxGH
073fe1322b Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into IcePick 
 Conflicts:
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
 2020-06-28 14:42:34 +03:00
LinoxGH
911ee2340f Did a requested change. 2020-06-28 14:22:15 +03:00
TheBusyBiscuit
03c08ed6f1 Fixes #2062 2020-06-28 11:20:56 +02:00
LinoxGH
d7ba054bef Removed unused imports. 2020-06-28 05:39:32 +03:00
LinoxGH
f3d21daf6a Did the requested changes. 2020-06-28 05:38:49 +03:00
LinoxGH
3e271ac786 Did more requested changes. 2020-06-28 05:29:51 +03:00
LinoxGH
a935951c22 Oops forgot to change these. 2020-06-28 01:14:37 +03:00
LinoxGH
07d837299f Did the requested changes. 2020-06-28 01:07:37 +03:00
LinoxGH
2ecf5a8845 Performance Improvement. 2020-06-28 00:33:17 +03:00
LinoxGH
558d069a33 Did the requested changes + improvements. 2020-06-27 17:45:39 +03:00
LinoxGH
64a1b247b4 Did the requested changes + fixes. 2020-06-27 17:30:28 +03:00
LinoxGH
a456034005 Fixed merge conflicts. 2020-06-27 16:07:22 +03:00
LinoxGH
ba0c3b30dd Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees 
 Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
 2020-06-27 16:01:36 +03:00
LinoxGH
b5ef8ff019 Did the requested changes + improvements. 2020-06-27 15:58:36 +03:00
TheBusyBiscuit
4314581a61 Another fix and an addition 2020-06-27 14:22:45 +02:00
TheBusyBiscuit
50aaa4b965 Added a few more items to the Bio Generator 2020-06-27 14:04:31 +02:00
TheBusyBiscuit
3dc043c857 Refactoring: Relocated Plugin class 2020-06-27 13:10:47 +02:00
LinoxGH
73973a00b7 Did the requested changes and some fixes. 2020-06-27 12:26:15 +03:00
LinoxGH
52dc7585fc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java
 2020-06-27 08:09:09 +03:00
TheBusyBiscuit
6d36655081 Another optimization for Solar Generators 2020-06-27 03:40:27 +02:00
TheBusyBiscuit
bd2f4b196d Minor optimization for Solar Helmet checks 2020-06-27 03:29:10 +02:00
TheBusyBiscuit
468617d9a2 Changed a comment. 2020-06-27 03:13:43 +02:00
TheBusyBiscuit
44c0029587 Fixed a rare concurrency issue with world saving 2020-06-27 02:47:53 +02:00
TheBusyBiscuit
0dfd40e407 Fixed a few more color codes for 1.16 (Sorry Walshy :P ) 2020-06-27 02:35:29 +02:00
TheBusyBiscuit
f6f09d2e2e Some more refactoring 2020-06-27 02:28:01 +02:00
TheBusyBiscuit
b2833b3ce8 Removed unused parameter 2020-06-27 02:18:49 +02:00
TheBusyBiscuit
e081d15c6d Fixed a slight mistake with the lore 2020-06-27 01:46:20 +02:00
LinoxGH
bc074c83ee Did the requested changes. 2020-06-27 02:22:17 +03:00
LinoxGH
ffd57ec760 Did the requested Changes 2020-06-27 01:51:38 +03:00
LinoxGH
9fcbe94553 Organized the new imports. 2020-06-27 00:13:00 +03:00
LinoxGH
6334e251cb Improved the computation of velocity. 2020-06-27 00:06:22 +03:00
LinoxGH
f1aa8a08d0 Did the requested changes 2020-06-26 23:59:40 +03:00
LinoxGH
29fe881768 Added a new lore to Hazmat Suit for 1.15+ 2020-06-26 23:31:15 +03:00
LinoxGH
cd4a36c519 Added Bee Protection to Hazmat Suit. 2020-06-26 23:18:27 +03:00
LinoxGH
207cb35dda Added Climbing Pick 2020-06-26 22:03:17 +03:00
TheBusyBiscuit
80fc0a173e Added lore addition 2020-06-26 20:58:23 +02:00
TheBusyBiscuit
ed85a9a051 Added Unit tests for rechargeable items 2020-06-26 17:58:54 +02:00
TheBusyBiscuit
28e5b57c5d Some better exception handling 2020-06-26 17:36:57 +02:00
TheBusyBiscuit
8d0c816ed2 Some performance improvements 2020-06-26 16:27:16 +02:00
TheBusyBiscuit
6ffa5ab9a7 Lots of refactoring and rewriting of Item Energy 2020-06-26 15:32:57 +02:00
LinoxGH
eb2bbae0c9 Did the requested changes. 2020-06-26 13:31:45 +03:00
LinoxGH
9176d795c8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into EnchRune 2020-06-26 13:28:45 +03:00
TheBusyBiscuit
1520e71107
Updated translators 2020-06-25 22:51:56 +02:00
LinoxGH
f54b277111 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into EnchRune 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/resources/languages/researches_en.yml
 2020-06-25 22:35:14 +03:00
LinoxGH
1a8ff9c511 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ExplosiveBowChange 2020-06-25 22:16:49 +03:00
LinoxGH
e016ea1180 Explosive Bow Functionality Changed. 
Explosive Bow now deals an area of effect.
 2020-06-25 22:13:24 +03:00
TheBusyBiscuit
d18af0c211 Ore Crusher now also accepts Nether Gold Ore 2020-06-25 15:27:18 +02:00
TheBusyBiscuit
427a312240 More steps towards 1.16 compatibility (unfinished) 2020-06-25 14:43:17 +02:00
TheBusyBiscuit
92e7e58915
Merge branch 'master' into support/1.16 2020-06-25 13:40:28 +02:00
TheBusyBiscuit
3b7ad0ac63
[CI skip] Merge pull request #2039 from LinoxGH/AutoDrierFix 
Auto Drier 1.13 Update
 2020-06-25 13:27:50 +02:00
LinoxGH
f9c8cd1d76 Fixed the recipe. 2020-06-25 14:08:57 +03:00
LinoxGH
82b9de4c54 Fixed merge conflict. 2020-06-25 13:38:30 +03:00
LinoxGH
7e20e7cd9f Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into AutoDrierFix 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
 2020-06-25 13:37:33 +03:00
SoSeDiK
e52ac9d43b Make it compile 2020-06-25 13:06:34 +03:00
SoSeDiK
386cbea53b Whoops 2020-06-25 12:59:02 +03:00
SoSeDiK
ade18c7bd8 Remove unused import 2020-06-25 12:58:04 +03:00
SoSeDiK
4ed2258eb0 Replace stream with for loop 2020-06-25 12:49:18 +03:00
LinoxGH
7a09253311 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ShulkerShell 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/resources/languages/researches_en.yml
 2020-06-25 10:11:33 +03:00
Daniel Walsh
81e16a6c47 1.16 support 2020-06-25 06:05:17 +01:00
SoSeDiK
ecd97b3e50 Fixed a tiny typo 2020-06-25 05:54:21 +03:00
SoSeDiK
c175596536 Improve the handling of non-registered worlds 2020-06-25 05:33:02 +03:00
TheBusyBiscuit
a36c42959e Some refactoring of PR #2020 2020-06-25 00:21:43 +02:00
LinoxGH
3cba1f71fc Fixed an issue created by another pr. 2020-06-24 22:46:02 +03:00
LinoxGH
8f0c5100d4
Merge branch 'master' into AutoBrewer 2020-06-24 22:38:15 +03:00
LinoxGH
4249a2b85b Did the requested changes. 2020-06-24 22:33:55 +03:00
TheBusyBiscuit
c64b311ee2 Finished merge of PR #2015 and updated language keys 2020-06-24 21:25:21 +02:00
LinoxGH
776dc2a302 Added some documentation. 2020-06-24 22:17:01 +03:00
TheBusyBiscuit
cccc8f2162
[CI skip] Merge pull request #2015 from LinoxGH/master 
Added Magic Pills. The Edited Version
 2020-06-24 21:11:30 +02:00
TheBusyBiscuit
2424a2ceab [CI skip] Refactoring 2020-06-24 20:50:53 +02:00
LinoxGH
4832701fda Added a research for the recipe. 2020-06-24 21:41:35 +03:00
LinoxGH
9096db6137 Added a new recipe for shulker shell. 2020-06-24 21:39:03 +03:00
LinoxGH
841b2003bb Added 1.13 compability for auto drier. 2020-06-24 21:33:22 +03:00
LinoxGH
e1fc23c265 Fixed an import dis-organisation. 2020-06-24 21:27:27 +03:00
LinoxGH
daadabd535 Fixed an import dis-organisation. 2020-06-24 21:25:42 +03:00
LinoxGH
4f6bbafdfc Added Auto Brewer. 
A new medium machine that can create potions automatically.
 2020-06-24 21:24:16 +03:00
TheBusyBiscuit
6840a1e957 Updated assets 2020-06-24 18:57:12 +02:00
TheBusyBiscuit
d3f1dc6fb3 Fixes #1855 plus a few optimizations 2020-06-24 18:50:39 +02:00
LinoxGH
07224cc7d5 Added Enchantment Rune. 
Added Enchantment Rune that applies a random enchantment on items.
Works similar to Soulbound Rune.
 2020-06-24 16:28:35 +03:00
TheBusyBiscuit
8d373a3812 Minor changes 2020-06-24 14:54:43 +02:00
LinoxGH
573068283a Added the support for 1.13 2020-06-24 01:17:14 +03:00
LinoxGH
3278457441 Did the requested changes. 2020-06-24 01:06:48 +03:00
LinoxGH
9205b143ed Added Magic Pills. 
Added Magic Pills which are used to cure zombie villagers.
Approved suggestion #178
 2020-06-23 21:11:08 +03:00
TheBusyBiscuit
4504259546 Fixed a Unit test 2020-06-22 23:02:21 +02:00
TheBusyBiscuit
1c50d29fa8 Added Nether Quartz Ore Crusher Recipe 2020-06-22 22:49:07 +02:00
TheBusyBiscuit
bab94652bc Duplication glitch fix and performance improvements for Rainbow blocks 2020-06-22 22:45:14 +02:00
TheBusyBiscuit
bdb25b74ec Changed the texture of the Nether Star Reactor 2020-06-22 14:22:41 +02:00
TheBusyBiscuit
7d8ef33d78 Changed the texture for the Nuclear Reactor 2020-06-22 12:07:56 +02:00
TheBusyBiscuit
a06e49cf13 Improvements to error logging in world loading 2020-06-22 01:55:11 +02:00
TheBusyBiscuit
f8182e4e3b Fixed Infused Magnet working even if you haven't researched it 2020-06-21 19:51:34 +02:00
TheBusyBiscuit
8e07ada321 Reduced technical debt / Refactoring 2020-06-21 10:26:54 +02:00
TheBusyBiscuit
68532ea38f Small improvement 2020-06-20 21:41:19 +02:00
TheBusyBiscuit
24cea8dade Further Improvements on the backwards-compatibility toggle 2020-06-20 21:39:41 +02:00
TheBusyBiscuit
c98aca37f1 Massive Performance improvements to GEO-Miner and Oil Pump 2020-06-20 19:33:37 +02:00
TheBusyBiscuit
4b38dd655d Added ReactorExplodeEvent to the API 2020-06-20 19:21:44 +02:00
TheBusyBiscuit
907fb1566a Fixes #2009 2020-06-20 18:52:30 +02:00
TheBusyBiscuit
1456245ee0 Added a toggle for backwards compatibility 2020-06-20 11:56:29 +02:00
TheBusyBiscuit
7059ad216c Refactoring and general improvements 2020-06-19 13:22:52 +02:00
TheBusyBiscuit
3c3dd48e9b Fixes #2005 2020-06-18 21:15:47 +02:00
TheBusyBiscuit
33db9151d6 Lots of refactoring and clean up 2020-06-17 14:56:48 +02:00
TheBusyBiscuit
5c14bc5cbe Refactoring 2020-06-17 01:24:47 +02:00
TheBusyBiscuit
f0b5d55c48 Reduced technical debt 2020-06-16 15:40:05 +02:00
TheBusyBiscuit
e82acc0b3c Refactoring 2020-06-16 15:36:44 +02:00
TheBusyBiscuit
0fd631813b [CI skip] Removed some deprecated stuff 2020-06-16 14:50:03 +02:00
TheBusyBiscuit
314907eb82 A ton of refactoring 2020-06-16 14:16:21 +02:00
TheBusyBiscuit
c77a2c2997 Did some long overdue refactoring 2020-06-16 01:54:18 +02:00
TheBusyBiscuit
d628f8586f Really really big refactoring and deprecation 2020-06-16 01:16:14 +02:00
TheBusyBiscuit
ffa3ea1c1b Further improvements to Unit Tests 2020-06-15 15:01:33 +02:00
TheBusyBiscuit
944c009afb [CI skip] Added Unit Tests for GEO Resources 2020-06-15 13:29:15 +02:00
TheBusyBiscuit
4efc10db15 Fixes #1907 2020-06-15 11:53:38 +02:00
TheBusyBiscuit
c84dd02b39 Fixes #1993 2020-06-14 19:28:51 +02:00
TheBusyBiscuit
4855f0da86 Androids now have a seperate category 2020-06-14 18:58:38 +02:00
TheBusyBiscuit
2bead0cd3d Maybe fixes #1951 2020-06-14 13:34:31 +02:00
TheBusyBiscuit
2733b8a17b Fixes #1992 and changes to the fishing loot for androids 2020-06-14 13:01:38 +02:00
TheBusyBiscuit
cf24923e9c Fixes #1985 2020-06-14 02:39:01 +02:00
TheBusyBiscuit
85af23c17c Fixes #1988 2020-06-14 02:36:32 +02:00
TheBusyBiscuit
debc925bd0 Fixes #1976 2020-06-13 21:24:28 +02:00
TheBusyBiscuit
e3dc17a9df [CI skip] Reduced technical debt 2020-06-13 13:52:53 +02:00
TheBusyBiscuit
4dbc66fc4e [CI skip] More refactoring 2020-06-13 13:05:22 +02:00
TheBusyBiscuit
872c83f1a6 [CI skip] Updated translators 2020-06-13 10:21:15 +02:00
TheBusyBiscuit
7baa3cb81b [CI skip] Reduced technical debt 2020-06-13 10:15:18 +02:00
TheBusyBiscuit
e45764ade1 Refactored a bunch of android-related things 2020-06-13 01:50:48 +02:00
TheBusyBiscuit
e7b7061b56 Added further documentation 2020-06-13 01:08:42 +02:00
TheBusyBiscuit
62ffb59ba2 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-13 01:02:39 +02:00
Josh
0b4904831b
update 2020-06-12 18:52:54 -04:00
Josh
a232d82851
add check 2020-06-12 18:10:06 -04:00
Josh
5f8ae4b182
don't get it twice 2020-06-12 18:04:55 -04:00
Josh
e989969713
safety check in CustomItemDataService 2020-06-12 18:01:19 -04:00
Josh
56bd432719
check if null in getItemMeta 2020-06-12 17:29:04 -04:00
Josh
6bc28d6b69
allow null meta 2020-06-12 17:09:57 -04:00
TheBusyBiscuit
b304ce14e1 [CI skip] Added lots more unit tests, some will be skipped 2020-06-12 19:18:29 +02:00
TheBusyBiscuit
9b2c378c3a [CI skip] Refactored unit tests 2020-06-12 18:55:09 +02:00
TheBusyBiscuit
c5cc2a86ff [CI skip] Refactoring and optimizations 2020-06-11 13:50:22 +02:00
TheBusyBiscuit
79e8ca46ff Another small optimization 2020-06-11 11:42:24 +02:00
TheBusyBiscuit
aeab6df103 Small performance improvements for cargo networks 2020-06-11 10:08:08 +02:00
TheBusyBiscuit
25d970ea94 Fixes #1971 2020-06-11 09:34:29 +02:00
TheBusyBiscuit
5c20d3b470
Merge pull request #1963 from siaynoq/gold-ingot-pulverize 
Adding recipe for vanilla Gold Ingot -> Gold Dust conversion
 2020-06-11 00:43:49 +02:00
TheBusyBiscuit
f58d6aeff4 Small performance improvement 2020-06-11 00:43:17 +02:00
Siaynoq
1156cb33c0 Removed unneeded construction of GOLD_DUST 2020-06-11 08:33:37 +10:00
Siaynoq
5bf4604026 Removed unneeded array objects 2020-06-11 08:05:50 +10:00
TheBusyBiscuit
7acee959ce Lots of refactoring 2020-06-10 23:33:51 +02:00
TheBusyBiscuit
22650f53dd [Ci skip] Refactoring 2020-06-10 21:26:28 +02:00
TheBusyBiscuit
dc592605d6 [Ci skip] Fixed javadoc warning 2020-06-10 17:51:02 +02:00
TheBusyBiscuit
316d70ecc6 [CI skip] Added Unit Tests for /sf backpack 2020-06-10 17:48:00 +02:00
TheBusyBiscuit
9eb22db6de [CI skip] Added more Unit Tests 2020-06-10 17:33:14 +02:00
TheBusyBiscuit
da7291995b [CI skip] Added some Unit Tests for commands 2020-06-10 17:11:28 +02:00
Siaynoq
c44730c589 Adding recipe for vanilla Gold Ingot -> Gold Dust conversion 2020-06-10 14:06:03 +10:00
TheBusyBiscuit
005d2a3c6a Fixed lore 2020-06-09 23:36:01 +02:00
TheBusyBiscuit
b659e51008
Merge pull request #1953 from TheBusyBiscuit/feature/miner 
Added Industrial Miner & Removed Digital Miner
 2020-06-09 23:23:56 +02:00
TheBusyBiscuit
d645fcc75b [CI skip] Updated translators list 2020-06-09 23:23:02 +02:00
TheBusyBiscuit
df947e0967 [CI skip] Refactoring 2020-06-09 23:21:37 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
4f7b06be4c Changes to organic food/fertilizer 2020-06-09 00:10:32 +02:00
TheBusyBiscuit
abe8afab67 More balancing for Organic Food/Fertilizer 2020-06-08 23:25:45 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
TheBusyBiscuit
70738a45ee Refactored recipe service for electric furnaces 2020-06-08 14:20:01 +02:00
TheBusyBiscuit
615e0c07a2 Minor changes 2020-06-07 17:48:10 +02:00
TheBusyBiscuit
586a6970ed
Updated translator list 2020-06-05 18:18:18 +02:00
TheBusyBiscuit
fcd17d3a5a Updated lore for advanced industrial miner 2020-06-05 14:37:31 +02:00
TheBusyBiscuit
8bde659daf The Advanced Miner now preserves buckets 2020-06-05 14:34:24 +02:00
TheBusyBiscuit
cd79775402 Added Advanced Industrial Miner 2020-06-05 14:13:53 +02:00
TheBusyBiscuit
e41eca9caa Refactoring 2020-06-05 14:09:32 +02:00
TheBusyBiscuit
15aabd6a63 Attributes are now hidden 2020-06-05 00:37:21 +02:00
TheBusyBiscuit
4f21fd03bc Finished Industrial Miner 2020-06-05 00:21:45 +02:00
TheBusyBiscuit
c8f78379a1 Added Industrial Miner 2020-06-05 00:00:07 +02:00
TheBusyBiscuit
4664fb00fe Added back researches 2020-06-04 23:59:58 +02:00
TheBusyBiscuit
aebd03301d Added new ItemStacks 2020-06-04 23:56:08 +02:00
TheBusyBiscuit
618bbfff24 Optimized Fuel 2020-06-04 23:55:53 +02:00
TheBusyBiscuit
7e8a63bff8 Dried Kelp Blocks are now valid coal generator fuel 2020-06-04 15:26:35 +02:00
TheBusyBiscuit
968b3df10a Relocated Multiblock class 2020-06-03 09:51:51 +02:00
TheBusyBiscuit
31a9b69651 Refactored Backpacks 2020-06-02 13:58:03 +02:00
TheBusyBiscuit
595767ad03 Some cleanup 2020-06-02 13:50:29 +02:00
TheBusyBiscuit
0faaef9b25 Removed Digital Miners 2020-06-01 14:10:22 +02:00
TheBusyBiscuit
f65ac6b68c Lava can no longer be used as a coolant for reactors 2020-06-01 14:02:49 +02:00
TheBusyBiscuit
2f09470b51 [Ci skip] Reduced technical debt 2020-06-01 13:52:04 +02:00
PhanaticD
dc351f51ad remove metadata on entity death, and when items are removed from pedestal. Also remove references to "item_placed" I do not see anywhere where this key is actually set, maybe leftover from old code? 2020-06-01 01:19:41 -04:00
TheBusyBiscuit
4bb81c0f5f Updated changelog 2020-05-31 00:38:19 +02:00
TheBusyBiscuit
c85b29c009 Fixes #1943 2020-05-30 16:21:13 +02:00
TheBusyBiscuit
5378341839 [Ci skip] Refactoring and proper deprecation of the HandledBlock class 2020-05-30 14:53:29 +02:00
TheBusyBiscuit
343a18a95d Added dried Kelp and bone block recipes to the Electric Press 2020-05-30 13:36:48 +02:00
TheBusyBiscuit
929f26d103 [CI skip] Reduced technical debt 2020-05-30 13:21:17 +02:00
TheBusyBiscuit
d19da209d5 Fixes #1942 2020-05-29 16:07:02 +02:00
TheBusyBiscuit
efd9903ace [CI skip] Refactoring 2020-05-29 12:07:24 +02:00
TheBusyBiscuit
6ca1f7dca9 [Ci skip] Removed deprecated stuff 2020-05-29 01:39:21 +02:00
TheBusyBiscuit
7039eb1312 [skip] Removed weird line breaks und updated translator list 2020-05-28 12:47:01 +02:00
TheBusyBiscuit
e2b979fca9 Pushing a new "stable" build 2020-05-27 13:43:52 +02:00
TheBusyBiscuit
982a07262e Another relocation 2020-05-26 10:21:58 +02:00
TheBusyBiscuit
4af26f3b00 [Ci skip] Added some more basic tests 2020-05-26 09:57:45 +02:00
TheBusyBiscuit
1b951f77ea [CI skip] Added an extremely simple ResearchSetup test 2020-05-25 12:58:01 +02:00
TheBusyBiscuit
a34abcb1e7 Some refactoring, also fixes #1935 2020-05-24 20:19:22 +02:00
TheBusyBiscuit
7ae16f8358 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-05-24 19:13:03 +02:00
TheBusyBiscuit
f38c895780 [CI skip] Updated MockBukkit and re-enabled Deathpoint tests 2020-05-24 19:12:45 +02:00
bito-blosh
aab6624ce0
Fixed android ATTACK part deals wrong damage 2020-05-24 15:39:48 +09:00
TheBusyBiscuit
23c2ab0f65 Fixed custom player heads errors 2020-05-24 01:57:38 +02:00
TheBusyBiscuit
6a4e23853c Added more Unit Tests 2020-05-24 01:48:42 +02:00
TheBusyBiscuit
0af8c41eeb Added a toggle for #1924 and fixes #1933 2020-05-24 01:11:10 +02:00
TheBusyBiscuit
efcc9c1a4b [CI skip] Refactoring 2020-05-24 00:49:27 +02:00
TheBusyBiscuit
323ddc949b Fixes #1926 2020-05-23 20:34:37 +02:00
TheBusyBiscuit
a96f85ece4 [CI skip] Coverage ahoy! 2020-05-23 20:18:43 +02:00
TheBusyBiscuit
a6a4a0a671 [CI skip] Infrastructure for further Unit Testing 2020-05-22 18:01:25 +02:00
TheBusyBiscuit
902367de0c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-05-22 16:40:33 +02:00
TheBusyBiscuit
de93daf9be [CI skip] Updated MockBukkit 2020-05-22 16:40:26 +02:00
TheBusyBiscuit
c51ff84640
Merge pull request #1925 from WalshyDev/fix/walshys-fixes 
Add a way to reload BlockMenu
 2020-05-22 16:36:52 +02:00
Daniel Walsh
9ddbaf70cd So... I can't test this 2020-05-22 15:02:26 +01:00
Daniel Walsh
984a96bcb5 REEE I can't sleep 😢 2020-05-22 14:42:28 +01:00
TheBusyBiscuit
a94da8a372 [Ci skip] Removed unused imports 2020-05-22 12:19:40 +02:00
Daniel Walsh
8db67af455 Requested pickiness 2020-05-22 10:28:21 +01:00
Daniel Walsh
3048f0f6a0 Unit tests save the day 2020-05-22 07:11:58 +01:00
Daniel Walsh
f269c37f76 Add build num to UpdaterService 2020-05-22 07:08:17 +01:00
Daniel Walsh
fffd9921b3 Doc 2020-05-22 06:51:39 +01:00
Daniel Walsh
f049a75006 Add a way to reload menus 2020-05-22 06:43:02 +01:00
FabioZumbi12
7a6e6cd8eb Missing space on line 2020-05-22 01:13:59 -03:00
FabioZumbi12
d1a968d4ff Changed to Block explode, and added the event to Explosive Shovel 2020-05-22 01:07:20 -03:00
FabioZumbi12
388ed255b8 Fix compatibility with other plugins firing bukkit explosion event to do not drop near blocks on pickaxe area if the block was removed from explosion event. 2020-05-22 00:24:18 -03:00
TheBusyBiscuit
9a85120597 Removed debug message 👀 2020-05-21 19:09:49 +02:00
TheBusyBiscuit
69d32bd6f2 Fixes TheBusyBiscuit/ChestTerminal#25 2020-05-21 18:51:53 +02:00
TheBusyBiscuit
04a7435f2b [CI skip] #GiveMeMoreCoverage 2020-05-21 13:44:00 +02:00
TheBusyBiscuit
624f0b298e [Ci skip] Removed debug message 2020-05-21 12:45:04 +02:00
TheBusyBiscuit
83d5eafb54 [CI skip] Added Unit Tests for Waypoints 2020-05-21 12:35:21 +02:00
TheBusyBiscuit
ec33df8e93 [CI skip] Added a little more javadocs 2020-05-20 17:33:18 +02:00
TheBusyBiscuit
acd759ae4c [CI skip] Refactoring 2020-05-20 17:20:52 +02:00
TheBusyBiscuit
0d00e52c29 [CI skip] Added SlimefunUtils.getCustomHead() 2020-05-20 16:47:56 +02:00
TheBusyBiscuit
27fd81298c [CI skip] Added more Unit Tests 2020-05-18 17:11:12 +02:00
Daniel Walsh
c4cb29b897 Add location data to error message 2020-05-18 10:06:24 +01:00
TheBusyBiscuit
dd633df96f [CI skip] Provoking our discord webhook 2020-05-17 20:20:08 +02:00
TheBusyBiscuit
e3ba751cf9 [CI skip] Added more unit tests to cover multiblocks 2020-05-17 16:41:16 +02:00
TheBusyBiscuit
d7a7230d6c [CI skip] Refined the newly added Unit Tests 2020-05-17 15:00:46 +02:00
TheBusyBiscuit
c69a86ae42 [CI skip] Added a Research unlocking unit test 2020-05-17 14:54:16 +02:00
TheBusyBiscuit
65228fbeb1 Added a callback to Research#unlock(...) 2020-05-17 14:13:46 +02:00
TheBusyBiscuit
de8fb5ccef [ci skip] refactoring 2020-05-17 12:49:11 +02:00
TheBusyBiscuit
6eebb9c04d AncientAltar now has a speed variable 2020-05-17 00:40:07 +02:00
TheBusyBiscuit
dec22b9960 Added WaypointCreateEvent 2020-05-16 17:51:42 +02:00
TheBusyBiscuit
3a2cced5d0 Infused Magnets can no longer be placed down 2020-05-16 17:04:16 +02:00
TheBusyBiscuit
b3a3f4511b [CI skip] Fixed PerWorldSettingsService handling some files wrongly 2020-05-16 15:40:22 +02:00
TheBusyBiscuit
7e137fb360 [CI skip] Refactoring 2020-05-16 15:06:32 +02:00
TheBusyBiscuit
e07933a911 [ci skip] Included translators in latest github improvement 2020-05-16 14:22:47 +02:00
TheBusyBiscuit
9cafd147aa [ci skip] New texture for restored backpacks 2020-05-16 13:38:26 +02:00
TheBusyBiscuit
29d2aaf055 Fixes #1914 2020-05-16 12:42:46 +02:00
TheBusyBiscuit
c4012fe697 [ci skip] Reduced mojang.com connection errors 2020-05-16 12:04:19 +02:00
TheBusyBiscuit
d181d54245 Some refactoring 2020-05-16 02:16:29 +02:00
beSnow
733599691a Changed some stuff in BeeWingListener, Should be more performance friendly now. 2020-05-15 23:50:41 +02:00
beSnow
6311f6ec2e Fixed some redundancies 2020-05-15 18:18:07 +02:00
beSnow
f0dbe746c6 Fixed the Wildcard 2020-05-15 17:51:08 +02:00
TheBusyBiscuit
11383cad1d Fixes #1829 2020-05-15 17:45:13 +02:00
TheBusyBiscuit
d5f430c723 Refactoring 2020-05-15 17:44:57 +02:00
TheBusyBiscuit
6553aeb3e1 Fixes #1883 2020-05-15 16:57:47 +02:00
TheBusyBiscuit
c4a3cdc833 Fixed Organic food/fertilizer not being recognized 2020-05-15 16:47:01 +02:00
TheBusyBiscuit
6aeee8f4be [ci skip] Reduced some technical debt 2020-05-15 16:10:25 +02:00
TheBusyBiscuit
3aff637f4f [CI skip] more Unit Tests 2020-05-15 12:16:46 +02:00
beSnow
d88c815005 Fixed Mincraft Version Compatibility and some IDE weirdness 2020-05-15 11:22:22 +02:00
TheBusyBiscuit
9f4557185a
Merge pull request #1910 from Sfiguz7/tests 
setBackpackId param type change, fix in bp command
 2020-05-15 09:59:02 +02:00
Sfiguz7
00fa225d4a Made BackpackListener#setBackpackId accept OfflinePlayer instead, fix in BackpackCommand 2020-05-15 09:11:15 +02:00
TheBusyBiscuit
d11bfe8278 [CI skip] Added more Unit Tests 2020-05-15 01:16:25 +02:00
TheBusyBiscuit
741d18a8e8 Fixes #1903 2020-05-15 00:36:39 +02:00
beSnow
865f97d1ba Added some documentation 2020-05-14 23:35:21 +02:00
beSnow
0d0a4aa578 Fixed some Wildcards (Auto formater messed with it) 2020-05-14 23:14:27 +02:00
beSnow
f0f134ea72 Added Bee Armor (and all the things to make it function) 2020-05-14 22:50:15 +02:00
TheBusyBiscuit
886121e226 Fixes #1908 2020-05-14 20:07:18 +02:00
TheBusyBiscuit
c2fb42b721 Relocated an Interface 2020-05-14 20:05:08 +02:00
TheBusyBiscuit
cf32902730 Fixed DyedBackpacks 2020-05-13 23:52:22 +02:00
TheBusyBiscuit
3adbc84d53 Removed some longtime deprecated methods 2020-05-12 22:32:59 +02:00
TheBusyBiscuit
67121760cd Added Unit Tests for "Soulboundness" 2020-05-12 22:12:42 +02:00
Daniel Walsh
c0a530f532 Fix conflict 2020-05-12 20:17:34 +01:00
Daniel Walsh
6634d44033
Merge branch 'tests' into feature/soulbound-key 2020-05-12 20:15:47 +01:00
Daniel Walsh
0bd78104cc Requested changes and performance improvements 2020-05-12 18:43:34 +01:00
TheBusyBiscuit
471a271518 Another one bites the Unit Tests 2020-05-12 00:50:01 +02:00
TheBusyBiscuit
05e36bf839
Merge pull request #1898 from Sfiguz7/tests 
Backpack command
 2020-05-12 00:08:42 +02:00
TheBusyBiscuit
736f7bc542 Added an additional validation and unit test 2020-05-11 23:20:40 +02:00
TheBusyBiscuit
d01a7d2186 Added Unit Tests for NetworkManager and Network class 2020-05-11 23:02:24 +02:00
Sfiguz7
8b09111b4a Overridden description getter 2020-05-11 22:19:33 +02:00
TheBusyBiscuit
3597fc0388 Reduced technical debt 2020-05-11 18:56:01 +02:00
Sfiguz7
8c0ff9acfb Now cloning :/ Also fixed double key in messages 2020-05-11 16:58:58 +02:00
Sfiguz7
b2856755d9 Added Javadocs, removed unnecessary parameter 2020-05-11 16:11:41 +02:00
Sfiguz7
23fdd45b3d Messages fixes, Refactored HiddenBackpack to be dedicated to restored bp 2020-05-11 15:35:35 +02:00
Sfiguz7
bcb2add2a6 Integrity! HiddenBackpack now accepts size, restored bp has 54 2020-05-11 15:19:50 +02:00
Sfiguz7
da25ac9f80 Redone fixes without formatting 2020-05-11 09:24:01 +02:00
Sfiguz7
cb8efb2d55 Revert "Last fixes(?)" 
This reverts commit 21f21ed671.
 2020-05-11 09:19:25 +02:00
Sfiguz7
21f21ed671 Last fixes(?) 2020-05-11 02:18:06 +02:00
Daniel Walsh
b4f19e8548 Document 2020-05-11 01:12:41 +01:00
Daniel Walsh
bd02eb9570 Tested! 2020-05-11 01:09:49 +01:00
Daniel Walsh
8795900ec6 Quick soulbound key to speed this up 2020-05-11 00:50:40 +01:00
Sfiguz7
cedd749edb Split a line for readability 2020-05-11 01:46:12 +02:00
Sfiguz7
e021fb9ce3 Tweaked, requested changes added 2020-05-11 01:25:59 +02:00
Sfiguz7
0fc0a0be29 I said, added a command! 2020-05-10 23:28:30 +02:00
Sfiguz7
fcf28fdf7f Added a command to retrieve lost backpacks 2020-05-10 23:27:09 +02:00
TheBusyBiscuit
ccad2982ab Fixes #1897 2020-05-10 21:37:24 +02:00
TheBusyBiscuit
ea200b37aa Added UpdaterService#isEnabled() 2020-05-10 21:35:48 +02:00
TheBusyBiscuit
0eeef20b1f A little bit more Unit Tests 2020-05-10 17:13:31 +02:00
TheBusyBiscuit
feadc9f231 Some refactoring and documentation 2020-05-10 16:54:33 +02:00
TheBusyBiscuit
990b717339 Added ItemStackWrapper Unit Tests 2020-05-10 15:34:04 +02:00
TheBusyBiscuit
d39906866d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into tests
 2020-05-10 10:32:55 +02:00
TheBusyBiscuit
eacbd2c5c1 Refactored Talismans a bit 2020-05-10 10:31:28 +02:00
jacky
bacd14a833 Removed unuse parameter for consumeItem() 2020-05-10 10:54:19 +08:00
jacky
64451244cd Removed unuse parameter for consumeItem() 2020-05-10 10:43:53 +08:00
jacky
13afbecb90 Fixed Ender Talisman to be consumed inside Ender Chest 2020-05-10 10:41:31 +08:00
TheBusyBiscuit
71d13869a1 Added Unit Tests for Player Profile and related 2020-05-10 02:22:38 +02:00
TheBusyBiscuit
6a0c45c788 Removed Reflection 2020-05-09 21:39:59 +02:00
TheBusyBiscuit
4df99b6fd8 You better work :reeeee: 2020-05-09 20:31:03 +02:00
TheBusyBiscuit
1646d7c82d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into tests

Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
 2020-05-09 18:24:11 +02:00
TheBusyBiscuit
c93c6cfa68 Small refactoring 2020-05-09 18:00:10 +02:00
jacky
d806837000 Fixes Prismarine Brick duplication bug with Grind Stone #1851 2020-05-09 22:04:27 +08:00
jacky
e329560d6d Revert "Fixes Prismarine Brick duplication bug with Grind Stone #1829" 
This reverts commit cd0baa30
 2020-05-09 22:04:07 +08:00
jacky
cd0baa307e Fixes Prismarine Brick duplication bug with Grind Stone #1829 2020-05-09 21:22:25 +08:00
TheBusyBiscuit
0e6ce77fd8 Deprecated these methods again 2020-05-09 10:51:55 +02:00
TheBusyBiscuit
cf777126ba [CI skip] Deprecated two methods because the Research class will move 2020-05-09 10:48:02 +02:00
TheBusyBiscuit
922444c046 Added new api method for researches 2020-05-09 10:41:36 +02:00
TheBusyBiscuit
c4026966a2 Removed api method 2020-05-09 10:35:21 +02:00