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
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
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
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
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
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
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