765 Commits

Author	SHA1	Message	Date
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
Roland Metivier	cbc48584bc	Attempt to fix bug #2360	2020-10-01 11:28:29 -05:00
TheBusyBiscuit	6238b57080	Merge pull request #2370 from poma123/fix/necrotic-skull ... Made Necrotic Skull unplaceable	2020-10-01 11:01:19 +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
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	395713cd52	Merge pull request #2354 from LinoxGH/patch-6 ... Possibly fixed #2353	2020-09-28 15:53:26 +02:00
LinoxGH	fdd3dbbb4e	Update AbstractCargoNode.java	2020-09-27 21:41:25 +03: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
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
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	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	f3b5581a11	Merge pull request #2336 from Seggan/master ... Added Energized Capacitor (From Discord suggestion)	2020-09-21 15:47:23 +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
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	b98cdcf7d8	Added AsyncReactorProcessCompleteEvent	2020-09-19 10:37:06 +02: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
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	f2eeadb24b	[CI skip] Some minor changes	2020-09-09 13:18:43 +02:00
TheBusyBiscuit	23143cd576	Merge pull request #2297 from LinoxGH/patch-2 ... Possibly fixes #2296.	2020-09-08 12:06:57 +02:00
TheBusyBiscuit	fe22c5e9ed	Fixes #2300 (and deprecated bStats)	2020-09-08 12:06:12 +02:00
Daniel Walsh	53dea5e195	Some good old micro-optimisations	2020-09-07 22:38:23 +01:00
LinoxGH	956d8ed078	Did the requested changes.	2020-09-07 18:47:51 +03:00
LinoxGH	cdd7dc9232	Forgot to change a small part.	2020-09-07 13:38:12 +03:00
LinoxGH	7cd2e53bf1	Possibly fixes #2296.	2020-09-07 13:22:59 +03:00