mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
6,357 Commits 1 Branch 0 Tags 64 MiB
2e682c185d
Commit Graph

2034 Commits

Author SHA1 Message Date
TheBusyBiscuit
854c3335e9 Fixes #2818 2021-02-10 18:33:34 +01:00
TheBusyBiscuit
e2f3944d66 Fixes #2817 2021-02-09 17:08:49 +01:00
TheBusyBiscuit
b224123918 Fixes #2804 2021-02-07 18:26:08 +01:00
TheBusyBiscuit
d3f4ca4779 Proper error-handling for addon inventories 2021-02-07 16:06:06 +01:00
TheBusyBiscuit
e47d0171cc Fixes #2810 2021-02-07 12:30:55 +01:00
TheBusyBiscuit
9e83b4af00 Fixes #2809 2021-02-06 20:23:32 +01:00
TheBusyBiscuit
6e864ace99 Added researches and updated textures 2021-02-06 19:35:58 +01:00
TheBusyBiscuit
bbd631536d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-02-06 19:33:45 +01:00
TheBusyBiscuit
7ddd0469eb Deprecated Automated Crafting Chamber (soon to be replaced) 2021-02-06 19:32:41 +01:00
TheBusyBiscuit
e6494da8c9 Allow any RecipeType (in theory) 2021-02-06 14:00:56 +01:00
TheBusyBiscuit
a5a16621ee
Merge branch 'master' into feature/auto-crafters 2021-02-06 11:19:07 +01:00
TheBusyBiscuit
47743b632e Fixed an exception when disabled in an invalid environment. 2021-02-06 11:18:09 +01:00
TheBusyBiscuit
baa4f92ea1 Added documentation 2021-02-06 11:09:13 +01:00
TheBusyBiscuit
eeb89c3c3b Some very basic unit tests 2021-02-06 10:48:30 +01:00
TheBusyBiscuit
0adc1c3192 The Enhanced Auto Crafter now requires confirmation too 2021-02-06 01:55:54 +01:00
TheBusyBiscuit
e8a67cdd6a Many more fixes 2021-02-06 01:54:08 +01:00
TheBusyBiscuit
340005109b Even more fixes! 2021-02-06 01:14:23 +01:00
TheBusyBiscuit
1e9e8be82a More bug fixes 2021-02-06 01:06:11 +01:00
TheBusyBiscuit
dd9a04fe04 Restored old classes and added deprecation warnings 2021-02-06 01:02:31 +01:00
TheBusyBiscuit
83aa84ca3b Some bug fixes 2021-02-06 00:58:29 +01:00
TheBusyBiscuit
057fad1f08 Finished Auto-Crafters 2021-02-06 00:46:55 +01:00
TheBusyBiscuit
2d050a8e35 RecipeChoice task is now thread-safe 2021-02-06 00:29:57 +01:00
TheBusyBiscuit
a25b470272 Added sounds and two more messages 2021-02-06 00:14:44 +01:00
TheBusyBiscuit
3567dd87ba Show recipe after selecting 2021-02-05 20:03:06 +01:00
TheBusyBiscuit
53ac633927 Split up recipe classes 2021-02-05 19:53:48 +01:00
TheBusyBiscuit
7d50d0eb32 Fixes #1161 2021-02-05 18:40:41 +01:00
TheBusyBiscuit
7ff6d755e8 Implemented basic behaviour 2021-02-05 17:26:03 +01:00
TheBusyBiscuit
6b4fe8a7a9 Added Enhanced Auto Crafter 2021-02-05 15:14:09 +01:00
TheBusyBiscuit
a7e890829d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-02-05 14:16:47 +01:00
TheBusyBiscuit
5edf61404b Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-02-05 14:15:17 +01:00
TheBusyBiscuit
155b2fc637 Some small visual changes 2021-02-05 14:12:17 +01:00
TheBusyBiscuit
80b49c264f
Update Translators.java 2021-02-04 20:12:47 +01:00
StarWishsama
b7fa8b621e fix: color text doesn't work 2021-02-03 12:45:55 +08:00
StarWishsama
bc3b61ed90 optimize: no need display enchant item 2021-02-03 12:43:20 +08:00
StarWishsama
f0d427a19c forget to return 2021-02-03 12:36:17 +08:00
StarWishsama
e5deee2bbd optimize: add a switch for limit, set default value to 10 
feat: utilize the progress bar to display (dis)enchant failed
 2021-02-03 12:31:42 +08:00
