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

3043 Commits

Author SHA1 Message Date
kwonms871
c286f0652e Translate categories_ko.yml via GitLocalize 2020-05-02 17:42:36 +00:00
TheBusyBiscuit
1d257f0ca9
[CI skip] Merge pull request #1846 from TheBusyBiscuit/gitlocalize-11551
Updated hungarian
2020-05-02 19:29:07 +02:00
TheBusyBiscuit
bff26cff11 Translate messages_hu.yml via GitLocalize 2020-05-02 17:28:09 +00:00
András Marczinkó
58d29b427b Translate messages_hu.yml via GitLocalize 2020-05-02 17:28:08 +00:00
TheBusyBiscuit
4131a900e1
Merge pull request #1844 from clementgallois/master
Resolves #1843
2020-05-02 19:13:00 +02:00
TheBusyBiscuit
0c123631d9 [CI skip] Fixed one assignment 2020-05-02 19:10:48 +02:00
TheBusyBiscuit
c6ad95bace
[CI skip] Merge pull request #1673 from TheBusyBiscuit/gitlocalize-11195
Added hebrew categories
2020-05-02 19:10:18 +02:00
TheBusyBiscuit
981c6ab8e8
[CI skip] Merge pull request #1683 from TheBusyBiscuit/gitlocalize-11221
Added indonesian categories
2020-05-02 19:10:03 +02:00
TheBusyBiscuit
0e21ba6b02
[CI skip] Merge pull request #1758 from TheBusyBiscuit/gitlocalize-11274
Added thai categories
2020-05-02 19:09:54 +02:00
TheBusyBiscuit
2c409d1c27
[CI skip] Merge pull request #1766 from TheBusyBiscuit/gitlocalize-11284
Added thai researches
2020-05-02 19:09:44 +02:00
TheBusyBiscuit
343c2dbaf9 [CI skip] Added more translators to the credits 2020-05-02 19:09:28 +02:00
TheBusyBiscuit
b9f22fbe2a [CI skip] Minor changes 2020-05-02 19:07:31 +02:00
TheBusyBiscuit
d5f85587c6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-05-02 10:41:04 +02:00
TheBusyBiscuit
e69cdff244 [CI skip] Added failsafe for misconfigured addons 2020-05-02 10:40:53 +02:00
clement.gallois@epitech.eu
6cb196898f Fixed typo 2020-05-02 00:18:59 +02:00
clement.gallois@epitech.eu
6ce560bdfe Resolves #1843 2020-05-02 00:01:01 +02:00
TheBusyBiscuit
2a595dd408
[CI skip] Updated README 2020-05-01 19:10:52 +02:00
TheBusyBiscuit
6a0d3a1f45
[CI skip] Update README 2020-05-01 18:57:59 +02:00
TheBusyBiscuit
085d10be0a Maybe resolves #1834 2020-05-01 11:25:42 +02:00
TheBusyBiscuit
189507844d
[CI skip] Merge pull request #1839 from TheBusyBiscuit/gitlocalize-11547
Updated czech translations
2020-05-01 11:22:36 +02:00
LirCZE
f0e6b85593 Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:32 +00:00
jakmanda05
8ebc23b5c9 Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:31 +00:00
TheBusyBiscuit
3467f1b3ce Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:30 +00:00
100petr
7bedde4f0c Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:29 +00:00
TheBusyBiscuit
e57e4c8219 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-30 20:51:40 +02:00
TheBusyBiscuit
8cb5579a12 Fixes #1833 2020-04-30 20:51:17 +02:00
TheBusyBiscuit
a996771b7d
[CI skip] Merge pull request #1838 from TheBusyBiscuit/gitlocalize-11546
Completed recipes_it
2020-04-30 17:43:29 +02:00
Sfiguz7
c7f846640d Translate recipes_it.yml via GitLocalize 2020-04-30 15:26:26 +00:00
TheBusyBiscuit
da2dc039de
[CI skip] Merge pull request #1837 from TheBusyBiscuit/gitlocalize-11545
Completed categories_it
2020-04-30 17:22:44 +02:00
Sfiguz7
2922422d88 Translate categories_it.yml via GitLocalize 2020-04-30 15:20:44 +00:00
TheBusyBiscuit
ba762b9dea
[CI skip] Merge pull request #1836 from TheBusyBiscuit/gitlocalize-11542
Fix translate error
2020-04-30 17:18:19 +02:00
0XPYEX0
03a293fc40 Translate researches_zh-CN.yml via GitLocalize 2020-04-30 09:17:02 +00:00
TheBusyBiscuit
2b9d109d16 Bandages, Rags and Splints will no longer be consumed if at full health 2020-04-26 16:08:01 +02:00
TheBusyBiscuit
2f188338fc
[CI skip] This should work now 2020-04-26 16:06:08 +02:00
TheBusyBiscuit
d3cbdb677d
[CI skip] Another test 2020-04-26 16:04:14 +02:00
TheBusyBiscuit
38eef9da86
[CI skip] test 2020-04-26 16:02:04 +02:00
TheBusyBiscuit
5cf965bc65
[CI skip] Updated workflow 2020-04-26 16:00:44 +02:00
TheBusyBiscuit
7be0142ef0
Update duplicates.yml 2020-04-26 16:00:09 +02:00
TheBusyBiscuit
f1bfac4aea [CI skip] Added new workflow for duplicate issues 2020-04-26 15:58:22 +02:00
TheBusyBiscuit
804e450f51 Only retry Mojang lookups if it was rate-limiting 2020-04-26 15:51:12 +02:00
TheBusyBiscuit
ec96e13c82 [CI Skip] Refactoring 2020-04-26 13:50:37 +02:00
TheBusyBiscuit
4cc6a02835
Merge pull request #1827 from TheBusyBiscuit/revert-1826-patch-6
Revert "Easier to register items"
2020-04-25 23:13:12 +02:00
TheBusyBiscuit
15b64fc1d5
Revert "Easier to register items" 2020-04-25 23:13:00 +02:00
TheBusyBiscuit
f4c52505f3
Merge pull request #1826 from WalshyDev/patch-6
Easier to register items
2020-04-25 23:00:37 +02:00
Daniel Walsh
a3f7c2dc46
Chaining whooo 2020-04-25 21:57:46 +01:00
Daniel Walsh
15b6e3fa31
Easier to register items
Instead of having to do registerResearch(Research, ItemStack...) you can just do new Research(..., items).register()

Makes this more consistent with the other registering too.
2020-04-25 21:28:04 +01:00
TheBusyBiscuit
9eb9a98410 Fixes #1824 2020-04-25 19:14:50 +02:00
TheBusyBiscuit
f18cb33eef [CI skip] Reduced technical debt 2020-04-25 13:01:32 +02:00
TheBusyBot
9e80e55ada [CI skip] Updated Changelog 2020-04-25 10:07:59 +00:00
TheBusyBiscuit
90812f7828 [CI skip] Updated README 2020-04-25 12:07:36 +02:00