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
395713cd52
Merge pull request #2354 from LinoxGH/patch-6
...
Possibly fixed #2353
2020-09-28 15:53:26 +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
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
a439722062
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2020-09-22 18:37:41 +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
f3b5581a11
Merge pull request #2336 from Seggan/master
...
Added Energized Capacitor (From Discord suggestion)
2020-09-21 15:47:23 +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
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
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
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
7b10410a70
[Ci skip] A small change
2020-09-13 11:38:04 +02:00
Silent
03f7e64107
Fixed colors & functionality of cheat sheet
2020-09-12 15:19:07 +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
NCBPFluffyBear
37c0ce4ce0
Organized imports
2020-09-10 23:52:19 -05: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
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
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
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
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
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
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
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