mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
5,859 Commits 1 Branch 0 Tags 64 MiB
fd40737682
Commit Graph

3126 Commits

Author SHA1 Message Date
DNBGlol
61a30ec8b3 Translate messages_bg.yml via GitLocalize 2021-01-16 13:13:33 +00:00
Daniel Walsh
485fc1aa69
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-16 10:39:05 +00:00
Daniel Walsh
ff368bdf56
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-16 10:35:03 +00:00
TheBusyBiscuit
34d18c5547
Merge branch 'master' into refactoring/holograms 2021-01-16 11:34:24 +01:00
Daniel Walsh
55d2f82dcd
Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items 2021-01-16 10:33:16 +00:00
TheBusyBiscuit
7c929a2f22 Fixes #2728 2021-01-16 11:30:39 +01:00
TheBusyBiscuit
e523d7849e Fixes #2662 2021-01-16 11:28:38 +01:00
Daniel Walsh
da2419d414
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE 2021-01-16 10:26:22 +00:00
TheBusyBiscuit
d678977a03 Fixed formatting, import and small optimization 2021-01-15 11:52:56 +01:00
TheBusyBiscuit
a810458345 [CI skip] Small changes 2021-01-15 11:46:40 +01:00
TheBusyBiscuit
3663a7d43b Proper error handling and updated changelog 2021-01-15 03:31:33 +01:00
TheBusyBiscuit
1997fe04d8 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into refactoring/holograms 2021-01-15 03:12:41 +01:00
TheBusyBiscuit
5ea34a895d Fixed holograms cache 2021-01-15 01:37:55 +01:00
TheBusyBiscuit
3ea2fccf25 Fixed docs 2021-01-15 01:34:56 +01:00
TheBusyBiscuit
570908a448 Cache entity names 2021-01-15 01:32:39 +01:00
TheBusyBiscuit
34f24f4d60 Invisible and invulnerable might be a good idea. 2021-01-15 00:29:28 +01:00
TheBusyBiscuit
d84a2e37a3 Lowered purge delay 2021-01-15 00:24:23 +01:00
TheBusyBiscuit
a7d0758692 More work on holograms 2021-01-15 00:16:58 +01:00
ProfElements
58eca5affa Check for conflicting enchantments, this can probably be better 2021-01-14 16:02:33 -06:00
ProfElements
5cd1d8cb22 appease yaml lint v3 2021-01-14 15:05:08 -06:00
ProfElements
782da8582f fix researches_en.yml formatting 2021-01-14 14:56:13 -06:00
ProfElements
fada355fe5 Add research and make Book Binder recipe slightly harder 2021-01-14 14:39:28 -06:00
TheBusyBiscuit
84d2d99097 not done yet 2021-01-14 20:44:56 +01:00
TheBusyBiscuit
ac590fdde3 Fixes #2721 2021-01-14 14:41:09 +01:00
TheBusyBiscuit
7826b2359a Finished fix for #2636 and fixed a threading issue with BlockStates 2021-01-14 11:58:52 +01:00
ProfElements
23049b64fa Make request changes, simpliflied BookBinder 2021-01-13 15:25:28 -06:00
ProfElements
088a08952b Make requested changes, made combineEnchantments better generally 2021-01-13 14:35:17 -06:00
Daniel Walsh
2f08066449
Merge pull request #2487 from CURVX/fix/sf-machine-hopper 2021-01-13 18:46:13 +00:00
TheBusyBiscuit
029bc2ae78 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
refactoring/holograms

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java
 2021-01-13 14:29:18 +01:00
