1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

6554 Commits

Author SHA1 Message Date
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
a60bc30506 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-01-22 12:31:38 +01:00
TheBusyBiscuit
f36532550b [CI skip] Added a few more unit tests 2021-01-22 12:31:18 +01:00
TheBusyBiscuit
c9834137fb
[CI skip] Merge pull request #2750 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.172
2021-01-22 11:15:17 +01:00
Renovate Bot
4f800c7d09
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.172 2021-01-22 00:31:48 +00: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
TheBusyBiscuit
2519df55cc
[CI skip] Updated changelog 2021-01-21 15:56:36 +01:00
TheBusyBiscuit
9df9710d82
[CI skip] Merge pull request #2746 from Slimefun/gitlocalize-14840
Chinese Taiwan 1/21 ScriptTooLong
2021-01-21 09:50:04 +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
TheBusyBiscuit
17ee89fec4
[CI skip] Merge pull request #2745 from Slimefun/gitlocalize-14839
Translated messages_vi.yml
2021-01-20 15:42:28 +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
985c9d8e13
[CI skip] Merge pull request #2744 from Slimefun/gitlocalize-14838
Translated researches into hebrew
2021-01-20 14:57:33 +01: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
TheBusyBiscuit
22ffb73236
[CI skip] Merge pull request #2742 from Slimefun/gitlocalize-14836
Update Japanese translation file.
2021-01-20 14:18:15 +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
TheBusyBiscuit
9700a50c5b
[CI skip] Merge pull request #2741 from Slimefun/gitlocalize-14830
recipes_es
2021-01-20 10:52:44 +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