4742 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Seggan	a4dc1428bc	Changed protection check (untested)	2020-10-05 17:02:09 -04:00
Seggan	4b3e31a8c7	Renamed listener	2020-10-05 16:56:25 -04:00
Seggan	58e2b9ab3b	Added default annonation	2020-10-05 11:01:58 -04:00
Seggan	bb24bdd837	Merge remote-tracking branch 'upstream/master'	2020-10-05 10:55:26 -04:00
Seggan	51dd53cae1	Moved elytra cap to magical gadgets	2020-10-05 10:01:38 -04:00
TheBusyBiscuit	d60aeb05b8	[CI skip] Updated MockBukkit to 0.10.2	2020-10-05 15:07:04 +02:00
TheBusyBiscuit	9c96ee1785	[CI skip] Merge pull request #2392 from comrade-om/updating-wiki-json ... updated wiki.json	2020-10-05 13:05:10 +02:00
TheBusyBiscuit	1dc9aee488	[CI skip] Updated MockBukkit to 0.10.1	2020-10-05 13:02:05 +02:00
TheBusyBiscuit	904a9b1ef0	[CI skip] Updated to MockBukit 0.10.0	2020-10-05 10:01:46 +02:00
Om Uparkar	bf625c3371	corrected spelling mistakes and stuff in wiki.json	2020-10-05 11:55:53 +05:30
Seggan	7f1bddb759	Merge branch 'text_revisions'	2020-10-04 22:05:22 -04:00
Seggan	3dcd5942aa	Changed some linguistic things (Biscuit needs to be an English professor)	2020-10-04 22:03:48 -04:00
Seggan	d6df2ea00c	Added crash protection type	2020-10-04 21:59:10 -04:00
Om Uparkar	12038c2c96	updated wiki.json	2020-10-05 03:35:03 +05:30
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
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
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	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	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
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
LinoxGH	f7c3a5b052	Did some more requestes changes.	2020-10-04 00:09:52 +03:00
LinoxGH	4316f83a00	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java ... Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-10-04 00:06:20 +03:00
LinoxGH	0e530fe13a	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java ... Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-10-04 00:06:13 +03:00
LinoxGH	fc999ae60d	Update SlimefunGuideListener.java	2020-10-03 23:57:27 +03:00
LinoxGH	41fc987083	Did more requested changes.	2020-10-03 23:56:51 +03:00
TheBusyBiscuit	33c8744478	[CI skip] Added maven default goals	2020-10-03 22:45:58 +02:00
LinoxGH	a222295b03	Did a requested change.	2020-10-03 23:39:06 +03:00
Seggan	23efd62c49	Added crash helmet listener and research	2020-10-03 16:31:27 -04:00
Seggan	9e0485e526	Added crash helmet	2020-10-03 16:21:39 -04:00
LinoxGH	5e038d1cc8	And this is the last build error. Hopefully...	2020-10-03 23:20:51 +03:00
LinoxGH	6d887b8abf	Fixed some build errors.	2020-10-03 23:17:09 +03:00
LinoxGH	869051b093	Merge branch 'master' into SfGuideEvent	2020-10-03 23:09:25 +03:00
LinoxGH	2cfbaf3ca6	Added GuideOpenEvent.	2020-10-03 23:05:23 +03:00
LinoxGH	d72a60aed1	Added GuideOpenEvent.	2020-10-03 23:04:39 +03:00