1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

885 Commits

Author SHA1 Message Date
TheBusyBiscuit
f0f2f0be92 [CI skip] Refactoring and documentation 2020-03-02 14:25:33 +01:00
TheBusyBiscuit
25eca28be3 [CI skip] Added new RC tags to the GitHub Releases tab 2020-03-02 12:46:28 +01:00
TheBusyBiscuit
e9ca9aac66 [CI skip] Weird fix but ok 2020-03-01 19:55:56 +01:00
TheBusyBiscuit
f22d526398
[CI skip] Merge pull request #1603 from TheBusyBiscuit/gitlocalize-11073
Implement categories_nl.yml
2020-03-01 19:41:44 +01:00
TheBusyBiscuit
c8668ca54e
[CI skip] Merge pull request #1604 from TheBusyBiscuit/gitlocalize-11074
Implement resources_nl.yml
2020-03-01 19:40:47 +01:00
TheBusyBiscuit
5d677f59da [CI skip] Little change 2020-03-01 19:40:34 +01:00
Senne Van Rompaey
bf417b5aaf Translate resources_nl.yml via GitLocalize 2020-03-01 18:38:33 +00:00
Senne Van Rompaey
929a2e0810 Translate categories_nl.yml via GitLocalize 2020-03-01 18:38:05 +00:00
TheBusyBiscuit
b6e574fc1d [CI skip] More refactoring 2020-03-01 16:17:18 +01:00
Panda.com
7b74a347b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GearListener.java
2020-03-01 15:52:36 +01:00
TheBusyBiscuit
9eda7d1e5e [CI skip] Refactoring 2020-03-01 15:23:09 +01:00
TheBusyBiscuit
c3f6eb3a3d [CI skip] More refactoring 2020-03-01 15:06:35 +01:00
Panda.com
56648c464f last fix! 2020-03-01 14:59:11 +01:00
TheBusyBiscuit
aaff35152a [CI skip] Refactored Slimefun guide 2020-03-01 14:49:00 +01:00
Panda.com
efa8d81f77 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java
2020-03-01 14:33:44 +01:00
Panda.com
105b32583d Changed requested changes 2020-03-01 14:27:11 +01:00
TheBusyBiscuit
0609fa1b5f [CI skip] Added a warning for disabled auto-updaters. 2020-03-01 14:03:12 +01:00
TheBusyBiscuit
f007c1b68e [CI skip] Reduced technical debt 2020-03-01 10:36:31 +01:00
TheBusyBiscuit
dad60f85c4 Fixes #1577 2020-03-01 09:29:37 +01:00
TheBusyBiscuit
b2a0214ef0 [CI skip] More cleanup 2020-03-01 01:05:48 +01:00
TheBusyBiscuit
cec1107198 [CI skip] A bunch of refactoring 2020-02-29 23:42:02 +01:00
Daniel Walsh
cbd7faf4d7 General performance improvements 2020-02-27 16:11:32 +00:00
TheBusyBiscuit
9b0cb78960
Merge pull request #1584 from ThatPreston/master
Add New Rainbow Blocks
2020-02-26 23:49:39 +01:00
ThatPreston
5549eb77b7
Remove Rainbow Concrete Powder 2020-02-26 15:23:06 -06:00
ThatPreston
0414cae04a
Remove Rainbow Concrete Powder 2020-02-26 15:21:45 -06:00
ThatPreston
2197b7eabd
Update ResearchSetup.java 2020-02-26 15:20:04 -06:00
TheBusyBiscuit
57bedbbcfe
[CI skip] Merge pull request #1585 from TheBusyBiscuit/gitlocalize-11043
Categories_es
2020-02-26 20:49:55 +01:00
TheBusyBiscuit
ccca0e03c7
[CI skip] Merge pull request #1587 from TheBusyBiscuit/gitlocalize-11045
recipes_es
2020-02-26 20:49:30 +01:00
TheBusyBiscuit
00a0b5bf5f
[CI skip] Merge pull request #1589 from TheBusyBiscuit/gitlocalize-11047
researches_es
2020-02-26 20:48:58 +01:00
TheBusyBiscuit
6c3c0fbbbc
[CI skip] Merge pull request #1588 from TheBusyBiscuit/gitlocalize-11046
messages_es
2020-02-26 20:48:14 +01:00
TheBusyBiscuit
dd0b979423
[CI skip] Merge pull request #1586 from TheBusyBiscuit/gitlocalize-11044
Resources_es
2020-02-26 20:47:39 +01:00
SoSeDiK
5f653fe0e1 Translate messages_ru.yml via GitLocalize 2020-02-26 16:40:33 +00:00
TheBusyBiscuit
602ec46d28 Translate messages_ru.yml via GitLocalize 2020-02-26 16:40:32 +00:00
dbzjjoe
4fdef96b47 Translate researches_es.yml via GitLocalize 2020-02-26 16:00:35 +00:00
Vravinite
464bedc76d Translate researches_es.yml via GitLocalize 2020-02-26 16:00:34 +00:00
Luu7
ca425a5de9 Translate messages_es.yml via GitLocalize 2020-02-26 15:58:07 +00:00
Vravinite
c9e055a655 Translate messages_es.yml via GitLocalize 2020-02-26 15:58:06 +00:00
Vravinite
c46100c081 Translate recipes_es.yml via GitLocalize 2020-02-26 15:56:01 +00:00
Vravinite
f58b8ab43c Translate resources_es.yml via GitLocalize 2020-02-26 15:33:27 +00:00
Vravinite
73dad7020e Translate categories_es.yml via GitLocalize 2020-02-26 15:32:59 +00:00
ThatPreston
1e9dc2b85d
Added New Rainbow Blocks
Added rainbow concrete, concrete powder, and glazed terracotta to the rainbow blocks research group.
2020-02-25 18:38:45 -06:00
ThatPreston
d12f7b4b8e
Added New Rainbow Blocks
Added normal and seasonal variants of rainbow concrete, concrete powder, and glazed terracotta.
2020-02-25 18:36:53 -06:00
ThatPreston
4c8bb36c6a
Added New Seasonal Rainbow Blocks
Added Christmas, Halloween, and Valentine's Day variants of rainbow concrete, concrete powder, and glazed terracotta.
2020-02-25 18:15:14 -06:00
ThatPreston
ab1c9318a6
Add new Rainbow Blocks
Added Rainbow Concrete, Rainbow Concrete Powder, and Rainbow Glazed Terracotta
2020-02-25 17:53:28 -06:00
András Marczinkó
312eac4308 Translate recipes_hu.yml via GitLocalize 2020-02-24 20:22:27 +00:00
András Marczinkó
bf3ebc5768 Translate messages_hu.yml via GitLocalize 2020-02-24 20:22:23 +00:00
KillerXCoder
1d4f8ec7f2 Translate recipes_sk.yml via GitLocalize 2020-02-24 10:56:30 +00:00
Muhammad Kamal Fergany
2b09c413c3 Translate messages_ar.yml via GitLocalize 2020-02-24 08:17:52 +00:00
TheBusyBiscuit
78a307c31c Translate messages_ar.yml via GitLocalize 2020-02-24 08:17:50 +00:00
Nameless
0a5fffb1ce Translate recipes_zh-CN.yml via GitLocalize 2020-02-23 23:57:57 +00:00
TheBusyBiscuit
15e57ffd9c Pushing another build again 2020-02-24 00:53:13 +01:00
TheBusyBiscuit
dfcb06180d
[CI skip] Merge pull request #1572 from TheBusyBiscuit/gitlocalize-10999
Update messages_zh-CN.yml
2020-02-23 10:51:55 +01:00
nahkd123
acc222db4a Translate messages_vi.yml via GitLocalize 2020-02-23 03:02:14 +00:00
Nameless
8b908a6f91 Translate messages_zh-CN.yml via GitLocalize 2020-02-23 01:41:38 +00:00
TheBusyBiscuit
2869a654c9 [CI skip] More Refactoring 2020-02-23 00:59:55 +01:00
András Marczinkó
f9b8f85a7c Translate messages_hu.yml via GitLocalize 2020-02-22 23:14:09 +00:00
TheBusyBiscuit
dcd7146949 [CI skip] Some minor changes 2020-02-22 18:54:23 +01:00
TheBusyBiscuit
ae782d9d7a
[CI skip] Merge pull request #1569 from TheBusyBiscuit/gitlocalize-10993
Added chinese (TW) recipe types
2020-02-22 17:40:58 +01:00
TheBusyBiscuit
e50c097ed0
[CI skip] Merge pull request #1568 from TheBusyBiscuit/gitlocalize-10992
Updated Chinese (Taiwan)
2020-02-22 17:40:41 +01:00
HeroBrineKing
560c76eeff Translate recipes_zh-TW.yml via GitLocalize 2020-02-22 16:38:45 +00:00
HeroBrineKing
dbb94421d0 Translate messages_zh-TW.yml via GitLocalize 2020-02-22 16:37:30 +00:00
TheBusyBiscuit
bdb4ba07ea Translate messages_zh-TW.yml via GitLocalize 2020-02-22 16:37:29 +00:00
Turret
e4fc507357 Translate messages_sv.yml via GitLocalize 2020-02-22 16:15:53 +00:00
bito-blosh
1a172865e7 Translate messages_ja.yml via GitLocalize 2020-02-22 16:05:58 +00:00
TheBusyBiscuit
b494dc1e00 Translate messages_ja.yml via GitLocalize 2020-02-22 16:05:57 +00:00
Dams_
837b58e3cb Translate recipes_fr.yml via GitLocalize 2020-02-22 15:17:57 +00:00
Edwin Kerforne
6df40df8c6 Translate recipes_fr.yml via GitLocalize 2020-02-22 15:17:55 +00:00
Edwin Kerforne
239e76d027 Translate messages_fr.yml via GitLocalize 2020-02-22 15:10:18 +00:00
Pierre
d58e56dea1 Translate messages_fr.yml via GitLocalize 2020-02-22 15:10:16 +00:00
TheBusyBiscuit
add25fa75a
[ci skip] Merge pull request #1563 from TheBusyBiscuit/gitlocalize-10986
Added german recipe translations
2020-02-22 16:09:09 +01:00
TheBusyBiscuit
5a8b12a242
[ci skip] Merge pull request #1562 from TheBusyBiscuit/gitlocalize-10985
Updated german messages
2020-02-22 16:08:53 +01:00
TheBusyBiscuit
a64b8b0df9
[ci skip] Merge pull request #1561 from TheBusyBiscuit/gitlocalize-10984
Messages - Slovak language
2020-02-22 16:08:40 +01:00
TheBusyBiscuit
5825c4db1a Translate recipes_de.yml via GitLocalize 2020-02-22 15:07:28 +00:00
TheBusyBiscuit
cfdf98a5e5 [CI skip] Fixed a typo 2020-02-22 15:59:42 +01:00
TheBusyBiscuit
35024f4186 Translate messages_de.yml via GitLocalize 2020-02-22 14:48:10 +00:00
KillerXCoder
4c97eb2988 Translate messages_sk.yml via GitLocalize 2020-02-22 14:45:24 +00:00
TheBusyBiscuit
8c4892a304 Translate messages_sk.yml via GitLocalize 2020-02-22 14:45:23 +00:00
TheBusyBiscuit
51d33dee02 [CI skip] Recipe Types can now be translated as well 2020-02-22 15:41:35 +01:00
Nameless
0c3884ca91
Fix #1558 2020-02-22 18:55:09 +08:00
TheBusyBiscuit
9ca20379a2 [Ci skip] Some more refactoring 2020-02-21 22:13:38 +01:00
TheBusyBiscuit
6175cff35a A Refactoring Supernova - You don't wanna look at the Diff 2020-02-21 21:22:26 +01:00
TheBusyBiscuit
f9f3e495e7 [CI skip] Refactoring 2020-02-21 12:09:12 +01:00
TheBusyBiscuit
155a9572c4 Fixed #1557 2020-02-21 11:00:41 +01:00
Nameless
078b506aca
Try to fix #1513 2020-02-20 11:15:06 +08:00
ThatPreston
c0af5eee77
Update SlimefunManager.java 2020-02-19 13:51:05 -06:00
TheBusyBiscuit
f5eb90f3d0 [CI skip] Removed some empty strings 2020-02-16 16:12:15 +01:00
TheBusyBiscuit
682755f106 Switching back to the development branch 2020-02-16 12:22:59 +01:00
TheBusyBiscuit
3226f57e8d Pushing another stable build 2020-02-16 12:21:25 +01:00
TheBusyBiscuit
5e74657263 [CI skip] Changed the API a bit 2020-02-16 12:17:14 +01:00
TheBusyBiscuit
70ee567b3c
[CI skip] Merge pull request #1547 from TheBusyBiscuit/gitlocalize-10944
Added resources for brazil
2020-02-16 11:38:25 +01:00
TheBusyBiscuit
df21cb99e0
[CI skip] Merge pull request #1546 from TheBusyBiscuit/gitlocalize-10943
Added researches for brazil
2020-02-16 11:38:14 +01:00
TheBusyBiscuit
1163166588
[CI skip] Merge pull request #1548 from TheBusyBiscuit/gitlocalize-10945
Added categories for brazil
2020-02-16 11:38:03 +01:00
Yuri Nogueira Moreira da Silva
0dbe7961f5 Translate categories_pt-BR.yml via GitLocalize 2020-02-16 10:36:19 +00:00
Yuri Nogueira Moreira da Silva
f93a813c8e Translate resources_pt-BR.yml via GitLocalize 2020-02-16 10:36:07 +00:00
Yuri Nogueira Moreira da Silva
f836cf1540 Translate researches_pt-BR.yml via GitLocalize 2020-02-16 10:35:53 +00:00
G4stavoM1ster
160caaaa24 Translate researches_pt-BR.yml via GitLocalize 2020-02-16 10:35:51 +00:00
Yuri Nogueira Moreira da Silva
b7bb419667 Translate messages_pt-BR.yml via GitLocalize 2020-02-16 10:35:30 +00:00
G4stavoM1ster
1db16b7a44 Translate messages_pt-BR.yml via GitLocalize 2020-02-16 10:35:27 +00:00
TheBusyBiscuit
9510d9b1fb [CI skip] Updated translators 2020-02-15 20:43:21 +01:00
TheBusyBiscuit
85fd76c8da
[CI skip] Merge pull request #1544 from TheBusyBiscuit/gitlocalize-10940
Added czech resources
2020-02-15 20:39:13 +01:00
TheBusyBiscuit
9398316bee
[CI skip] Merge pull request #1543 from TheBusyBiscuit/gitlocalize-10939
Added czech categories
2020-02-15 20:38:57 +01:00
TheBusyBiscuit
f036d14e48
[CI skip] Merge pull request #1541 from TheBusyBiscuit/gitlocalize-10937
Updated czech resources
2020-02-15 20:38:29 +01:00
TheBusyBiscuit
022be20242
[CI skip] Merge pull request #1542 from TheBusyBiscuit/gitlocalize-10938
Updated czech messages
2020-02-15 20:38:11 +01:00
jakmanda05
6800181c64 Translate researches_cs.yml via GitLocalize 2020-02-15 19:37:28 +00:00
Aile-Minicraftcz
ac27101dd5 Translate researches_cs.yml via GitLocalize 2020-02-15 19:37:26 +00:00
jakmanda05
c9d9a85ebb Translate categories_cs.yml via GitLocalize 2020-02-15 19:37:06 +00:00
Aile-Minicraftcz
9432fdab84 Translate categories_cs.yml via GitLocalize 2020-02-15 19:37:04 +00:00
Friggo
a23c6010b6 Translate categories_cs.yml via GitLocalize 2020-02-15 19:37:01 +00:00
IsLineCZ
4b9d491dc8 Translate messages_cs.yml via GitLocalize 2020-02-15 19:36:09 +00:00
Aile-Minicraftcz
6a0ed7ab5d Translate resources_cs.yml via GitLocalize 2020-02-15 19:35:46 +00:00
András Marczinkó
55d4a949fc Translate messages_hu.yml via GitLocalize 2020-02-15 19:35:25 +00:00
TheBusyBiscuit
0ec53e94d8
[CI skip] Merge pull request #1535 from TheBusyBiscuit/gitlocalize-10902
Polish category translation for Slimefun
2020-02-15 20:30:27 +01:00
TheBusyBiscuit
5a9d6f3d08
[CI skip] Merge pull request #1536 from TheBusyBiscuit/gitlocalize-10903
Polish resources translation for Slimefun
2020-02-15 20:29:46 +01:00
TheBusyBiscuit
6b724bafa1
[CI skip] Merge pull request #1537 from TheBusyBiscuit/gitlocalize-10917
messages_es
2020-02-15 20:28:37 +01:00
koloksk
326e730546
Spelling correction 2020-02-15 15:38:25 +01:00
dbzjjoe
82b0d2229f Translate messages_es.yml via GitLocalize 2020-02-14 21:21:12 +00:00
Luu7
a57ef4db95 Translate messages_es.yml via GitLocalize 2020-02-14 21:21:11 +00:00
Wirusiu
37d95b2200 Translate resources_pl.yml via GitLocalize 2020-02-14 17:29:27 +00:00
Wirusiu
51c9799c17 Translate categories_pl.yml via GitLocalize 2020-02-14 17:26:35 +00:00
TheBusyBiscuit
7d1e3b729e [CI skip] Updated change log 2020-02-14 10:49:45 +01:00
Nameless
b703f176a2
Fixed magician talisman can't give book extra enchantment 2020-02-14 11:16:41 +08:00
TheBusyBiscuit
e3a778ded1 [CI skip] Updated translators list 2020-02-14 01:57:41 +01:00
TheBusyBiscuit
09de53237b
[CI skip] Merge pull request #1529 from TheBusyBiscuit/gitlocalize-10893
Added Japanese
2020-02-14 01:42:30 +01:00
TheBusyBiscuit
e843cb7b10
[CI skip] Merge pull request #1531 from TheBusyBiscuit/gitlocalize-10895
Updated japanese
2020-02-14 01:42:18 +01:00
TheBusyBiscuit
59d3c00333
[CI skip] Merge pull request #1530 from TheBusyBiscuit/gitlocalize-10894
Added Japanese resources
2020-02-14 01:42:07 +01:00
TheBusyBiscuit
9936c4ab95
[CI skip] Merge pull request #1532 from TheBusyBiscuit/gitlocalize-10896
Added japanese categories
2020-02-14 01:41:53 +01:00
TheBusyBiscuit
db3f448717
[CI skip] Merge pull request #1523 from TheBusyBiscuit/gitlocalize-10884
Updated chiense translation
2020-02-14 01:41:39 +01:00
bito-blosh
0bac34ce33 Translate categories_ja.yml via GitLocalize 2020-02-14 00:40:58 +00:00
bito-blosh
252cb58151 Translate researches_ja.yml via GitLocalize 2020-02-14 00:40:39 +00:00
bito-blosh
81424d0652 Translate resources_ja.yml via GitLocalize 2020-02-14 00:40:10 +00:00
bito-blosh
1a4519a2c2 Translate messages_ja.yml via GitLocalize 2020-02-14 00:39:55 +00:00
TheBusyBiscuit
c21c44446d
[CI skip] Merge pull request #1525 from TheBusyBiscuit/gitlocalize-10887
Messages - Slovak language
2020-02-13 21:30:51 +01:00
TheBusyBiscuit
a8580619d1
[CI skip] Merge pull request #1526 from TheBusyBiscuit/gitlocalize-10888
Updated Chinese (Taiwan)
2020-02-13 21:29:06 +01:00
TheBusyBiscuit
399240ed22
[CI skip] Merge pull request #1527 from TheBusyBiscuit/gitlocalize-10889
Updated Russian messages
2020-02-13 21:27:14 +01:00
TheBusyBiscuit
dace6a610c
[CI skip] Merge pull request #1528 from TheBusyBiscuit/gitlocalize-10892
Updated Arabic Messages Translation
2020-02-13 21:25:18 +01:00
Muhammad Kamal Fergany
74bcf19cb8 Translate messages_ar.yml via GitLocalize 2020-02-13 17:54:44 +00:00
TomWiskis
b5a63a42a7 Translate messages_ru.yml via GitLocalize 2020-02-13 11:02:08 +00:00
SoSeDiK
2c0627644d Translate messages_ru.yml via GitLocalize 2020-02-13 11:02:07 +00:00
HeroBrineKing
00819420b9 Translate messages_zh-TW.yml via GitLocalize 2020-02-13 09:23:04 +00:00
KillerXCoder
d3da78307d Translate messages_sk.yml via GitLocalize 2020-02-13 08:44:09 +00:00
Turret
3d5fea47dc Translate messages_sv.yml via GitLocalize 2020-02-13 07:44:35 +00:00
Nameless
3abf6f0e30 Translate messages_zh-CN.yml via GitLocalize 2020-02-13 01:05:43 +00:00
TheBusyBiscuit
ecfd242c32
Merge branch 'master' into patch-2 2020-02-13 01:46:02 +01:00
Edwin Kerforne
274db4a558 Translate messages_fr.yml via GitLocalize 2020-02-13 00:41:20 +00:00
Pierre
1d826a8b1d Translate messages_fr.yml via GitLocalize 2020-02-13 00:41:19 +00:00
Nameless
d8c29ec7bb
Double ores by drop items 2020-02-13 08:40:18 +08:00
TheBusyBiscuit
430a27d164 Translate messages_de.yml via GitLocalize 2020-02-13 00:36:24 +00:00
TheBusyBiscuit
0ff1311c32 [CI skip] Updated language files and reduced technical debt 2020-02-13 01:30:27 +01:00
TheBusyBiscuit
14623e7378
[CI skip] Merge pull request #1519 from TheBusyBiscuit/gitlocalize-10881
Researches - Slovak language
2020-02-12 18:20:13 +01:00
Nameless
ef3c1f3d10
Update TalismanListener.java 2020-02-12 21:39:42 +08:00