TheBusyBiscuit
6e27ea0ca1 [CI skip] Fixed javadocs 2021-01-13 13:48:56 +01:00
TheBusyBiscuit
faa3219add Added an additional item warning for illegal stack sizes 2021-01-13 13:15:05 +01:00
TheBusyBiscuit
11a368f97e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-01-13 12:46:35 +01:00
TheBusyBiscuit
b0f5768443 [CI skip] Removed a deprecated method 2021-01-13 12:46:16 +01:00
TheBusyBiscuit
89f6b69e80
[CI skip] Merge pull request #2713 from Slimefun/gitlocalize-14728 
Updated and improve zh-CN Translation
 2021-01-13 12:19:25 +01:00
TheBusyBiscuit
69df04f128 Remove as much old stuff as possible 2021-01-13 11:58:54 +01:00
Nameless
a69226dd76 Translate messages_zh-CN.yml via GitLocalize 2021-01-13 05:23:28 +00:00
CURVX
889ffe4872 Few minor changes 2021-01-13 10:31:45 +05:30
TheBusyBiscuit
f602c6c575 Slimefun but without cs-corelib 2021-01-13 02:51:05 +01:00
TheBusyBiscuit
7339a6ed4b [CI skip] Refactoring 2021-01-13 02:20:32 +01:00
TheBusyBiscuit
ec8eed58f9 [CI skip] Refactoring 2021-01-12 19:28:12 +01:00
CURVX
a0ab148a65 Cleaned imports pt.2 2021-01-12 23:42:19 +05:30
CURVX
f0e891134b Cleaned imports 2021-01-12 23:17:23 +05:30
CURVX
19e2f37ac6 Resolve merge conflicts 2021-01-12 21:51:31 +05:30
CURVX
b3b7a22ee9 Changes req. by TTB 2021-01-12 21:42:53 +05:30
CURVX
105a57fb37
Merge pull request #6 from Slimefun/master 
[CI skip] Update fork
 2021-01-12 21:37:20 +05:30
TheBusyBiscuit
3f5fb7c7a7 [Ci skip] Fixed javadocs and improved documentation 2021-01-12 12:03:02 +01:00
TheBusyBiscuit
bc8d72b9ab Small aesthetic change 2021-01-11 13:12:09 +01:00
TheBusyBiscuit
5ed452660f Fixed elevator order (highest floor first) 2021-01-11 13:07:46 +01:00
TheBusyBiscuit
f6a9150296 Little bit of refactoring 2021-01-11 12:45:11 +01:00
TheBusyBiscuit
7a4712f930 Removed obsolete things 2021-01-11 12:33:49 +01:00
TheBusyBiscuit
7bfb46d3fd
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java 
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
 2021-01-11 12:07:46 +01:00
TheBusyBiscuit
85639c75ac Fixed floor numbers 2021-01-11 11:25:03 +01:00
TheBusyBiscuit
32474a588b Added ElevatorFloor class from PR #2699 2021-01-11 10:56:46 +01:00
TheBusyBiscuit
a313d8a878 Removed comments 2021-01-11 10:48:54 +01:00
TheBusyBiscuit
e119f762ac Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
features/inventory-elevator

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideLayout.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideLayoutOption.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/ElevatorPlate.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java
 2021-01-11 10:47:18 +01:00
TheBusyBiscuit
577ad2c308 [CI skip] Prepare RC-19 2021-01-11 10:33:12 +01:00
TheBusyBiscuit
4b6610d0b7 [CI skip] Finalized guide refactoring 2021-01-11 10:30:50 +01:00
Daniel Walsh
d4cfe2a0db
Quick fix 2021-01-11 07:57:51 +00:00
Daniel Walsh
116642fcec
Finish up 2021-01-11 07:38:26 +00:00
TheBusyBiscuit
7e48d96fa3 Removed "written book" slimefun guide and disabled elevators 2021-01-11 02:39:54 +01:00
TheBusyBiscuit
93dc77b188 [CI skip] Fixed javadocs 2021-01-11 02:14:49 +01:00
TheBusyBiscuit
c280ec26a0
Merge branch 'master' into fix/broken-book-guide-and-elevator 2021-01-10 23:09:06 +01:00
TheBusyBiscuit
4c879ac3b3 Added AndroidFarmEvent (+ refactored Farmer Androids) 2021-01-10 21:20:43 +01:00
TheBusyBiscuit
47fc037536 [CI skip] Lots of refactoring and documentation 
* Moved the ProtectionManager to the IntegrationsManager
* Refactored static NamespacedKeys to be non-static
* Added some documentation
 2021-01-10 17:32:47 +01:00
