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

2190 Commits

Author SHA1 Message Date
TheBusyBiscuit
c2d1a08eb5
[CI skip] Merge pull request #1675 from TheBusyBiscuit/gitlocalize-11198
Categories_es
2020-03-12 00:09:07 +01:00
TheBusyBiscuit
ca65b115b1
[CI skip] Merge pull request #1677 from TheBusyBiscuit/gitlocalize-11200
resources_es
2020-03-12 00:08:44 +01:00
Edwin Kerforne
0739272178 Translate messages_fr.yml via GitLocalize 2020-03-11 22:50:15 +00:00
Dams_
dd84eb77e2 Translate messages_fr.yml via GitLocalize 2020-03-11 22:50:14 +00:00
Pierre
e708cd91c2 Translate messages_fr.yml via GitLocalize 2020-03-11 22:50:13 +00:00
Vravinite
59d7d79b96 Translate resources_es.yml via GitLocalize 2020-03-11 22:32:45 +00:00
Vravinite
df29485d8d Translate recipes_es.yml via GitLocalize 2020-03-11 22:32:06 +00:00
Vravinite
928e0f3e2f Translate categories_es.yml via GitLocalize 2020-03-11 22:29:59 +00:00
Luu7
270695e807 Translate messages_es.yml via GitLocalize 2020-03-11 22:29:17 +00:00
Vravinite
bd61c437bf Translate messages_es.yml via GitLocalize 2020-03-11 22:29:16 +00:00
TheBusyBiscuit
92d030ca3b
[CI skip] Merge pull request #1672 from TheBusyBiscuit/gitlocalize-11193
Translation to Turkish of Recipes is updated
2020-03-11 18:00:07 +01:00
LinoxGH
7ccabd8ca6 Translate recipes_tr.yml via GitLocalize 2020-03-11 15:28:20 +00:00
LinoxGH
797ffa30b3 Translate messages_tr.yml via GitLocalize 2020-03-11 15:27:39 +00:00
TheBusyBiscuit
2fa9b46f89
[CI skip] Merge pull request #1667 from WalshyDev/patch-4
Add getItem() to SlimefunItemStack
2020-03-11 03:27:28 +01:00
TheBusyBiscuit
87f693a1ca
[CI skip] Merge pull request #1668 from TheBusyBiscuit/gitlocalize-11173
Update messages_vi.yml
2020-03-11 03:25:37 +01:00
TheBusyBiscuit
29fb2a917d
[CI skip] Merge pull request #1663 from TheBusyBiscuit/gitlocalize-11168
researches_es
2020-03-11 03:21:59 +01:00
TheBusyBiscuit
087fa918b5
[CI skip] Merge pull request #1660 from TheBusyBiscuit/gitlocalize-11165
messages_es
2020-03-11 03:21:07 +01:00
Daniel Walsh
4c1953ef60
Link SlimefunItemStack 2020-03-11 02:13:58 +00:00
Daniel Walsh
865ff25d4c
(By the way, you know this breaks convention) 2020-03-11 02:10:57 +00:00
nahkd123
a99931e60e Translate messages_vi.yml via GitLocalize 2020-03-11 02:10:16 +00:00
Daniel Walsh
c1aa385fae
Import 2020-03-11 02:06:22 +00:00
Daniel Walsh
1eeeaba3a4
Add getItem() 2020-03-11 01:53:59 +00:00
Muhammad Kamal Fergany
8aa1319afd Translate messages_ar.yml via GitLocalize 2020-03-10 23:32:07 +00:00
Luu7
a1989bdac5 Translate researches_es.yml via GitLocalize 2020-03-10 22:08:03 +00:00
dbzjjoe
fa67d29ffc Translate researches_es.yml via GitLocalize 2020-03-10 22:08:02 +00:00
Vravinite
3264c6e0bd Translate researches_es.yml via GitLocalize 2020-03-10 22:08:01 +00:00
Pierre
c4797e835a Translate messages_fr.yml via GitLocalize 2020-03-10 21:50:40 +00:00
Luu7
8e616bfb3a Translate messages_es.yml via GitLocalize 2020-03-10 21:48:26 +00:00
TheBusyBiscuit
364d9cb4d1
[CI skip] Merge pull request #1659 from TheBusyBiscuit/gitlocalize-11164
Updated Russian messages
2020-03-10 22:46:54 +01:00
SoSeDiK
2adeea3b08 Translate messages_ru.yml via GitLocalize 2020-03-10 21:45:15 +00:00
bito-blosh
129634bd34 Translate recipes_ja.yml via GitLocalize 2020-03-10 21:39:59 +00:00
bito-blosh
b2d6761e95 Translate messages_ja.yml via GitLocalize 2020-03-10 21:33:46 +00:00
TheBusyBiscuit
5f73b78943
[CI skip] Merge pull request #1655 from TheBusyBiscuit/gitlocalize-11160
Slovak language
2020-03-10 22:30:40 +01:00
TheBusyBiscuit
b262c7f9ff
[CI skip] Merge pull request #1656 from TheBusyBiscuit/gitlocalize-11161
Slovak language  - messages
2020-03-10 22:29:34 +01:00
TheBusyBiscuit
d68c019396 [Ci skip] Little tweak 2020-03-10 22:28:17 +01:00
KillerXCoder
0066e3b253 Translate messages_sk.yml via GitLocalize 2020-03-10 21:28:17 +00:00
KillerXCoder
adc263c431 Translate recipes_sk.yml via GitLocalize 2020-03-10 21:27:18 +00:00
TheBusyBiscuit
08277133aa
[CI skip] Merge pull request #1654 from TheBusyBiscuit/gitlocalize-11159
Updated german recipe types
2020-03-10 22:27:08 +01:00
TheBusyBiscuit
2901183006 Translate recipes_de.yml via GitLocalize 2020-03-10 21:26:20 +00:00
TheBusyBiscuit
2a02ff96cb Translate messages_de.yml via GitLocalize 2020-03-10 21:24:26 +00:00
TheBusyBiscuit
3234e2b86a [CI skip] Manually causing an update so gitlocalize wakes up... 2020-03-10 22:21:50 +01:00
TheBusyBiscuit
a589c75aa9 [CI skip] Updating translations (test?) 2020-03-10 22:19:53 +01:00
TheBusyBiscuit
952d2592b7 [CI skip] Updated language files 2020-03-10 22:09:19 +01:00
TheBusyBiscuit
eb6140c7ed [CI skip] Added new recipe type translations 2020-03-10 21:44:42 +01:00
TheBusyBiscuit
242aba9352 [CI skip] Refactoring 2020-03-10 21:44:24 +01:00
TheBusyBiscuit
e486ab152b [CI skip] Refactoring 2020-03-10 15:20:59 +01:00
TheBusyBiscuit
aa1f505141 [CI skip] Refactoring 2020-03-10 01:49:55 +01:00
bito-blosh
f02a7b89c6 Translate recipes_ja.yml via GitLocalize 2020-03-09 12:56:22 +00:00
TheBusyBiscuit
e4b00920d2 [CI skip] Reduced technical debt 2020-03-08 18:27:32 +01:00
TheBusyBiscuit
7f12521b00 Significantly increased the teleporter speed 2020-03-08 17:43:56 +01:00
Yunus Kemal
6e155fd7f2 Translate recipes_tr.yml via GitLocalize 2020-03-07 17:27:46 +00:00
LinoxGH
7ffe444048 Translate recipes_tr.yml via GitLocalize 2020-03-07 17:27:44 +00:00
TheBusyBiscuit
eed8cb4e71
Merge pull request #1641 from TheBusyBiscuit/gitlocalize-11132
Translation to Turkish of Messages is done
2020-03-07 17:27:24 +01:00
TheBusyBiscuit
3ea6d0d16b [CI skip] Updated translators list 2020-03-07 17:26:16 +01:00
TheBusyBiscuit
fefbf37839
[CI skip] Merge pull request #1640 from TheBusyBiscuit/gitlocalize-11131
Translation to Turkish of Categories is done
2020-03-07 17:25:41 +01:00
TheBusyBiscuit
40b1a53708
[CI skip] Merge pull request #1643 from TheBusyBiscuit/gitlocalize-11134
Translation to Turkish of Researches is done
2020-03-07 17:24:25 +01:00
TheBusyBiscuit
55f11de0fa
[CI skip] Merge pull request #1644 from TheBusyBiscuit/gitlocalize-11135
Translation to Turkish of Resources is done
2020-03-07 17:24:03 +01:00
TheBusyBiscuit
7f6686db32
[CI skip] Merge pull request #1637 from TheBusyBiscuit/gitlocalize-11128
Undo translations of Slimefun Machines
2020-03-07 17:20:42 +01:00
LinoxGH
a06ba21440 Translate resources_tr.yml via GitLocalize 2020-03-07 15:49:08 +00:00
Yunus Kemal
e6ddd0410a Translate resources_tr.yml via GitLocalize 2020-03-07 15:49:06 +00:00
machine-translation
a87ba59469 Translate researches_tr.yml via GitLocalize 2020-03-07 15:48:43 +00:00
Yunus Kemal
c244d47393 Translate researches_tr.yml via GitLocalize 2020-03-07 15:48:41 +00:00
LinoxGH
e07ad49feb Translate researches_tr.yml via GitLocalize 2020-03-07 15:48:39 +00:00
Yunus Kemal
26c6b74d1f Translate messages_tr.yml via GitLocalize 2020-03-07 15:47:21 +00:00
LinoxGH
9f9752c36b Translate messages_tr.yml via GitLocalize 2020-03-07 15:47:19 +00:00
LinoxGH
5a284b29b4 Translate categories_tr.yml via GitLocalize 2020-03-07 15:37:21 +00:00
Yunus Kemal
d6e331d2c2 Translate categories_tr.yml via GitLocalize 2020-03-07 15:37:19 +00:00
PabloMarcendo
4138c9b696 Translate messages_nl.yml via GitLocalize 2020-03-07 15:30:27 +00:00
Senne Van Rompaey
c72d6e0de4 Translate messages_nl.yml via GitLocalize 2020-03-07 15:30:26 +00:00
PabloMarcendo
d0b5354288 Translate recipes_nl.yml via GitLocalize 2020-03-07 15:28:40 +00:00
TheBusyBiscuit
96179d9d36 [CI skip] Refactoring, documentation, reduced technical debt 2020-03-07 14:52:33 +01:00
TheBusyBiscuit
1c8a7e4958 Fixed Solar Generators not working 2020-03-07 11:35:29 +01:00
TheBusyBiscuit
f499f840c3 Changed Ignition Chamber to a Dropper 2020-03-07 00:10:52 +01:00
TheBusyBiscuit
0228b76f0b Cleaned up some old stuff and added new bStats charts 2020-03-06 16:39:07 +01:00
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