1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

5044 Commits

Author SHA1 Message Date
TheBusyBiscuit
17e324fc88
Merge pull request #2347 from OmerBenGera/patch-1
Fixed CargoNetworkTask not checking for other slots before dropping i…
2020-09-26 22:54:59 +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
TheBusyBiscuit
b79597bf07
[CI skip] Merge pull request #2349 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.00
2020-09-26 22:01:10 +02:00
TheSilentPro
4966d3ad4c Separate player-only and no-permission messages 2020-09-26 21:53:09 +02:00
Renovate Bot
678061d08f
Update dependency com.konghq:unirest-java to v3.11.00 2020-09-26 17:28:09 +00: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
beb3a01323 [CI skip] Updated sonarcloud settings 2020-09-24 19:40:22 +02:00
TheBusyBiscuit
d4cc2afbcd
[CI skip] Merge pull request #2346 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.13
2020-09-24 18:13:39 +02:00
Renovate Bot
f2e0606362
Update dependency org.mockito:mockito-core to v3.5.13 2020-09-24 15:53:41 +00: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
8a1780de2c
[CI skip] Failing URL checks be gone 2020-09-23 16:11:06 +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
14b96aae5b
Added back dirt_like tag 2020-09-22 15:51:08 +02:00
TheBusyBiscuit
428c8b4774
Added back tall_flowers tag 2020-09-22 15:46:06 +02:00
TheBusyBiscuit
4c530a4813
Merge branch 'master' into tags 2020-09-22 15:37:03 +02:00
TheBusyBiscuit
fbfd37c4a3
Merge pull request #2341 from J3fftw1/update/didnt-i-already-do-this
Added materials to CoalGenerator
2020-09-22 15:34:16 +02:00
TheBusyBiscuit
8365d1e6d9
Merge branch 'master' into tags 2020-09-22 15:33:56 +02:00
TheBusyBiscuit
e0a76fa0e8
[CI skip] Updated changelog 2020-09-22 15:32:06 +02:00
TheBusyBiscuit
f60fbc7fcd
[CI skip] Updated Discord Banner in README 2020-09-22 10:15:02 +02:00
TheBusyBiscuit
d35ee992ae [CI skip] Added another Unit Test 2020-09-21 23:54:21 +02:00
Panda.com
1c0abdd3fe Did i really get out of bed for this 2020-09-21 23:22:13 +02:00
Panda.com
c8d22fa381 did requested changes 2020-09-21 22:32:04 +02:00
Panda.com
f63d246b82 changed doors to wooden_doors 2020-09-21 22:26:54 +02:00
Panda.com
59f422c757 note to self listen to your notes 2020-09-21 22:16:32 +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
a36dfc1151
[CI skip] Updated changelog 2020-09-21 15:47:06 +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
FluffyBear
a843e99dbf
Merge pull request #3 from Slimefun/master
Update
2020-09-19 16:27:08 -05: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
32462b0554 Merge branch 'tags' of https://github.com/Slimefun/Slimefun4.git into
tags

Conflicts:
	CHANGELOG.md
2020-09-19 11:36:34 +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