3672 Commits

Author	SHA1	Message	Date
svr333	7eb680fa58	Remove redundant new line	2020-10-05 20:15:11 +02:00
svr333	997dce8970	Extract to method && remove redundant if statement	2020-10-05 20:07:56 +02:00
Senne Van Rompaey	94c5068cc2	Move version check ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-05 20:03:50 +02:00
svr333	038efb8391	Add myself @author	2020-10-05 20:00:31 +02:00
svr333	3ef0a67db6	Add @Nonnull	2020-10-05 19:59:55 +02:00
svr333	9242978a96	Remove redundant if-else && Consume item after output	2020-10-05 19:57:50 +02:00
svr333	51de095404	Add ResurrectedTalisman class	2020-10-05 19:55:27 +02:00
svr333	ff0c2b7984	Change else if to else	2020-10-05 19:37:12 +02:00
svr333	868a7e566b	Change else if to else	2020-10-05 19:34:26 +02:00
svr333	b237d076bf	Add version check	2020-10-05 19:34:00 +02:00
svr333	983bc103d3	Refactor	2020-10-05 18:43:11 +02:00
svr333	fe50d96270	Remove empty line	2020-10-05 18:38:58 +02:00
Sfiguz7	1d1adf9b3e	Added mc version check	2020-10-05 17:25:57 +02:00
svr333	62aa2dd0d8	Simplify displayrecipes and use planks.isTagged()	2020-10-05 17:23:40 +02:00
Sfiguz7	87dedf3492	Swapped order as it makes more sense + consistency	2020-10-05 17:17:16 +02:00
Sfiguz7	cff403a7b9	Added blackstone and basalt to crucible's recipes	2020-10-05 17:15:53 +02:00
Senne Van Rompaey	8675e96e75	Add space ... Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>	2020-10-05 17:11:56 +02: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
svr333	0e57d94d61	Add Sticks recipe to Table Saw	2020-10-05 16:28:23 +02:00
svr333	b3ca362df2	Add DisplayRecipes	2020-10-05 16:06:19 +02:00
Seggan	51dd53cae1	Moved elytra cap to magical gadgets	2020-10-05 10:01:38 -04:00
svr333	d64fe94b50	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans	2020-10-05 15:58:32 +02:00
svr333	0a19f76787	Use PigZombie over Entity	2020-10-05 15:56:54 +02:00
svr333	b8c2c97766	Add missing import	2020-10-05 15:43:24 +02:00
svr333	6c568bd7d1	Fix imports	2020-10-05 15:38:21 +02:00
svr333	8d3f432158	Use instanceof	2020-10-05 15:37:45 +02:00
svr333	3ca6e612cc	Add @nonnull	2020-10-05 15:33:48 +02:00
svr333	ab5251021a	Fix compile error	2020-10-05 15:30:23 +02:00
svr333	e65341eb0b	Add newline	2020-10-05 15:29:02 +02:00
svr333	a2fb390a8e	Extra code to separate methods	2020-10-05 15:28:43 +02:00
svr333	a01d33fea3	Refactor	2020-10-05 15:25:11 +02:00
svr333	21bf7cf607	Refactor slightly	2020-10-05 15:00:21 +02:00
svr333	ab92df7693	Fix imports	2020-10-05 14:58:53 +02:00
svr333	e1488c0811	Add Zombified piglin conversion	2020-10-05 14:56:40 +02:00
svr333	5ec63f632f	Update lore	2020-10-05 14:20:44 +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
svr333	e240fa1b64	Refactor onPlayerDeath	2020-10-05 12:31:55 +02:00
svr333	961f442733	Update recipe for wise_talisman	2020-10-05 12:18:42 +02:00
svr333	64e39abc62	Update resurrected talisman message	2020-10-05 12:13:46 +02:00
Senne Van Rompaey	133705e287	Use SlimefunPlugin.runSync over scheduler ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-05 12:11:00 +02:00
svr333	0e1dba507d	Remove redundant .getPlayer()'s	2020-10-05 12:07:16 +02:00
svr333	e08b4b1f17	Refactor onExperienceReceive	2020-10-05 12:05:53 +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
Seggan	f87a1d3660	Added research check	2020-10-04 15:07:11 -04: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
b10n1k	91a5b56947	Define a constant instead of duplicating "backpacks."	2020-10-04 12:09:04 +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
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
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
Senne Van Rompaey	8cd9a4e2f8	Add ResearchSetup entry for wise_talisman	2020-10-03 22:58:29 +02:00
LinoxGH	fc999ae60d	Update SlimefunGuideListener.java	2020-10-03 23:57:27 +03:00
Senne Van Rompaey	aefb51cc27	Add text entries for wise_talisman	2020-10-03 22:57:20 +02:00
Senne Van Rompaey	a7c48cec64	Create Talisman of the Wise	2020-10-03 22:57:02 +02:00
LinoxGH	41fc987083	Did more requested changes.	2020-10-03 23:56:51 +03: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
TheBusyBiscuit	9ccdfa4655	Merge pull request #2378 from svr333/AddAllCaratGoldsToOreCrusher ... Add remaining carat golds to ore crusher	2020-10-03 22:03:40 +02:00
TheBusyBiscuit	b6a3b38294	Merge pull request #2377 from poma123/fix/cartography-table fixes #2357 ... Cartography Table fix	2020-10-03 21:29:26 +02:00
poma123	b1a07c0337	Minor improvements	2020-10-03 21:18:36 +02:00
poma123	cb97a89f98	Added a separate version check	2020-10-03 21:12:01 +02:00
Senne Van Rompaey	4c0bd29cfa	Add empty line in lore ... Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-10-03 20:56:28 +02:00
Senne Van Rompaey	06bf6229fa	Update lore with correct chance	2020-10-03 20:43:31 +02:00
Senne Van Rompaey	2c47a786b8	Narrow talisman down to only ores	2020-10-03 20:27:20 +02:00
Senne Van Rompaey	d70f4df845	Update lore of talisman	2020-10-03 20:06:46 +02:00
Senne Van Rompaey	aba43c5365	Buff chance to 50%	2020-10-03 20:06:18 +02:00