1773 Commits

Author	SHA1	Message	Date
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
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	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
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	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