1611 Commits

Author	SHA1	Message	Date
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	8568ba300a	Small performance optimization and deprecated an old class	2020-09-25 09:46:02 +02: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	dd11cd0f30	[CI skip] Removed redundant interface	2020-09-22 18:38:40 +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	d4c26f20f0	Merge branch 'master' into beeArmor	2020-09-21 15:59:56 +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
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
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
LinoxGH	cf5a6e0cca	Oops forgot an import.	2020-09-17 15:17:53 +03:00
LinoxGH	a63f3eb886	Some refactoring and optimizations.	2020-09-17 15:16:24 +03:00
LinoxGH	2bad759178	Fixed a little issue.	2020-09-16 21:54:23 +03:00
LinoxGH	d40b6199e9	Shhh noone needs to know about this.	2020-09-16 21:25:04 +03:00
LinoxGH	ad1bfc052c	Refactoring, requested changes and lots of improvement.	2020-09-16 21:16:47 +03: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
LinoxGH	45da395418	Did a requested change.	2020-09-13 23:41:16 +03:00
LinoxGH	2c0c298dfc	Did a requested change.	2020-09-13 23:36:20 +03:00
LinoxGH	4414b3f29b	Fixed indentation.	2020-09-13 23:35:14 +03:00
LinoxGH	8a91cdbfc2	Code formatting.	2020-09-13 23:32:32 +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	7b10410a70	[Ci skip] A small change	2020-09-13 11:38:04 +02:00
LinoxGH	cff18a32df	Fixed missing import.	2020-09-12 17:34:32 +03:00
LinoxGH	35e0d44b0b	Some refactoring and added a material check.	2020-09-12 17:21:03 +03:00
Silent	03f7e64107	Fixed colors & functionality of cheat sheet	2020-09-12 15:19:07 +02:00
poma123	5112fd25fa	Fixed merge conflicts	2020-09-12 13:02:12 +02:00
poma123	12b32b0856	Merge remote-tracking branch 'upstream/master' into pr/1909	2020-09-12 12:27:24 +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
NCBPFluffyBear	37c0ce4ce0	Organized imports	2020-09-10 23:52:19 -05: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
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	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
LinoxGH	6d6359ce26	Improved the code.	2020-09-09 16:50:04 +03:00
poma123	8f34365aaa	Removed redundant annotations	2020-09-09 14:51:21 +02:00
poma123	87543ccb83	Fixed javadocs	2020-09-09 14:35:17 +02:00
poma123	a4eb852b19	Added annotations	2020-09-09 14:34:01 +02:00
poma123	25bd60fd0e	Fixed a typo	2020-09-09 14:26:01 +02:00
poma123	274c5ada2f	Minor improvement	2020-09-09 14:25:47 +02:00
poma123	e628ad2685	Added MachineProcessCompleteEvent	2020-09-09 14:25:20 +02:00
TheBusyBiscuit	f2eeadb24b	[CI skip] Some minor changes	2020-09-09 13:18:43 +02:00
TheBusyBiscuit	3a5c1ee22b	[CI skip] Removed deprecated class	2020-09-08 12:22:57 +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
TheBusyBiscuit	5c0aba7692	[CI skip] Moved Slimefun repository	2020-09-06 17:19:02 +02:00
Ome_R	490db0d719	Fixed teleporters not functioning if the teleport event is cancelled	2020-09-06 12:22:37 +03:00
TheBusyBiscuit	be5f1ed8ee	Merge pull request #2285 from NCBPFluffyBear/multitool-offhand-fix ... Multitool offhand hunger consumption fix	2020-09-05 22:15:47 +02:00
FluffyBear	6e33549006	Got rid of the extra imports	2020-09-05 15:11:29 -05:00
FluffyBear	069b183b68	Changed it back	2020-09-05 15:11:08 -05:00
FluffyBear	c9fd33318e	Did changes	2020-09-05 11:12:14 -05:00
TheBusyBiscuit	2791da3796	A bit redundant	2020-09-05 15:01:26 +02:00
TheBusyBiscuit	ec9133cf8a	Small improvements	2020-09-05 14:45:42 +02:00
TheBusyBiscuit	8061df9b5e	[CI skip] More nullability annotations	2020-09-05 13:56:56 +02:00
FluffyBear	6f49044998	Applied fix	2020-09-04 10:20:11 -05:00
FluffyBear	6ac3c9698b	Fixed dual wielding problem with shears	2020-09-04 09:29:08 -05:00
TheBusyBiscuit	0c3cb5db37	[CI skip] Updated it once again	2020-09-04 10:02:20 +02:00
TheBusyBiscuit	deb9e0c711	[CI skip] Updated translator list	2020-09-04 09:57:34 +02:00
FluffyBear	cf1c58dd8b	Got rid of charge command from this branch	2020-09-04 00:54:06 -05:00
FluffyBear	90309dabe1	Fixed multitools consuming hunger when used in offhand	2020-09-04 00:46:26 -05:00
FluffyBear	649d4797c9	Merge pull request #1 from TheBusyBiscuit/master ... Update to latest	2020-09-04 00:40:03 -05:00
TheBusyBiscuit	26f9e5f7c6	More annotations and refactoring	2020-09-03 17:19:24 +02:00
TheBusyBiscuit	dd9962d3e2	Small improvement, many annotations	2020-09-03 12:24:49 +02:00
TheBusyBiscuit	f4869991ca	Moved Nether goo to the appropriate package (+ more annotations)	2020-09-02 14:47:32 +02:00
TheBusyBiscuit	4ce4388218	[CI skip] More annotations :o	2020-09-02 13:53:10 +02:00
TheBusyBiscuit	c5630791c0	Added item break sound to some tools	2020-09-02 12:19:18 +02:00
TheBusyBiscuit	3b28545714	Little tweak	2020-09-02 12:08:36 +02:00
TheBusyBiscuit	f1515edae9	Fixed Synthetic Shulker Shells missing	2020-09-02 12:07:16 +02:00
TheBusyBiscuit	8a6e00a402	Even more annotations	2020-09-02 11:53:42 +02:00
TheBusyBiscuit	71322d95a8	More annotations	2020-09-02 11:27:53 +02:00
TheBusyBiscuit	486253973c	Renamed to Villager Rune	2020-09-02 11:16:45 +02:00
TheBusyBiscuit	eb9837953c	Delete RangedItemSetting.java	2020-09-02 11:13:16 +02:00
TheBusyBiscuit	7da5b9ad35	Merge branch 'master' into experimental	2020-09-02 10:34:13 +02:00
TheBusyBiscuit	f4091e931b	Refactoring and some annotations	2020-09-02 10:31:35 +02:00
TheBusyBiscuit	35c1fa6a23	Fixes #2275	2020-09-01 22:38:22 +02:00
BuildTools	c091c7992f	Removed redundancies, added javadocs, fixed formatting	2020-08-31 18:50:35 -05:00
BuildTools	16ea468c38	Added command to charge items	2020-08-31 15:31:09 -05:00
TheBusyBiscuit	4a6068b078	Refactoring	2020-08-31 20:38:01 +02:00
TheBusyBiscuit	93ff508603	More refactoring	2020-08-31 20:37:24 +02:00
TheBusyBiscuit	759946f5c3	[Ci skip] Reduced technical debt	2020-08-31 20:18:35 +02:00
TheBusyBiscuit	3d22e42bef	Merge pull request #2270 from LinoxGH/master ... Fixes #2265 <Tested>	2020-08-31 19:56:05 +02:00
TheBusyBiscuit	8073b5dafb	Fixes #2266	2020-08-31 19:49:25 +02:00
LinoxGH	6dba662d4b	Merge branch 'master' into master	2020-08-31 20:34:15 +03:00
TheBusyBiscuit	68b9a0aed8	Fixes #2269 (+ refactoring)	2020-08-31 19:08:15 +02:00
LinoxGH	d95049db27	Did the requested change.	2020-08-31 19:13:23 +03:00
LinoxGH	f740cc7850	Did the requested change.	2020-08-31 19:04:23 +03:00
LinoxGH	fa01e82179	Did the requested changes.	2020-08-31 18:51:21 +03:00
LinoxGH	e2c93c54e5	Fixes #2265 <Tested>	2020-08-31 17:28:26 +03:00
LinoxGH	918edbeeb1	Fixed the javadocs.	2020-08-30 18:42:57 +03:00
LinoxGH	305dd57b39	Did the requested change.	2020-08-30 18:25:08 +03:00
LinoxGH	dffc5758e2	Fixed compilation error.	2020-08-30 18:21:50 +03:00
LinoxGH	3d0c642477	Added an additional check for Wind Staff	2020-08-30 18:14:39 +03:00
LinoxGH	cdb6eeab96	Did the requested changes.	2020-08-30 18:13:45 +03:00
LinoxGH	e0914af6d9	Fixes #2263	2020-08-30 17:53:39 +03:00
TheBusyBiscuit	6b4f914784	Some more refactoring	2020-08-29 14:20:33 +02:00
TheBusyBiscuit	e3f7e68468	Fixed a merging issue	2020-08-29 14:09:41 +02:00
TheBusyBiscuit	dc233997ae	Merge branch 'master' into refactoring/block-energy	2020-08-29 12:47:50 +02:00
TheBusyBiscuit	ac5d5521ce	Fixes #2260	2020-08-28 23:35:11 +02:00
TheBusyBiscuit	ec6f48e374	[CI skip] Refactoring	2020-08-28 23:35:05 +02:00
TheBusyBiscuit	5bef6a9ec8	Fixes #2257	2020-08-28 23:18:43 +02:00
TheBusyBiscuit	9d740436a7	Merge branch 'master' into experimental	2020-08-28 20:53:20 +02:00
TheBusyBiscuit	83b66232fa	Fixes #2251	2020-08-28 20:03:45 +02:00
LinoxGH	f371a5fda6	Fixed a stupid issue and added some docs.	2020-08-27 20:53:13 +03:00
LinoxGH	8c1cccc390	Forgot about imports.	2020-08-27 20:33:01 +03:00
LinoxGH	fd665843a0	Did requested changes.	2020-08-27 20:20:13 +03:00
LinoxGH	53abf76a35	Fixed Fluid Pump dupe.	2020-08-27 20:08:02 +03:00
TheBusyBiscuit	f97935b5c7	Deleted unused class	2020-08-27 14:29:02 +02:00
TheBusyBiscuit	fcbae02a4b	Fixs #2208	2020-08-27 14:16:09 +02:00
TheBusyBiscuit	4232caf17a	[CI skip] Reduced technical debt	2020-08-27 13:16:38 +02:00
TheBusyBiscuit	b9b3d7f504	[CI skip] Removed deprecated class	2020-08-27 13:00:36 +02:00
TheBusyBiscuit	4dab0c5b47	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy	2020-08-26 17:51:43 +02:00
TheBusyBiscuit	3bc943bdb2	Little bit of refactoring	2020-08-26 14:33:40 +02:00
TheBusyBiscuit	c8ab9e8568	Fixes #1022	2020-08-26 14:31:51 +02:00
TheBusyBiscuit	6e6a953009	Fixes #2249	2020-08-26 12:47:08 +02:00
TheBusyBiscuit	dba52edc47	Merge branch 'master' into experimental	2020-08-24 21:12:38 +02:00
TheBusyBiscuit	4bc22ab106	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into experimental Conflicts: CHANGELOG.md	2020-08-24 21:12:04 +02:00
TheBusyBiscuit	ecde46616a	Climbing Pick no longer causes fall damage	2020-08-24 20:59:01 +02:00
TheBusyBiscuit	89a5db2593	Fixed Unit Tests for Climbing Pick	2020-08-24 20:45:45 +02:00
TheBusyBiscuit	9e92f64222	Added damageable setting	2020-08-24 20:35:35 +02:00
TheBusyBiscuit	8c2038634f	Fixed dual wielding climbing picks and added messages	2020-08-24 20:31:54 +02:00
TheBusyBiscuit	b81959e7a0	Added dual-wielding to the Climbing Pick	2020-08-24 20:19:24 +02:00
TheBusyBiscuit	076ae6532b	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-08-24 18:12:31 +02:00
poma123	7b7c6350c6	Fixed android script editor menu hotkey glitch	2020-08-24 15:30:51 +02:00
TheBusyBiscuit	605862b400	Improved consistency and reduced redundancy	2020-08-24 14:26:11 +02:00
TheBusyBiscuit	a2b2478394	Update EnergyNet.java	2020-08-24 02:18:32 +02:00
TheBusyBiscuit	d998f3ec8c	Merge branch 'master' into refactoring/block-energy	2020-08-24 02:11:59 +02:00
TheBusyBiscuit	155092a321	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... Conflicts: pom.xml	2020-08-23 17:57:13 +02:00
TheBusyBiscuit	f51a19777f	[CI skip] Added more Unit tests	2020-08-23 17:56:38 +02:00
Sfiguz7	89fdf45d28	I said, fixed extra indentation	2020-08-23 17:50:31 +02:00
Sfiguz7	44451d6244	Fixed extra indentation	2020-08-23 17:49:44 +02:00
Sfiguz7	813200b29c	Made requested changes	2020-08-23 15:36:10 +02:00
Sfiguz7	bdd2adc21e	Cleared unused imports I forgot to delete	2020-08-23 13:56:39 +02:00
Sfiguz7	eb66f3e183	Added option to drop excess items on /sf give	2020-08-23 13:54:51 +02:00
TheBusyBiscuit	ec95797cbf	Fixes #2240	2020-08-22 02:38:17 +02:00
TheBusyBiscuit	b36e3e41a8	Reduced technical debt	2020-08-22 02:36:36 +02:00
TheBusyBiscuit	e839ece670	Reduced technical debt	2020-08-22 00:57:44 +02:00
TheBusyBiscuit	95655dc6fc	A few fixes and performance improvements	2020-08-21 15:19:08 +02:00
TheBusyBiscuit	167326292d	Maybe fixes #1951 (+ performance improvements)	2020-08-20 23:25:43 +02:00
TheBusyBiscuit	29092b87c9	Merge branch 'experimental' into IcePick	2020-08-20 22:56:09 +02:00
TheBusyBiscuit	d8d4811974	Merged Nitwit Rune and Shulker Shell PRs	2020-08-20 18:20:25 +02:00
TheBusyBiscuit	65021f7615	Merge branch 'rune' into ShulkerShell	2020-08-20 17:33:27 +02:00
TheBusyBiscuit	88be3e79ff	Merge branch 'master' into refactoring/block-energy	2020-08-20 16:55:35 +02:00
LinoxGH	73d623a0fd	Github Web and its indent issues.	2020-08-20 14:39:31 +03:00
LinoxGH	37bacaa8cb	Apparently SlimefunPlugin.instance is private now.	2020-08-20 14:30:21 +03:00
LinoxGH	bf3b04a4c5	Oops sorry for this silly mistake	2020-08-20 14:19:48 +03:00
LinoxGH	0946b88cd1	Fixed symbol name issues in ClimbingPick.java	2020-08-20 14:11:46 +03:00
LinoxGH	a54e8623d3	Merge branch 'master' into ShulkerShell	2020-08-20 12:21:50 +03:00
LinoxGH	5f78e7a854	Merge branch 'master' into IcePick	2020-08-20 11:43:14 +03:00
TheBusyBiscuit	9787cf734b	Renamed to Nitwit Rune	2020-08-19 14:31:07 +02:00
TheBusyBiscuit	b1abf7bb99	Fixed categories	2020-08-19 14:12:51 +02:00
TheBusyBiscuit	8c5d15e311	Increased Bartering chance	2020-08-19 14:11:33 +02:00
TheBusyBiscuit	66fa277014	A few additional changes	2020-08-19 14:07:42 +02:00
TheBusyBiscuit	57b3f06aa6	Merge pull request #2220 from dniym/NitwitRune ... Added Rune of Unemployment	2020-08-19 13:58:16 +02:00
TheBusyBiscuit	aa22e7c9b2	[CI skip] A bit of refactoring and documentation	2020-08-19 13:54:46 +02:00
dniym	e13e7e1400	Update RuneOfUnemployment.java ... made requested changes	2020-08-18 15:30:12 -04:00
TheBusyBiscuit	9d4d2060ba	[CI skip] Added a few more strings to translation files	2020-08-18 14:45:51 +02:00
TheBusyBiscuit	6be0709aea	Fixes #2138	2020-08-18 14:18:44 +02:00
TheBusyBiscuit	8e8a87fce6	Fixed ChestTerminal timings showing up as cargo nodes	2020-08-17 17:31:15 +02:00
TheBusyBiscuit	fb47574fe8	Added poma's requested change ... Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-08-17 16:27:26 +02:00
TheBusyBiscuit	a10813036b	Added poma's suggested change ... Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-08-17 13:30:18 +02:00
TheBusyBiscuit	0f73b62658	Added Walshys suggested change ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:30:03 +02:00
TheBusyBiscuit	07c62d5932	Added Walshys suggested change ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:29:54 +02:00
TheBusyBiscuit	33f6f039ec	Added Walshys suggested change ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:29:44 +02:00
TheBusyBiscuit	d4953dd029	[CI skip] Added more Unit Tests	2020-08-17 13:00:22 +02:00
TheBusyBiscuit	1bba2efa3e	[CI skip] Added more unit tests	2020-08-17 02:23:28 +02:00
TheBusyBiscuit	7a31c88ce9	Fixes #2207	2020-08-17 00:32:18 +02:00
TheBusyBiscuit	c98fe74ea9	Merge branch 'master' into NitwitRune	2020-08-17 00:25:18 +02:00
dniym	42e4b1620d	Update SlimefunItemSetup.java ... Fixed merge conflict 2	2020-08-16 13:52:09 -04:00