Daniel Walsh
e2d2ec60de
Merge pull request #3279 from variananora/fix/3265
2021-09-28 15:13:58 +01:00
Daniel Walsh
5da1789d11
Merge pull request #3288 from Sfiguz7/feature/solargen-extensibility
2021-09-28 15:10:33 +01:00
Sfiguz7
215ac668e0
Added capaciy to solargens
2021-09-26 14:45:30 +02:00
Sfiguz7
a1cd40998b
Removed unneeded final: added in a fix, limits extensibility
2021-09-26 14:32:08 +02:00
TheBusyBiscuit
36c6d15421
Merge pull request #3252 from Sefiraat/smithing-table-listener
...
Smithing table listener
2021-09-25 21:15:26 +02:00
TheBusyBiscuit
b4ca3fc40f
[CI skip] Updated changelog
2021-09-25 21:15:06 +02:00
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
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
Renovate Bot
f89e9d4ebd
Update dependency org.junit.jupiter:junit-jupiter to v5.8.1
2021-09-22 20:21:04 +00: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
Sefiraat
13db44011b
Slight wording change
2021-09-13 14:02:09 +01:00
Sefiraat
206e205d1b
Deny using Slimefun Netherite in the SmithingTable + Tests
2021-09-13 13:26:35 +01:00
Renovate Bot
3310897403
Update dependency org.junit.jupiter:junit-jupiter to v5.8.0
2021-09-12 19:30:37 +00:00
Renovate Bot
dcfb399b3d
Update dependency com.konghq:unirest-java to v3.13.0
2021-09-12 16:17:39 +00:00
Renovate Bot
08e9e86ac7
Update thollander/actions-comment-pull-request action to v1.0.4
2021-09-11 20:12:20 +00:00
TheBusyBiscuit
79c6c139c6
Fixed #3241
2021-09-09 13:54:48 +02:00
TheBusyBiscuit
68e32cb358
Fixed #3218
2021-09-09 12:58:57 +02:00
TheBusyBiscuit
1e5c32cf52
[CI skip] Merge pull request #3242 from Slimefun/renovate/org.apache.maven.plugins-maven-javadoc-plugin-3.x
...
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1
2021-09-09 12:37:23 +02:00
TheBusyBiscuit
9a88b9fbcf
[CI skip] Merge pull request #3244 from Slimefun/renovate/com.konghq-unirest-java-3.x
...
Update dependency com.konghq:unirest-java to v3.12.0
2021-09-09 12:37:02 +02:00