3579 Commits

Author	SHA1	Message	Date
svr333	2eddaef88c	Fix comments	2020-10-07 00:00:22 +02:00
svr333	a9ce3c1f3e	Try to implement requested feature for RessurectedTalisman	2020-10-06 15:34:18 +02:00
svr333	d5caaaa13e	Add base for ResurrectedTalisman	2020-10-05 22:46:53 +02:00
svr333	7eb680fa58	Remove redundant new line	2020-10-05 20:15:11 +02:00
svr333	51de095404	Add ResurrectedTalisman class	2020-10-05 19:55:27 +02:00
svr333	d64fe94b50	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans	2020-10-05 15:58:32 +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
Om Uparkar	12038c2c96	updated wiki.json	2020-10-05 03:35:03 +05:30
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
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
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
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
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