mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
6,911 Commits 1 Branch 0 Tags 64 MiB
5fe8dff05e
Commit Graph

5065 Commits

Author SHA1 Message Date
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
Jan Vrska
405b553f0b Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:44 +00:00
frfole
08942610af Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:43 +00:00
100petr
4c16273097 Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:42 +00:00
Renzotom
4b4ef00ecb Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:41 +00:00
StarWishsama
b7fa8b621e fix: color text doesn't work 2021-02-03 12:45:55 +08:00
StarWishsama
bc3b61ed90 optimize: no need display enchant item 2021-02-03 12:43:20 +08:00
StarWishsama
f0d427a19c forget to return 2021-02-03 12:36:17 +08:00
StarWishsama
e5deee2bbd optimize: add a switch for limit, set default value to 10 
feat: utilize the progress bar to display (dis)enchant failed
 2021-02-03 12:31:42 +08:00
TheBusyBiscuit
581199271c Almost done with the vanilla auto crafter 2021-02-02 20:27:04 +01:00
TheBusyBiscuit
2c22983f0a Added package descriptions 2021-02-02 19:38:01 +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
TheBusyBiscuit
5a0a52baab Sweet deprecation warnings 2021-02-02 18:57:29 +01:00
Daniel Walsh
36639fd22c
Merge pull request #2791 from Slimefun/feature/componentify-versions-subcommand 2021-02-02 17:31:35 +00:00
Daniel Walsh
695ba7c742
Merge pull request #2643 from Slimefun/chore/has-unlocked 2021-02-02 17:30:45 +00:00
Daniel Walsh
b74eb5b30d
Merge pull request #2782 from Slimefun/feature/taisman-actionbar 
Allow Talismans to use the Actionbar
 2021-02-02 17:27:47 +00:00
Daniel Walsh
636d44cfb8
oops forgot 1 space 2021-02-02 12:25:43 +00:00
Daniel Walsh
498050dc81
Apply suggestions from code review 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-02-02 11:51:56 +00:00
TheBusyBiscuit
6d89d38c3a Fixes #2793 2021-02-02 10:05:08 +01:00
TheBusyBiscuit
e99a39d2ab Fixes #2794 2021-02-02 09:39:22 +01:00
StarWishsama
f308c60bd1 fix: Unable to limit enchantment level 
optimize: set default and max level to Short.MAX_VALUE
 2021-02-02 12:49:02 +08:00
Daniel Walsh
d41f276543
Lots more hover and click! 2021-02-01 17:14:21 +00:00
Daniel Walsh
e11929b587
Add java ver and hover to versions subcommand 2021-02-01 16:07:06 +00:00
TheBusyBiscuit
fe42f6fa9f Nether Wart Blocks can be turned into Nether Warts using a Grind Stone 2021-02-01 10:47:31 +01:00
PaladinBear
6f8134a800 Translate researches_he.yml via GitLocalize 2021-01-31 07:52:59 +00:00
PaladinBear
dabc8bbbc0 Translate messages_he.yml via GitLocalize 2021-01-31 07:52:58 +00:00
TheBusyBiscuit
418b6ffa74
[CI skip] Merge pull request #2787 from Slimefun/gitlocalize-14895 2021-01-31 00:28:14 +01:00
TheBusyBiscuit
c78092bb85
[CI skip] Updated translators list 2021-01-31 00:27:14 +01:00
amarcais53
704e100e07 Translate messages_fr.yml via GitLocalize 2021-01-30 21:07:29 +00:00
Maxime
d6ae3ac81d Translate messages_fr.yml via GitLocalize 2021-01-30 21:07:28 +00:00
Pierre
dbe127a1d1 Translate messages_fr.yml via GitLocalize 2021-01-30 21:07:27 +00:00
TheBusyBiscuit
b4d1894d8f
Merge pull request #2757 from StarWishsama/magician-talisman-fix 
Fixes #2679
 2021-01-29 16:34:53 +01:00
TheBusyBiscuit
a80269b7d9 [CI skip] Formatting 2021-01-29 12:19:40 +01:00
TheBusyBiscuit
f207601244 Translate messages_de.yml via GitLocalize 2021-01-29 10:51:06 +00:00
TheBusyBiscuit
d1b907dc02 Translate researches_de.yml via GitLocalize 2021-01-29 10:51:04 +00:00
HeroBrineKing
76d4c1362d Translate messages_zh-TW.yml via GitLocalize 2021-01-29 08:43:23 +00:00
TheBusyBiscuit
9415a446f3
[CI skip] Merge pull request #2784 from Slimefun/gitlocalize-14892 
Synced up zhCN translation
 2021-01-29 09:23:59 +01:00
