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

1940 Commits

Author SHA1 Message Date
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
KillerXCoder
06a8c72720 Translate researches_sk.yml via GitLocalize 2020-02-12 12:17:08 +00:00
KillerXCoder
fd04eb6abb Translate categories_sk.yml via GitLocalize 2020-02-12 11:55:50 +00:00
Nameless
c25a39c955
Avoid can't get bonus items 2020-02-12 16:43:53 +08:00
Nameless
07b7ed73fa
Fixed give more items when using fortune pickaxe 2020-02-12 14:39:16 +08:00
Nameless
c899413f7f
Forgot to import packages 2020-02-12 14:14:08 +08:00
Nameless
b87354a39e
Fixed #1516 2020-02-12 14:07:42 +08:00
TheBusyBiscuit
55b01b61f1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-11 22:22:43 +01:00
TheBusyBiscuit
2cf5989d7a More cleanup and Refactoring 2020-02-11 22:22:33 +01:00
TheBusyBiscuit
92ab904a41
Merge pull request #1514 from StarWishsama/patch-1
Fixed can't back in setting opened by command
2020-02-11 21:16:34 +01:00
TheBusyBiscuit
17cf48a773 [CI skip] Fixes #1515 2020-02-11 21:16:09 +01:00
Nameless
302a059bf8
Fixed can't back in setting opened by command 2020-02-11 15:51:10 +08:00
TheBusyBiscuit
7d915dbb95
Merge pull request #1510 from TheBusyBiscuit/gitlocalize-10828
Added czech resource translations
2020-02-10 18:01:09 +01:00
TheBusyBiscuit
3955639f24
[CI skip] Merge pull request #1511 from TheBusyBiscuit/gitlocalize-10831
Added czech translation
2020-02-10 18:00:36 +01:00
TheBusyBiscuit
e3a02ea52d [CI skip] Updated /sf research 2020-02-10 18:00:14 +01:00
TheBusyBiscuit
0d9908b4b5 Translate messages_cs.yml via GitLocalize 2020-02-10 16:59:45 +00:00
sad_mirai
d08094c5f6 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:30 +00:00
jakmanda05
c242b6a400 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:28 +00:00
Aile-Minicraftcz
fe8275ab05 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:26 +00:00
Tengoblinekcz
c704f6e5d9 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:24 +00:00
sirhCCC
76e699f6c7 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:22 +00:00
Thezerix
f4f1da6ea2 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:20 +00:00
TheBusyBiscuit
f5dd391566 [Ci skip] Reduced cognitive complexity 2020-02-10 13:52:38 +01:00
TheBusyBiscuit
b5a7b5f5b6 [CI skip] Removed a redundancy 2020-02-10 13:45:50 +01:00
TheBusyBiscuit
fbc1726e5d [CI skip] Added czech translators 2020-02-10 12:51:39 +01:00
jakmanda05
16942a1141 Translate resources_cs.yml via GitLocalize 2020-02-10 11:47:32 +00:00
GGGEDR
b8e5c60bb3 Translate resources_cs.yml via GitLocalize 2020-02-10 11:47:30 +00:00
sad_mirai
a01328554e Translate resources_cs.yml via GitLocalize 2020-02-10 11:47:28 +00:00
TheBusyBiscuit
b916c3636b [CI skip] A lot of internal cleanup, performance improvements 2020-02-10 12:42:34 +01:00
TheBusyBiscuit
e53746990e [CI skip] Reduced technical debt 2020-02-09 23:13:15 +01:00
Muhammad Kamal Fergany
b6336d3962 Translate categories_ar.yml via GitLocalize 2020-02-09 21:22:21 +00:00
Muhammad Kamal Fergany
6eb851d142 Translate resources_ar.yml via GitLocalize 2020-02-09 20:56:26 +00:00
Turret
e999a6e38e Translate researches_sv.yml via GitLocalize 2020-02-09 14:01:55 +00:00
TheBusyBiscuit
3a5a18ae70 [CI skip] Moved some items to different categories 2020-02-09 13:42:21 +01:00
TheBusyBiscuit
e6c2cbf5fc Added unfinished languages back into the development branch 2020-02-09 12:19:35 +01:00
TheBusyBiscuit
04709365a4 Finishing touches, new stable release incoming 2020-02-09 12:04:06 +01:00
TheBusyBiscuit
e0e46995af [Ci skip] Little fix 2020-02-09 11:15:34 +01:00
Nameless
6e34f86797 Give filled knowledge flask as SlimefunItem 2020-02-09 18:10:45 +08:00
TheBusyBiscuit
9bdd961332 [CI skip] Updated bStats and CS-CoreLib2 2020-02-09 11:03:46 +01:00
TheBusyBiscuit
cefa85f451 [CI skip] Removed deprecated method 2020-02-09 00:30:31 +01:00
TheBusyBiscuit
be43f825a9 [Ci skip] Refactored Androids 2020-02-09 00:26:04 +01:00
TheBusyBiscuit
8b3b67e5c5 [CI skip] Removed deprecated method 2020-02-08 23:02:25 +01:00
TheBusyBiscuit
8b3aa8ffbe [Ci skip] Refactoring 2020-02-08 22:58:55 +01:00
TheBusyBiscuit
55cf5a1079 [Ci skip] Improved debugging and removed a deprecated class 2020-02-08 22:42:11 +01:00
Edwin Kerforne
de0aab2113 Translate resources_fr.yml via GitLocalize 2020-02-08 20:40:12 +00:00
TheBusyBiscuit
bdb3b8705a [CI skip] Merge pull request #1500 from TheBusyBiscuit/gitlocalize-10800
Updated chinese (TW) researches
2020-02-08 21:35:42 +01:00
TheBusyBiscuit
455d0ea082
[CI skip] Merge pull request #1499 from TheBusyBiscuit/gitlocalize-10799
Updated chinese (TW) messages
2020-02-08 21:35:32 +01:00
TheBusyBiscuit
0226d1b205 [CI skip] Merge pull request #1498 from TheBusyBiscuit/gitlocalize-10798
Added chinese (taiwan) categories
2020-02-08 21:35:21 +01:00
HeroBrineKing
d2d1046dc2 Translate researches_zh-TW.yml via GitLocalize 2020-02-08 20:34:49 +00:00
HeroBrineKing
f246781bad Translate messages_zh-TW.yml via GitLocalize 2020-02-08 20:34:36 +00:00
HeroBrineKing
263a920732 Translate categories_zh-TW.yml via GitLocalize 2020-02-08 20:34:16 +00:00
HeroBrineKing
c639595637 Translate resources_zh-TW.yml via GitLocalize 2020-02-08 20:33:25 +00:00
TheBusyBiscuit
5e0e260dae Translate resources_zh-TW.yml via GitLocalize 2020-02-08 20:33:23 +00:00
TheBusyBiscuit
447683b600 [CI skip] Refactoring 2020-02-08 20:50:21 +01:00
TheBusyBiscuit
7d38654452 [CI skip] Merge pull request #1495 from TheBusyBiscuit/gitlocalize-10794
messages_es
2020-02-08 20:49:26 +01:00
TheBusyBiscuit
3faacfbd53
[CI skip] Merge pull request #1496 from TheBusyBiscuit/gitlocalize-10795
researches_es
2020-02-08 20:48:36 +01:00
TheBusyBiscuit
e7783ad8fc [CI skip] Merge pull request #1494 from TheBusyBiscuit/gitlocalize-10793
Resources_es
2020-02-08 20:48:12 +01:00
Luu7
a52fc39977 Translate researches_es.yml via GitLocalize 2020-02-08 19:45:09 +00:00
dbzjjoe
6508489b8f Translate researches_es.yml via GitLocalize 2020-02-08 19:45:07 +00:00
Luu7
3131774b5e Translate messages_es.yml via GitLocalize 2020-02-08 19:44:42 +00:00
Luu7
fb04b87030 Translate resources_es.yml via GitLocalize 2020-02-08 19:44:11 +00:00
dbzjjoe
6fe8ccf10e Translate resources_es.yml via GitLocalize 2020-02-08 19:44:08 +00:00
Luu7
f74d2276de Translate categories_es.yml via GitLocalize 2020-02-08 19:41:46 +00:00
dbzjjoe
15aab25b76 Translate categories_es.yml via GitLocalize 2020-02-08 19:36:31 +00:00
Luu7
a3a600c6e9 Translate categories_es.yml via GitLocalize 2020-02-08 19:36:29 +00:00
TheBusyBiscuit
91856087f5
[CI skip] Merge pull request #1491 from TheBusyBiscuit/gitlocalize-10790
Updated hungarian resources
2020-02-08 20:28:58 +01:00
András Marczinkó
8aa227e0ab Translate categories_hu.yml via GitLocalize 2020-02-08 19:28:32 +00:00
András Marczinkó
454e46c86a Translate resources_hu.yml via GitLocalize 2020-02-08 19:28:05 +00:00
NihilistBrew
5674570175 small formatting 2020-02-08 13:58:01 +01:00
TheBusyBiscuit
340258323b
[CI skip] Merge pull request #1486 from TheBusyBiscuit/gitlocalize-10787
Translation 2
2020-02-08 11:11:38 +01:00
Turret
1016c0942f Translate resources_sv.yml via GitLocalize 2020-02-08 09:57:20 +00:00
Turret
ab4e8a3bf0 Translate categories_sv.yml via GitLocalize 2020-02-08 09:49:51 +00:00
NihilistBrew
5028911e84 Translate categories_sv.yml via GitLocalize 2020-02-08 09:49:49 +00:00
Poma123
4f6ca04843
Merge pull request #2 from TheBusyBiscuit/master
Comparing new changes
2020-02-08 10:05:53 +01:00
TheBusyBiscuit
38830b3bdf [Ci skip] Updated translators 2020-02-08 10:02:12 +01:00
TheBusyBiscuit
d877698000
[Ci skip] Merge pull request #1475 from TheBusyBiscuit/gitlocalize-10777
Update Categories in Vietnamese
2020-02-08 10:01:40 +01:00
TheBusyBiscuit
d7280c110e
[CI skip] Merge pull request #1476 from TheBusyBiscuit/gitlocalize-10778
Update Resources Vietnamese
2020-02-08 10:01:22 +01:00
TheBusyBiscuit
3cc53ccb2d
[CI skip] Merge pull request #1478 from TheBusyBiscuit/gitlocalize-10780
Update categories_zh-CN.yml
2020-02-08 10:00:20 +01:00
TheBusyBiscuit
64a22b721f [Ci skip] Merge pull request #1479 from TheBusyBiscuit/gitlocalize-10781
Update resources_zh-CN.yml
2020-02-08 10:00:03 +01:00
TheBusyBiscuit
b55b2af133
[CI skip] Merge pull request #1477 from TheBusyBiscuit/gitlocalize-10779
New words translated
2020-02-08 09:59:25 +01:00
TheBusyBiscuit
4c01ec7e57
[Ci skip] Merge pull request #1481 from TheBusyBiscuit/gitlocalize-10783
Resources - Slovak langugage
2020-02-08 09:58:59 +01:00
TheBusyBiscuit
95e16089c5 [Ci skip] Merge pull request #1482 from TheBusyBiscuit/gitlocalize-10784
Categories - Slovak language
2020-02-08 09:58:17 +01:00
TheBusyBiscuit
231f8904c4
[Ci skip] Merge pull request #1483 from TheBusyBiscuit/gitlocalize-10785
Localized categories to Russian
2020-02-08 09:57:52 +01:00
poma123
9bb3fea54c Fix PickaxeOfContainmnet bug 2020-02-08 09:57:46 +01:00
SoSeDiK
6259064f38 Translate resources_ru.yml via GitLocalize 2020-02-08 08:51:43 +00:00
TomWiskis
3ab18bf79b Translate resources_ru.yml via GitLocalize 2020-02-08 08:51:41 +00:00
SoSeDiK
39949076ab Translate categories_ru.yml via GitLocalize 2020-02-08 08:51:20 +00:00
TomWiskis
32a6ac0266 Translate categories_ru.yml via GitLocalize 2020-02-08 08:51:18 +00:00
KillerXCoder
5254ea5f3b Translate categories_sk.yml via GitLocalize 2020-02-08 08:14:25 +00:00
KillerXCoder
539cd86a24 Translate resources_sk.yml via GitLocalize 2020-02-08 08:07:16 +00:00
Nameless
7d83a331c2 Translate resources_zh-CN.yml via GitLocalize 2020-02-08 06:23:40 +00:00
Nameless
12c4cb6df2 Translate categories_zh-CN.yml via GitLocalize 2020-02-08 06:23:11 +00:00
Dams_
1099e10036 Translate categories_fr.yml via GitLocalize 2020-02-08 03:05:42 +00:00
Edwin Kerforne
2c78456fa3 Translate categories_fr.yml via GitLocalize 2020-02-08 03:05:40 +00:00
JustAPieOP
01579cfeb6 Translate resources_vi.yml via GitLocalize 2020-02-08 02:49:49 +00:00
Julie-Sigtuna
37491587bc Translate resources_vi.yml via GitLocalize 2020-02-08 02:49:47 +00:00
Julie-Sigtuna
0b41496d76 Translate categories_vi.yml via GitLocalize 2020-02-08 02:47:53 +00:00
Just Mango
e9ab47e54a Translate categories_vi.yml via GitLocalize 2020-02-08 02:47:51 +00:00
TheBusyBiscuit
f68d110a43 [Ci skip] Minor design change 2020-02-08 02:55:49 +01:00
TheBusyBiscuit
71dcb17d25
[CI skip] Merge pull request #1473 from TheBusyBiscuit/gitlocalize-10775
Added german GEO Resources
2020-02-08 02:52:39 +01:00
TheBusyBiscuit
caecae4b0d Translate categories_de.yml via GitLocalize 2020-02-08 01:51:32 +00:00
TheBusyBiscuit
19d8ad88ea Translate resources_de.yml via GitLocalize 2020-02-08 01:47:11 +00:00
TheBusyBiscuit
f3c7bbdb43 [CI skip] Updated something 2020-02-08 02:38:54 +01:00
TheBusyBiscuit
4f94f87301
[Ci skip] Merge pull request #1467 from TheBusyBiscuit/gitlocalize-10773
Messages - Slovak language
2020-02-08 02:38:22 +01:00
TheBusyBiscuit
5317c46b2f [CI skip] "a shit ton" may be an understatement 2020-02-08 02:36:57 +01:00
KillerXCoder
2545948295 Translate messages_sk.yml via GitLocalize 2020-02-07 19:30:49 +00:00
TheBusyBiscuit
e10f5a9766
[CI skip] Merge pull request #1466 from TheBusyBiscuit/gitlocalize-10771
Arabic Messages Translation
2020-02-07 20:08:52 +01:00
Muhammad Kamal Fergany
792279cc2d Translate messages_ar.yml via GitLocalize 2020-02-07 18:35:57 +00:00
Muhammad Kamal Fergany
c8cf172b34 Translate researches_ar.yml via GitLocalize 2020-02-07 18:33:59 +00:00
András Marczinkó
e966742fd9 Translate researches_hu.yml via GitLocalize 2020-02-06 21:35:51 +00:00
TheBusyBiscuit
ee695f8dee [Ci skip] Code improvements 2020-02-06 22:31:45 +01:00
András Marczinkó
c61e919ec0 Translate messages_hu.yml via GitLocalize 2020-02-06 20:18:13 +00:00
NihilistBrew
063dea5796 Translate messages_sv.yml via GitLocalize 2020-02-06 19:38:49 +00:00
Turret
edf317ee64 Translate messages_sv.yml via GitLocalize 2020-02-06 19:38:48 +00:00
TheBusyBiscuit
ccc1048eed [CI skip] A little bit refactoring 2020-02-06 20:38:32 +01:00
TheBusyBiscuit
f9987d1308 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-06 20:25:07 +01:00
TheBusyBiscuit
a09e8e42cc
[Ci skip] Another test 2020-02-06 20:10:24 +01:00
TheBusyBiscuit
1163996360
[Ci skip] Test 2020-02-06 20:08:33 +01:00
TheBusyBiscuit
f5105c858f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-06 19:43:57 +01:00
Pierre
5b8343f909 Translate messages_fr.yml via GitLocalize 2020-02-06 18:34:08 +00:00
TheBusyBiscuit
df60d4c2fd [Ci skip] Updated translators 2020-02-06 19:20:37 +01:00
TheBusyBiscuit
c33054cffd [CI skip] Updated translators 2020-02-06 19:03:47 +01:00
TheBusyBiscuit
62e4712067 [CI skip] Updated languages 2020-02-05 23:34:17 +01:00
TheBusyBiscuit
28f1ba1aec Translate messages_zh-TW.yml via GitLocalize 2020-02-05 22:30:35 +00:00
HeroBrineKing
be0fb18617 Translate messages_zh-TW.yml via GitLocalize 2020-02-05 22:30:34 +00:00
TheBusyBiscuit
26bbf0794a [Ci skip] Fixed norwegian 2020-02-05 23:21:15 +01:00
TheBusyBiscuit
78cb1bf55a
[Ci skip] Merge pull request #1457 from TheBusyBiscuit/gitlocalize-10716
Localized researches to Russian
2020-02-05 23:20:29 +01:00
TheBusyBiscuit
ae1a3aa739
[CI skip] Merge pull request #1453 from TheBusyBiscuit/gitlocalize-10712
Update messages_zh-CN.yml
2020-02-05 23:20:10 +01:00
TheBusyBiscuit
a3fe369495
[Ci skip] Merge pull request #1451 from TheBusyBiscuit/gitlocalize-10706
Fixed resource_vi.yml #3
2020-02-05 23:19:53 +01:00
TheBusyBiscuit
5d12e4bf1d
[Ci skip] Merge pull request #1455 from TheBusyBiscuit/gitlocalize-10714
Added more Russian messages
2020-02-05 23:19:30 +01:00
TheBusyBiscuit
540e4c518b
[CI skip] Merge pull request #1456 from TheBusyBiscuit/gitlocalize-10715
Messages - Slovak language
2020-02-05 23:18:53 +01:00
TheBusyBiscuit
0eb9368dc3 [Ci skip] Updated vietnamese 2020-02-05 23:18:32 +01:00
TheBusyBiscuit
b22dd51954
Merge pull request #1452 from TheBusyBiscuit/gitlocalize-10707
Updated some new line of messages_vi.yml
2020-02-05 23:17:54 +01:00
TheBusyBiscuit
4d57e6e221
[Ci skip] Merge pull request #1454 from TheBusyBiscuit/gitlocalize-10713
Improved a translation
2020-02-05 23:17:32 +01:00
TheBusyBiscuit
a4e472cae4 Translate messages_de.yml via GitLocalize 2020-02-05 22:16:40 +00:00
TheBusyBiscuit
3786791044 [CI skip] Maybe fixed norwegian? 2020-02-05 22:16:09 +01:00
NihilistBrew
162a5e45f3
Update SlimefunItems.java 2020-02-05 16:13:22 +01:00
NihilistBrew
9a672b3fde
formatting 2020-02-05 15:43:13 +01:00
TomWiskis
3589491b2f Translate researches_ru.yml via GitLocalize 2020-02-05 12:14:22 +00:00
SoSeDiK
dc5d447d9b Translate researches_ru.yml via GitLocalize 2020-02-05 12:14:20 +00:00
KillerXCoder
7657a1338d Translate messages_sk.yml via GitLocalize 2020-02-05 12:13:53 +00:00
TomWiskis
ca4a9e7689 Translate messages_ru.yml via GitLocalize 2020-02-05 12:02:18 +00:00
SoSeDiK
7bb437e0c8 Translate messages_ru.yml via GitLocalize 2020-02-05 12:02:17 +00:00