6433 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Seggan	8bbef4c911	Did some requested changes	2020-10-04 16:08:42 -04:00
TheBusyBiscuit	4af3833118	[CI skip] Removed trailing spaces from workflow	2020-10-04 21:11:10 +02:00
Seggan	f87a1d3660	Added research check	2020-10-04 15:07:11 -04:00
TheBusyBiscuit	67bf85e5f8	[CI skip] Added Wiki schema validation	2020-10-04 21:02:33 +02:00
Seggan	107125802c	Forgot to change id. Reverted back to setDamage()	2020-10-04 15:02:21 -04:00
svr333	d5d7960a56	Add missing brackets	2020-10-04 21:00:53 +02:00
svr333	49578b7b51	Fix grammar	2020-10-04 20:59:52 +02:00
Senne Van Rompaey	207d69a09b	Uppercase talisman	2020-10-04 20:56:34 +02:00
Senne Van Rompaey	b5b62bc48c	Fix imports	2020-10-04 20:56:13 +02:00
Seggan	1dbdd077ec	Updated recipe	2020-10-04 14:43:30 -04:00
Seggan	70be1c38d0	Did requested changes	2020-10-04 14:42:50 -04:00
Senne Van Rompaey	a1d5d474fc	Remove unused scheduler var	2020-10-04 20:35:41 +02:00
Senne Van Rompaey	f5e5484697	Remove unnecessary import	2020-10-04 20:33:42 +02:00
Senne Van Rompaey	ef12fc3d01	Add text entries for resurrected_talisman	2020-10-04 20:29:14 +02:00
Senne Van Rompaey	74107cf963	Add Talisman of the Resurrected	2020-10-04 20:28:39 +02:00
TheBusyBiscuit	2ac5899abc	Whoops	2020-10-04 13:44:04 +02:00
TheBusyBiscuit	b32dc0b727	@poma123 for the rescue	2020-10-04 13:40:41 +02:00
TheBusyBiscuit	655b429f0d	Added a new super tag	2020-10-04 13:31:52 +02:00
TheBusyBiscuit	7cab529a2b	Merged master into tags	2020-10-04 13:19:54 +02:00
TheBusyBiscuit	76e42fa9af	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-10-04 13:17:13 +02:00
TheBusyBiscuit	078e749679	Added a new Unit test for Slimefun Tags	2020-10-04 13:04:21 +02:00
TheBusyBiscuit	5753def8e9	Hey unit tests, you work now, k pls?	2020-10-04 12:42:59 +02:00
TheBusyBiscuit	c8d2bea162	Maybe now? 👀	2020-10-04 12:16:32 +02:00
TheBusyBiscuit	4a7367d6ec	[CI skip] Merge pull request #2386 from b10n1k/fix_dublicate_var ... Define a constant instead of duplicating "backpacks."	2020-10-04 12:14:25 +02:00
b10n1k	91a5b56947	Define a constant instead of duplicating "backpacks."	2020-10-04 12:09:04 +02:00
TheBusyBiscuit	ceadd2147f	Added a debug line to finally fix this unit test	2020-10-04 11:51:03 +02:00
TheBusyBiscuit	37a16496ab	[CI skip] Merge pull request #2387 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x ... Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.7.0	2020-10-04 11:50:05 +02:00
Renovate Bot	f55ebc663f	Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.7.0	2020-10-04 09:47:32 +00:00
TheBusyBiscuit	2ff105dabe	Maybe fixed the unit tests?	2020-10-04 11:22:56 +02:00
TheBusyBiscuit	4df4f6d4c9	More Climbing Pick unit tests which may give us better context?	2020-10-04 11:04:35 +02:00
LinoxGH	7dffd84687	Update ResearchSetup.java	2020-10-04 09:06:21 +03:00
LinoxGH	38f891ca98	Some code improvements. ... (at least that's what was meant to be done)	2020-10-04 09:01:24 +03:00
LinoxGH	6347e2f6ca	Merge branch 'master' into beeArmor	2020-10-04 08:48:05 +03:00
TheBusyBiscuit	50777ac546	A bit of code cleanup and docs	2020-10-04 02:55:11 +02:00
TheBusyBiscuit	8bbdc37130	Refactored Climbing Picks and added Tags	2020-10-04 02:28:59 +02:00
TheBusyBiscuit	0e6fc92e28	Merge branch 'master' into tags	2020-10-04 00:46:37 +02:00
TheBusyBiscuit	de17060070	Merge pull request #2383 from LinoxGH/SfGuideEvent ... Added SlimefunGuideOpenEvent.	2020-10-04 00:40:15 +02:00
TheBusyBiscuit	87196ef3b9	Merge pull request #2385 from Mooy1/master ... Speed can affect enchanter/disenchanter times, fixed pom typo	2020-10-04 00:40:01 +02:00
TheBusyBiscuit	e83e194784	[CI skip] Updated changelog	2020-10-04 00:39:31 +02:00
LinoxGH	dbe8755e4a	Update src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-04 01:04:41 +03:00
Mooy1	e33c70e189	removed accidental space	2020-10-03 16:33:29 -05:00
Mooy1	766d0bbc53	Speed can affect enchanter/disenchanter times, fixed pom typo	2020-10-03 16:27:54 -05:00
Seggan	d9aceea4d6	Changed recipe	2020-10-03 17:27:22 -04:00
LinoxGH	ca76411c40	Update SlimefunGuideListener.java	2020-10-04 00:26:29 +03:00
Senne Van Rompaey	2b39865f42	Add event logic for resurrection_talisman	2020-10-03 23:26:25 +02:00
LinoxGH	2ed707b3b3	Update SlimefunGuideOpenEvent.java	2020-10-04 00:25:27 +03:00
Seggan	99e0c542ae	Moved crash helmet item declaration	2020-10-03 17:22:03 -04:00
Seggan	b540bc05bc	Crash helmet now works	2020-10-03 17:20:29 -04:00
Senne Van Rompaey	682c899754	Add Talisman of the Resurrected	2020-10-03 23:10:27 +02:00
LinoxGH	f7c3a5b052	Did some more requestes changes.	2020-10-04 00:09:52 +03:00