TheBusyBiscuit
2d34d61d9a
Merge pull request #3274 from variananora/fix/3273
...
Fixes #3273
2021-09-25 20:59:29 +02:00
TheBusyBiscuit
bf6acd37af
[CI skip] Updated changelog
2021-09-25 20:58:51 +02:00
TheBusyBiscuit
8c7e9e0d9b
[CI skip] Merge pull request #3282 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x
...
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.2
2021-09-24 11:24:36 +02:00
Renovate Bot
80dc5a5e51
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.2
2021-09-24 08:11:24 +00:00
Kyle Einstein
26442b3198
Add override-output-limit setting for Electric Gold Pans to allow EGP to still be useful when cargo networks are disabled.
2021-09-23 11:16:06 -04:00
Daniel Walsh
133e1190a6
Update changelog
2021-09-23 11:16:06 -04:00
ybw0014
703196bb7b
add break to switch default
2021-09-23 11:16:06 -04:00
ybw0014
e58b52ca7e
add default to switch
2021-09-23 11:16:06 -04:00
ybw0014
8d89739d9b
move imports
2021-09-23 11:16:06 -04:00
ybw0014
ae6cfdcf0f
Hercules' Pickaxe now supports 1.17 deepslate ores and copper
2021-09-23 11:16:06 -04:00
Renovate Bot
e0291d7092
Update dependency org.junit.jupiter:junit-jupiter to v5.8.1
2021-09-23 11:16:06 -04:00
Varian Anora
1da20d0846
Better formatting
2021-09-23 18:37:06 +07:00
TheBusyBiscuit
5c545162c1
[CI skip] Merge pull request #3278 from Slimefun/changelog-update
...
Update changelog
2021-09-23 13:35:47 +02:00
Varian Anora
eec5d2d66b
Merge remote-tracking branch 'upstream/master' into fix/3265
2021-09-23 18:05:49 +07:00
Varian Anora
cc018582a6
Fixed #3265
...
Add checks for off hand items.
2021-09-23 18:05:42 +07:00
Daniel Walsh
c2ab3b55ba
Update changelog
2021-09-23 11:54:47 +01:00
Daniel Walsh
7e04117357
Merge pull request #3253 from guizhanss/feature/hercules-pickaxe-update
2021-09-23 11:52:26 +01:00
Daniel Walsh
d329532f77
Merge pull request #3276 from Slimefun/renovate/junit5-monorepo
2021-09-23 11:52:12 +01:00
Sfiguz7
e64cb10447
Merge branch 'fix/itemsadder_cargo_stacking' of https://github.com/Sfiguz7/Slimefun4 into fix/itemsadder_cargo_stacking
2021-09-23 12:42:44 +02:00
Sfiguz7
47f5278e48
Reverted to equalsLore
2021-09-23 12:41:10 +02:00
Kyle Einstein
ba8cc49b6e
Allow admins to control the behavior of the Electric Gold Pan via the legacy-gold-pan configuration option.
2021-09-22 20:43:15 -04:00
Renovate Bot
f89e9d4ebd
Update dependency org.junit.jupiter:junit-jupiter to v5.8.1
2021-09-22 20:21:04 +00:00
Sfiguz7
e880a9bb07
Merge branch 'master' into fix/itemsadder_cargo_stacking
2021-09-22 21:57:46 +02:00
Sfiguz7
3ff5a49c5a
And more...
2021-09-22 21:47:37 +02:00
Sfiguz7
d6ad57b60f
More formatting
2021-09-22 21:45:09 +02:00
Sfiguz7
e32b6ff064
Undid formatting
2021-09-22 21:38:35 +02:00
Sfiguz7
aa456901e4
Fixes #3133
2021-09-22 21:19:44 +02:00
Varian Anora
fc8c02c777
Add missing recipes to Electrified Crucible
...
This will make normal crucible and electrified crucible have the same recipe.
Fixes #3273
2021-09-21 21:52:01 +07:00
TheBusyBiscuit
19c7e235ed
Small improvements
2021-09-19 19:39:06 +02:00
TheBusyBiscuit
4727b2a5dd
Merge pull request #3258 from Slimefun/performance/improve-item-comparison-performance
...
Improves item comparison performance
2021-09-19 18:58:26 +02:00
TheBusyBiscuit
6a712696fc
Merge pull request #3259 from Sfiguz7/feature/auto-ench-lvl-override-config
...
Fixes #3248
2021-09-19 15:34:46 +02:00
TheBusyBiscuit
c83c84e61e
[CI skip] Updated changelog
2021-09-19 15:34:30 +02:00
Sfiguz7
1a3a50120f
Defaulted to fixed. Requested changes
2021-09-16 20:31:25 +02:00
Sfiguz7
7e98984547
Formatting...
2021-09-15 18:11:03 +02:00
Sfiguz7
d83d18819f
Removed unused imports
2021-09-15 18:09:44 +02:00
Sfiguz7
ff58385063
Fixes
2021-09-15 18:07:24 +02:00
Daniel Walsh
fbc3f9ee92
Improves item comparison performance
...
There are a lot of situations where SF items are CraftItemStacks not SlimefunItemStacks
This is most obvious with cargo and has been a big bottleneck there (~60%).
This PR addresses the cargo specific point but will probably carry over to other parts of the code here and in addons.
In Cargo we wrap the items being used for comparison, these items can still be SF items just, they look like regular Bukkit items. So, the is item similar check should account for this.
With this change it will check if it's wrapped and if it has item meta, if it does then it will try and get IDs to compare. Otherwise, fall back to usual item meta comparison. This improves cargo performance by about 60% when filtering SF items.
2021-09-15 11:22:19 +01:00
GuizhanCraft
270e3f4dce
Merge branch 'Slimefun:master' into feature/hercules-pickaxe-update
2021-09-14 23:33:01 +08:00
ybw0014
e9b5ea5e81
add break to switch default
2021-09-14 18:11:18 +08:00
ybw0014
2c8a40cb26
add default to switch
2021-09-14 18:10:08 +08:00
TheBusyBiscuit
7ae0128ff6
[CI skip] Merge pull request #3250 from Slimefun/renovate/junit5-monorepo
...
Update dependency org.junit.jupiter:junit-jupiter to v5.8.0
2021-09-14 11:53:50 +02:00
TheBusyBiscuit
1f12693691
[CI skip] Merge pull request #3249 from Slimefun/renovate/com.konghq-unirest-java-3.x
...
Update dependency com.konghq:unirest-java to v3.13.0
2021-09-14 11:53:30 +02:00
TheBusyBiscuit
c90b666fe5
[CI skip] Merge pull request #3245 from Slimefun/renovate/thollander-actions-comment-pull-request-1.x
...
Update thollander/actions-comment-pull-request action to v1.0.4
2021-09-14 11:53:13 +02:00
Sefiraat
5d6b7e6ace
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java
...
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2021-09-14 10:05:55 +01:00
Sefiraat
002a0e3e46
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-09-14 07:07:58 +01:00
ybw0014
fbc6253175
move imports
2021-09-14 02:20:31 +08:00
ybw0014
cc0add1137
Hercules' Pickaxe now supports 1.17 deepslate ores and copper
2021-09-14 02:16:55 +08:00
Sefiraat
83a4d1b65d
Comment to show it's the Material/Netherite slot
2021-09-13 14:42:50 +01:00
Sefiraat
153f33a72b
Message indentation and remove random &&
2021-09-13 14:36:17 +01:00
Sefiraat
20beabcc3b
Apply suggestions from code review
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-09-13 14:13:27 +01:00