LinoxGH
869051b093
Merge branch 'master' into SfGuideEvent
2020-10-03 23:09:25 +03:00
LinoxGH
2cfbaf3ca6
Added GuideOpenEvent.
2020-10-03 23:05:23 +03:00
TheBusyBiscuit
6b3ae3b1cf
Merge branch 'master' into tags
2020-10-03 22:05:13 +02:00
LinoxGH
d72a60aed1
Added GuideOpenEvent.
2020-10-03 23:04:39 +03:00
TheBusyBiscuit
9ccdfa4655
Merge pull request #2378 from svr333/AddAllCaratGoldsToOreCrusher
...
Add remaining carat golds to ore crusher
2020-10-03 22:03:40 +02:00
poma123
3ec39ec16a
Merge branch 'master' into tags
2020-10-03 21:46:28 +02:00
TheBusyBiscuit
b6a3b38294
Merge pull request #2377 from poma123/fix/cartography-table fixes #2357
...
Cartography Table fix
2020-10-03 21:29:26 +02:00
poma123
b1a07c0337
Minor improvements
2020-10-03 21:18:36 +02:00
poma123
cb97a89f98
Added a separate version check
2020-10-03 21:12:01 +02:00
Senne Van Rompaey
4c0bd29cfa
Add empty line in lore
...
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2020-10-03 20:56:28 +02:00
Senne Van Rompaey
06bf6229fa
Update lore with correct chance
2020-10-03 20:43:31 +02:00
Senne Van Rompaey
2c47a786b8
Narrow talisman down to only ores
2020-10-03 20:27:20 +02:00
Senne Van Rompaey
d70f4df845
Update lore of talisman
2020-10-03 20:06:46 +02:00
Senne Van Rompaey
aba43c5365
Buff chance to 50%
2020-10-03 20:06:18 +02:00
Senne Van Rompaey
ee9b0e90ad
Chance.ToLowerCase()
2020-10-03 19:05:07 +02:00
Senne Van Rompaey
b9750917a6
Rebalance yield results
2020-10-03 17:02:36 +02:00
Senne Van Rompaey
178fc6eb22
Rename Hastier to Caveman
2020-10-03 16:52:49 +02:00
Senne Van Rompaey
7a366aa5ce
Change haste amplifier to 2
2020-10-03 15:15:01 +02:00
Senne Van Rompaey
7301ca834f
Add event listener to BreakBlockEvent for Hastier talisman
2020-10-02 22:04:53 +02:00
Senne Van Rompaey
90d0019cb6
Add chance and proper duration
2020-10-02 21:53:27 +02:00
Senne Van Rompaey
add31a38e0
Set up research for TALISMAN_HASTIER
2020-10-02 21:34:52 +02:00
Senne Van Rompaey
a00e640a6c
Add Talisman of the Hastier
2020-10-02 19:53:01 +02:00
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
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
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
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
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
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
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