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

869 Commits

Author SHA1 Message Date
TheBusyBiscuit
0a3f910892 Back to the development branch 2020-03-06 11:48:39 +01:00
TheBusyBiscuit
82c6bb9b6d Pushing another build 2020-03-06 11:42:33 +01:00
TheBusyBiscuit
1a29f160b5
[CI skip] Merge pull request #1623 from TheBusyBiscuit/gitlocalize-11117
Synced french translations
2020-03-06 11:41:47 +01:00
TheBusyBiscuit
1977fa8deb
[CI skip] Merge pull request #1627 from TheBusyBiscuit/gitlocalize-11121
Sync chinese (TW)
2020-03-06 11:40:28 +01:00
TheBusyBiscuit
36eae141bc
[CI skip] Merge pull request #1628 from TheBusyBiscuit/gitlocalize-11122
Sync Slovak
2020-03-06 11:40:08 +01:00
TheBusyBiscuit
48c956a725
[CI skip] Merge pull request #1629 from TheBusyBiscuit/gitlocalize-11123
Sync russian
2020-03-06 11:39:56 +01:00
TheBusyBiscuit
4da7fc8073
[CI skip] Merge pull request #1631 from TheBusyBiscuit/gitlocalize-11125
Sync arabic
2020-03-06 11:39:33 +01:00
TheBusyBiscuit
0cd9329325
[CI skip] Merge pull request #1626 from TheBusyBiscuit/gitlocalize-11120
Sync chinese
2020-03-06 11:39:21 +01:00
TheBusyBiscuit
ee111cdefe
[CI skip] Merge pull request #1622 from TheBusyBiscuit/gitlocalize-11116
Updated japanese
2020-03-06 11:38:41 +01:00
TheBusyBiscuit
642c6aa2c1
[CI skip] Merge pull request #1621 from TheBusyBiscuit/gitlocalize-11115
Updated pt-BR
2020-03-06 11:38:27 +01:00
TheBusyBiscuit
a7f1879df4 [CI skip] Little bit more refactoring before another release candidate 2020-03-06 11:37:55 +01:00
TheBusyBiscuit
49897ff392 Translate messages_ar.yml via GitLocalize 2020-03-06 10:32:59 +00:00
TheBusyBiscuit
ec0fafc1bf Translate messages_ru.yml via GitLocalize 2020-03-06 10:31:10 +00:00
TheBusyBiscuit
5235383fda Translate messages_sk.yml via GitLocalize 2020-03-06 10:30:05 +00:00
TheBusyBiscuit
583717f7fd Translate messages_zh-TW.yml via GitLocalize 2020-03-06 10:29:16 +00:00
Nameless
60524e138f Translate messages_zh-CN.yml via GitLocalize 2020-03-06 10:28:47 +00:00
Pierre
3c7fc9c1cc Translate messages_fr.yml via GitLocalize 2020-03-06 10:25:46 +00:00
TheBusyBiscuit
5139c42b9c Translate messages_ja.yml via GitLocalize 2020-03-06 10:23:57 +00:00
Sakanas
6e7eac51e0 Translate messages_pt-BR.yml via GitLocalize 2020-03-06 10:23:21 +00:00
TheBusyBiscuit
d027106747 Translate messages_pt-BR.yml via GitLocalize 2020-03-06 10:23:20 +00:00
Nameless
882a4aa728
Fixed #1613 2020-03-06 09:54:07 +08:00
TheBusyBiscuit
4255aaa444 [CI skip] Refactoring + documentation 2020-03-06 01:57:50 +01:00
TheBusyBiscuit
42e13e6194 [CI skip] Updated documentation 2020-03-06 01:22:54 +01:00
TheBusyBiscuit
58b2ac0dfc [CI skip] More refactoring, reduced technical debt 2020-03-05 23:38:39 +01:00
TheBusyBiscuit
1544443ad1 [CI skip] Updated javadocs 2020-03-05 21:52:34 +01:00
TheBusyBiscuit
22776e828d [CI skip] Refactoring + Added Javadocs 2020-03-05 21:28:50 +01:00
TheBusyBiscuit
0ab4ba425c [CI skip] One more class 2020-03-05 01:02:03 +01:00
TheBusyBiscuit
f08521e7b9 [CI skip] And even more refactoring and documentation 2020-03-05 01:01:38 +01:00
TheBusyBiscuit
0369fac3d6 [CI skip] More refactoring and documentation 2020-03-05 00:52:14 +01:00
TheBusyBiscuit
c7040fee49 [CI skip] Refactoring + documentation. A lot of it. 2020-03-05 00:04:18 +01:00
TheBusyBiscuit
ba940206fa
[CI skip] Merge pull request #1610 from TheBusyBiscuit/gitlocalize-11094
Updated hungarian
2020-03-04 09:09:02 +01:00
Nameless
9965211dd3 Translate messages_zh-CN.yml via GitLocalize 2020-03-04 06:09:06 +00:00
András Marczinkó
6c50ccc3a9 Translate recipes_hu.yml via GitLocalize 2020-03-04 00:54:35 +00:00
András Marczinkó
ac4fe359ae Translate messages_hu.yml via GitLocalize 2020-03-02 23:33:14 +00:00
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