mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
6,603 Commits 1 Branch 0 Tags 64 MiB
5577a4e965
Commit Graph

3596 Commits

Author SHA1 Message Date
TheBusyBiscuit
e59a5926c4 Code cleanup 2021-04-18 10:35:39 +02:00
TheBusyBiscuit
b20353557f Photovoltaic Cells can no longer be placed 2021-04-18 10:11:32 +02:00
Varian Anora
473c58d720 Update GrindStone.java 2021-04-18 12:12:30 +07:00
Martin Brom
1c820196ef Add Block of Coal -> Carbon recipe to the CarbonPress and Compressor 2021-04-17 14:41:24 +02:00
TheBusyBiscuit
f91481db1c Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 
Conflicts:
	CHANGELOG.md
 2021-04-17 09:51:24 +02:00
Daniel Walsh
bf22f40f99
Oops forgot one validate 2021-04-17 08:39:56 +01:00
TheBusyBiscuit
d2e17af2a1 Removed SlimefunBlockHandler 2021-04-16 15:05:39 +02:00
TheBusyBiscuit
aa85388480 Renamed Solar Panel to Photovoltaic Cell 2021-04-16 14:55:49 +02:00
TheBusyBiscuit
cb3e9dfbeb [CI skip] Refactoring 2021-04-16 14:50:06 +02:00
Daniel Walsh
448d6ca565
Fix nullability - not sure why this wasnt flagged... 2021-04-15 12:23:02 +01:00
Daniel Walsh
38a2246561
Fixes #2942 2021-04-14 12:15:55 +01:00
TheBusyBiscuit
53471f1177 [CI skip] Refactoring 2021-04-10 21:03:03 +02:00
TheBusyBiscuit
485dec746b
Merge pull request #2951 from Slimefun/api/auto-enchant-event 
AutoEnchantEvent
 2021-04-10 19:12:03 +02:00
Daniel Walsh
c8bf364e8f
no idea what you mean :eyes 2021-04-10 16:28:46 +01:00
TheBusyBiscuit
8be5673b7f
Merge pull request #2950 from md5sha256/feature/optimized-cargo 
Optimizations to cargo
 2021-04-10 17:20:21 +02:00
Daniel Walsh
20855c6977
AutoEnchantEvent 2021-04-10 15:36:47 +01:00
Andrew Wong
270b907582
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-04-10 16:30:47 +02:00
Daniel Walsh
2e682c185d
Merge pull request #2929 from RobotHanzo/fix/unbreaking-misbehaviour 2021-04-10 13:51:02 +01:00
Daniel Walsh
63e3f553ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java 2021-04-10 13:40:28 +01:00
TheBusyBiscuit
b4b0636cd7 Added magma cream/block to slime ball/block recipes to Freezer 2021-04-09 19:06:19 +02:00
TheBusyBiscuit
2ef332a003 Lowered "Magma block -> Sulfate" recipe to only require 1 magma block 2021-04-09 18:54:16 +02:00
TheBusyBiscuit
dbda4d0b23 Added a deprecation warning to the SlimefunBlockHandler 
Also converted the remaining machines to the new system
 2021-04-09 18:30:27 +02:00
Andrew Wong
debbc5bd17
Code format fixes, use an ArrayDeqeue in CargoNet#distributeItems 2021-04-09 14:20:23 +02:00
Andrew Wong
6c0c95c138
Fix star import 2021-04-09 00:19:41 +02:00
Andrew Wong
bccb2f38d5
Optimizations to cargo 
This commit introduces two optimizations to cargo handling:

- Utilization of regex to validate integers in CargoNet#getFrequency,
- Smart shallow-cloning in CargoNetworkTask: using an ArrayList when round-robin is disabled
 2021-04-08 23:46:43 +02:00
