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,318 Commits 1 Branch 0 Tags 64 MiB
96f657f6e7
Commit Graph

6318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
2cf3ede10b Fixed some concurrency issues 2021-03-28 11:44:47 +02:00
Daniel Walsh
488ffd951b
Fix test? (Im super tired... not sure why this didnt occur to me...) 2021-03-28 03:23:10 +01:00
Daniel Walsh
5283f02903
Fixes #2650 2021-03-28 03:16:50 +01:00
TheBusyBiscuit
0dc1ac3894 Added Produce Collector to automate Milk and Mushroom Stew 
Also fixed Auto Crafters not handling milk buckets properly
And allowed Block Placers to place down cakes
 2021-03-28 01:40:19 +01:00
Daniel Walsh
73b5ef8b52
Merge pull request #2915 from Slimefun/fix/issue-2914 
Fixes #2914
 2021-03-27 23:02:13 +00:00
Daniel Walsh
cb2052ec93
Fixes #2914 2021-03-27 22:52:14 +00:00
TheBusyBiscuit
b64be98274 Added Unit Tests for disabling recipes 2021-03-27 22:34:23 +01:00
TheBusyBiscuit
fd16306b61 Auto-Crafters can now be turned on and off via the gui 2021-03-27 22:26:15 +01:00
TheBusyBiscuit
235d3f4d57 Added Auto-Crafter for the Armor Forge 2021-03-27 18:58:31 +01:00
TheBusyBiscuit
70db23bdc5 Fixes #2913 2021-03-27 18:36:30 +01:00
Daniel Walsh
f7352895ae
Merge pull request #2909 from RobotHanzo/master 
Fixes #2903
 2021-03-27 17:14:40 +00:00
RobotHanzo
a7ee828209
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-03-28 00:47:20 +08:00
TheBusyBiscuit
6eb5235cf7 Automated Crafting Chamber is now disabled. 2021-03-27 11:55:00 +01:00
TheBusyBiscuit
090a0f7791 Merge branch 'chore/cleanup-deprecated-crafter' 2021-03-27 11:52:54 +01:00
TheBusyBiscuit
342b969b77 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-03-26 20:58:46 +01:00
TheBusyBiscuit
ba984728e7 Added "Netherite Ingot -> Netherite Block" recipe to Electric Press 2021-03-26 20:58:22 +01:00
TheBusyBiscuit
dba628f99c [CI skip] Small performance optimization 2021-03-26 20:56:15 +01:00
RobotHanzo
50aaa08ccc
Update Crucible.java 2021-03-27 00:36:20 +08:00
RobotHanzo
af4d3a180e Fixes #2903 2021-03-26 21:43:21 +08:00
TheBusyBiscuit
f91f4d485d
[CI skip] Merge pull request #2908 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x 
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.182
 2021-03-26 01:26:43 +01:00
Renovate Bot
ec4b08e3b0
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.182 2021-03-26 00:04:42 +00:00
Sfiguz7
5b5a2452a6 Small research cost balancing 2021-03-25 21:21:46 +01:00
Sfiguz7
b515fdbf1b Filled researches.en, added capitalisation 2021-03-25 21:19:28 +01:00
Sfiguz7
12422a9da4 Misc research too 2021-03-25 21:08:35 +01:00
Sfiguz7
59c3f676e5 Added 2 missing researches 2021-03-25 20:57:28 +01:00
TheBusyBiscuit
f4bded9491 Added "Smart-Filling" mode to Cargo Input Nodes 2021-03-25 18:39:07 +01:00
TheBusyBiscuit
cc421e7e33 Fixes #2906 2021-03-25 13:59:57 +01:00
TheBusyBiscuit
4e719dacc3 [CI skip] Fixed javadocs 2021-03-24 23:17:08 +01:00
TheBusyBiscuit
2535295455 Auto Crafters now work on Barrels, Trapped Chests and Shulker boxes 2021-03-24 23:16:07 +01:00
TheBusyBiscuit
26c7dddbf4 [CI skip] Relocated AutoCrafters 2021-03-24 23:08:06 +01:00
TheBusyBiscuit
a2fc623974
[CI skip] Merge pull request #2905 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x 
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.3
 2021-03-24 23:06:04 +01:00
Renovate Bot
2008fa7d47
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.3 2021-03-24 19:17:47 +00:00
TheBusyBiscuit
1a8d2bfe18
[CI skip] Merge pull request #2900 from Seggan/master 
Fixed a Message
 2021-03-22 22:37:31 +01:00
TheBusyBiscuit
ced7b5a697 [CI skip] Added more documentation 2021-03-22 19:49:00 +01:00
TheBusyBiscuit
02f7135805 [CI skip] Removed an unused class 2021-03-22 19:44:37 +01:00
TheBusyBiscuit
e3171b37dc Merge branch 'chore/cleanup-deprecated-crafter' 2021-03-22 19:20:18 +01:00
TheBusyBiscuit
ef5d5140ee [CI skip] Code cleanup 2021-03-22 19:19:53 +01:00
TheBusyBiscuit
e277732608 Fixes #2899 2021-03-22 15:43:20 +01:00
Seggan
c1090b0fc8
Do changes 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-03-22 09:46:35 -04:00
Seggan
44eb7e7ebe Fixed message 2021-03-22 09:20:46 -04:00
Daniel Walsh
f6d4d20090
[CI Skip] Merge pull request #2898 from svr333/AutoCrafterFollowUp 2021-03-22 12:35:55 +00:00
svr333
01a0bb7be1
Remove unnecessary spaces 2021-03-22 11:00:04 +01:00
svr333
a83cfcd5cc
Recommended changes 2021-03-22 10:58:55 +01:00
TheBusyBiscuit
0e238497d9 Improved error handling 2021-03-22 10:28:35 +01:00
TheBusyBiscuit
328f9d3331 [CI skip] Automated Crafting Chambers will no longer work. 2021-03-22 10:23:54 +01:00
TheBusyBiscuit
13355c1afe Fixes #2896 2021-03-22 10:04:57 +01:00
svr333
cda38b13ec
Remove Whiteline 2021-03-22 01:46:24 +01:00
svr333
4067969229
More specific error messages 2021-03-22 01:45:38 +01:00
svr333
92b7c6118a
Be a maid 2021-03-22 01:41:11 +01:00
TheBusyBiscuit
001e7654aa Fixed #2895 2021-03-21 20:06:46 +01:00