2135 Commits

Author	SHA1	Message	Date
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
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	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	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	6df052e4cf	Fixes #2771	2021-01-28 12:37:13 +01:00
Daniel Walsh	23efc9b6f0	REEE Im not having a good day	2021-01-26 13:01:07 +00:00
Daniel Walsh	f923612388	oops	2021-01-26 12:58:14 +00:00
Daniel Walsh	03cce6265d	Make it return an immutable map	2021-01-26 12:55:03 +00:00
Daniel Walsh	5aa4361a92	Merge branch 'api/access-raw-storage' of github.com:Slimefun/Slimefun4 into api/access-raw-storage	2021-01-26 12:52:35 +00: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
Daniel Walsh	986eb38e81	Whoops forgot to change this one	2021-01-26 07:47:41 +00:00
Daniel Walsh	d0e0aa3c65	getStorage -> getRawStorage	2021-01-26 07:44:04 +00:00
Daniel Walsh	fd40737682	Oops	2021-01-26 07:40:37 +00:00
Daniel Walsh	6c7b8fd9da	Add a way to retrieve the raw storage	2021-01-26 07:30:42 +00: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	30202d3f51	Merge pull request #2755 from kii-chan-reloaded/master ... Check inv maxStackSize	2021-01-25 16:34:47 +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
Name1ess	8d844254c2	fix: register recipes when speed is not 0	2021-01-25 12:15:18 +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	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