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
3,921 Commits 1 Branch 0 Tags 64 MiB
8481f0cde3
Commit Graph

1807 Commits

Author SHA1 Message Date
TheBusyBiscuit
88dfdfa560 Small improvement to Cargo performance 2020-07-05 12:04:40 +02:00
TheBusyBiscuit
4edc557547 Fixed an issue where moving Androids got stuck 2020-07-05 11:46:20 +02:00
TheBusyBiscuit
7d901744fd Small improvement 2020-07-04 19:15:13 +02:00
TheBusyBiscuit
5a19b18633 Thunderstorms now count as night for Solar Generators (+ other stuff) 2020-07-04 19:04:29 +02:00
dniym
27149ee514 Fixed formatting error 2020-07-04 09:42:17 -04:00
dniym
aca5b6efc5 Removed unused import 2020-07-04 09:39:13 -04:00
dniym
f80bada54b Made Requested Changes 2020-07-04 09:36:29 -04:00
dniym
1ddd763dbf Added Chance Drop for MOB_DROP recipe items. References #980 
Added interface for ChanceDrop items

Added a check for chance drop items in the EntityDeathListener

Adjusted circuit board to have a 75% chance rather than 100% chance
 2020-07-03 23:19:19 -04:00
TheBusyBiscuit
768e4f1021 Massive performance improvements to Rainbow Glass Panes 2020-07-03 17:43:10 +02:00
TheBusyBiscuit
06b14836dd Added plugins summary to /sf timings 2020-07-03 14:47:51 +02:00
LinoxGH
bbcf1da3e2 Translate recipes_tr.yml via GitLocalize 2020-07-02 20:47:59 +00:00
TheBusyBiscuit
4ddea8f7ae Small performance improvement 2020-07-02 20:41:40 +02:00
TheBusyBiscuit
b2f594ed88
Merge pull request #2064 from TheBusyBiscuit/feature/profiler 
Changes to performance, added a proper Lag Profiler
 2020-07-02 18:11:04 +02:00
TheBusyBiscuit
172a2c47fb Added a directional cache to Cargo Nodes, should improve performance 2020-07-02 18:04:26 +02:00
Scott Gomez Andoy
424cf12b64 Translate messages_tl.yml via GitLocalize 2020-07-02 11:27:02 +00:00
Scott Gomez Andoy
144483178d Translate categories_tl.yml via GitLocalize 2020-07-02 11:27:01 +00:00
TheBusyBiscuit
8cbaf14d2e Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into feature/profiler

Conflicts:
	CHANGELOG.md
 2020-07-02 11:51:38 +02:00
TheBusyBiscuit
cfefa393a6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-02 11:50:25 +02:00
TheBusyBiscuit
548e3586ae Fixes #2066 2020-07-02 11:50:07 +02:00
TheBusyBiscuit
697b173359 Refactoring 2020-07-02 11:26:38 +02:00
TheBusyBiscuit
ef7624dde9 Performance improvement for ChestTerminal 2020-07-01 20:39:01 +02:00
TheBusyBiscuit
1016b5fc76 Added better summaries, ratings + more performance improvements 2020-07-01 18:20:34 +02:00
LinoxGH
0e9c1a6ccf Removed a redundant import. 2020-07-01 10:33:25 +03:00
LinoxGH
7bf31d600e Did the requested change. 2020-07-01 10:31:06 +03:00
LinoxGH
9100dfe6f3 Minor refactoring and more documentation. 2020-06-30 23:38:21 +03:00
TheBusyBiscuit
a4197fe5dd A couple of performance and memory optimizations 2020-06-30 21:31:55 +02:00
TheBusyBiscuit
d82b66a842 Added a better profiler 2020-06-30 19:36:55 +02:00
TheBusyBiscuit
0aa99df8c2 Performance optimization 2020-06-30 16:44:50 +02:00
TheBusyBiscuit
527ffdd742 Added Gilded Blackstone recipe to the Ore Crusher 2020-06-30 02:12:40 +02:00
TheBusyBiscuit
cb7cc4402f Refactoring 2020-06-30 01:33:13 +02:00
TheBusyBiscuit
30c87b2256
Merge pull request #2046 from LinoxGH/EnchRune 
Enchantment Rune
 2020-06-30 01:23:20 +02:00
