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
6,589 Commits 1 Branch 0 Tags 64 MiB
e7ae14beaf
Commit Graph

6589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
8c8577ad92
Delete AutoDisenchanter.java 2021-03-14 14:28:25 +01:00
TheBusyBiscuit
da01091e26 [CI skip] Removed deprecated methods from item settings 2021-03-14 13:36:25 +01:00
TheBusyBiscuit
6e4a1ccf5f [CI skip] Removed temporary redirects 2021-03-14 13:34:17 +01:00
StarWishsama
ba96617b2d
chore: change text to adapt specify machine 2021-03-14 18:29:16 +08:00
TheBusyBiscuit
51d0435718
Trigger another build... 
Previous one failed due to some maven repository issues. This is always fun.
 2021-03-14 11:28:52 +01:00
StarWishsama
8762958f6d
refactor: finish review 2021-03-14 18:27:50 +08:00
TheBusyBiscuit
e39c2b661c Fixes #2883 2021-03-14 11:02:47 +01:00
TheBusyBiscuit
2c2ba73500 Fixed unit test 2021-03-13 22:00:17 +01:00
TheBusyBiscuit
fbd701bced Fixed Mining Androids and improved itemsettings API 2021-03-13 21:56:54 +01:00
TheBusyBiscuit
3aa02d5e04 Added an option to disable block-gen optimizations for androids 2021-03-13 11:22:59 +01:00
TheBusyBiscuit
bc59731c38 Added a message when no chest was found 2021-03-13 11:03:57 +01:00
TheBusyBiscuit
a3ecde181e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-03-13 10:59:57 +01:00
TheBusyBiscuit
02ce83544f
[CI skip] Merge pull request #2881 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x 
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.181
 2021-03-13 10:46:12 +01:00
TheBusyBiscuit
e6093981b8
[CI skip] Merge pull request #2882 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x 
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.4
 2021-03-13 10:45:53 +01:00
Renovate Bot
4b536b9d6d
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.4 2021-03-13 08:55:43 +00:00
Renovate Bot
7476285cb5
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.181 2021-03-13 02:10:04 +00:00
TheBusyBiscuit
42146d8608 [CI skip] Fixed javadocs 2021-03-13 00:46:50 +01:00
TheBusyBiscuit
4aec2ffbcf Fixes #2878 2021-03-13 00:18:02 +01:00
Daniel Walsh
76cb7434dc
[ci skip] Merge pull request #2880 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x 2021-03-12 00:47:00 +00:00
Renovate Bot
125d488f34
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.180 2021-03-12 00:36:44 +00:00
TheBusyBiscuit
75ffc0437f
[CI skip] Merge pull request #2879 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x 
Update dependency com.github.LoneDev6:itemsadder-api to v2.2.1
 2021-03-11 20:22:36 +01:00
Renovate Bot
5203424bd2
Update dependency com.github.LoneDev6:itemsadder-api to v2.2.1 2021-03-11 18:58:32 +00:00
TheBusyBiscuit
853f447337
Merge pull request #2859 from GallowsDove/master 
Added ExplosiveToolBreakBlockEvent
 2021-03-11 11:17:09 +01:00
TheBusyBiscuit
5d4412d3cd
[CI skip] Updated changelog 2021-03-11 11:15:23 +01:00
TheBusyBiscuit
f0b5e8463f
[CI skip] Updated changelog 2021-03-11 02:22:02 +01:00
Mooy1
048d4d6590 Update SlimefunStartupTask.java 2021-03-10 19:12:25 -06:00
Daniel Walsh
7a230d42c3
Merge pull request #2681 from Slimefun/features/multi-categories 2021-03-11 00:55:26 +00:00
Daniel Walsh
4b5ad219ec
Merge pull request #2328 from Slimefun/performance/cobblestone 
This totally wasn't sitting fully approved for 16 days 👀
 2021-03-11 00:52:41 +00:00
GallowsDove
305da7952d
did requested changes 2021-03-10 17:48:45 +01:00
TheBusyBiscuit
4678de1697 Fixes #2877 and added a new config option to crucibles 2021-03-10 14:04:33 +01:00
TheBusyBiscuit
86edb0df6a Fixes #2876 2021-03-10 13:36:28 +01:00
TheBusyBiscuit
5b99391a33 Better logging for exceptions in cargo network code 2021-03-10 12:15:37 +01:00
TheBusyBiscuit
0fa862314f Fixes #2856 2021-03-10 00:49:53 +01:00
TheBusyBiscuit
0be442bc07 Some refactoring 2021-03-10 00:44:20 +01:00
TheBusyBiscuit
bef0cfb413 Fixed #2861 2021-03-10 00:24:05 +01:00
TheBusyBiscuit
9cdab83db2
Merge branch 'master' into feature/auto-crafters 2021-03-09 17:00:21 +01:00
TheBusyBiscuit
0696991ab0 [CI skip] A lot of refactoring 2021-03-09 16:55:28 +01:00
TheBusyBiscuit
717e8c84a0 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
feature/auto-crafters

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java
 2021-03-09 16:44:54 +01:00
TheBusyBiscuit
618a7fee84
[CI skip] Merge pull request #2874 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x 
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.2
 2021-03-09 14:21:55 +01:00
Renovate Bot
aaca1610f5
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.2 2021-03-09 12:33:10 +00:00
TheBusyBiscuit
a643dcae3b
[CI skip] Merge pull request #2870 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x 
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.179
 2021-03-08 16:54:20 +01:00
Renovate Bot
50ffdcf081
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.179 2021-03-07 23:42:48 +00:00
TheBusyBiscuit
e7a71b55ef
[CI skip] Merge pull request #2865 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x 
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.178
 2021-03-06 15:25:01 +01:00
Mooy1
f7be9289d9 Update SlimefunPlugin.java 2021-03-06 01:00:56 -06:00
Mooy1
4dcf8aabea fix addon inventories bug with non-default worlds 2021-03-06 00:55:12 -06:00
Renovate Bot
6cd1a3fef2
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.178 2021-03-06 04:51:22 +00:00
TheBusyBiscuit
d33dc965e0
Merge pull request #2827 from ProfElements/bookbinder-fixes 
Fix multiple Book Binder issues.
 2021-03-05 09:58:49 +01:00
TheBusyBiscuit
3bef3b1e73 [CI skip] Updated changelog 2021-03-05 09:58:35 +01:00
TheBusyBiscuit
dc1be10b33 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-03-05 09:51:07 +01:00
TheBusyBiscuit
1315912081 [CI skip] Update mcMMO dependency and remove codemc repository 2021-03-05 09:51:03 +01:00