mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
4,539 Commits 1 Branch 0 Tags 64 MiB
35e0d44b0b
Commit Graph

3445 Commits

Author SHA1 Message Date
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
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
Pierre
1ee04e79b3 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:25 +00:00
amarcais53
d22c14e5a6 Translate researches_fr.yml via GitLocalize 2020-09-03 18:23:24 +00: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
TheBusyBiscuit
6b4f914784 Some more refactoring 2020-08-29 14:20:33 +02:00
TheBusyBiscuit
e3f7e68468 Fixed a merging issue 2020-08-29 14:09:41 +02:00
TheBusyBiscuit
dc233997ae
Merge branch 'master' into refactoring/block-energy 2020-08-29 12:47:50 +02:00
TheBusyBiscuit
ac5d5521ce Fixes #2260 2020-08-28 23:35:11 +02:00
TheBusyBiscuit
ec6f48e374 [CI skip] Refactoring 2020-08-28 23:35:05 +02:00
TheBusyBiscuit
5bef6a9ec8 Fixes #2257 2020-08-28 23:18:43 +02:00
TheBusyBiscuit
9d740436a7
Merge branch 'master' into experimental 2020-08-28 20:53:20 +02:00
TheBusyBiscuit
83b66232fa Fixes #2251 2020-08-28 20:03:45 +02:00
LinoxGH
f371a5fda6
Fixed a stupid issue and added some docs. 2020-08-27 20:53:13 +03:00
LinoxGH
8c1cccc390
Forgot about imports. 2020-08-27 20:33:01 +03:00
LinoxGH
fd665843a0
Did requested changes. 2020-08-27 20:20:13 +03:00
LinoxGH
53abf76a35
Fixed Fluid Pump dupe. 2020-08-27 20:08:02 +03:00
TheBusyBiscuit
f97935b5c7
Deleted unused class 2020-08-27 14:29:02 +02:00
TheBusyBiscuit
fcbae02a4b Fixs #2208 2020-08-27 14:16:09 +02:00
TheBusyBiscuit
4232caf17a [CI skip] Reduced technical debt 2020-08-27 13:16:38 +02:00
TheBusyBiscuit
b9b3d7f504 [CI skip] Removed deprecated class 2020-08-27 13:00:36 +02:00
TheBusyBiscuit
4dab0c5b47 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy 2020-08-26 17:51:43 +02:00
TheBusyBiscuit
3bc943bdb2 Little bit of refactoring 2020-08-26 14:33:40 +02:00
TheBusyBiscuit
c8ab9e8568 Fixes #1022 2020-08-26 14:31:51 +02:00
TheBusyBiscuit
6e6a953009 Fixes #2249 2020-08-26 12:47:08 +02:00
TheBusyBiscuit
2c319d866f Fixed Unit Test 2020-08-25 01:17:11 +02:00
TheBusyBiscuit
dba52edc47 Merge branch 'master' into experimental 2020-08-24 21:12:38 +02:00
TheBusyBiscuit
4bc22ab106 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
 2020-08-24 21:12:04 +02:00
TheBusyBiscuit
ecde46616a Climbing Pick no longer causes fall damage 2020-08-24 20:59:01 +02:00
TheBusyBiscuit
89a5db2593 Fixed Unit Tests for Climbing Pick 2020-08-24 20:45:45 +02:00
TheBusyBiscuit
9e92f64222 Added damageable setting 2020-08-24 20:35:35 +02:00
TheBusyBiscuit
8c2038634f Fixed dual wielding climbing picks and added messages 2020-08-24 20:31:54 +02:00
TheBusyBiscuit
b81959e7a0 Added dual-wielding to the Climbing Pick 2020-08-24 20:19:24 +02:00
TheBusyBiscuit
076ae6532b Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-24 18:12:31 +02:00
poma123
7b7c6350c6 Fixed android script editor menu hotkey glitch 2020-08-24 15:30:51 +02:00
TheBusyBiscuit
605862b400 Improved consistency and reduced redundancy 2020-08-24 14:26:11 +02:00
TheBusyBiscuit
a2b2478394
Update EnergyNet.java 2020-08-24 02:18:32 +02:00
TheBusyBiscuit
d998f3ec8c
Merge branch 'master' into refactoring/block-energy 2020-08-24 02:11:59 +02:00
TheBusyBiscuit
155092a321 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
Conflicts:
	pom.xml
 2020-08-23 17:57:13 +02:00
TheBusyBiscuit
f51a19777f [CI skip] Added more Unit tests 2020-08-23 17:56:38 +02:00
Sfiguz7
89fdf45d28 I said, fixed extra indentation 2020-08-23 17:50:31 +02:00
Sfiguz7
44451d6244 Fixed extra indentation 2020-08-23 17:49:44 +02:00
Sfiguz7
813200b29c Made requested changes 2020-08-23 15:36:10 +02:00
Sfiguz7
e06d17f8e5 Restored original plugin.yml as pulling hadn't 2020-08-23 13:58:29 +02:00
Sfiguz7
bdd2adc21e Cleared unused imports I forgot to delete 2020-08-23 13:56:39 +02:00
Sfiguz7
eb66f3e183 Added option to drop excess items on /sf give 2020-08-23 13:54:51 +02:00
TheBusyBiscuit
ec95797cbf Fixes #2240 2020-08-22 02:38:17 +02:00
TheBusyBiscuit
b36e3e41a8 Reduced technical debt 2020-08-22 02:36:36 +02:00
TheBusyBiscuit
e839ece670 Reduced technical debt 2020-08-22 00:57:44 +02:00
100petr
d6e519c840 Translate messages_cs.yml via GitLocalize 2020-08-21 13:27:22 +00:00
TheBusyBiscuit
95655dc6fc A few fixes and performance improvements 2020-08-21 15:19:08 +02:00
TheBusyBiscuit
167326292d Maybe fixes #1951 (+ performance improvements) 2020-08-20 23:25:43 +02:00
TheBusyBiscuit
29092b87c9
Merge branch 'experimental' into IcePick 2020-08-20 22:56:09 +02:00
TheBusyBiscuit
d8d4811974 Merged Nitwit Rune and Shulker Shell PRs 2020-08-20 18:20:25 +02:00