TheBusyBiscuit
f3ed8c0451 [CI skip] Refactoring 2021-01-10 16:21:15 +01:00
TheBusyBiscuit
177637d070
[CI skip] Merge pull request #2703 from Slimefun/gitlocalize-14714 
Chinese Taiwan 1/10 (Timings messages and tweaks)
 2021-01-10 14:36:31 +01:00
TheBusyBiscuit
3392a11883
[CI skip] Merge pull request #2702 from Slimefun/gitlocalize-14713 
Updated Hungarian translations
 2021-01-10 14:34:56 +01:00
TheBusyBiscuit
9f3adc1278 [CI skip] Refactored some more I had forgotten 2021-01-10 14:33:48 +01:00
HeroBrineKing
3cd6aeaf29 Translate messages_zh-TW.yml via GitLocalize 2021-01-10 13:07:07 +00:00
TheBusyBiscuit
9c89419d15 [CI skip] Missed one 2021-01-10 14:02:58 +01:00
poma123
c63e09219d Translate messages_hu.yml via GitLocalize 2021-01-10 13:01:44 +00:00
András Marczinkó
b3c72e984a Translate messages_hu.yml via GitLocalize 2021-01-10 13:01:43 +00:00
TheBusyBiscuit
22b5421118 Fixed /sf timings --verbose not working correctly (+refactoring) 2021-01-10 13:38:07 +01:00
TheBusyBiscuit
50a1050038 Translate messages_de.yml via GitLocalize 2021-01-10 12:17:21 +00:00
TheBusyBiscuit
73ef76b292
[CI skip] Merge pull request #2697 from Slimefun/gitlocalize-14666 
Update Japanese translation files.
 2021-01-10 13:08:20 +01:00
TheBusyBiscuit
5c34d26f8d
[CI skip] Fixed a typo 2021-01-10 13:06:22 +01:00
Daniel Walsh
53b6ea131b
Fixy fixy fix 2021-01-09 21:39:15 +00:00
bito-blosh
59e7b5c6f1 Translate recipes_ja.yml via GitLocalize 2021-01-09 21:31:23 +00:00
bito-blosh
daea1d54fc Translate messages_ja.yml via GitLocalize 2021-01-09 21:31:22 +00:00
TheBusyBiscuit
5dce476dc9 Translate messages_ja.yml via GitLocalize 2021-01-09 21:31:21 +00:00
ProfElements
93997718c0 Make requested changes, removed redundant isCompatible, and make isCompatible return false on else instead of just after the if 2021-01-09 15:25:59 -06:00
Daniel Walsh
d80784c6b3
Merge pull request #2695 from J3fftw1/feature/changed-version-command 2021-01-09 20:41:13 +00:00
Jeffrey Kosse
62285bb858 did requested changes 2021-01-09 21:28:41 +01:00
Jeffrey Kosse
c9a3cc3787 ree 2021-01-09 21:27:57 +01:00
Daniel Walsh
6fcc69bacc
[CI Skip] Merge pull request #2687 from Slimefun/features/verbose-flag 2021-01-09 20:27:26 +00:00
Jeffrey Kosse
4a281c87bc ree 2021-01-09 21:27:12 +01:00
Jeffrey Kosse
413a74ece4 added annotations 2021-01-09 21:25:26 +01:00
Jeffrey Kosse
1b52417380 removed unused import 2021-01-09 21:23:50 +01:00
Jeffrey Kosse
a5f42f31dd Changed VersionsCommand to give more info 2021-01-09 20:18:09 +01:00
ProfElements
23d0f0ae2a Made requested changes. 2021-01-07 14:41:59 -06:00
TheBusyBiscuit
8e2d250b1c
[CI skip] Merge pull request #2691 from Slimefun/gitlocalize-14618 
Updated Hungarian translations
 2021-01-07 13:56:28 +01:00
