Daniel Walsh
9e5162179f
[CI Skip] Merge pull request #2970 from IAmSorryArt/protected
2021-04-22 11:03:03 +01:00
TheBusyBiscuit
c0058a3994
[CI skip] Refactored and cleaned up Auto (Dis)enchanters
2021-04-20 17:35:51 +02:00
IAmSorry
a16e1f6efc
Fixed the wrong protected :)
2021-04-19 22:30:07 +02:00
TheBusyBiscuit
0fbb9b2d9b
[CI skip] 200+ contributors, we need a third page 👀
2021-04-19 20:15:56 +02:00
IAmSorry
cc39df17ac
Change visibility to protected 17
2021-04-19 17:26:34 +02:00
IAmSorry
86e73631c7
Change visibility to protected 16
2021-04-19 17:25:09 +02:00
IAmSorry
ce86abca47
Change visibility to protected 15
2021-04-19 17:23:40 +02:00
IAmSorry
6d36b43ced
Change visibility to protected 14
2021-04-19 17:22:31 +02:00
IAmSorry
ecda25819b
Change visibility to protected 13
2021-04-19 17:21:07 +02:00
IAmSorry
b0a8ab55b9
Change visibility to protected 12
2021-04-19 17:20:13 +02:00
IAmSorry
a0b559330d
Change visibility to protected 11
2021-04-19 17:19:11 +02:00
IAmSorry
848725c42b
Change visibility to protected 10
2021-04-19 17:18:02 +02:00
IAmSorry
e7a92113d1
Change visibility to protected 9
2021-04-19 17:17:19 +02:00
IAmSorry
d1259888ce
Change visibility to protected 8
2021-04-19 17:15:36 +02:00
IAmSorry
54309e1f56
Change visibility to protected 7
2021-04-19 17:14:20 +02:00
IAmSorry
96715da55a
Change visibility to protected 6
2021-04-19 17:13:14 +02:00
IAmSorry
6de81be703
Change visibility to protected 5
2021-04-19 17:11:20 +02:00
IAmSorry
7efd07da10
Change visibility to protected 4
2021-04-19 17:08:56 +02:00
IAmSorry
c28ad40cf7
Change visibility to protected 3
2021-04-19 17:07:08 +02:00
IAmSorry
a222ec14dc
Changing the visibility to protected 2
2021-04-19 17:03:58 +02:00
IAmSorry
c574065470
Change visibility to protected
2021-04-19 17:02:19 +02:00
TheBusyBiscuit
dcc5648c8f
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-19 10:36:43 +02:00
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
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