TheBusyBiscuit
6f1a2b82b5 Added runtime deprecation warnings for Addon Creators 2020-06-29 17:12:54 +02:00
TheBusyBiscuit
3415a124c7 A bunch of refactoring 2020-06-29 15:47:51 +02:00
TheBusyBiscuit
3713940512 Prevent Spigot from breaking everything... 2020-06-29 15:19:20 +02:00
LinoxGH
b6112e2728
Did a requested change. 2020-06-29 14:45:27 +03:00
TheBusyBiscuit
fe63637281 Removed unused folder 2020-06-29 13:04:36 +02:00
TheBusyBiscuit
4f2bb90f15 [CI skip] Slight refactoring 2020-06-29 12:10:45 +02:00
TheBusyBiscuit
acd8278889
Merge pull request #2045 from LinoxGH/ExplosiveBowChange 
Explosive Bow Area of Effect
 2020-06-29 11:46:44 +02:00
LinoxGH
942bf436bb Did another requested change. 2020-06-29 10:02:54 +03:00
TheBusyBiscuit
7f7ed6861e Fixes #1959 and other Grappling hook-related issues 2020-06-29 03:04:31 +02:00
LinoxGH
833b2d3943 Did another requested change. 2020-06-29 01:11:01 +03:00
LinoxGH
28b5d545da Did some requested change. 2020-06-29 00:56:38 +03:00
LinoxGH
5c7accbbe8 Did the requested changes + a fix. 2020-06-28 23:46:09 +03:00
LinoxGH
27ba744fe5 Fixed a little bug. 2020-06-28 22:09:04 +03:00
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
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
Vravinite
c941b9080f Translate recipes_es.yml via GitLocalize 2020-06-26 21:53:21 +00: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
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
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
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
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
1520e71107
Updated translators 2020-06-25 22:51:56 +02:00
krazybeat
2cc97398d0 Translate researches_pt-BR.yml via GitLocalize 2020-06-25 20:50:17 +00:00
FaolanMalcadh
514e6af7a6 Translate categories_pt-BR.yml via GitLocalize 2020-06-25 20:50:16 +00:00
LinoxGH
f54b277111 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into EnchRune 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/resources/languages/researches_en.yml
 2020-06-25 22:35:14 +03:00
LinoxGH
1a8ff9c511 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ExplosiveBowChange 2020-06-25 22:16:49 +03:00
LinoxGH
e016ea1180 Explosive Bow Functionality Changed. 
Explosive Bow now deals an area of effect.
 2020-06-25 22:13:24 +03:00
TheBusyBiscuit
d18af0c211 Ore Crusher now also accepts Nether Gold Ore 2020-06-25 15:27:18 +02:00
TheBusyBiscuit
e66aa0baa5 Added Smithing Table Recipe support 2020-06-25 15:18:31 +02:00
TheBusyBiscuit
427a312240 More steps towards 1.16 compatibility (unfinished) 2020-06-25 14:43:17 +02:00
TheBusyBiscuit
92e7e58915
Merge branch 'master' into support/1.16 2020-06-25 13:40:28 +02:00
TheBusyBiscuit
3b7ad0ac63
[CI skip] Merge pull request #2039 from LinoxGH/AutoDrierFix 
Auto Drier 1.13 Update
 2020-06-25 13:27:50 +02:00
LinoxGH
f9c8cd1d76 Fixed the recipe. 2020-06-25 14:08:57 +03:00
LinoxGH
82b9de4c54 Fixed merge conflict. 2020-06-25 13:38:30 +03:00
LinoxGH
7e20e7cd9f Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into AutoDrierFix 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
 2020-06-25 13:37:33 +03:00
TheBusyBiscuit
ff205aee4e
Merge pull request #2027 from SoSeDiK/storage 
Improve the handling of non-registered worlds
 2020-06-25 12:12:08 +02:00
SoSeDiK
e52ac9d43b Make it compile 2020-06-25 13:06:34 +03:00
SoSeDiK
386cbea53b Whoops 2020-06-25 12:59:02 +03:00
SoSeDiK
ade18c7bd8 Remove unused import 2020-06-25 12:58:04 +03:00
SoSeDiK
4ed2258eb0 Replace stream with for loop 2020-06-25 12:49:18 +03:00
TheBusyBiscuit
3402f344b2
[CI skip] Merge pull request #2034 from TheBusyBiscuit/gitlocalize-12215 
Turkish Translation Update Pt.4
 2020-06-25 10:33:54 +02:00
TheBusyBiscuit
8e8dd55994
[CI skip] Merge pull request #2033 from TheBusyBiscuit/gitlocalize-12214 
Turkish Translation Update Pt.3
 2020-06-25 10:33:32 +02:00
TheBusyBiscuit
bfc1fac276
[CI skip] Merge pull request #2032 from TheBusyBiscuit/gitlocalize-12213 
Turkish Translation Update Pt.2
 2020-06-25 10:33:06 +02:00