TheBusyBiscuit
e1f0e0cd6c Converted more machines to the new BlockBreakHandler 2021-04-08 13:34:18 +02:00
TheBusyBiscuit
e52b1a92c7 Fixes #2944 2021-04-07 16:34:39 +02:00
TheBusyBiscuit
96f657f6e7 Small performance improvements 2021-04-05 13:16:31 +02:00
TheBusyBiscuit
bbd41ff70c [CI skip] Fixed 24k carat gold ingot 2021-04-03 19:42:14 +02:00
TheBusyBiscuit
1955d1235b [CI skip] Refactoring 2021-04-03 19:40:54 +02:00
TheBusyBiscuit
89b8b76fce [CI skip] Refactoring... I said 2021-04-03 15:20:45 +02:00
TheBusyBiscuit
cb05563014 [CI skip] Refactoring 
+ Removed unused class
 2021-04-03 15:20:08 +02:00
TheBusyBiscuit
18139bb5c4 Fixed Grappling Hook vanishing in creative mode 2021-04-03 14:08:21 +02:00
TheBusyBiscuit
5e87df873c Fixes #2926 2021-04-03 14:01:48 +02:00
RobotHanzo
dcf411032e Fixes 2021-04-03 19:25:22 +08:00
RobotHanzo
d428375132
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/UnbreakingAlgorithm.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-04-03 19:21:52 +08:00
RobotHanzo
a268088d59 Even more advanced enum 2021-04-03 19:13:12 +08:00
RobotHanzo
c56713ed7d Now using enum 2021-04-03 16:07:41 +08:00
RobotHanzo
11fded46db Overridable durability RNG 2021-04-02 22:16:25 +08:00
RobotHanzo
f9201b648a Unused imp. 2021-04-02 21:48:44 +08:00
RobotHanzo
53b38e51be
Fix mistakes 2021-04-02 21:11:42 +08:00
RobotHanzo
a000c92d93 Null checks 2021-04-02 20:50:28 +08:00
RobotHanzo
1bc51f4d80 Fixes #2837 2021-04-02 17:40:00 +08:00
TheBusyBiscuit
ee8d421189 Ancient Pedestals can now be found under "Magical Gadgets" 2021-03-31 19:13:21 +02:00
TheBusyBiscuit
ca3715a0dc Added Crafting Motor (crafting ingredient for Auto-Crafters) 
Also retextured the Cargo Motor
 2021-03-31 19:02:34 +02:00
TheBusyBiscuit
816cc0613b Added "Slimeballs -> Slime Block" recipe to Electric Press 2021-03-31 18:31:59 +02:00
TheBusyBiscuit
61f0fa5d0d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-03-31 18:30:04 +02:00
TheBusyBiscuit
32c60ad5ac [CI skip] Refactoring 2021-03-31 18:29:43 +02:00
TheBusyBiscuit
0ee724e1e5
Merge pull request #2919 from GallowsDove/master 
Fixed damageable items not respecting `unbreakable` tag
 2021-03-31 17:20:50 +02:00
J3fftw
567b5397cf
Update src/main/resources/languages/messages_en.yml 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-03-31 15:36:19 +02:00
Jeffrey Kosse
5649f95174 Added a new message to multiblocks to see if inventory is empty 2021-03-31 14:37:24 +02:00
GallowsDove
ae7c22703e
requested changes 2021-03-29 20:39:55 +02:00
GallowsDove
062adb4cb7
Hopefully improved code 2021-03-28 22:49:45 +02:00
GallowsDove
7536f01145
Added unbreakable support for damageable items 2021-03-28 22:33:04 +02:00
TheBusyBiscuit
82366191b0
Merge pull request #2916 from Slimefun/fix/issue-2650 
Fixed 2650
 2021-03-28 15:03:58 +02:00
