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

4263 Commits

Author SHA1 Message Date
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
SoSeDiK
1e6ac71bef Translate messages_uk.yml via GitLocalize 2020-06-26 08:53:53 +00:00
TheBusyBiscuit
05740b4459
[CI skip] Merge pull request #2051 from TheBusyBiscuit/gitlocalize-12226
Updated Russian messages
2020-06-26 10:43:43 +02:00
TheBusyBiscuit
2b1acfd121
[CI skip] Merge pull request #2052 from TheBusyBiscuit/gitlocalize-12227
Updated Russian researches
2020-06-26 10:41:29 +02:00
TheBusyBiscuit
5ddb381f84
[CI skip] Merge pull request #2053 from TheBusyBiscuit/gitlocalize-12228
Updated Russian recipes
2020-06-26 10:40:27 +02:00
SoSeDiK
5d283c053d Translate recipes_ru.yml via GitLocalize 2020-06-26 08:38:51 +00:00
SoSeDiK
1b159091a0 Translate researches_ru.yml via GitLocalize 2020-06-26 08:38:41 +00:00
SoSeDiK
e358289c4b Translate messages_ru.yml via GitLocalize 2020-06-26 08:38:32 +00:00
TheBusyBiscuit
df8ae5738d
[CI skip] Merge pull request #2050 from TheBusyBiscuit/gitlocalize-12224
Update recipes_zh-CN.yml
2020-06-26 10:34:58 +02:00
TheBusyBiscuit
9acc6e146b
[CI skip] Merge pull request #2049 from TheBusyBiscuit/gitlocalize-12223
Tagalog/Filipino Translation Update for Slimefun 1.16
2020-06-26 10:32:13 +02:00
Nameless
682dcf1189 Translate recipes_zh-CN.yml via GitLocalize 2020-06-26 04:57:58 +00:00
Scott Gomez Andoy
526c2e5228 Translate recipes_tl.yml via GitLocalize 2020-06-25 23:36:17 +00:00
TheBusyBiscuit
a334387a07
[CI skip] Merge pull request #2048 from TheBusyBiscuit/gitlocalize-12222
Updated portuguese (BR) translations
2020-06-25 22:57:06 +02:00
TheBusyBiscuit
1520e71107
Updated translators 2020-06-25 22:51:56 +02:00
FaolanMalcadh
def404378d Translate researches_pt-BR.yml via GitLocalize 2020-06-25 20:50:18 +00:00