TheBusyBiscuit
24d0a87fe0
[CI skip] Updated translators list 2021-01-29 09:23:47 +01:00
Nameless
9e6c24a46a Translate messages_zh-CN.yml via GitLocalize 2021-01-29 08:22:17 +00:00
Jiejue233
fed5925892 Translate researches_zh-CN.yml via GitLocalize 2021-01-29 08:22:15 +00:00
Just Mango
a7bf430183 Translate researches_vi.yml via GitLocalize 2021-01-29 08:20:43 +00:00
Just Mango
5ba1eaadff Translate messages_vi.yml via GitLocalize 2021-01-29 08:20:41 +00:00
nahkd123
38d959d44c Translate messages_vi.yml via GitLocalize 2021-01-29 08:20:40 +00:00
Name1ess
d5d7bc705a
Merge branch 'master' into magician-talisman-fix 2021-01-29 12:14:39 +08:00
StarWishsama
29b368f648 fix: shadow name 2021-01-29 12:13:24 +08:00
StarWishsama
8effed7139 Merge remote-tracking branch 'origin/magician-talisman-fix' into magician-talisman-fix 2021-01-29 12:10:02 +08:00
StarWishsama
a031585b5a fix: thank you idea 2021-01-29 12:09:24 +08:00
TheBusyBiscuit
ee7786b8e4 Allow Talismans to use the Actionbar 2021-01-29 03:02:50 +01:00
TheBusyBiscuit
3c0afeb943 Small fix 2021-01-29 02:47:20 +01:00
TheBusyBiscuit
d75e693ceb
[CI skip] Merge pull request #2780 from Slimefun/gitlocalize-14890 
Translated the new string
 2021-01-28 23:16:28 +01:00
Nikolay
6505b1c624 Translate messages_bg.yml via GitLocalize 2021-01-28 21:28:58 +00:00
TheBusyBiscuit
06335f6e9a Finished MachineProcessor API 2021-01-28 21:18:45 +01:00
TheBusyBiscuit
3f51440f11 First groundwork 2021-01-28 19:06:32 +01:00
bito-blosh
1c404d7f66 Translate messages_ja.yml via GitLocalize 2021-01-28 17:55:10 +00:00
TheBusyBiscuit
835e8fa384 Translate messages_ja.yml via GitLocalize 2021-01-28 17:55:09 +00:00
TheBusyBiscuit
46de5a700a Little bit of refactoring 2021-01-28 18:43:20 +01:00
TheBusyBiscuit
8cf0f61f3e Added placeholder for unloaded profiles to PlaceholderAPI integration 2021-01-28 18:21:22 +01:00
TheBusyBiscuit
20d6656f35
[CI skip] Merge pull request #2777 from Slimefun/gitlocalize-14884 
add zh-TW wise talisman and enchantment book binding
 2021-01-28 14:28:30 +01:00
HeroBrineKing
afb492fb3b Translate researches_zh-TW.yml via GitLocalize 2021-01-28 13:09:52 +00:00
HeroBrineKing
8399136bc1 Translate messages_zh-TW.yml via GitLocalize 2021-01-28 13:08:40 +00:00
TheBusyBiscuit
1d111772f2 Translate messages_zh-TW.yml via GitLocalize 2021-01-28 13:08:39 +00:00
TheBusyBiscuit
cadf66a13c
Merge branch 'master' into fixes/blocks 2021-01-28 13:41:27 +01:00
TheBusyBiscuit
6df052e4cf Fixes #2771 2021-01-28 12:37:13 +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
5aa4361a92
Merge branch 'api/access-raw-storage' of github.com:Slimefun/Slimefun4 into api/access-raw-storage 2021-01-26 12:52:35 +00:00
TheBusyBiscuit
7ffc8aff24 Fixes #2760 2021-01-26 10:35:47 +01:00
TheBusyBiscuit
9436ce451a Fixes #2460 2021-01-26 10:07:12 +01:00
TheBusyBiscuit
ff83bb025e
[CI skip] Merge pull request #2481 from MoKe12g/master 
Explosive tools not working with silk touch
 2021-01-26 10:02:25 +01: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
bito-blosh
177c67d25c Translate researches_ja.yml via GitLocalize 2021-01-26 04:15:47 +00:00
TheBusyBiscuit
c2da6c5f53 Changed recipe for Tier 3 electric ore grinder 2021-01-26 00:57:49 +01:00
TheBusyBiscuit
7d0168115f
Merge pull request #2599 from svr333/AddT3ElectricGrinder 
Add Tier 3 Electric Ore Grinder
 2021-01-26 00:56:19 +01:00
