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

3108 Commits

Author SHA1 Message Date
Daniel Walsh
b4f19e8548 Document 2020-05-11 01:12:41 +01:00
Daniel Walsh
bd02eb9570 Tested! 2020-05-11 01:09:49 +01:00
Daniel Walsh
8795900ec6 Quick soulbound key to speed this up 2020-05-11 00:50:40 +01:00
TheBusyBiscuit
c3c23a683a
Merge pull request #1895 from DaemonicKing/master fixes #1893
Fixed Consumable Ender Infused Talismans don't get consumed #1893
2020-05-10 10:19:23 +02:00
jacky
bacd14a833 Removed unuse parameter for consumeItem() 2020-05-10 10:54:19 +08:00
jacky
64451244cd Removed unuse parameter for consumeItem() 2020-05-10 10:43:53 +08:00
jacky
13afbecb90 Fixed Ender Talisman to be consumed inside Ender Chest 2020-05-10 10:41:31 +08:00
TheBusyBiscuit
74c40d5ad0
Merge pull request #1890 from jackychay/master fixes #1851
Fixes Prismarine Brick duplication with Grind Stone #1851
2020-05-09 16:13:46 +02:00
jacky
d806837000 Fixes Prismarine Brick duplication bug with Grind Stone #1851 2020-05-09 22:04:27 +08:00
jacky
e329560d6d Revert "Fixes Prismarine Brick duplication bug with Grind Stone #1829"
This reverts commit cd0baa30
2020-05-09 22:04:07 +08:00
jacky
cd0baa307e Fixes Prismarine Brick duplication bug with Grind Stone #1829 2020-05-09 21:22:25 +08:00
TheBusyBiscuit
cf777126ba [CI skip] Deprecated two methods because the Research class will move 2020-05-09 10:48:02 +02:00
TheBusyBiscuit
c3dbe8f34a Maybe fixed the Electric Smeltery recipe priorities 2020-05-08 15:54:14 +02:00
TheBusyBiscuit
528edc80d0 Fixes #1873 2020-05-07 20:38:51 +02:00
TheBusyBiscuit
de1af960bb [CI skip] Updated translator list 2020-05-07 20:35:03 +02:00
TheBusyBiscuit
51708d1eb1
[CI skip] Merge pull request #1887 from TheBusyBiscuit/gitlocalize-11632
Added bulgarian categories
2020-05-07 20:34:47 +02:00
TheBusyBiscuit
ea7d87a584
[CI skip] Merge pull request #1886 from TheBusyBiscuit/gitlocalize-11631
Added macedonian recipes
2020-05-07 20:34:22 +02:00
DNBGlol
97b352b4bc Translate categories_bg.yml via GitLocalize 2020-05-07 18:29:47 +00:00
Silent
0db56b4e7c Translate recipes_mk.yml via GitLocalize 2020-05-07 18:29:28 +00:00
TheBusyBiscuit
8ad75b3f53
[CI skip] Merge pull request #1882 from TheBusyBiscuit/gitlocalize-11625
messages_es
2020-05-07 17:35:09 +02:00
Luu7
8d26c83304 Translate messages_es.yml via GitLocalize 2020-05-07 15:34:48 +00:00
TheBusyBiscuit
2037e65588
[CI skip] Merge pull request #1881 from TheBusyBiscuit/gitlocalize-11617
Slovak language  - messages
2020-05-07 11:59:18 +02:00
TheBusyBiscuit
6cd8266107 Translate messages_sk.yml via GitLocalize 2020-05-07 09:58:22 +00:00
KillerXCoder
5845b224e4 Translate messages_sk.yml via GitLocalize 2020-05-07 09:58:21 +00:00
TheBusyBiscuit
1b2ebd1759
[CI skip] Merge pull request #1880 from TheBusyBiscuit/gitlocalize-11616
Slovak language - recipes
2020-05-07 11:57:31 +02:00
KillerXCoder
558c440fad Translate recipes_sk.yml via GitLocalize 2020-05-07 09:55:06 +00:00
TheBusyBiscuit
212be28011
[CI skip] Merge pull request #1876 from TheBusyBiscuit/gitlocalize-11608
Added korean recipes
2020-05-05 19:37:54 +02:00
mt-gitlocalize
1e67550118 Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:24 +00:00
AOJUCBJD
be8f7d9b1b Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:22 +00:00
kwonms871
14a9f9dde6 Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:20 +00:00
TheBusyBiscuit
6d569f0ead
[CI skip] Merge pull request #1871 from TheBusyBiscuit/gitlocalize-11581
Translated recipes to Ukrainian
2020-05-04 21:22:12 +02:00
TheBusyBiscuit
6565b861f2
[CI skip] Merge pull request #1861 from TheBusyBiscuit/gitlocalize-11569
Added Ukrainian categories
2020-05-04 21:22:01 +02:00
TheBusyBiscuit
98406fe9a5
[CI skip] Merge pull request #1868 from TheBusyBiscuit/gitlocalize-11577
Translated researches to Ukrainian
2020-05-04 21:21:51 +02:00
TheBusyBiscuit
352ca54b37
[CI skip] Merge pull request #1859 from TheBusyBiscuit/gitlocalize-11567
Translated resources to Ukrainian
2020-05-04 21:21:37 +02:00
TheBusyBiscuit
d1a095800e
[CI skip] Merge pull request #1860 from TheBusyBiscuit/gitlocalize-11568
Added Ukrainian messages
2020-05-04 21:21:26 +02:00
TheBusyBiscuit
e95c5939a3 [CI skip] Added Ukrainian language 2020-05-04 21:21:01 +02:00
TheBusyBiscuit
f1b2aad788
[CI skip] Merge pull request #1872 from TheBusyBiscuit/gitlocalize-11582
Translate new messages into Japanese
2020-05-04 21:06:27 +02:00
bito-blosh
1fb1a149db Translate messages_ja.yml via GitLocalize 2020-05-04 18:38:46 +00:00
TheBusyBiscuit
d74c2cff8b Translate messages_ja.yml via GitLocalize 2020-05-04 18:38:45 +00:00
SoSeDiK
b4fd2510cb Translate recipes_uk.yml via GitLocalize 2020-05-04 16:14:12 +00:00
TheBusyBiscuit
fd1c67d5c4
[CI skip] Merge pull request #1870 from TheBusyBiscuit/gitlocalize-11579
Localized recipes to Russian
2020-05-04 18:00:53 +02:00
SoSeDiK
3104504628 Translate recipes_ru.yml via GitLocalize 2020-05-04 15:58:28 +00:00
TheBusyBiscuit
fae0c9a017
[CI skip] Merge pull request #1869 from TheBusyBiscuit/gitlocalize-11578
Updated Russian researches
2020-05-04 17:48:47 +02:00
SoSeDiK
09a7578e10 Translate researches_ru.yml via GitLocalize 2020-05-04 15:44:24 +00:00
SoSeDiK
6428e84b17 Translate researches_uk.yml via GitLocalize 2020-05-04 15:43:28 +00:00
TheBusyBiscuit
4ed7e55e2f
[CI skip] Merge pull request #1867 from TheBusyBiscuit/gitlocalize-11576 2020-05-04 17:31:54 +02:00
Turret
665779c30b Translate researches_sv.yml via GitLocalize 2020-05-04 15:29:36 +00:00
TheBusyBiscuit
beb03ce8e8
[CI skip] Merge pull request #1858 from TheBusyBiscuit/gitlocalize-11566
Translation 5
2020-05-04 17:08:53 +02:00
TheBusyBiscuit
dfb1ee57b9
[CI skip] Merge pull request #1857 from TheBusyBiscuit/gitlocalize-11565
Updated Russian messages
2020-05-04 17:07:39 +02:00
SoSeDiK
27e3afe9bd Translate categories_uk.yml via GitLocalize 2020-05-04 15:06:37 +00:00