1541 Commits

Author	SHA1	Message	Date
Sfiguz7	51d0ac0417	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-10-07 13:06:45 +02:00
TheBusyBiscuit	d09a7e0f93	Fixes #2391	2020-10-06 21:05:39 +02:00
TheBusyBiscuit	07c84af3b5	Added NotConfigurable attribute	2020-10-06 21:01:18 +02:00
TheBusyBiscuit	f98d048b55	[CI skip] Reduced technical debt	2020-10-06 20:20:02 +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	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	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
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
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
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
LinoxGH	2ed707b3b3	Update SlimefunGuideOpenEvent.java	2020-10-04 00:25:27 +03: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
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
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