TheBusyBiscuit
581199271c Almost done with the vanilla auto crafter 2021-02-02 20:27:04 +01:00
TheBusyBiscuit
2c22983f0a Added package descriptions 2021-02-02 19:38:01 +01:00
TheBusyBiscuit
0bf27fca15 Refactoring 2021-02-02 19:36:00 +01:00
TheBusyBiscuit
0aa5a999d4 Created abstract auto crafter framework 2021-02-02 18:57:45 +01:00
TheBusyBiscuit
5a0a52baab Sweet deprecation warnings 2021-02-02 18:57:29 +01:00
Daniel Walsh
36639fd22c
Merge pull request #2791 from Slimefun/feature/componentify-versions-subcommand 2021-02-02 17:31:35 +00:00
Daniel Walsh
695ba7c742
Merge pull request #2643 from Slimefun/chore/has-unlocked 2021-02-02 17:30:45 +00:00
Daniel Walsh
b74eb5b30d
Merge pull request #2782 from Slimefun/feature/taisman-actionbar 
Allow Talismans to use the Actionbar
 2021-02-02 17:27:47 +00:00
Daniel Walsh
636d44cfb8
oops forgot 1 space 2021-02-02 12:25:43 +00:00
Daniel Walsh
498050dc81
Apply suggestions from code review 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-02-02 11:51:56 +00:00
TheBusyBiscuit
6d89d38c3a Fixes #2793 2021-02-02 10:05:08 +01:00
TheBusyBiscuit
e99a39d2ab Fixes #2794 2021-02-02 09:39:22 +01:00
StarWishsama
f308c60bd1 fix: Unable to limit enchantment level 
optimize: set default and max level to Short.MAX_VALUE
 2021-02-02 12:49:02 +08:00
Daniel Walsh
d41f276543
Lots more hover and click! 2021-02-01 17:14:21 +00:00
Daniel Walsh
e11929b587
Add java ver and hover to versions subcommand 2021-02-01 16:07:06 +00:00
TheBusyBiscuit
fe42f6fa9f Nether Wart Blocks can be turned into Nether Warts using a Grind Stone 2021-02-01 10:47:31 +01:00
TheBusyBiscuit
c78092bb85
[CI skip] Updated translators list 2021-01-31 00:27:14 +01:00
TheBusyBiscuit
b4d1894d8f
Merge pull request #2757 from StarWishsama/magician-talisman-fix 
Fixes #2679
 2021-01-29 16:34:53 +01:00
TheBusyBiscuit
a80269b7d9 [CI skip] Formatting 2021-01-29 12:19:40 +01:00
TheBusyBiscuit
24d0a87fe0
[CI skip] Updated translators list 2021-01-29 09:23:47 +01:00
Name1ess
d5d7bc705a
Merge branch 'master' into magician-talisman-fix 2021-01-29 12:14:39 +08:00
StarWishsama
29b368f648 fix: shadow name 2021-01-29 12:13:24 +08:00
StarWishsama
8effed7139 Merge remote-tracking branch 'origin/magician-talisman-fix' into magician-talisman-fix 2021-01-29 12:10:02 +08:00
StarWishsama
a031585b5a fix: thank you idea 2021-01-29 12:09:24 +08:00
TheBusyBiscuit
ee7786b8e4 Allow Talismans to use the Actionbar 2021-01-29 03:02:50 +01:00
TheBusyBiscuit
3c0afeb943 Small fix 2021-01-29 02:47:20 +01:00
TheBusyBiscuit
46de5a700a Little bit of refactoring 2021-01-28 18:43:20 +01:00
TheBusyBiscuit
8cf0f61f3e Added placeholder for unloaded profiles to PlaceholderAPI integration 2021-01-28 18:21:22 +01:00
TheBusyBiscuit
cadf66a13c
Merge branch 'master' into fixes/blocks 2021-01-28 13:41:27 +01:00
TheBusyBiscuit
6df052e4cf Fixes #2771 2021-01-28 12:37:13 +01:00
TheBusyBiscuit
7ffc8aff24 Fixes #2760 2021-01-26 10:35:47 +01:00
TheBusyBiscuit
9436ce451a Fixes #2460 2021-01-26 10:07:12 +01:00
TheBusyBiscuit
ff83bb025e
[CI skip] Merge pull request #2481 from MoKe12g/master 
Explosive tools not working with silk touch
 2021-01-26 10:02:25 +01:00
TheBusyBiscuit
c2da6c5f53 Changed recipe for Tier 3 electric ore grinder 2021-01-26 00:57:49 +01:00
TheBusyBiscuit
7d0168115f
Merge pull request #2599 from svr333/AddT3ElectricGrinder 
Add Tier 3 Electric Ore Grinder
 2021-01-26 00:56:19 +01:00
