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
Varian Anora
afc47f095c
Fix energy consumption on Auto Disenchanter II
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-18 20:55:21 +07:00
Varian Anora
4a949de996
Fix energy consumption on Auto Enchanter II
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-18 20:55:07 +07:00
Varian Anora
37d7772f02
Add tier II machines to Auto Enchanter and Auto Disenchanter
...
Auto Enchanter II
Speed 3x
Power: 48J/s
| A | B | A |
| C | D | C |
| E | F | E |
A = Reinforced Plate
B = Big Capasitor
C = Blistering Ingot (100%)
D = Auto Enchanter
E = Wither Proof Obsidian
F = Synthetic Diamond
Auto Disenchanter II
Speed: 3x
Power: 48J/s
| A | B | A |
| C | D | C |
| E | E | E |
A = Reinforced Plate
B = Anvil
C = Carbonado
D = Auto Enchanter II
E = Wither Proof Obsidian
2021-04-18 20:04:43 +07: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
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