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

3385 Commits

Author SHA1 Message Date
FluffyBear
c9fd33318e Did changes 2020-09-05 11:12:14 -05:00
FluffyBear
6f49044998 Applied fix 2020-09-04 10:20:11 -05:00
FluffyBear
6ac3c9698b Fixed dual wielding problem with shears 2020-09-04 09:29:08 -05: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
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
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
f4869991ca Moved Nether goo to the appropriate package (+ more annotations) 2020-09-02 14:47:32 +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
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
7db615fb82 Translate messages_tr.yml via GitLocalize 2020-09-02 10:06:20 +00: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
f4091e931b Refactoring and some annotations 2020-09-02 10:31:35 +02:00
TheBusyBiscuit
35c1fa6a23 Fixes #2275 2020-09-01 22:38:22 +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
LinoxGH
fa01e82179
Did the requested changes. 2020-08-31 18:51:21 +03:00
LinoxGH
e2c93c54e5
Fixes #2265 <Tested> 2020-08-31 17:28:26 +03:00
LinoxGH
918edbeeb1
Fixed the javadocs. 2020-08-30 18:42:57 +03:00
LinoxGH
bfc84d03b2
Undid the changes to language files. 2020-08-30 18:26:12 +03:00
LinoxGH
305dd57b39
Did the requested change. 2020-08-30 18:25:08 +03:00
LinoxGH
dffc5758e2
Fixed compilation error. 2020-08-30 18:21:50 +03:00
LinoxGH
a8f6f51724
Added a new message. 2020-08-30 18:15:31 +03:00
LinoxGH
3d0c642477
Added an additional check for Wind Staff 2020-08-30 18:14:39 +03:00
LinoxGH
cdb6eeab96
Did the requested changes. 2020-08-30 18:13:45 +03:00
LinoxGH
e0914af6d9
Fixes #2263 2020-08-30 17:53:39 +03:00