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
TheBusyBiscuit
d2e17af2a1
Removed SlimefunBlockHandler
2021-04-16 15:05:39 +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
TheBusyBiscuit
2cf3ede10b
Fixed some concurrency issues
2021-03-28 11:44:47 +02:00
TheBusyBiscuit
328f9d3331
[CI skip] Automated Crafting Chambers will no longer work.
2021-03-22 10:23:54 +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
c2b3053574
[CI skip] Added warning message when registering Item Handlers twice.
2021-03-14 19:57:33 +01: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
da01091e26
[CI skip] Removed deprecated methods from item settings
2021-03-14 13:36:25 +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
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
Daniel Walsh
7a230d42c3
Merge pull request #2681 from Slimefun/features/multi-categories
2021-03-11 00:55:26 +00:00
TheBusyBiscuit
4678de1697
Fixes #2877 and added a new config option to crucibles
2021-03-10 14:04:33 +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
659f329349
Merge branch 'master' into feature/auto-crafters
2021-02-23 11:11:26 +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
TheBusyBiscuit
2754703f9d
Merge branch 'master' into feature/auto-crafters
2021-02-10 18:34:34 +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
dec868284d
Updated dependencies
2021-02-06 11:11:58 +01:00
TheBusyBiscuit
e8a67cdd6a
Many more fixes
2021-02-06 01:54:08 +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
a7e890829d
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
2021-02-05 14:16:47 +01:00
TheBusyBiscuit
0bf27fca15
Refactoring
2021-02-02 19:36:00 +01:00
TheBusyBiscuit
0aa5a999d4
Created abstract auto crafter framework
2021-02-02 18:57:45 +01:00
Daniel Walsh
695ba7c742
Merge pull request #2643 from Slimefun/chore/has-unlocked
2021-02-02 17:30:45 +00:00
TheBusyBiscuit
a80269b7d9
[CI skip] Formatting
2021-01-29 12:19:40 +01:00
TheBusyBiscuit
cadf66a13c
Merge branch 'master' into fixes/blocks
2021-01-28 13:41:27 +01:00
Daniel Walsh
23efc9b6f0
REEE Im not having a good day
2021-01-26 13:01:07 +00:00
Daniel Walsh
f923612388
oops
2021-01-26 12:58:14 +00:00
Daniel Walsh
03cce6265d
Make it return an immutable map
2021-01-26 12:55:03 +00:00
Daniel Walsh
986eb38e81
Whoops forgot to change this one
2021-01-26 07:47:41 +00:00
Daniel Walsh
d0e0aa3c65
getStorage -> getRawStorage
2021-01-26 07:44:04 +00:00
Daniel Walsh
fd40737682
Oops
2021-01-26 07:40:37 +00:00
Daniel Walsh
6c7b8fd9da
Add a way to retrieve the raw storage
2021-01-26 07:30:42 +00:00
TheBusyBiscuit
2085d9eeba
[CI skip] Updated changelog
2021-01-26 00:56:03 +01:00
TheBusyBiscuit
36fe08a349
Merge pull request #2765 from StarWishsama/2761
...
Fixes #2761 probably
2021-01-25 16:36:49 +01:00
Name1ess
8d844254c2
fix: register recipes when speed is not 0
2021-01-25 12:15:18 +08:00
Keaton
76a0ea1fdc
Check inv maxStackSize
...
As mentioned in CS-CoreLib2's #141 and #142 PR's, previous iterations of Slimefun AContainers would not consider the underlying Inventory's max stack size when determining sizing or pushing items. This commit changes DirtyChestMenus to act similarly by storing a variable defined as the lower of the Inventory's max stack size and the ItemStack's max stack size in a slot.
2021-01-22 13:40:01 -06:00
TheBusyBiscuit
f36532550b
[CI skip] Added a few more unit tests
2021-01-22 12:31:18 +01:00
TheBusyBiscuit
d8aaf00635
Merge pull request #2715 from Slimefun/experimental/remove-cscorelib
...
Experimental: Slimefun but without CS-CoreLib
2021-01-21 15:58:38 +01:00
TheBusyBiscuit
05b67869a8
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
features/multi-categories
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
2021-01-14 12:41:53 +01:00
TheBusyBiscuit
ae4e4bed73
Merge branch 'master' into fixes/blocks
2021-01-14 12:35:57 +01:00
TheBusyBiscuit
5d4e22c4b5
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
chore/has-unlocked
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/LockedCategory.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java
src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
2021-01-14 12:25:37 +01:00