TheBusyBiscuit
bffef56407
Added Category#setTier()
2021-04-25 19:47:58 +02:00
TheBusyBiscuit
c975fe234e
Fixed #2989
2021-04-25 19:29:57 +02:00
Daniel Walsh
2f27ddc6a6
Merge pull request #2988 from martinbrom/fix/talisman-of-the-anvil
...
Fixes NPE when hand is empty while talisman of the anvil triggers
2021-04-24 12:22:59 +01:00
Martin Brom
a6f3696719
Fixes NPE when hand is empty while talisman of the anvil triggers
...
Resolves #2987
2021-04-24 12:22:40 +02:00
TheBusyBiscuit
1c5372d261
Complete restructure of language files
2021-04-23 20:48:24 +02:00
TheBusyBiscuit
1982ec0aeb
Reorganized language files
2021-04-23 19:22:25 +02:00
TheBusyBiscuit
34421d4a12
More refactoring
2021-04-23 19:01:41 +02:00
TheBusyBiscuit
a3a9ee4b90
Various code improvements
2021-04-23 18:58:35 +02:00
TheBusyBiscuit
8aeda66c5e
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
...
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java
2021-04-23 18:30:12 +02:00
TheBusyBiscuit
f017088f42
[CI skip] Small docs changes
2021-04-23 18:29:55 +02:00
Martin Brom
a94926dfaf
Small Auto-Enchanter cleanup
2021-04-23 17:12:26 +02:00
Martin Brom
cfb9f53057
Auto-Enchanter now checks both combinations of book and item in its inventory
...
Fixes #2977
2021-04-23 17:03:02 +02:00
Rothes
31a571455c
Update AbstractEnchantmentMachine.java
2021-04-23 20:08:40 +08:00
Rothes
67c0947dc8
Added toggle setting and some edit.
2021-04-23 20:04:00 +08:00
Daniel Walsh
b0f2fc8c4d
Merge pull request #2967 from variananora/add-suggestion-311
2021-04-23 12:50:41 +01:00
TheBusyBiscuit
c2ec4693ac
Merge pull request #2963 from martinbrom/feature/coalblock-carbon
...
Add Block of Coal -> Carbon recipe to the Carbon Press and Compressor
2021-04-23 13:46:22 +02:00
BuildTools
a846d4ea1b
Re-added check null and empty.
2021-04-23 19:29:36 +08:00
Varian Anora
45d6c376af
Update researches_en.yml
2021-04-22 20:14:52 +07:00
Varian Anora
23d4aad256
Merge branch 'master' into add-suggestion-311
2021-04-22 20:12:47 +07:00
Daniel Walsh
9e5162179f
[CI Skip] Merge pull request #2970 from IAmSorryArt/protected
2021-04-22 11:03:03 +01:00
Rothes
07167442f9
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-22 17:33:27 +08:00
Varian Anora
6840efe2f1
Changed Auto Disenchanter recipe and added new research for tier two enchanters.
...
Changed Auto Disenchanter Recipe to:
```
Auto Disenchanter II
Speed: 3x
Power: 48J/s
Buffer: 1024J
Recipe:
| A | B | A |
| C | D | C |
| E | E | E |
A = Reinforced Plate
B = Anvil
C = Blistering Ingot (100%)
D = Auto Disenchanter
E = Wither Proof Obsidian
F = Big Capacitor```
Changed wither proof obsidian with big capacitor for the buffer size.
Added new research for tier two enchanters with 48 exp levels on ID 277.
2021-04-22 12:30:58 +07:00
Rothes
16a5a2ce06
Update
2021-04-22 11:58:52 +08:00
Varian Anora
9dec7b710d
Merge branch 'master' into add-suggestion-311
2021-04-22 10:39:45 +07:00
BuildTools
76f5848e08
Use ItemName in default value instead of Identifier
2021-04-21 22:34:17 +08:00
Rothes
ecb23fa5e5
Update
2021-04-21 18:02:14 +08:00
BuildTools
27bbca1502
Update
2021-04-21 13:06:16 +08:00
BuildTools
8eb196caaa
a
2021-04-21 12:58:30 +08:00
TheBusyBiscuit
c0058a3994
[CI skip] Refactored and cleaned up Auto (Dis)enchanters
2021-04-20 17:35:51 +02:00
Varian Anora
2803fbe61e
Merge branch 'master' into add-suggestion-311
2021-04-20 19:00:37 +07: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
04b901928c
Change visibility to protected 19
2021-04-19 17:30:12 +02:00
IAmSorry
357898fe8e
Change visibility to protected 18
2021-04-19 17:28:47 +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
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
44abfe7ea5
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
api/machine-operations
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java
2021-04-09 20:33:14 +02: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
d61ebb6c19
Fix catastrophe
2021-04-03 16:11:37 +08:00
RobotHanzo
13e17beab4
Merge remote-tracking branch 'origin/fix/unbreaking-misbehaviour' into fix/unbreaking-misbehaviour
2021-04-03 16:10:35 +08:00
RobotHanzo
7e76392535
Test improvement
2021-04-03 16:10:18 +08:00
RobotHanzo
cceb2af054
Update src/test/java/io/github/thebusybiscuit/slimefun4/testing/mocks/DamageableMock.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-03 16:09:27 +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
6d12d1f7ac
Move classes out
2021-04-02 21:53:05 +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
61224ec686
Update src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/TestDamageableItem.java
...
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
2021-04-02 20:57:03 +08:00
RobotHanzo
a000c92d93
Null checks
2021-04-02 20:50:28 +08:00
RobotHanzo
8b9705a0b4
Added a test
2021-04-02 20:47:29 +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
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
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
TheBusyBiscuit
c47f56ce47
Merge branch 'master' into api/machine-operations
2021-03-22 15:16:48 +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
9aa3acde02
Merge branch 'master' into api/machine-operations
2021-03-21 15:31:50 +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
2c2ba73500
Fixed unit test
2021-03-13 22:00:17 +01:00
TheBusyBiscuit
fbd701bced
Fixed Mining Androids and improved itemsettings API
2021-03-13 21:56:54 +01:00
TheBusyBiscuit
0f54140f64
Renamed to ProcessHolder
2021-03-13 17:43:43 +01:00
TheBusyBiscuit
79a73d8e26
Some documentation and refactoring
2021-03-13 17:40:09 +01:00
TheBusyBiscuit
44a6d15d18
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
api/machine-operations
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
2021-03-13 17:36:55 +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
TheBusyBiscuit
0fa862314f
Fixes #2856
2021-03-10 00:49:53 +01:00
TheBusyBiscuit
0be442bc07
Some refactoring
2021-03-10 00:44:20 +01:00
TheBusyBiscuit
bef0cfb413
Fixed #2861
2021-03-10 00:24:05 +01:00
TheBusyBiscuit
9cdab83db2
Merge branch 'master' into feature/auto-crafters
2021-03-09 17:00:21 +01:00
TheBusyBiscuit
0696991ab0
[CI skip] A lot of refactoring
2021-03-09 16:55:28 +01:00
TheBusyBiscuit
717e8c84a0
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
feature/auto-crafters
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java
2021-03-09 16:44:54 +01:00
Mooy1
f7be9289d9
Update SlimefunPlugin.java
2021-03-06 01:00:56 -06:00
Mooy1
4dcf8aabea
fix addon inventories bug with non-default worlds
2021-03-06 00:55:12 -06:00
TheBusyBiscuit
d33dc965e0
Merge pull request #2827 from ProfElements/bookbinder-fixes
...
Fix multiple Book Binder issues.
2021-03-05 09:58:49 +01:00
GallowsDove
66db725ebc
forgot one thing, now it's ready.
2021-03-03 23:02:05 +01:00
GallowsDove
0518681887
Did requested changes
2021-03-03 19:56:14 +01:00
GallowsDove
3a7be26342
Added getExplosiveTool
2021-03-03 17:56:14 +01:00
GallowsDove
fe2492f006
Changed it into a single event instead of calling an event per block
2021-03-03 16:45:11 +01:00
GallowsDove
edf15fb40a
Added ExplosiveToolBreakBlockEvent triggered by an explosive tool breaking a block.
2021-03-03 16:23:14 +01:00
TheBusyBiscuit
8368194d94
[CI skip] Updated translators list
2021-03-03 14:21:19 +01:00
developer-pseudo
15fc388601
Translate categories_fi.yml via GitLocalize
2021-03-03 13:19:18 +00:00
Mooy1
c8fd79938b
did walshys annotations
2021-03-02 00:04:37 -06:00
TheBusyBiscuit
49950cf64c
Reduced technical debt
2021-03-01 14:07:20 +01:00
TheBusyBiscuit
15f4e838a8
Small improvements to logging
2021-03-01 13:55:57 +01:00
TheBusyBiscuit
8c1c67731b
Fixes #2852
2021-03-01 09:31:59 +01:00
TheBusyBiscuit
51b56b1e0b
Fixes #2851
2021-03-01 09:30:38 +01:00
ProfElements
9e01444b69
Make requested changes. Use Object.equals() instead of !=, make docs overall better
2021-02-27 18:23:35 -06:00
TheBusyBiscuit
84ad08be37
Fixes #2849
2021-02-27 10:19:19 +01:00
ProfElements
fb86415f31
Make requested changes. Fixed styling.
2021-02-26 15:07:47 -06:00
TheBusyBiscuit
c4be51f7bb
Fixes #2839
2021-02-24 15:57:21 +01:00
TheBusyBiscuit
979bb4b5f4
Updated textures and names
2021-02-23 11:14:07 +01:00
TheBusyBiscuit
659f329349
Merge branch 'master' into feature/auto-crafters
2021-02-23 11:11:26 +01:00
TheBusyBiscuit
6533b5023c
Merge pull request #2830 from StarWishsama/fix/wood-cutter-duplication
...
Fix duplicating woods when unable to replant
2021-02-23 11:05:45 +01:00
TheBusyBiscuit
338fe0f84b
Merge pull request #2597 from Slimefun/fixes/blocks fixes #2560
...
Refactoring + Fixes to Block Handlers
2021-02-22 18:34:19 +01:00
Name1ess
c854cb7788
fix: duplicating woods when unable to replant
2021-02-20 12:34:56 +08:00
ProfElements
c3349f8b4c
Actually comment the file
2021-02-19 13:20:02 -06:00
ProfElements
0439a48a16
Make requested changes
2021-02-19 13:01:48 -06:00
CactusTheGuy
4096315e7d
Translate categories_vi.yml via GitLocalize
2021-02-19 07:30:35 +00:00
ProfElements
c643a52b4e
fix merge conflicts
2021-02-18 20:39:24 -06:00
ProfElements
92ed16473e
Fix #2805 , make sure the book binder doesnt kill overleveled enchantments
2021-02-18 20:26:41 -06:00
TheBusyBiscuit
c09773fcef
[CI skip] Manually sync czech translations
2021-02-13 13:10:45 +01:00
TheBusyBiscuit
c27eb2959a
[CI skip] Manually update dutch translations...
2021-02-12 20:09:19 +01:00
TheBusyBiscuit
ce643ad87f
Update Translators.java
2021-02-12 18:35:44 +01:00
peppower
40754d7da0
Translate categories_nl.yml via GitLocalize
2021-02-12 17:33:32 +00:00
Nikolay
eebaa069c9
Translate messages_bg.yml via GitLocalize
2021-02-12 16:08:55 +00:00
TheBusyBiscuit
2754703f9d
Merge branch 'master' into feature/auto-crafters
2021-02-10 18:34:34 +01:00
TheBusyBiscuit
854c3335e9
Fixes #2818
2021-02-10 18:33:34 +01:00
TheBusyBiscuit
e2f3944d66
Fixes #2817
2021-02-09 17:08:49 +01:00
TheBusyBiscuit
b224123918
Fixes #2804
2021-02-07 18:26:08 +01:00
TheBusyBiscuit
d3f4ca4779
Proper error-handling for addon inventories
2021-02-07 16:06:06 +01:00
TheBusyBiscuit
e47d0171cc
Fixes #2810
2021-02-07 12:30:55 +01:00
TheBusyBiscuit
9a67c88ced
Added Unit Tests for the actual crafting
2021-02-07 01:34:58 +01:00
TheBusyBiscuit
9e83b4af00
Fixes #2809
2021-02-06 20:23:32 +01:00
TheBusyBiscuit
6e864ace99
Added researches and updated textures
2021-02-06 19:35:58 +01:00
TheBusyBiscuit
bbd631536d
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
2021-02-06 19:33:45 +01:00
TheBusyBiscuit
7ddd0469eb
Deprecated Automated Crafting Chamber (soon to be replaced)
2021-02-06 19:32:41 +01:00
TheBusyBiscuit
e6494da8c9
Allow any RecipeType (in theory)
2021-02-06 14:00:56 +01:00
TheBusyBiscuit
a5a16621ee
Merge branch 'master' into feature/auto-crafters
2021-02-06 11:19:07 +01:00
TheBusyBiscuit
47743b632e
Fixed an exception when disabled in an invalid environment.
2021-02-06 11:18:09 +01:00
TheBusyBiscuit
dec868284d
Updated dependencies
2021-02-06 11:11:58 +01:00
TheBusyBiscuit
baa4f92ea1
Added documentation
2021-02-06 11:09:13 +01:00
TheBusyBiscuit
eeb89c3c3b
Some very basic unit tests
2021-02-06 10:48:30 +01:00
TheBusyBiscuit
0adc1c3192
The Enhanced Auto Crafter now requires confirmation too
2021-02-06 01:55:54 +01:00
TheBusyBiscuit
e8a67cdd6a
Many more fixes
2021-02-06 01:54:08 +01:00
TheBusyBiscuit
340005109b
Even more fixes!
2021-02-06 01:14:23 +01:00
TheBusyBiscuit
1e9e8be82a
More bug fixes
2021-02-06 01:06:11 +01:00
TheBusyBiscuit
dd9a04fe04
Restored old classes and added deprecation warnings
2021-02-06 01:02:31 +01:00
TheBusyBiscuit
83aa84ca3b
Some bug fixes
2021-02-06 00:58:29 +01:00
TheBusyBiscuit
057fad1f08
Finished Auto-Crafters
2021-02-06 00:46:55 +01:00
TheBusyBiscuit
2d050a8e35
RecipeChoice task is now thread-safe
2021-02-06 00:29:57 +01:00
TheBusyBiscuit
a25b470272
Added sounds and two more messages
2021-02-06 00:14:44 +01:00
TheBusyBiscuit
3567dd87ba
Show recipe after selecting
2021-02-05 20:03:06 +01:00
TheBusyBiscuit
53ac633927
Split up recipe classes
2021-02-05 19:53:48 +01:00
TheBusyBiscuit
7d50d0eb32
Fixes #1161
2021-02-05 18:40:41 +01:00
TheBusyBiscuit
7ff6d755e8
Implemented basic behaviour
2021-02-05 17:26:03 +01:00
TheBusyBiscuit
6b4fe8a7a9
Added Enhanced Auto Crafter
2021-02-05 15:14:09 +01:00
TheBusyBiscuit
a7e890829d
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
2021-02-05 14:16:47 +01:00
TheBusyBiscuit
5edf61404b
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-02-05 14:15:17 +01:00
TheBusyBiscuit
155b2fc637
Some small visual changes
2021-02-05 14:12:17 +01:00
TheBusyBiscuit
9f2d2ddd45
[CI skip] Re-enable MockBukkit-blocked test
2021-02-05 00:12:19 +01:00
TheBusyBiscuit
80b49c264f
Update Translators.java
2021-02-04 20:12:47 +01:00
LirCZE
a2c3e24a95
Translate recipes_cs.yml via GitLocalize
2021-02-04 19:07:50 +00:00
100petr
e6a9511136
Translate recipes_cs.yml via GitLocalize
2021-02-04 19:07:49 +00:00
jakmanda05
bbce73ce76
Translate recipes_cs.yml via GitLocalize
2021-02-04 19:07:47 +00:00
100petr
c94add139b
Translate categories_cs.yml via GitLocalize
2021-02-04 19:07:45 +00:00
