5044 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	fa394b4d44	Call planks.isPresent()	2020-10-06 19:50:57 +02:00
svr333	e6ed632dd0	Refactor + undo placeholder item in displayrecipes	2020-10-06 11:53:51 +02:00
svr333	37242fe64a	Throw out variables	2020-10-06 01:26:23 +02:00
Seggan	db6295616e	Did more requested changes	2020-10-05 17:05:05 -04:00
Seggan	a4dc1428bc	Changed protection check (untested)	2020-10-05 17:02:09 -04:00
svr333	8c44c583cf	Add nullable tag	2020-10-05 23:01:30 +02:00
svr333	6e17cd2cc5	Extract to method	2020-10-05 23:00:44 +02:00
Seggan	4b3e31a8c7	Renamed listener	2020-10-05 16:56:25 -04:00
TheBusyBiscuit	cdff86fdd6	Merge pull request #2394 from svr333/ImproveMagicalZombiePills ... Improve magical zombie pills	2020-10-05 22:50:47 +02:00
TheBusyBiscuit	b26924bf81	[CI skip] Updated changelog	2020-10-05 22:50:32 +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	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	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
TheBusyBiscuit	cb35cddc9f	Merged with master	2020-10-05 15:07:48 +02:00
TheBusyBiscuit	d60aeb05b8	[CI skip] Updated MockBukkit to 0.10.2	2020-10-05 15:07:04 +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
TheBusyBiscuit	1dc9aee488	[CI skip] Updated MockBukkit to 0.10.1	2020-10-05 13:02:05 +02:00
TheBusyBiscuit	060170c12d	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... tags Conflicts: src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java	2020-10-05 10:03:44 +02:00