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

7241 Commits

Author SHA1 Message Date
svr333
da46794ac4
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-09 15:46:50 +02:00
svr333
f320fe5d9f
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-09 12:47:56 +02:00
Senne
4cff65ed16
Resolve conflicts 2021-10-07 17:26:05 +02:00
Senne
bdf2a1b8a1
Clean up if 2021-10-07 17:25:20 +02:00
svr333
eb790b232b
rename blockData to blockId
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-07 17:19:24 +02:00
Senne
c882154860
Typos 2021-10-07 15:22:14 +02:00
Senne
02b0411d57
Clone item 2021-10-07 15:21:33 +02:00
Senne
6978bdfe0d
Implement feature 2021-10-07 15:11:42 +02:00
Senne
0937391220
Initial tryout 2021-10-06 23:24:33 +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
TheBusyBiscuit
c1be10fa0d
[CI skip] Merge pull request #3303 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.202
2021-10-06 00:35:20 +02:00
Renovate Bot
699dd9899a
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.202 2021-10-05 19:59:21 +00: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