mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
6,187 Commits 1 Branch 0 Tags 64 MiB
fbdf7acc50
Commit Graph

1215 Commits

Author SHA1 Message Date
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
bc59731c38 Added a message when no chest was found 2021-03-13 11:03:57 +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
developer-pseudo
15fc388601 Translate categories_fi.yml via GitLocalize 2021-03-03 13:19:18 +00:00
TheBusyBiscuit
659f329349
Merge branch 'master' into feature/auto-crafters 2021-02-23 11:11:26 +01:00
CactusTheGuy
4096315e7d Translate categories_vi.yml via GitLocalize 2021-02-19 07:30:35 +00: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
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
6e864ace99 Added researches and updated textures 2021-02-06 19:35:58 +01:00
TheBusyBiscuit
a25b470272 Added sounds and two more messages 2021-02-06 00:14:44 +01:00
TheBusyBiscuit
7ff6d755e8 Implemented basic behaviour 2021-02-05 17:26:03 +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
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
TheBusyBiscuit
6d89d38c3a Fixes #2793 2021-02-02 10:05:08 +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
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
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
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
TheBusyBiscuit
ee7786b8e4 Allow Talismans to use the Actionbar 2021-01-29 03:02:50 +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
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
bito-blosh
177c67d25c Translate researches_ja.yml via GitLocalize 2021-01-26 04:15:47 +00:00