TheBusyBiscuit
2085d9eeba [CI skip] Updated changelog 2021-01-26 00:56:03 +01:00
Daniel Walsh
91aaa546a6
Merge pull request #2680 from ProfElements/master 2021-01-25 15:44:06 +00:00
TheBusyBiscuit
36fe08a349
Merge pull request #2765 from StarWishsama/2761 
Fixes #2761 probably
 2021-01-25 16:36:49 +01:00
TheBusyBiscuit
9f29901eb8
[CI skip] Updated translators list 2021-01-25 15:46:35 +01:00
Name1ess
f3fafabcff
Update TalismanListener.java 2021-01-25 20:10:35 +08:00
StarWishsama
a6bcab266f chore: remove register call when initialize 2021-01-25 12:18:24 +08:00
StarWishsama
decf9bd08c fix: grammar issue 2021-01-25 11:59:53 +08:00
TheBusyBiscuit
a9c4df30a4
Update Translators.java 2021-01-24 20:23:30 +01:00
TheBusyBiscuit
4019b9612d
Merge branch 'master' into master 2021-01-24 18:09:40 +01:00
TheBusyBiscuit
0b4c2f2e08 Cherry-picked Talisman of the Wise from #2645 2021-01-24 18:04:52 +01:00
TheBusyBiscuit
f6e9d70baa Merge branch 'feature/experimental-talismans' of https://github.com/Slimefun/Slimefun4.git 2021-01-24 17:03:14 +01:00
StarWishsama
ffb063e2d8 refactor: removed unused import 2021-01-24 11:42:01 +08:00
StarWishsama
078a553283 refactor: replace Auto Enchanter setting to IntRange 2021-01-24 11:40:38 +08:00
StarWishsama
f89db91778 refactor: use for-loop for notice and replace to IntRangeSetting 2021-01-24 11:37:59 +08:00
StarWishsama
8302c0c932 fix: add missing judge in getRandomEnchantment 2021-01-24 11:01:42 +08:00
StarWishsama
9e49071161 feat: Add ItemSetting for magician talisman 
This setting can set whether books can be enchanted.
 2021-01-24 10:59:55 +08:00
TheBusyBiscuit
17fd2ec570 Added AsyncProfileLoadEvent 2021-01-23 19:38:59 +01:00
TheBusyBiscuit
f2a80fc04f
Merge pull request #2749 from Slimefun/patch/make-rechargeablehelper-public 
Make RechargeableHelper public
 2021-01-23 16:11:29 +01:00
TheBusyBiscuit
2ceef773c6 Finished fix for #2754 2021-01-23 15:32:37 +01:00
TheBusyBiscuit
389a2978c0 Fixes #2754 2021-01-23 14:25:10 +01:00
StarWishsama
48165dd138 fix: add enchant item check in filter 2021-01-23 18:49:42 +08:00
Name1ess
a94567333a
fix: add bypass for book 2021-01-23 18:45:31 +08:00
StarWishsama
018cfc33c8 feat: add display limit level 2021-01-23 17:07:30 +08:00
StarWishsama
7d1df8ca24 feat: Add enchant limit to AutoDisenchanter and message 2021-01-23 14:36:50 +08:00
Name1ess
2777cec1d5
feat: Add enchant level limit to AutoEnchanter 2021-01-23 14:25:36 +08:00
TheBusyBiscuit
83c2c6a915 [CI skip] Refactoring 2021-01-22 22:00:27 +01:00
TheBusyBiscuit
663f5e2063
Update SupportedLanguage.java 2021-01-22 13:02:46 +01:00
TheBusyBiscuit
5a6081ec98
Update Translators.java 2021-01-22 13:02:24 +01:00
TheBusyBiscuit
f36532550b [CI skip] Added a few more unit tests 2021-01-22 12:31:18 +01:00
TheBusyBiscuit
ab8e603ec6
Update ChargeUtils.java 2021-01-21 22:25:53 +01:00
Daniel Walsh
1bc0ae56f1
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-21 21:20:14 +00:00
Daniel Walsh
89c0988aca
Make sure capacity is greater than 0 2021-01-21 20:20:52 +00:00
Daniel Walsh
84ca63365c
RechargeableHelper -> ChargeUtils 2021-01-21 20:07:31 +00:00
Daniel Walsh
f65efd95fc
Requested changes 2021-01-21 20:05:27 +00:00
Daniel Walsh
499a464595
Add unit test 2021-01-21 19:53:19 +00:00
Daniel Walsh
549b075939
Make RechargeableHelper public 2021-01-21 19:25:38 +00:00
TheBusyBiscuit
d8aaf00635
Merge pull request #2715 from Slimefun/experimental/remove-cscorelib 
Experimental: Slimefun but without CS-CoreLib
 2021-01-21 15:58:38 +01:00
