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

5184 Commits

Author SHA1 Message Date
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
TheBusyBiscuit
35c1fa6a23 Fixes #2275 2020-09-01 22:38:22 +02:00
TheBusyBiscuit
457cce740e
[CI skip] Merge pull request #2274 from TheBusyBiscuit/contributing
Rewritten CONTRIBUTING.md
2020-09-01 19:21:39 +02:00
TheBusyBiscuit
e5f00750ec
Update CONTRIBUTING.md 2020-09-01 19:12:57 +02:00
TheBusyBiscuit
8556d1e77b
Update CONTRIBUTING.md 2020-09-01 19:10:20 +02:00
TheBusyBiscuit
230ce04026
Fixed capitalization 2020-09-01 12:47:32 +02:00
TheBusyBiscuit
ec6d76d46d
Create CONTRIBUTING.md 2020-09-01 12:03:00 +02:00
BuildTools
c091c7992f Removed redundancies, added javadocs, fixed formatting 2020-08-31 18:50:35 -05:00
BuildTools
125c3fe60d Updated plugin.yml to include new charge command 2020-08-31 15:34:56 -05:00
BuildTools
16ea468c38 Added command to charge items 2020-08-31 15:31:09 -05:00
TheBusyBiscuit
4a6068b078 Refactoring 2020-08-31 20:38:01 +02:00
TheBusyBiscuit
93ff508603 More refactoring 2020-08-31 20:37:24 +02:00
TheBusyBiscuit
759946f5c3 [Ci skip] Reduced technical debt 2020-08-31 20:18:35 +02:00
TheBusyBiscuit
3d22e42bef
Merge pull request #2270 from LinoxGH/master
Fixes #2265 <Tested>
2020-08-31 19:56:05 +02:00
TheBusyBiscuit
8073b5dafb Fixes #2266 2020-08-31 19:49:25 +02:00
LinoxGH
6dba662d4b
Merge branch 'master' into master 2020-08-31 20:34:15 +03:00
TheBusyBiscuit
68b9a0aed8 Fixes #2269 (+ refactoring) 2020-08-31 19:08:15 +02:00
LinoxGH
d95049db27
Did the requested change. 2020-08-31 19:13:23 +03:00
LinoxGH
f740cc7850
Did the requested change. 2020-08-31 19:04:23 +03:00
TheBusyBiscuit
a1e5be2568
[CI skip] I will rewrite this file soon 2020-08-31 18:03:29 +02:00
TheBusyBiscuit
00792e8662
[CI skip] Merge pull request #2268 from TheBusyBiscuit/code-of-conduct
Added a Code of Conduct
2020-08-31 18:00:33 +02:00
LinoxGH
4346d374d8
Update CHANGELOG.md 2020-08-31 18:57:06 +03:00
LinoxGH
fa01e82179
Did the requested changes. 2020-08-31 18:51:21 +03:00
TheBusyBiscuit
11c783be11
Update CODE_OF_CONDUCT.md 2020-08-31 17:43:24 +02:00
TheBusyBiscuit
8b50a5e196
Patience 2020-08-31 17:05:33 +02:00
LinoxGH
e2c93c54e5
Fixes #2265 <Tested> 2020-08-31 17:28:26 +03:00
TheBusyBiscuit
e876aff455
Update CODE_OF_CONDUCT.md 2020-08-31 13:32:12 +02:00
TheBusyBiscuit
608511cff0
Updated Code of Conduct 2020-08-31 13:29:16 +02:00
TheBusyBiscuit
5df68a5ba1
Added a Code of Conduct 2020-08-31 13:09:31 +02:00