1236 Commits

Author	SHA1	Message	Date
poma123	93fc7ff3ab	Formatting	2020-10-01 22:13:47 +02:00
TheBusyBiscuit	8c850cf181	Merge pull request #2371 from poma123/feature/sf-cheat-seasonal-categories ... Added seasonal categories to the Cheat Sheet	2020-10-01 21:05:40 +02:00
poma123	af3156a43b	Requested changes	2020-10-01 21:01:37 +02:00
poma123	48b78a8af4	Requested changes	2020-10-01 20:58:09 +02:00
poma123	2cf0ca8188	Added javadocs and nullability annotations	2020-10-01 20:49:54 +02:00
TheBusyBiscuit	a8f1bfa706	Merge pull request #2374 from andrefpoliveira/fix-issue-2351 ... Update GrapplingHookListener	2020-10-01 20:45:32 +02:00
LinoxGH	50e48ed87c	Merge branch 'master' into tags	2020-10-01 21:42:50 +03:00
Roland Metivier	bfc221a7a5	Replace w/break instead	2020-10-01 12:52:16 -05:00
Roland Metivier	b327c55b5f	Remove redundant return statements	2020-10-01 12:49:05 -05:00
Roland Metivier	a074e7cc17	Fix formatting	2020-10-01 12:32:17 -05:00
poma123	30603d9bf5	Added an EventHandler for Cartography Table	2020-10-01 19:12:09 +02:00
Roland Metivier	cbc48584bc	Attempt to fix bug #2360	2020-10-01 11:28:29 -05:00
poma123	3948031dec	Requested changes	2020-10-01 18:06:07 +02:00
poma123	affab6ab80	Revert changes	2020-10-01 17:52:26 +02:00
BuildTools	c86e59b626	Removed redundance	2020-10-01 11:55:30 +01:00
BuildTools	85ebe5322b	Item verification	2020-10-01 11:50:55 +01:00
BuildTools	b6391160a7	Fixed Import	2020-10-01 11:21:03 +01:00
TheBusyBiscuit	6238b57080	Merge pull request #2370 from poma123/fix/necrotic-skull ... Made Necrotic Skull unplaceable	2020-10-01 11:01:19 +02:00
BuildTools	60c71fe560	Fixed Import	2020-10-01 09:40:19 +01:00
BuildTools	618698fa07	Update GrapplingHookListener	2020-10-01 09:28:26 +01:00
poma123	a1c973a817	Requested changes	2020-09-30 22:13:41 +02:00
poma123	1175bbca40	Added seasonal categories to the Cheat Sheet	2020-09-30 21:35:06 +02:00
poma123	5f7efbd5a6	Made Necrotic Skull unplaceable	2020-09-30 20:14:26 +02:00
poma123	e852837764	Added EntityInteractHandler cancellation	2020-09-30 19:57:54 +02:00
TheBusyBiscuit	fda74388a6	[CI skip] Internal changes to custom model data	2020-09-30 11:59:55 +02:00
TheBusyBiscuit	20de967306	Improvements to block ticking	2020-09-29 20:38:41 +02:00
TheBusyBiscuit	e7097e2c2b	[CI skip] Reduced technical debt, refactoring and improved documentation	2020-09-29 20:19:38 +02:00
TheBusyBiscuit	277ecb4a29	Merge branch 'master' into tags	2020-09-29 18:57:38 +02:00
poma123	362299c650	Sorted imports	2020-09-29 15:26:20 +02:00
poma123	57a80ed8a6	Requested changes	2020-09-29 15:24:45 +02:00
poma123	dc318217aa	Added Javadocs	2020-09-29 15:24:17 +02:00
poma123	56ba9f7496	Added event cancellation	2020-09-29 15:07:17 +02:00
TheBusyBiscuit	839d408105	[CI skip] Updated discord invite urls	2020-09-28 21:59:18 +02:00
TheBusyBiscuit	362b7bda63	Merge branch 'master' into tags	2020-09-28 16:01:30 +02:00
TheBusyBiscuit	395713cd52	Merge pull request #2354 from LinoxGH/patch-6 ... Possibly fixed #2353	2020-09-28 15:53:26 +02:00
TheBusyBiscuit	a674a38f2a	Merge branch 'master' into tags	2020-09-28 15:07:29 +02:00
LinoxGH	fdd3dbbb4e	Update AbstractCargoNode.java	2020-09-27 21:41:25 +03:00
TheBusyBiscuit	89ff9d8dc2	Merge pull request #2348 from flaxeneel2/grapplinghooks ... Pull request for an additional customizable option in grappling hooks	2020-09-27 20:13:57 +02:00
flaxeneel2	a82680b9fa	commenting fixes	2020-09-27 21:16:28 +04:00
flaxeneel2	518f3c2ebc	Made requested changes ... [+] Used a better name for the boolean [+] replaced Boolean with primitive boolean [+] Used pascal naming system	2020-09-27 16:54:35 +04:00
TheBusyBiscuit	dc551907d2	Merge pull request #2350 from TheSilentPro/backpack-changes ... Separate player-only and no-permission messages	2020-09-27 00:00:11 +02:00
TheSilentPro	b41c60934e	Fix code consistency	2020-09-26 22:06:23 +02:00
TheBusyBiscuit	75da0b883a	Refactored code	2020-09-26 22:05:47 +02:00
TheSilentPro	4966d3ad4c	Separate player-only and no-permission messages	2020-09-26 21:53:09 +02:00
flaxeneel2	87eb9cb75e	final commit ... [+] desired feature fully implemented [+] set the default value to false [+] now added option does not mess with despawn-seconds [+] added keepinv boolean to the functions	2020-09-26 20:53:36 +04:00
Ome_R	4d49e1ec8f	Fixed CargoNetworkTask not checking for other slots before dropping items on ground	2020-09-26 17:39:20 +03:00
flaxeneel2	eac3117547	Grappling hook edit ... [+] Added a setting to allow the grappling hook to stay in inventory instead of being dropped on the floor on use	2020-09-26 17:27:35 +04:00
TheBusyBiscuit	c0190bfa2d	Merge pull request #2334 from poma123/develop/generator-events ... Added AsyncReactorProcessCompleteEvent and AsyncGeneratorProcessCompleteEvent	2020-09-23 17:17:25 +02:00
TheBusyBiscuit	99e46fcb2a	[CI skip] Relocated and documented two methods	2020-09-22 19:39:06 +02:00
TheBusyBiscuit	a439722062	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-09-22 18:37:41 +02:00
TheBusyBiscuit	4c530a4813	Merge branch 'master' into tags	2020-09-22 15:37:03 +02:00
TheBusyBiscuit	d35ee992ae	[CI skip] Added another Unit Test	2020-09-21 23:54:21 +02:00
Panda.com	c8d22fa381	did requested changes	2020-09-21 22:32:04 +02:00
Panda.com	b7def0f58d	Added materials to CoalGenerator	2020-09-21 22:14:22 +02:00
TheBusyBiscuit	4412b40709	Merge branch 'master' into tags	2020-09-21 15:59:08 +02:00
TheBusyBiscuit	f3b5581a11	Merge pull request #2336 from Seggan/master ... Added Energized Capacitor (From Discord suggestion)	2020-09-21 15:47:23 +02:00
TheBusyBiscuit	2f37c2b8b7	Merge branch 'master' into tags	2020-09-21 13:24:44 +02:00
TheBusyBiscuit	5cd1d99b70	Fixes #2322	2020-09-21 13:23:14 +02:00
TheBusyBiscuit	9dfd43fda6	Fixed Climbing Pick having no animation in creative mode	2020-09-21 13:14:56 +02:00
TheBusyBiscuit	cdc495e62b	Fixes #2325	2020-09-21 13:09:45 +02:00
TheBusyBiscuit	0227e0cc30	[CI skip] Reduced technical debt	2020-09-21 12:51:13 +02:00
Seggan	cbafa4c59c	Moved some code and changed energized capacitor recipe	2020-09-20 20:15:32 -04:00
Seggan	5857b85199	Added research text	2020-09-20 12:52:16 -04:00
Seggan	55a384ab87	Made energized capacitor tier 3 (Did I miss any code?)	2020-09-20 12:16:56 -04:00
Seggan	641def8481	Added Energized Capacitor (From Discord suggestion)	2020-09-19 21:43:52 -04:00
poma123	8592051f87	Requested changes	2020-09-19 18:58:38 +02:00
TheBusyBiscuit	749bb972a3	[CI skip] Added a few more annotations	2020-09-19 11:51:02 +02:00
TheBusyBiscuit	23bf314905	Added fluid-sensitive tag	2020-09-19 11:39:35 +02:00
TheBusyBiscuit	9547d51db2	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... tags Conflicts: CHANGELOG.md src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java	2020-09-19 11:35:41 +02:00
poma123	24a97c59d8	Refactoring	2020-09-19 10:37:33 +02:00
poma123	b98cdcf7d8	Added AsyncReactorProcessCompleteEvent	2020-09-19 10:37:06 +02:00
poma123	fa1aad7bf8	Added AsyncGeneratorProcessCompleteEvent	2020-09-19 10:36:27 +02:00
TheBusyBiscuit	917bcce636	Fixed an issue with ChestTerminal	2020-09-18 10:48:36 +02:00
Daniel Walsh	07f5687b9f	Merge pull request #2323 from LinoxGH/patch-3	2020-09-13 22:33:13 +01:00
LinoxGH	19b95331d6	Added fire tag.	2020-09-13 23:55:16 +03:00
Panda.com	5b217246b6	fixed issue	2020-09-13 17:48:48 +02:00
TheBusyBiscuit	1e408665a7	[Ci skip] Removed deprecated method	2020-09-13 12:32:30 +02:00
TheBusyBiscuit	b14f0b76c0	Added unbreakable tag	2020-09-13 12:00:45 +02:00
TheBusyBiscuit	a770378025	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-09-13 11:57:11 +02:00
TheBusyBiscuit	7b10410a70	[Ci skip] A small change	2020-09-13 11:38:04 +02:00
Silent	03f7e64107	Fixed colors & functionality of cheat sheet	2020-09-12 15:19:07 +02:00
TheBusyBiscuit	8f95cb4f84	[CI skip] Merge pull request #2311 from poma123/fix/typos ... Fixed some typos	2020-09-11 20:48:20 +02:00
poma123	acd26b68dd	We can use useable anyway	2020-09-11 20:29:23 +02:00
poma123	be5f793695	Fixed a bunch of typos	2020-09-11 20:02:17 +02:00
TheBusyBiscuit	e2c021d270	Merge pull request #2310 from LinoxGH/patch-3 ... Changed the used sound categories.	2020-09-11 19:52:48 +02:00
LinoxGH	0177ee13dd	Changed the used SoundCategory.	2020-09-11 20:29:28 +03:00
LinoxGH	ca20594032	Added changed the used SoundCategory.	2020-09-11 20:27:38 +03:00
TheBusyBiscuit	ff9a6f7a3e	Fixed Unit Tests	2020-09-11 10:44:00 +02:00
TheBusyBiscuit	ed66ee9b79	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... tags Conflicts: CHANGELOG.md	2020-09-11 10:33:02 +02:00
NCBPFluffyBear	37c0ce4ce0	Organized imports	2020-09-10 23:52:19 -05:00
TheBusyBiscuit	74edbe499c	Fixes #2238	2020-09-11 00:07:26 +02:00
NCBPFluffyBear	57f52f62c6	Did requested changes	2020-09-10 16:27:50 -05:00
NCBPFluffyBear	6b95ed0293	Added Charge Command	2020-09-10 16:02:03 -05:00
TheBusyBiscuit	6fd90bde4f	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-09-10 16:19:23 +02:00
poma123	d22f7f31d8	Renamed to AsyncMachineProcessCompleteEvent	2020-09-10 14:36:41 +02:00
poma123	6e4ad1345f	This has to be async	2020-09-10 13:58:58 +02:00
TheBusyBiscuit	6c7af43574	Merge pull request #2304 from poma123/develop/machine-process-complete-event ... MachineProcessCompleteEvent	2020-09-10 12:16:35 +02:00
TheBusyBiscuit	8a3165e9ba	Fixed some tags and added glass	2020-09-10 00:33:47 +02:00
TheBusyBiscuit	00e71904b2	Merge pull request #2305 from LinoxGH/patch-3 ... Edited markDirty() to clean connectorCache	2020-09-09 23:33:06 +02:00
LinoxGH	1b80c698c5	Fixed a typo.	2020-09-09 21:36:29 +03:00