TheBusyBiscuit
f9cfe03a9f
[CI skip] Updated translators list 2021-01-07 13:56:10 +01:00
poma123
d15d8009cb Translate resources_hu.yml via GitLocalize 2021-01-07 11:43:26 +00:00
poma123
c4cc0496ea Translate messages_hu.yml via GitLocalize 2021-01-07 11:43:22 +00:00
KingDeadZ
a6c8f3b437 Translate messages_hu.yml via GitLocalize 2021-01-07 11:43:21 +00:00
TheBusyBiscuit
e66af680c2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-01-07 11:20:12 +01:00
TheBusyBiscuit
47fec04ab6 Small performance optimization for cargo networks 2021-01-07 11:19:48 +01:00
ProfElements
b26376078e Made requested changes. Defaulted has-custom-level to false because no-bypass is true 2021-01-06 16:03:44 -06:00
TheBusyBiscuit
0a5ca8d9f6
Update messages_vi.yml 2021-01-06 21:33:51 +01:00
CactusTheGuy
8c7f28f11b Translate researches_vi.yml via GitLocalize 2021-01-06 20:30:21 +00:00
Vương Vinh
3cded3d28b Translate researches_vi.yml via GitLocalize 2021-01-06 20:30:20 +00:00
nahkd123
3c41b341d1 Translate researches_vi.yml via GitLocalize 2021-01-06 20:30:19 +00:00
Just Mango
c0a06e4862 Translate researches_vi.yml via GitLocalize 2021-01-06 20:30:18 +00:00
TheBusyBiscuit
2734cc9f25 Translate messages_vi.yml via GitLocalize 2021-01-06 20:30:17 +00:00
Just Mango
1ae2adaf2e Translate messages_vi.yml via GitLocalize 2021-01-06 20:30:15 +00:00
CactusTheGuy
7cda34d47a Translate messages_vi.yml via GitLocalize 2021-01-06 20:30:14 +00:00
nahkd123
a64cdec153 Translate messages_vi.yml via GitLocalize 2021-01-06 20:30:13 +00:00
TheBusyBiscuit
22f308884c
[CI skip] Merge pull request #2689 from Slimefun/gitlocalize-14616 
Updated portuguese (brazil) translations
 2021-01-06 20:58:32 +01:00
TheBusyBiscuit
5fae6f1c37
[CI skip] Updated translators list 2021-01-06 20:57:58 +01:00
Gustavo de Souza
47d5d356d3 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:19 +00:00
DayOS
389dc388ed Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:18 +00:00
Marcio
c613d1220f Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:16 +00:00
Sxigames
58113d9aff Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:15 +00:00
FaolanMalcadh
1fa59c7d31 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:14 +00:00
TheBusyBiscuit
a2be3d1255 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:13 +00:00
krazybeat
a65a61a557 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:12 +00:00
Gustavo de Souza
cee50cd615 Translate resources_pt.yml via GitLocalize 2021-01-06 19:48:33 +00:00
TheBusyBiscuit
10b11e7bdf Made requested changes 2021-01-06 18:10:32 +01:00
TheBusyBiscuit
318c154e78 Fixed locale path 2021-01-06 17:56:03 +01:00
TheBusyBiscuit
b6f257bff1 Fixed whitespaces in yaml 2021-01-06 17:54:58 +01:00
TheBusyBiscuit
4f21d06c69 Added verbose flag to /sf timings 2021-01-06 17:52:46 +01:00
TheBusyBiscuit
75b72eb630 Removed deprecated stuff 2021-01-06 16:26:40 +01:00
TheBusyBiscuit
74f8204b75 [Ci skip] Refactoring 2021-01-06 14:23:49 +01:00
TheBusyBiscuit
a1ce83b58a [CI skip] Removed redundant modifiers 2021-01-06 12:24:56 +01:00
ProfElements
4eda0923bf Make all ItemSettings reasonable values 2021-01-04 14:14:30 -06:00
ProfElements
685614803c Add ItemSettings, hasCustomMaxLevel, customMaxLevel. Bypasses vanilla but not a custom defined max 2021-01-03 13:53:43 -06:00
TheBusyBiscuit
00902c8738
Merge pull request #2666 from Slimefun/chore/craftbukkit-warning 
Enforce Server Software requirements
 2021-01-03 19:50:51 +01:00
