mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
7,954 Commits 1 Branch 0 Tags 64 MiB
e261bbebe9
Commit Graph

7954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Renovate Bot
699dd9899a
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.202 2021-10-05 19:59:21 +00:00
qwertyuioplkjhgfd
36912f517f check for sneaking on lumber axe 2021-10-02 20:03:03 -07: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
Senne
e1a0ade124
Finish wiki.json 2021-10-02 17:13:59 +02:00
Senne
1aa2260cf0
wiki.json until Talisman category 2021-10-02 15:32:46 +02:00
Senne
96382a1a4b
Add wiki.json pages 2021-10-02 00:05:08 +02: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
Sfiguz7
dc45346c7a Renamed meta to snapshot since it is one 2021-10-01 17:18:48 +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
KyleEstein
84dc096393
Merge branch 'master' into legacy-gold-pan 2021-09-30 08:46:22 -04: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
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