TheBusyBiscuit
2085d9eeba [CI skip] Updated changelog 2021-01-26 00:56:03 +01:00
Daniel Walsh
91aaa546a6
Merge pull request #2680 from ProfElements/master 2021-01-25 15:44:06 +00:00
TheBusyBiscuit
36fe08a349
Merge pull request #2765 from StarWishsama/2761 
Fixes #2761 probably
 2021-01-25 16:36:49 +01:00
TheBusyBiscuit
30202d3f51
Merge pull request #2755 from kii-chan-reloaded/master 
Check inv maxStackSize
 2021-01-25 16:34:47 +01:00
TheBusyBiscuit
9f29901eb8
[CI skip] Updated translators list 2021-01-25 15:46:35 +01:00
Name1ess
f3fafabcff
Update TalismanListener.java 2021-01-25 20:10:35 +08:00
TheBusyBiscuit
5ac3b9ec53
[CI skip] Merge pull request #2766 from Slimefun/gitlocalize-14860 
Updated Hungarian translations
 2021-01-25 12:25:58 +01:00
TheBusyBiscuit
842308cce7
[CI skip] Merge pull request #2762 from Slimefun/gitlocalize-14855 
Update Japanese translation files.
 2021-01-25 12:25:13 +01:00
poma123
290afb4746 Translate researches_hu.yml via GitLocalize 2021-01-25 08:04:24 +00:00
KingDead
6792ee765f Translate messages_hu.yml via GitLocalize 2021-01-25 08:04:22 +00:00
poma123
e47b89de4e Translate messages_hu.yml via GitLocalize 2021-01-25 08:04:21 +00:00
StarWishsama
a6bcab266f chore: remove register call when initialize 2021-01-25 12:18:24 +08:00
Name1ess
8d844254c2
fix: register recipes when speed is not 0 2021-01-25 12:15:18 +08:00
Nameless
76ebff105b Translate researches_zh-CN.yml via GitLocalize 2021-01-25 04:06:01 +00:00
Nameless
89370d31f9 Translate messages_zh-CN.yml via GitLocalize 2021-01-25 04:05:59 +00:00
StarWishsama
decf9bd08c fix: grammar issue 2021-01-25 11:59:53 +08:00
Nikolay
3b564c0486 Translate messages_bg.yml via GitLocalize 2021-01-24 22:55:41 +00:00
bito-blosh
826e90ef82 Translate messages_ja.yml via GitLocalize 2021-01-24 21:22:01 +00:00
TheBusyBiscuit
c9cdffdfac Translate messages_ja.yml via GitLocalize 2021-01-24 21:22:00 +00:00
bito-blosh
ce869b2acc Translate researches_ja.yml via GitLocalize 2021-01-24 21:21:58 +00:00
TheBusyBiscuit
abf948e4ed Translate messages_de.yml via GitLocalize 2021-01-24 19:27:24 +00:00
TheBusyBiscuit
e5d5b2950d Translate researches_de.yml via GitLocalize 2021-01-24 19:27:23 +00:00
TheBusyBiscuit
a9c4df30a4
Update Translators.java 2021-01-24 20:23:30 +01:00
Luu7
794d184a41 Translate researches_es.yml via GitLocalize 2021-01-24 19:21:47 +00:00
Luu7
0da0468b23 Translate messages_es.yml via GitLocalize 2021-01-24 19:21:46 +00:00
dylan
cd643cabb5 Translate messages_es.yml via GitLocalize 2021-01-24 19:21:45 +00:00
TheBusyBiscuit
f958385f3d Translate messages_es.yml via GitLocalize 2021-01-24 19:21:44 +00:00
TheBusyBiscuit
4019b9612d
Merge branch 'master' into master 2021-01-24 18:09:40 +01:00
TheBusyBiscuit
0b4c2f2e08 Cherry-picked Talisman of the Wise from #2645 2021-01-24 18:04:52 +01:00
TheBusyBiscuit
f6e9d70baa Merge branch 'feature/experimental-talismans' of https://github.com/Slimefun/Slimefun4.git 2021-01-24 17:03:14 +01:00
StarWishsama
ffb063e2d8 refactor: removed unused import 2021-01-24 11:42:01 +08:00
StarWishsama
078a553283 refactor: replace Auto Enchanter setting to IntRange 2021-01-24 11:40:38 +08:00
StarWishsama
f89db91778 refactor: use for-loop for notice and replace to IntRangeSetting 2021-01-24 11:37:59 +08:00
StarWishsama
8302c0c932 fix: add missing judge in getRandomEnchantment 2021-01-24 11:01:42 +08:00
StarWishsama
9e49071161 feat: Add ItemSetting for magician talisman 
This setting can set whether books can be enchanted.
 2021-01-24 10:59:55 +08:00
