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,277 Commits 1 Branch 0 Tags 64 MiB
43ef02d31c
Commit Graph

4277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LinoxGH
e55e2690e7 Did the requested changes. 2020-06-28 22:06:35 +03:00
TheBusyBiscuit
c63f4bf8af
Merge pull request #2057 from LinoxGH/HazmatSuitBees 
Added Bee Protection to Hazmat Suit.
 2020-06-28 17:12:10 +02:00
LinoxGH
911ee2340f Did a requested change. 2020-06-28 14:22:15 +03:00
TheBusyBiscuit
03c08ed6f1 Fixes #2062 2020-06-28 11:20:56 +02:00
LinoxGH
d7ba054bef Removed unused imports. 2020-06-28 05:39:32 +03:00
LinoxGH
f3d21daf6a Did the requested changes. 2020-06-28 05:38:49 +03:00
LinoxGH
3e271ac786 Did more requested changes. 2020-06-28 05:29:51 +03:00
LinoxGH
a935951c22 Oops forgot to change these. 2020-06-28 01:14:37 +03:00
LinoxGH
07d837299f Did the requested changes. 2020-06-28 01:07:37 +03:00
LinoxGH
558d069a33 Did the requested changes + improvements. 2020-06-27 17:45:39 +03:00
LinoxGH
64a1b247b4 Did the requested changes + fixes. 2020-06-27 17:30:28 +03:00
LinoxGH
a456034005 Fixed merge conflicts. 2020-06-27 16:07:22 +03:00
LinoxGH
ba0c3b30dd Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees 
 Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
 2020-06-27 16:01:36 +03:00
LinoxGH
b5ef8ff019 Did the requested changes + improvements. 2020-06-27 15:58:36 +03:00
TheBusyBiscuit
492010a8d4 Adjusted Unit Test to include new item tags 2020-06-27 14:32:13 +02:00
TheBusyBiscuit
4314581a61 Another fix and an addition 2020-06-27 14:22:45 +02:00
TheBusyBiscuit
50aaa4b965 Added a few more items to the Bio Generator 2020-06-27 14:04:31 +02:00
TheBusyBiscuit
3dc043c857 Refactoring: Relocated Plugin class 2020-06-27 13:10:47 +02:00
LinoxGH
73973a00b7 Did the requested changes and some fixes. 2020-06-27 12:26:15 +03:00
LinoxGH
52dc7585fc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java
 2020-06-27 08:09:09 +03:00
TheBusyBiscuit
ca36271a79
Merge pull request #2055 from TheBusyBiscuit/refactoring/item-energy 
Lots of refactoring and rewriting of Item Energy
 2020-06-27 03:43:55 +02:00
TheBusyBiscuit
6d36655081 Another optimization for Solar Generators 2020-06-27 03:40:27 +02:00
TheBusyBiscuit
bd2f4b196d Minor optimization for Solar Helmet checks 2020-06-27 03:29:10 +02:00
TheBusyBiscuit
468617d9a2 Changed a comment. 2020-06-27 03:13:43 +02:00
TheBusyBiscuit
44c0029587 Fixed a rare concurrency issue with world saving 2020-06-27 02:47:53 +02:00
TheBusyBiscuit
0dfd40e407 Fixed a few more color codes for 1.16 (Sorry Walshy :P ) 2020-06-27 02:35:29 +02:00
TheBusyBiscuit
f6f09d2e2e Some more refactoring 2020-06-27 02:28:01 +02:00
TheBusyBiscuit
b2833b3ce8 Removed unused parameter 2020-06-27 02:18:49 +02:00
TheBusyBiscuit
e081d15c6d Fixed a slight mistake with the lore 2020-06-27 01:46:20 +02:00
LinoxGH
ffd57ec760 Did the requested Changes 2020-06-27 01:51:38 +03:00
TheBusyBiscuit
b3b2d3d8d1
[CI skip] Merge pull request #2059 from TheBusyBiscuit/gitlocalize-12240 
recipes_es
 2020-06-26 23:53:57 +02:00
Vravinite
c941b9080f Translate recipes_es.yml via GitLocalize 2020-06-26 21:53:21 +00:00
TheBusyBiscuit
cbe7c0f30d
[CI skip] Merge pull request #2058 from TheBusyBiscuit/gitlocalize-12239 
Updated chinese (Taiwan) translations
 2020-06-26 23:51:51 +02:00
HeroBrineKing
758e687783 Translate messages_zh-TW.yml via GitLocalize 2020-06-26 21:51:20 +00:00
HeroBrineKing
3ba284746b Translate researches_zh-TW.yml via GitLocalize 2020-06-26 21:51:18 +00:00
HeroBrineKing
6b89cd3fc2 Translate recipes_zh-TW.yml via GitLocalize 2020-06-26 21:51:17 +00:00
HeroBrineKing
dab48cbe13 Translate categories_zh-TW.yml via GitLocalize 2020-06-26 21:51:16 +00:00
LinoxGH
29fe881768 Added a new lore to Hazmat Suit for 1.15+ 2020-06-26 23:31:15 +03:00
LinoxGH
cd4a36c519 Added Bee Protection to Hazmat Suit. 2020-06-26 23:18:27 +03:00
TheBusyBiscuit
80fc0a173e Added lore addition 2020-06-26 20:58:23 +02:00
TheBusyBiscuit
f99c727583 Added another Unit Test 2020-06-26 20:37:53 +02:00
TheBusyBiscuit
ed85a9a051 Added Unit tests for rechargeable items 2020-06-26 17:58:54 +02:00
TheBusyBiscuit
28e5b57c5d Some better exception handling 2020-06-26 17:36:57 +02:00
TheBusyBiscuit
8d0c816ed2 Some performance improvements 2020-06-26 16:27:16 +02:00
TheBusyBiscuit
6ffa5ab9a7 Lots of refactoring and rewriting of Item Energy 2020-06-26 15:32:57 +02:00
LinoxGH
eb2bbae0c9 Did the requested changes. 2020-06-26 13:31:45 +03:00
LinoxGH
9176d795c8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into EnchRune 2020-06-26 13:28:45 +03:00
TheBusyBiscuit
42dd81391c
[CI skip] Merge pull request #2054 from TheBusyBiscuit/gitlocalize-12229 
Updated Ukrainian localization
 2020-06-26 10:55:41 +02:00
SoSeDiK
6ab2b34a83 Translate researches_uk.yml via GitLocalize 2020-06-26 08:53:56 +00:00
SoSeDiK
ca73b4a891 Translate recipes_uk.yml via GitLocalize 2020-06-26 08:53:54 +00:00