Alessio Colombo
8116820a53
Bleh
2021-12-20 14:04:16 +01:00
Alessio Colombo
2d526f30b4
Moved double drops to helper method
2021-12-20 13:37:01 +01:00
Sfiguz7
73a59014cc
Restored and removed the correct comments
2021-10-06 22:57:23 +02:00
Sfiguz7
a3b65280fe
Merge branch 'feature/farmer_talisman' of github.com:Slimefun/Slimefun4 into feature/farmer_talisman
2021-10-06 21:44:48 +02:00
Sfiguz7
faa57514c2
Removed comments related directly to miner talisman
2021-10-06 21:44:13 +02:00
Sfiguz7
0eeaa777c3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java
...
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2021-10-06 21:40:11 +02:00
Sfiguz7
6e24269c59
Added research message
2021-10-06 16:35:45 +02:00
Sfiguz7
e6ed69c26e
Removed warts, not exactly a crop so feels weird
2021-10-06 01:08:00 +02:00
Sfiguz7
d3007c21fb
Added author
2021-10-06 01:03:29 +02:00
Sfiguz7
273cf78082
Added talisman message
2021-10-06 00:30:31 +02:00
Sfiguz7
9cfcc5c402
Added farmer talisman
2021-10-06 00:18:44 +02:00
Sfiguz7
fe9d11d879
Fix explosive bow knockback being way too high if close to the entity ( #3295 )
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-02 23:38:50 +01:00
TheBusyBiscuit
4170de96a3
[CI skip] Merge pull request #3290 from Slimefun/renovate/actions-setup-java-2.x
...
Update actions/setup-java action to v2.3.1
2021-10-01 22:44:47 +02:00
Daniel Walsh
3b31431ab1
[CI Skip] Merge pull request #3292 from Sfiguz7/fix/solargen-ischargeable
2021-09-30 16:15:01 +01:00
Sfiguz7
36a5834eaa
Api tag again...
2021-09-30 16:48:31 +02:00
Sfiguz7
027e63925e
Walshy is picky
2021-09-30 16:48:03 +02:00
Sfiguz7
59fae4539b
Added (API) tag
2021-09-30 16:43:44 +02:00
Sfiguz7
566085ffee
Might as well add this (Walshy don't hurt me)
2021-09-30 16:41:22 +02:00
Sfiguz7
dc2ad18eeb
Updated Changelog.md
2021-09-30 16:33:46 +02:00
Sfiguz7
e5c58b2493
Removed useless overriding
2021-09-30 16:30:20 +02:00
Renovate Bot
34a0235db5
Update actions/setup-java action to v2.3.1
2021-09-29 11:22:59 +00:00
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
