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
5,993 Commits 1 Branch 0 Tags 64 MiB
53ac633927
Commit Graph

3225 Commits

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