Daniel Walsh
526c2cc76c
Update src/main/resources/languages/researches_en.yml 2021-03-28 13:56:50 +01:00
Sfiguz7
7d92fe45b6 Gitlost I'm coming 2021-03-28 14:54:54 +02:00
Sfiguz7
25fd2120dc FUCK YOU 2021-03-28 14:53:15 +02:00
Sfiguz7
07c0e88bec Fuck the research_en file 2021-03-28 14:50:14 +02:00
TheBusyBiscuit
fb8c2ede7f
Merge branch 'master' into fix/issue-2650 2021-03-28 14:47:47 +02:00
Sfiguz7
78d1a8b21a More merge conflicts 2021-03-28 14:45:03 +02:00
Sfiguz7
7ee4b98745 Resolved merge conflicts 2021-03-28 14:43:57 +02:00
Daniel Walsh
ec37fb142a
Requested changes 2021-03-28 13:26:57 +01:00
TheBusyBiscuit
9e2867870f Added missing recipe 2021-03-28 14:22:19 +02:00
TheBusyBiscuit
95a2d9e385 Fixed Multimeter not working on Auto-Crafters 2021-03-28 14:18:43 +02:00
TheBusyBiscuit
2cf3ede10b Fixed some concurrency issues 2021-03-28 11:44:47 +02: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
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
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
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
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
TheBusyBiscuit
0803529176
Merge pull request #2807 from Slimefun/feature/auto-crafters 
Added Vanilla Auto-Crafter and Enhanced Auto-Crafter
 2021-03-21 18:44:42 +01:00
TheBusyBiscuit
068c121dae [CI skip] Little cleanup and fixed javadocs 2021-03-21 10:31:37 +01:00
Daniel Walsh
b9a9793134
Merge pull request #2756 from StarWishsama/enchant-level-limit 2021-03-21 03:45:24 +00:00
TheBusyBiscuit
07572eb848
Merge pull request #2888 from NCBPFluffyBear/blockbreakhandler-fix 
Allow onBlockBreak to be cancelled by BlockBreakHandler
 2021-03-19 16:17:17 +01:00
TheBusyBiscuit
fbdf7acc50
Update src/main/resources/languages/messages_en.yml 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-03-19 15:49:52 +01:00
TheBusyBiscuit
6620f85433
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java 
Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>
 2021-03-19 15:27:48 +01:00
TheBusyBiscuit
9f0e8ba6ed [CI skip] Fixed javadocs 2021-03-19 14:47:43 +01:00
TheBusyBiscuit
c12229b25f Removed deprecated hologram class 2021-03-19 13:05:34 +01:00
TheBusyBiscuit
8161b9ee6d Fixed Enhanced Furnace not dropping any items when broken 2021-03-19 00:39:41 +01:00
TheBusyBiscuit
44dbb34d9a Fixed #2887 2021-03-19 00:39:24 +01:00
NCBPFluffyBear
6fef1c8e67 Allow onBlockBreak to be cancelled by BlockBreakHandler 2021-03-17 14:09:22 -05:00
TheBusyBiscuit
a4521a2dd1 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-03-17 11:02:16 +01:00
TheBusyBiscuit
320ee27b3d
Merge branch 'master' into feature/auto-crafters 2021-03-17 10:54:37 +01:00
TheBusyBiscuit
714df364a6
Merge pull request #2866 from Mooy1/master 
Fix addon blockmenu loading with custom worlds
 2021-03-17 10:54:03 +01:00
Name1ess
22f6503184
fix: grammar error 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-03-16 09:16:09 +08:00
svr333
a8f53714b0
Switcheroo 2021-03-15 22:09:22 +01:00
TheBusyBiscuit
c2b3053574 [CI skip] Added warning message when registering Item Handlers twice. 2021-03-14 19:57:33 +01:00
TheBusyBiscuit
7ba3a0b7fa [CI skip] Converted more blocks to the new BlockBreakHandler 2021-03-14 19:45:40 +01:00
StarWishsama
102e22c636
chore: resolve merge conflict 2021-03-14 21:40:14 +08:00
StarWishsama
322b55c9a4
Merge remote-tracking branch 'upstream/master' into enchant-level-limit 2021-03-14 21:34:51 +08:00
TheBusyBiscuit
aa349ccd0f Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-03-14 14:29:30 +01:00
TheBusyBiscuit
f91bd21da1
Delete AutoEnchanter.java 2021-03-14 14:28:33 +01:00
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
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
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
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
TheBusyBiscuit
853f447337
Merge pull request #2859 from GallowsDove/master 
Added ExplosiveToolBreakBlockEvent
 2021-03-11 11:17:09 +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