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

4512 Commits

Author SHA1 Message Date
Renovate Bot
ca45de1160
Update dependency org.mockito:mockito-core to v3.5.10 2020-09-04 14:18:52 +00:00
TheBusyBiscuit
120d3299ee
[CI skip] Merge pull request #2284 from TheBusyBiscuit/gitlocalize-12841
New pull request
2020-09-04 10:02:31 +02:00
TheBusyBiscuit
0c3cb5db37
[CI skip] Updated it once again 2020-09-04 10:02:20 +02:00
TheBusyBiscuit
deb9e0c711
[CI skip] Updated translator list 2020-09-04 09:57:34 +02:00
TheBusyBiscuit
129a26e1ba
[CI skip] Merge pull request #2281 from TheBusyBiscuit/gitlocalize-12830
pull updates
2020-09-04 09:56:20 +02:00
FluffyBear
55bf76799f Got rid of charge command from this branch (Missed something) 2020-09-04 00:54:53 -05:00
FluffyBear
cf1c58dd8b Got rid of charge command from this branch 2020-09-04 00:54:06 -05:00
FluffyBear
90309dabe1 Fixed multitools consuming hunger when used in offhand 2020-09-04 00:46:26 -05:00
FluffyBear
649d4797c9
Merge pull request #1 from TheBusyBiscuit/master
Update to latest
2020-09-04 00:40:03 -05:00
NinoFutur
62279981c4 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:27 +00:00
Dams_
31f7316385 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:26 +00:00
Pierre
1ee04e79b3 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:25 +00:00
Pierre
6592489aa3 Translate researches_fr.yml via GitLocalize 2020-09-03 18:23:25 +00:00
amarcais53
d22c14e5a6 Translate researches_fr.yml via GitLocalize 2020-09-03 18:23:24 +00:00
TheBusyBiscuit
c156a317a5 [CI skip] Updated change log 2020-09-03 20:06:53 +02:00
TheBusyBiscuit
26f9e5f7c6 More annotations and refactoring 2020-09-03 17:19:24 +02:00
TheBusyBiscuit
dd9962d3e2 Small improvement, many annotations 2020-09-03 12:24:49 +02:00
TheBusyBiscuit
bb4c4b3a59
[CI skip] Updated workflow 2020-09-03 10:57:03 +02:00
TheBusyBiscuit
8e682311d3
[CI skip] Merge pull request #2279 from TheBusyBiscuit/gitlocalize-12818
Update Japanese translation files.
2020-09-03 10:05:29 +02:00
TheBusyBiscuit
d12a6b7d1d
[CI skip] Added a new workflow 2020-09-03 09:59:46 +02:00
bito-blosh
2308457c01 Translate messages_ja.yml via GitLocalize 2020-09-03 05:33:00 +00:00
TheBusyBiscuit
cc2dd0dd64 Translate messages_ja.yml via GitLocalize 2020-09-03 05:32:59 +00:00
bito-blosh
af89dba9f6 Translate researches_ja.yml via GitLocalize 2020-09-03 05:32:27 +00:00
TheBusyBiscuit
35faf5b5ac
[CI skip] Updated YAML Linter config 2020-09-02 16:20:38 +02:00
TheBusyBiscuit
b6ce469310
[CI skip] Updated workflow 2020-09-02 16:18:55 +02:00
TheBusyBiscuit
f4869991ca Moved Nether goo to the appropriate package (+ more annotations) 2020-09-02 14:47:32 +02:00
TheBusyBiscuit
426b4caae0
Updated PR template 2020-09-02 14:29:08 +02:00
TheBusyBiscuit
e15d74bd00 [Ci skip] Re-incluce Junit4 2020-09-02 14:13:44 +02:00
TheBusyBiscuit
7d075efc3f [CI skip] Excluded some dependencies that could lead to inconsistencies 2020-09-02 14:08:40 +02:00
TheBusyBiscuit
4ce4388218 [CI skip] More annotations :o 2020-09-02 13:53:10 +02:00
TheBusyBiscuit
c5630791c0 Added item break sound to some tools 2020-09-02 12:19:18 +02:00
TheBusyBiscuit
99de9a6919
Merge pull request #2278 from TheBusyBiscuit/gitlocalize-12802
Updated german translations
2020-09-02 12:13:48 +02:00
TheBusyBiscuit
d0498f51c5 Translate messages_de.yml via GitLocalize 2020-09-02 10:13:36 +00:00
TheBusyBiscuit
2dfa2f139b Translate researches_de.yml via GitLocalize 2020-09-02 10:13:35 +00:00
TheBusyBiscuit
2fadb47e65
Merge pull request #2277 from TheBusyBiscuit/gitlocalize-12801
Updated TR localization
2020-09-02 12:09:48 +02:00
TheBusyBiscuit
3b28545714 Little tweak 2020-09-02 12:08:36 +02:00
TheBusyBiscuit
f1515edae9 Fixed Synthetic Shulker Shells missing 2020-09-02 12:07:16 +02:00
LinoxGH
4fde84d521 Translate researches_tr.yml via GitLocalize 2020-09-02 10:06:23 +00:00
LinoxGH
c2c6cb6dfb Translate recipes_tr.yml via GitLocalize 2020-09-02 10:06:21 +00:00
LinoxGH
7db615fb82 Translate messages_tr.yml via GitLocalize 2020-09-02 10:06:20 +00:00
TheBusyBiscuit
f0e0d985e1
[CI skip] Merge pull request #2253 from TheBusyBiscuit/experimental
Experimental features
2020-09-02 11:54:45 +02:00
TheBusyBiscuit
8a6e00a402 Even more annotations 2020-09-02 11:53:42 +02:00
TheBusyBiscuit
71322d95a8 More annotations 2020-09-02 11:27:53 +02:00
TheBusyBiscuit
486253973c Renamed to Villager Rune 2020-09-02 11:16:45 +02:00
TheBusyBiscuit
eb9837953c
Delete RangedItemSetting.java 2020-09-02 11:13:16 +02:00
TheBusyBiscuit
7da5b9ad35
Merge branch 'master' into experimental 2020-09-02 10:34:13 +02:00
TheBusyBiscuit
da4560d490 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-09-02 10:31:58 +02:00
TheBusyBiscuit
f4091e931b Refactoring and some annotations 2020-09-02 10:31:35 +02:00
TheBusyBiscuit
6d560c4884
[CI skip] Merge pull request #2276 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.9
2020-09-02 09:13:52 +02:00
Renovate Bot
4a4ad466ce
Update dependency org.mockito:mockito-core to v3.5.9 2020-09-01 23:14:48 +00:00