TheBusyBiscuit
17fd2ec570 Added AsyncProfileLoadEvent 2021-01-23 19:38:59 +01:00
TheBusyBiscuit
f2a80fc04f
Merge pull request #2749 from Slimefun/patch/make-rechargeablehelper-public 
Make RechargeableHelper public
 2021-01-23 16:11:29 +01:00
TheBusyBiscuit
2ceef773c6 Finished fix for #2754 2021-01-23 15:32:37 +01:00
TheBusyBiscuit
1b4504a8cf Added a Unit Test to verify that #2754 is fixed 2021-01-23 15:20:18 +01:00
TheBusyBiscuit
389a2978c0 Fixes #2754 2021-01-23 14:25:10 +01:00
StarWishsama
48165dd138 fix: add enchant item check in filter 2021-01-23 18:49:42 +08:00
Name1ess
a94567333a
fix: add bypass for book 2021-01-23 18:45:31 +08:00
StarWishsama
018cfc33c8 feat: add display limit level 2021-01-23 17:07:30 +08:00
StarWishsama
5e279d7c40 fix: yaml format 2021-01-23 14:41:12 +08:00
StarWishsama
77231e86a5 fix: yaml format 2021-01-23 14:38:38 +08:00
StarWishsama
7d1df8ca24 feat: Add enchant limit to AutoDisenchanter and message 2021-01-23 14:36:50 +08:00
Name1ess
2777cec1d5
feat: Add enchant level limit to AutoEnchanter 2021-01-23 14:25:36 +08:00
TheBusyBiscuit
83c2c6a915 [CI skip] Refactoring 2021-01-22 22:00:27 +01: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
95170b6115
Update messages_he.yml 2021-01-22 13:16:40 +01:00
TheBusyBiscuit
feef32f44e
Update messages_he.yml 2021-01-22 13:15:43 +01:00
TheBusyBiscuit
2af5ce0b2d
Update messages_he.yml 2021-01-22 13:14:57 +01:00
TheBusyBiscuit
85ff6af02e
Fixed this mess of variables. 2021-01-22 13:13:33 +01:00
TheBusyBiscuit
663f5e2063
Update SupportedLanguage.java 2021-01-22 13:02:46 +01:00
TheBusyBiscuit
5a6081ec98
Update Translators.java 2021-01-22 13:02:24 +01:00
Molioron
5763553859 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:58 +00:00
McAlmog
4fc735bb23 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:56 +00:00
Omer Oreg
63009c0824 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:54 +00:00
Timotiyadeyhakesem
ea32ae19c3 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:52 +00:00
dhtdht020
22e07a716c Translate messages_he.yml via GitLocalize 2021-01-22 12:00:51 +00:00
Eylonnn
4beda62944 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:49 +00:00
TheBusyBiscuit
50149f6b99
[CI skip] Merge pull request #2752 from Slimefun/gitlocalize-14844 
Update Chinese Translation
 2021-01-22 12:59:02 +01:00
Nameless
c9591d34bb Translate messages_zh-CN.yml via GitLocalize 2021-01-22 11:51:19 +00:00
TheBusyBiscuit
d00eff49b9 Translate messages_zh-CN.yml via GitLocalize 2021-01-22 11:51:18 +00:00
TheBusyBiscuit
f36532550b [CI skip] Added a few more unit tests 2021-01-22 12:31:18 +01:00
TheBusyBiscuit
ab8e603ec6
Update ChargeUtils.java 2021-01-21 22:25:53 +01:00
Daniel Walsh
1bc0ae56f1
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-21 21:20:14 +00:00
Daniel Walsh
b5d74830d9
Fix missing branch from jacoco report 2021-01-21 20:39:01 +00:00
Daniel Walsh
89c0988aca
Make sure capacity is greater than 0 2021-01-21 20:20:52 +00:00
Daniel Walsh
84ca63365c
RechargeableHelper -> ChargeUtils 2021-01-21 20:07:31 +00:00
Daniel Walsh
f65efd95fc
Requested changes 2021-01-21 20:05:27 +00:00
Daniel Walsh
499a464595
Add unit test 2021-01-21 19:53:19 +00:00
Daniel Walsh
549b075939
Make RechargeableHelper public 2021-01-21 19:25:38 +00: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
HeroBrineKing
2a0b921e1c Translate messages_zh-TW.yml via GitLocalize 2021-01-21 05:06:03 +00:00
TheBusyBiscuit
f4c5fd4898 Translate messages_zh-TW.yml via GitLocalize 2021-01-21 05:06:02 +00:00
TheBusyBiscuit
1a2858c6a0 Fixed imports 2021-01-20 17:23:25 +01:00
TheBusyBiscuit
570c981de3
Merge branch 'master' into fixes/blocks 2021-01-20 17:19:18 +01:00
Just Mango
3966c352ee Translate messages_vi.yml via GitLocalize 2021-01-20 14:11:46 +00:00
CactusTheGuy
40817f4b48 Translate messages_vi.yml via GitLocalize 2021-01-20 14:11:45 +00:00
nahkd123
de57194440 Translate messages_vi.yml via GitLocalize 2021-01-20 14:11:44 +00:00
TheBusyBiscuit
35b2c4a1e4
Updated translators list 2021-01-20 14:55:03 +01:00
Molioron
4832637501 Translate researches_he.yml via GitLocalize 2021-01-20 13:51:32 +00:00
Timotiyadeyhakesem
33d265a779 Translate researches_he.yml via GitLocalize 2021-01-20 13:51:30 +00:00
Eylonnn
480f5d949d Translate researches_he.yml via GitLocalize 2021-01-20 13:51:29 +00:00
Omer Oreg
af630a6e4c Translate researches_he.yml via GitLocalize 2021-01-20 13:51:27 +00:00
TheBusyBiscuit
f0b0e77fd5
[CI skip] Merge pull request #2743 from Slimefun/gitlocalize-14837 
Translated the new string
 2021-01-20 14:20:25 +01:00
