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,219 Commits 1 Branch 0 Tags 64 MiB
001e7654aa
Commit Graph

4637 Commits

Author SHA1 Message Date
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
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