TheBusyBiscuit
c1bce66bca
[CI skip] Merge pull request #2031 from TheBusyBiscuit/gitlocalize-12212 
Turkish Translation Update Pt.1
 2020-06-25 10:32:28 +02:00
TheBusyBiscuit
dab7baceaa
[CI skip] Merge pull request #2028 from TheBusyBiscuit/gitlocalize-12211 
Filipino/Tagalog Translation Update
 2020-06-25 10:31:53 +02:00
TheBusyBiscuit
75cfc05cdb
[CI skip] Merge pull request #2026 from TheBusyBiscuit/gitlocalize-12210 
Update chinese translation to latest
 2020-06-25 10:29:33 +02:00
TheBusyBiscuit
3aa4930e9f
[CI skip] Merge pull request #2025 from TheBusyBiscuit/gitlocalize-12207 
researches_es
 2020-06-25 10:28:43 +02:00
LinoxGH
7a09253311 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ShulkerShell 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/resources/languages/researches_en.yml
 2020-06-25 10:11:33 +03:00
LinoxGH
898294c4a2 Translate researches_tr.yml via GitLocalize 2020-06-25 06:08:57 +00:00
LinoxGH
7d250e58d6 Translate recipes_tr.yml via GitLocalize 2020-06-25 06:08:18 +00:00
LinoxGH
2cd81a2dbc Translate messages_tr.yml via GitLocalize 2020-06-25 06:07:35 +00:00
LinoxGH
8ec118f88c Translate categories_tr.yml via GitLocalize 2020-06-25 06:07:06 +00:00
Scott Gomez Andoy
d76e2fb752 Translate researches_tl.yml via GitLocalize 2020-06-25 05:57:06 +00:00
Scott Gomez Andoy
3ee151b069 Translate messages_tl.yml via GitLocalize 2020-06-25 05:51:05 +00:00
Daniel Walsh
81e16a6c47 1.16 support 2020-06-25 06:05:17 +01:00
Scott Gomez Andoy
ea9b2e2494 Translate researches_tl.yml via GitLocalize 2020-06-25 04:45:20 +00:00
Scott Gomez Andoy
00a61a296f Translate messages_tl.yml via GitLocalize 2020-06-25 04:45:19 +00:00
SoSeDiK
ecd97b3e50 Fixed a tiny typo 2020-06-25 05:54:21 +03:00
Nameless
9ade467249 Translate researches_zh-CN.yml via GitLocalize 2020-06-25 02:41:27 +00:00
Nameless
bb3650e9e7 Translate messages_zh-CN.yml via GitLocalize 2020-06-25 02:41:25 +00:00
SoSeDiK
c175596536 Improve the handling of non-registered worlds 2020-06-25 05:33:02 +03:00
Vravinite
813e72b5b4 Translate researches_es.yml via GitLocalize 2020-06-25 02:10:20 +00:00
Luu7
6276029aec Translate messages_es.yml via GitLocalize 2020-06-25 01:46:53 +00:00
TheBusyBiscuit
655fb44021
[CI skip] Merge pull request #2022 from TheBusyBiscuit/gitlocalize-12200 
Translate added section in messages into Japanese.
 2020-06-25 02:35:25 +02:00
TheBusyBiscuit
d3a30347fd
[CI skip] Merge pull request #2021 from TheBusyBiscuit/gitlocalize-12199 
Translate added section in categories into Japanese.
 2020-06-25 02:34:46 +02:00
bito-blosh
5d4bc5c769 Translate researches_ja.yml via GitLocalize 2020-06-25 00:21:47 +00:00
TheBusyBiscuit
1d43faeb76 Translate messages_ja.yml via GitLocalize 2020-06-25 00:13:08 +00:00
bito-blosh
89357ba7db Translate categories_ja.yml via GitLocalize 2020-06-25 00:13:06 +00:00
TheBusyBiscuit
a36c42959e Some refactoring of PR #2020 2020-06-25 00:21:43 +02:00
LinoxGH
3cba1f71fc Fixed an issue created by another pr. 2020-06-24 22:46:02 +03:00
LinoxGH
8f0c5100d4
Merge branch 'master' into AutoBrewer 2020-06-24 22:38:15 +03:00
LinoxGH
4249a2b85b Did the requested changes. 2020-06-24 22:33:55 +03:00
TheBusyBiscuit
c64b311ee2 Finished merge of PR #2015 and updated language keys 2020-06-24 21:25:21 +02:00