Nikolay
b13daf886b Translate messages_bg.yml via GitLocalize 2021-01-20 13:12:31 +00:00
bito-blosh
50e1e02118 Translate messages_ja.yml via GitLocalize 2021-01-20 13:07:47 +00:00
TheBusyBiscuit
b47fbf60ff Translate messages_ja.yml via GitLocalize 2021-01-20 13:07:45 +00:00
Daniel Walsh
346fc7bc44
Merge pull request #2733 from Seggan/master 2021-01-20 12:35:07 +00:00
TheBusyBiscuit
fcafc125c7
[CI skip] Merge pull request #2740 from Slimefun/gitlocalize-14829 
messages_es
 2021-01-20 10:55:24 +01:00
TheBusyBiscuit
5c3f815a77
[CI skip] Merge pull request #2739 from Slimefun/gitlocalize-14828 
researches_es
 2021-01-20 10:53:22 +01:00
Luu7
15e95846a5 Translate recipes_es.yml via GitLocalize 2021-01-19 19:02:37 +00:00
KhronoZ
89c030340c Translate messages_es.yml via GitLocalize 2021-01-19 18:52:47 +00:00
Luu7
c410d7ea4e Translate messages_es.yml via GitLocalize 2021-01-19 18:52:46 +00:00
Luu7
842cc9b791 Translate researches_es.yml via GitLocalize 2021-01-19 18:52:27 +00:00
TheBusyBiscuit
591421fc32 [CI skip] Fixed javadocs 2021-01-19 10:01:55 +01:00
TheBusyBiscuit
9840a550ce [CI skip] Changed internal profiler flag to a volatile boolean 2021-01-19 10:01:28 +01:00
TheBusyBiscuit
4075c51975 [CI skip] Refactoring and improved logging 2021-01-18 23:29:44 +01:00
svr333
ffef8350b1
Merge branch 'master' into performance/cobblestone 2021-01-18 22:18:02 +01:00
Seggan
3fac23e26b Fine 2021-01-18 16:03:19 -05:00
Seggan
31a1d7b3b2 Localization + removed redundant 1st check 2021-01-18 09:41:38 -05:00
TheBusyBiscuit
8b28f3685a Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into chore/has-unlocked 2021-01-17 14:33:46 +01:00
TheBusyBiscuit
7eff4d381e Fixed a small issue with backpacks 2021-01-17 14:27:01 +01:00
TheBusyBiscuit
9c3c6d7245 [CI skip] Fixed javadocs 2021-01-17 14:04:51 +01:00
TheBusyBiscuit
eab6164690 Fixed 2021-01-17 12:19:08 +01:00
TheBusyBiscuit
7ca8392616 Improved documentation 2021-01-17 01:48:26 +01:00
TheBusyBiscuit
79c7c4826f Refactoring and documentation 2021-01-17 01:01:42 +01:00
Seggan
e1810f60ff Oops 2021-01-16 12:01:27 -05:00
Seggan
2e7291c3a5 Script validation 2021-01-16 11:38:19 -05:00
svr333
f8b135592d
Merge branch 'master' into chore/has-unlocked 2021-01-16 16:04:21 +01:00
TheBusyBiscuit
16ed670573 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
refactoring/holograms

Conflicts:
	CHANGELOG.md
 2021-01-16 15:56:23 +01:00
