2158 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	7ddd0469eb	Deprecated Automated Crafting Chamber (soon to be replaced)	2021-02-06 19:32:41 +01:00
TheBusyBiscuit	47743b632e	Fixed an exception when disabled in an invalid environment.	2021-02-06 11:18:09 +01:00
TheBusyBiscuit	dec868284d	Updated dependencies	2021-02-06 11:11:58 +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
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
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	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