1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Commit Graph

7381 Commits

Author SHA1 Message Date
Daniel Walsh
bafaf135a6
Merge pull request #3319 from Slimefun/fix/enderlump_recipe 2021-10-12 15:47:36 +01:00
Alessio Colombo
5f27e968b3 Removed unused recipe from GrindStone 2021-10-12 16:26:19 +02:00
Alessio Colombo
1ea5281b27 Updated changelog 2021-10-12 16:23:52 +02:00
Alessio Colombo
5817494b2a Recipe fix 2021-10-12 16:19:29 +02:00
Daniel Walsh
ab13980f13
[CI Skip] Merge pull request #3318 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x 2021-10-12 14:21:12 +01:00
Renovate Bot
c82e02db43
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.8 2021-10-12 11:51:49 +00:00
TheBusyBiscuit
008090cc6f [CI skip] Added unit test for new debugging tool 2021-10-11 01:37:54 +02:00
TerslenK
8ba3e35f0e
Merge branch 'Slimefun:master' into master 2021-10-10 23:32:46 +03:00
Daniel Walsh
ee43db9388
Merge pull request #3311 from Slimefun/feature/debug-command 2021-10-10 20:50:37 +01:00
TheBusyBiscuit
5883a84158
Merge branch 'master' into feature/debug-command 2021-10-10 19:45:40 +02:00
TheBusyBiscuit
b68ecf55d5
Update CHANGELOG.md 2021-10-10 19:45:08 +02:00
Daniel Walsh
9d222ec49c
peepoPog wow 2021-10-10 18:42:08 +01:00
TerslenK
2c2042de82
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-10 20:38:43 +03:00
Daniel Walsh
3f00777db3
Fix import 2021-10-10 18:29:01 +01:00
Daniel Walsh
cdf5142f8b
Improved message and removed tab completion 2021-10-10 17:58:09 +01:00
Daniel Walsh
13a7b5effb
[CI Skip] Merge pull request #3316 from Slimefun/renovate/ibiqlik-action-yamllint-3.x 2021-10-10 16:53:56 +01:00
Renovate Bot
8da712453f
Update ibiqlik/action-yamllint action to v3.1.0 2021-10-10 15:11:34 +00:00
terslenk
7e3774ecd1 adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:32:54 +03:00
terslenk
4b652ca485 Merge remote-tracking branch 'origin/master' 2021-10-10 14:20:54 +03:00
terslenk
75b298ed18 adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:20:35 +03:00
TerslenK
76b82b8fbe
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
2021-10-10 14:15:36 +03:00
terslenk
af9c61904d adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:06:49 +03:00
Daniel Walsh
c18ce123c0
Add "disable" to tab complete 2021-10-09 18:02:22 +01:00
Daniel Walsh
4444fc6ec2
Changes 2021-10-09 17:57:38 +01:00
TheBusyBiscuit
e42700dc98
Merge pull request #3307 from svr333/AdjustSolarGenerator
Solar Generators - Return night energy in non overworld dimensions
2021-10-09 18:08:11 +02:00
TheBusyBiscuit
b3a3131210
[CI skip] Updated changelog 2021-10-09 18:08:04 +02:00
Daniel Walsh
cea2ec194f
Merge branch 'feature/debug-command' of github.com:Slimefun/Slimefun4 into feature/debug-command 2021-10-09 16:35:39 +01:00
Daniel Walsh
b3ee9628b5
Add perm to plugin.yml 2021-10-09 16:35:30 +01:00
Daniel Walsh
ccd4d5bf65
Apply suggestions from code review
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2021-10-09 16:19:30 +01:00
Senne
b0544ee79b
Add as setting 2021-10-09 16:09:25 +02:00
Senne
42e647020f
Remove redundant line 2021-10-09 12:42:56 +02:00
Daniel Walsh
ecc0d6bb69
Added some comments 2021-10-09 10:13:27 +01:00
Daniel Walsh
1d27adabd4
Missing author tags 2021-10-09 10:06:05 +01:00
Daniel Walsh
b2590ddd42
Lots of docs and stuff 2021-10-09 10:05:09 +01:00
TheBusyBiscuit
9c3465e80f
Merge pull request #3298 from qwertyuioplkjhgfd/shift-lumber-axe
Check for sneaking when breaking logs on lumber axe
2021-10-08 19:32:40 +02:00
TheBusyBiscuit
4df19f2756
[CI skip] Updated changelog 2021-10-08 19:32:17 +02:00
TheBusyBiscuit
a1cd647b3c
[CI skip] Merge pull request #3310 from Slimefun/renovate/major-mockito-monorepo
Update dependency org.mockito:mockito-core to v4
2021-10-08 19:23:33 +02:00
Daniel Walsh
421545111e
da hecl 2021-10-07 19:20:01 +01:00
Daniel Walsh
fd148f9d8e
Another log 2021-10-07 19:14:08 +01:00
Daniel Walsh
f0d4b57a47
Fix bug 2021-10-07 19:12:16 +01:00
Renovate Bot
74dc110ac8
Update dependency org.mockito:mockito-core to v4 2021-10-07 15:30:57 +00:00
Daniel Walsh
3284604160
Implement the ability for debug logging 2021-10-07 13:51:31 +01:00
Daniel Walsh
bc1a4d104a
Merge pull request #3308 from TweepCoding/master 2021-10-06 22:07:02 +01:00
TweepCoding
48d01f9aae Removed unnecesary runSync() calls 2021-10-06 10:57:34 -05:00
Senne
ef3db81157
Return night energy in other dimensions 2021-10-06 16:03:41 +02:00
Daniel Walsh
6c6ed306f3
Merge pull request #3306 from svr333/SfCheatShiftRightClick
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-06 13:41:20 +01:00
Senne
8b037f9310
Fix logic 2021-10-06 14:38:21 +02:00
svr333
cacb0a82e3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-06 14:37:31 +02:00
Senne
da988c981f
Use correct if 2021-10-06 14:30:40 +02:00
Senne
d3c9bbdcac
Improve Right Click in Cheat Menu
On right click it will check if the user is holding shift, if so it will give a full stack.
2021-10-06 11:14:08 +02:00