TheBusyBiscuit
0feace9c06
Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items 
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
 2021-01-16 15:51:17 +01:00
TheBusyBiscuit
7758fabcec
Merge pull request #2732 from Slimefun/gitlocalize-14785 
Translated to Bulgarian
 2021-01-16 15:50:38 +01:00
TheBusyBiscuit
03b4c10bad [CI skip] Updated changelog 2021-01-16 14:46:00 +01:00
Nikolay
defad8af32 Translate messages_bg.yml via GitLocalize 2021-01-16 13:13:35 +00:00
DNBGlol
61a30ec8b3 Translate messages_bg.yml via GitLocalize 2021-01-16 13:13:33 +00:00
Daniel Walsh
485fc1aa69
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-16 10:39:05 +00:00
Daniel Walsh
ff368bdf56
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-16 10:35:03 +00:00
TheBusyBiscuit
1b527f4a61
Merge branch 'master' into chore/has-unlocked 2021-01-16 11:34:57 +01:00
TheBusyBiscuit
34d18c5547
Merge branch 'master' into refactoring/holograms 2021-01-16 11:34:24 +01:00
Daniel Walsh
55d2f82dcd
Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items 2021-01-16 10:33:16 +00:00
TheBusyBiscuit
7c929a2f22 Fixes #2728 2021-01-16 11:30:39 +01:00
TheBusyBiscuit
e523d7849e Fixes #2662 2021-01-16 11:28:38 +01:00
Daniel Walsh
da2419d414
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE 2021-01-16 10:26:22 +00:00
TheBusyBiscuit
d678977a03 Fixed formatting, import and small optimization 2021-01-15 11:52:56 +01:00
TheBusyBiscuit
a810458345 [CI skip] Small changes 2021-01-15 11:46:40 +01:00
TheBusyBiscuit
3663a7d43b Proper error handling and updated changelog 2021-01-15 03:31:33 +01:00
TheBusyBiscuit
1997fe04d8 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into refactoring/holograms 2021-01-15 03:12:41 +01:00
TheBusyBiscuit
5ea34a895d Fixed holograms cache 2021-01-15 01:37:55 +01:00
TheBusyBiscuit
3ea2fccf25 Fixed docs 2021-01-15 01:34:56 +01:00
TheBusyBiscuit
570908a448 Cache entity names 2021-01-15 01:32:39 +01:00
TheBusyBiscuit
34f24f4d60 Invisible and invulnerable might be a good idea. 2021-01-15 00:29:28 +01:00
TheBusyBiscuit
d84a2e37a3 Lowered purge delay 2021-01-15 00:24:23 +01:00
TheBusyBiscuit
a7d0758692 More work on holograms 2021-01-15 00:16:58 +01:00
ProfElements
58eca5affa Check for conflicting enchantments, this can probably be better 2021-01-14 16:02:33 -06:00
ProfElements
5cd1d8cb22 appease yaml lint v3 2021-01-14 15:05:08 -06:00
ProfElements
782da8582f fix researches_en.yml formatting 2021-01-14 14:56:13 -06:00
ProfElements
fada355fe5 Add research and make Book Binder recipe slightly harder 2021-01-14 14:39:28 -06:00
TheBusyBiscuit
84d2d99097 not done yet 2021-01-14 20:44:56 +01:00
TheBusyBiscuit
739e7a7a9a
Merge branch 'master' into chore/has-unlocked 2021-01-14 14:44:57 +01:00
TheBusyBiscuit
ac590fdde3 Fixes #2721 2021-01-14 14:41:09 +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
TheBusyBiscuit
7826b2359a Finished fix for #2636 and fixed a threading issue with BlockStates 2021-01-14 11:58:52 +01:00
TheBusyBiscuit
43109ab2d3
Merge branch 'master' into performance/cobblestone 2021-01-14 11:16:39 +01:00
ProfElements
23049b64fa Make request changes, simpliflied BookBinder 2021-01-13 15:25:28 -06:00
ProfElements
088a08952b Make requested changes, made combineEnchantments better generally 2021-01-13 14:35:17 -06:00
Daniel Walsh
9be11921c7
Merge branch 'master' into fixes/blocks 2021-01-13 18:50:06 +00:00
Daniel Walsh
2f08066449
Merge pull request #2487 from CURVX/fix/sf-machine-hopper 2021-01-13 18:46:13 +00:00
TheBusyBiscuit
029bc2ae78 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
refactoring/holograms

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java
 2021-01-13 14:29:18 +01:00
