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