TheBusyBiscuit
1a2858c6a0 Fixed imports 2021-01-20 17:23:25 +01:00
TheBusyBiscuit
570c981de3
Merge branch 'master' into fixes/blocks 2021-01-20 17:19:18 +01:00
TheBusyBiscuit
35b2c4a1e4
Updated translators list 2021-01-20 14:55:03 +01:00
Daniel Walsh
346fc7bc44
Merge pull request #2733 from Seggan/master 2021-01-20 12:35:07 +00:00
TheBusyBiscuit
591421fc32 [CI skip] Fixed javadocs 2021-01-19 10:01:55 +01:00
TheBusyBiscuit
9840a550ce [CI skip] Changed internal profiler flag to a volatile boolean 2021-01-19 10:01:28 +01:00
TheBusyBiscuit
4075c51975 [CI skip] Refactoring and improved logging 2021-01-18 23:29:44 +01:00
svr333
ffef8350b1
Merge branch 'master' into performance/cobblestone 2021-01-18 22:18:02 +01:00
Seggan
3fac23e26b Fine 2021-01-18 16:03:19 -05:00
Seggan
31a1d7b3b2 Localization + removed redundant 1st check 2021-01-18 09:41:38 -05:00
TheBusyBiscuit
8b28f3685a Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into chore/has-unlocked 2021-01-17 14:33:46 +01:00
TheBusyBiscuit
7eff4d381e Fixed a small issue with backpacks 2021-01-17 14:27:01 +01:00
TheBusyBiscuit
9c3c6d7245 [CI skip] Fixed javadocs 2021-01-17 14:04:51 +01:00
TheBusyBiscuit
eab6164690 Fixed 2021-01-17 12:19:08 +01:00
TheBusyBiscuit
7ca8392616 Improved documentation 2021-01-17 01:48:26 +01:00
TheBusyBiscuit
79c7c4826f Refactoring and documentation 2021-01-17 01:01:42 +01:00
Seggan
e1810f60ff Oops 2021-01-16 12:01:27 -05:00
Seggan
2e7291c3a5 Script validation 2021-01-16 11:38:19 -05:00
svr333
f8b135592d
Merge branch 'master' into chore/has-unlocked 2021-01-16 16:04:21 +01:00
TheBusyBiscuit
16ed670573 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
refactoring/holograms

Conflicts:
	CHANGELOG.md
 2021-01-16 15:56:23 +01:00
TheBusyBiscuit
0feace9c06
Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items 
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
 2021-01-16 15:51:17 +01:00
TheBusyBiscuit
03b4c10bad [CI skip] Updated changelog 2021-01-16 14:46:00 +01: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
1b527f4a61
Merge branch 'master' into chore/has-unlocked 2021-01-16 11:34:57 +01: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
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
739e7a7a9a
Merge branch 'master' into chore/has-unlocked 2021-01-14 14:44:57 +01:00
TheBusyBiscuit
ac590fdde3 Fixes #2721 2021-01-14 14:41:09 +01:00
TheBusyBiscuit
05b67869a8 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
features/multi-categories

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
 2021-01-14 12:41:53 +01:00
TheBusyBiscuit
ae4e4bed73
Merge branch 'master' into fixes/blocks 2021-01-14 12:35:57 +01:00
TheBusyBiscuit
5d4e22c4b5 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
chore/has-unlocked

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/LockedCategory.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java
	src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
 2021-01-14 12:25:37 +01:00
TheBusyBiscuit
7826b2359a Finished fix for #2636 and fixed a threading issue with BlockStates 2021-01-14 11:58:52 +01:00
TheBusyBiscuit
43109ab2d3
Merge branch 'master' into performance/cobblestone 2021-01-14 11:16:39 +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
9be11921c7
Merge branch 'master' into fixes/blocks 2021-01-13 18:50:06 +00: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
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
17d11b513e
Merge branch 'master' into fixes/blocks 2021-01-12 19:53:48 +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
c92ba89d9a
Merge branch 'master' into performance/cobblestone 2021-01-11 13:58:21 +01:00
TheBusyBiscuit
3777b59596
Merge branch 'master' into fixes/blocks 2021-01-11 13:57:33 +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
2943289c6d
Merge branch 'master' into fixes/blocks 2021-01-10 23:12:34 +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
9f3adc1278 [CI skip] Refactored some more I had forgotten 2021-01-10 14:33:48 +01:00
TheBusyBiscuit
9c89419d15 [CI skip] Missed one 2021-01-10 14:02:58 +01:00
TheBusyBiscuit
22b5421118 Fixed /sf timings --verbose not working correctly (+refactoring) 2021-01-10 13:38:07 +01:00