TheBusyBiscuit
6e27ea0ca1 [CI skip] Fixed javadocs 2021-01-13 13:48:56 +01:00
TheBusyBiscuit
faa3219add Added an additional item warning for illegal stack sizes 2021-01-13 13:15:05 +01:00
TheBusyBiscuit
11a368f97e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-01-13 12:46:35 +01:00
TheBusyBiscuit
b0f5768443 [CI skip] Removed a deprecated method 2021-01-13 12:46:16 +01:00
TheBusyBiscuit
89f6b69e80
[CI skip] Merge pull request #2713 from Slimefun/gitlocalize-14728 
Updated and improve zh-CN Translation
 2021-01-13 12:19:25 +01:00
TheBusyBiscuit
69df04f128 Remove as much old stuff as possible 2021-01-13 11:58:54 +01:00
Nameless
a69226dd76 Translate messages_zh-CN.yml via GitLocalize 2021-01-13 05:23:28 +00:00
CURVX
889ffe4872 Few minor changes 2021-01-13 10:31:45 +05:30
TheBusyBiscuit
f602c6c575 Slimefun but without cs-corelib 2021-01-13 02:51:05 +01:00
TheBusyBiscuit
7339a6ed4b [CI skip] Refactoring 2021-01-13 02:20:32 +01:00
TheBusyBiscuit
17d11b513e
Merge branch 'master' into fixes/blocks 2021-01-12 19:53:48 +01:00
TheBusyBiscuit
ec8eed58f9 [CI skip] Refactoring 2021-01-12 19:28:12 +01:00
CURVX
a0ab148a65 Cleaned imports pt.2 2021-01-12 23:42:19 +05:30
CURVX
f0e891134b Cleaned imports 2021-01-12 23:17:23 +05:30
CURVX
19e2f37ac6 Resolve merge conflicts 2021-01-12 21:51:31 +05:30
CURVX
b3b7a22ee9 Changes req. by TTB 2021-01-12 21:42:53 +05:30
CURVX
105a57fb37
Merge pull request #6 from Slimefun/master 
[CI skip] Update fork
 2021-01-12 21:37:20 +05:30
TheBusyBiscuit
3f5fb7c7a7 [Ci skip] Fixed javadocs and improved documentation 2021-01-12 12:03:02 +01:00
TheBusyBiscuit
c92ba89d9a
Merge branch 'master' into performance/cobblestone 2021-01-11 13:58:21 +01:00
TheBusyBiscuit
3777b59596
Merge branch 'master' into fixes/blocks 2021-01-11 13:57:33 +01:00
TheBusyBiscuit
bc8d72b9ab Small aesthetic change 2021-01-11 13:12:09 +01:00
TheBusyBiscuit
5ed452660f Fixed elevator order (highest floor first) 2021-01-11 13:07:46 +01:00
TheBusyBiscuit
f6a9150296 Little bit of refactoring 2021-01-11 12:45:11 +01:00
TheBusyBiscuit
7a4712f930 Removed obsolete things 2021-01-11 12:33:49 +01:00
TheBusyBiscuit
7bfb46d3fd
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java 
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
 2021-01-11 12:07:46 +01:00
TheBusyBiscuit
85639c75ac Fixed floor numbers 2021-01-11 11:25:03 +01:00
TheBusyBiscuit
32474a588b Added ElevatorFloor class from PR #2699 2021-01-11 10:56:46 +01:00
TheBusyBiscuit
a313d8a878 Removed comments 2021-01-11 10:48:54 +01:00
TheBusyBiscuit
e119f762ac Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
features/inventory-elevator

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideLayout.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideLayoutOption.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/ElevatorPlate.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java
 2021-01-11 10:47:18 +01:00
TheBusyBiscuit
577ad2c308 [CI skip] Prepare RC-19 2021-01-11 10:33:12 +01:00
TheBusyBiscuit
4b6610d0b7 [CI skip] Finalized guide refactoring 2021-01-11 10:30:50 +01:00
Daniel Walsh
d4cfe2a0db
Quick fix 2021-01-11 07:57:51 +00:00
Daniel Walsh
116642fcec
Finish up 2021-01-11 07:38:26 +00:00
TheBusyBiscuit
7e48d96fa3 Removed "written book" slimefun guide and disabled elevators 2021-01-11 02:39:54 +01:00
TheBusyBiscuit
93dc77b188 [CI skip] Fixed javadocs 2021-01-11 02:14:49 +01:00
TheBusyBiscuit
2943289c6d
Merge branch 'master' into fixes/blocks 2021-01-10 23:12:34 +01:00
TheBusyBiscuit
c280ec26a0
Merge branch 'master' into fix/broken-book-guide-and-elevator 2021-01-10 23:09:06 +01:00
TheBusyBiscuit
4c879ac3b3 Added AndroidFarmEvent (+ refactored Farmer Androids) 2021-01-10 21:20:43 +01:00
TheBusyBiscuit
47fc037536 [CI skip] Lots of refactoring and documentation 
* Moved the ProtectionManager to the IntegrationsManager
* Refactored static NamespacedKeys to be non-static
* Added some documentation
 2021-01-10 17:32:47 +01:00