ProfElements
62f0019a7f Lower time requirement to deal with large enchantments books (>4 enchantments) 2021-01-03 12:36:08 -06:00
ProfElements
fe8b0c21f7 Fixed code inconsistencies 2021-01-03 12:35:00 -06:00
TheBusyBiscuit
debf201846 Started to refactor holograms 2021-01-03 18:48:18 +01:00
ProfElements
c162e5194d
Merge branch 'master' into master 2021-01-03 05:10:28 +00:00
ProfElements
a42af430e3 Add deniesVanillaRules ItemSetting, this can make the Book Binder adhere to vanilla rules 2021-01-02 22:50:48 -06:00
ProfElements
b23869f037 Added Book Binder 2021-01-02 22:26:59 -06:00
TheBusyBiscuit
ef0d557b62
[CI skip] Merge pull request #2678 from Slimefun/gitlocalize-14569 
Updated bulgarian translations
 2021-01-02 20:43:50 +01:00
TheBusyBiscuit
c637b2fd0c
[CI skip] Updated translators list 2021-01-02 20:43:29 +01:00
Nikolay
3acdcec70f Translate categories_bg.yml via GitLocalize 2021-01-02 19:42:31 +00:00
Nikolay
e89363e8bb Translate recipes_bg.yml via GitLocalize 2021-01-02 19:42:30 +00:00
TheBusyBiscuit
60acccfb28
[CI skip] Merge pull request #2671 from Slimefun/gitlocalize-14557 
update translation
 2021-01-02 20:37:25 +01:00
TheBusyBiscuit
1d95455429
[CI skip] Merge pull request #2672 from Slimefun/gitlocalize-14558 
update translation
 2021-01-02 20:37:09 +01:00
TheBusyBiscuit
df2dce0c95
[CI skip] Updated translators list 2021-01-02 20:35:54 +01:00
Aeris One
863306d2df Translate messages_fr.yml via GitLocalize 2021-01-01 16:07:21 +00:00
Pierre
270382d7ec Translate messages_fr.yml via GitLocalize 2021-01-01 16:07:19 +00:00
Aeris One
b23972c7dd Translate researches_fr.yml via GitLocalize 2021-01-01 16:06:53 +00:00
TheRetix
b41a4df823 Translate researches_fr.yml via GitLocalize 2021-01-01 16:06:52 +00:00
TheBusyBiscuit
db789f1b0d A little bit of additional refactoring 2021-01-01 00:45:05 +01:00
TheBusyBiscuit
f2dd3a0125 Fixes #2655 2020-12-31 17:38:51 +01:00
TheBusyBiscuit
aa98bd0ba2 Fixes #2664 2020-12-31 17:08:50 +01:00
TheBusyBiscuit
bd9d496b4d Enforce Server Software requirements 2020-12-31 16:33:43 +01:00
Daniel Walsh
9c31c746dd Requested changes 2020-12-23 22:16:45 +00:00
Daniel Walsh
6cf2051e60 Panda smells 2020-12-23 14:56:51 +00:00