TheBusyBiscuit
f3ed8c0451 [CI skip] Refactoring 2021-01-10 16:21:15 +01:00
TheBusyBiscuit
177637d070
[CI skip] Merge pull request #2703 from Slimefun/gitlocalize-14714 
Chinese Taiwan 1/10 (Timings messages and tweaks)
 2021-01-10 14:36:31 +01:00
TheBusyBiscuit
3392a11883
[CI skip] Merge pull request #2702 from Slimefun/gitlocalize-14713 
Updated Hungarian translations
 2021-01-10 14:34:56 +01:00
TheBusyBiscuit
9f3adc1278 [CI skip] Refactored some more I had forgotten 2021-01-10 14:33:48 +01:00
HeroBrineKing
3cd6aeaf29 Translate messages_zh-TW.yml via GitLocalize 2021-01-10 13:07:07 +00:00
TheBusyBiscuit
9c89419d15 [CI skip] Missed one 2021-01-10 14:02:58 +01:00
poma123
c63e09219d Translate messages_hu.yml via GitLocalize 2021-01-10 13:01:44 +00:00
András Marczinkó
b3c72e984a Translate messages_hu.yml via GitLocalize 2021-01-10 13:01:43 +00:00
TheBusyBiscuit
22b5421118 Fixed /sf timings --verbose not working correctly (+refactoring) 2021-01-10 13:38:07 +01:00
TheBusyBiscuit
50a1050038 Translate messages_de.yml via GitLocalize 2021-01-10 12:17:21 +00:00
TheBusyBiscuit
73ef76b292
[CI skip] Merge pull request #2697 from Slimefun/gitlocalize-14666 
Update Japanese translation files.
 2021-01-10 13:08:20 +01:00
TheBusyBiscuit
5c34d26f8d
[CI skip] Fixed a typo 2021-01-10 13:06:22 +01:00
Daniel Walsh
53b6ea131b
Fixy fixy fix 2021-01-09 21:39:15 +00:00
bito-blosh
59e7b5c6f1 Translate recipes_ja.yml via GitLocalize 2021-01-09 21:31:23 +00:00
bito-blosh
daea1d54fc Translate messages_ja.yml via GitLocalize 2021-01-09 21:31:22 +00:00
TheBusyBiscuit
5dce476dc9 Translate messages_ja.yml via GitLocalize 2021-01-09 21:31:21 +00:00
ProfElements
93997718c0 Make requested changes, removed redundant isCompatible, and make isCompatible return false on else instead of just after the if 2021-01-09 15:25:59 -06:00
Daniel Walsh
d80784c6b3
Merge pull request #2695 from J3fftw1/feature/changed-version-command 2021-01-09 20:41:13 +00:00
Jeffrey Kosse
62285bb858 did requested changes 2021-01-09 21:28:41 +01:00
Jeffrey Kosse
c9a3cc3787 ree 2021-01-09 21:27:57 +01:00
Daniel Walsh
6fcc69bacc
[CI Skip] Merge pull request #2687 from Slimefun/features/verbose-flag 2021-01-09 20:27:26 +00:00
Jeffrey Kosse
4a281c87bc ree 2021-01-09 21:27:12 +01:00
Jeffrey Kosse
413a74ece4 added annotations 2021-01-09 21:25:26 +01:00
Jeffrey Kosse
1b52417380 removed unused import 2021-01-09 21:23:50 +01:00
Jeffrey Kosse
a5f42f31dd Changed VersionsCommand to give more info 2021-01-09 20:18:09 +01:00
ProfElements
23d0f0ae2a Made requested changes. 2021-01-07 14:41:59 -06:00
TheBusyBiscuit
8e2d250b1c
[CI skip] Merge pull request #2691 from Slimefun/gitlocalize-14618 
Updated Hungarian translations
 2021-01-07 13:56:28 +01:00
TheBusyBiscuit
f9cfe03a9f
[CI skip] Updated translators list 2021-01-07 13:56:10 +01:00
poma123
d15d8009cb Translate resources_hu.yml via GitLocalize 2021-01-07 11:43:26 +00:00
poma123
c4cc0496ea Translate messages_hu.yml via GitLocalize 2021-01-07 11:43:22 +00:00
KingDeadZ
a6c8f3b437 Translate messages_hu.yml via GitLocalize 2021-01-07 11:43:21 +00:00